@eohjsc/react-native-smart-city 0.3.36 → 0.3.37

package/src/commons/Header/__test__/HeaderCT.test.js

@@ -24,36 +24,36 @@ describe('Test HeaderCustom', () => {
     showPopoverWithRef: mockShowPopoverWithRef,
   };
 
-  it('Test not render right', () => {
-    act(() => {
-      tree = create(wrapComponent(defaultProps));
+  it('Test not render right', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(defaultProps));
     });
     const instance = tree.root;
     const TouchableOpacityElement = instance.findAllByType(TouchableOpacity);
     expect(TouchableOpacityElement).toHaveLength(1);
   });
 
-  it('Test render right', () => {
+  it('Test render right', async () => {
     defaultProps = { ...defaultProps, isShowRight: true };
-    act(() => {
-      tree = create(wrapComponent(defaultProps));
+    await act(async () => {
+      tree = await create(wrapComponent(defaultProps));
     });
     const instance = tree.root;
     const TouchableOpacityElement = instance.findAllByType(TouchableOpacity);
     expect(TouchableOpacityElement).toHaveLength(3);
-    act(() => {
+    await act(async () => {
       TouchableOpacityElement[1].props.onPress();
     });
     expect(mockOnRefresh).toBeCalled();
-    act(() => {
+    await act(async () => {
       TouchableOpacityElement[2].props.onPress();
     });
     expect(mockShowPopoverWithRef).toBeCalled();
   });
 
-  it('Test render without props', () => {
-    act(() => {
-      tree = create(wrapComponent(defaultProps));
+  it('Test render without props', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(defaultProps));
     });
     const instance = tree.root;
     const TouchableOpacityElement = instance.findAllByType(TouchableOpacity);

package/src/commons/ImageButton/__test__/ImageButton.test.js

@@ -7,8 +7,8 @@ import AddMemberIcon from '../../../../assets/images/Popover/Dashboard/AddMember
 describe('Test ImageButton component', () => {
   let tree;
   const mockFunc = jest.fn();
-  test('create ImageButton', () => {
-    act(() => {
+  it('create ImageButton', async () => {
+    await act(async () => {
       tree = renderer.create(
         <ImageButton
           onPress={mockFunc}

package/src/commons/ImagePicker/__test__/ImagePicker.test.js

@@ -27,9 +27,9 @@ describe('Test ImagePicker', () => {
   beforeEach(() => {
     Platform = require('react-native').Platform;
   });
-  test('create ImagePicker', () => {
+  it('create ImagePicker', async () => {
     Platform.OS = 'android';
-    act(() => {
+    await act(async () => {
       tree = renderer.create(wrapComponent());
     });
     const instance = tree.root;
@@ -37,7 +37,7 @@ describe('Test ImagePicker', () => {
     expect(textInputs.length).toBe(1);
   });
 
-  test('create ImagePicker optionsCapture', () => {
+  it('create ImagePicker optionsCapture', async () => {
     Platform.OS = 'android';
     const options = {
       mediaType: 'photo',
@@ -45,17 +45,17 @@ describe('Test ImagePicker', () => {
       compressImageMaxHeight: 720,
       compressImageQuality: 0.8,
     };
-    act(() => {
+    await act(async () => {
       tree = renderer.create(wrapComponent(options));
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(ButtonPopup);
     expect(textInputs.length).toBe(1);
-    act(() => {
+    await act(async () => {
       textInputs[0].props.onPressMain();
     });
   });
-  test('create ImagePicker onChooseFile', () => {
+  it('create ImagePicker onChooseFile', async () => {
     Platform.OS = 'android';
     const options = {
       mediaType: 'photo',
@@ -63,13 +63,13 @@ describe('Test ImagePicker', () => {
       compressImageMaxHeight: 720,
       compressImageQuality: 0.8,
     };
-    act(() => {
+    await act(async () => {
       tree = renderer.create(wrapComponent(options));
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(ButtonPopup);
     expect(textInputs.length).toBe(1);
-    act(() => {
+    await act(async () => {
       textInputs[0].props.onPressSecondary();
     });
   });

package/src/commons/MediaPlayerDetail/__test__/MediaPlayerDetail.test.js

@@ -20,7 +20,7 @@ const wrapComponent = () => (
 describe('Test MediaPlayerDetail', () => {
   let wrapper;
 
-  test('MediaPlayerDetail render when onTap setPause', async () => {
+  it('MediaPlayerDetail render when onTap setPause', async () => {
     await act(async () => {
       wrapper = await create(wrapComponent());
     });

package/src/commons/MediaPlayerDetail/__test__/MediaPlayerFull.test.js

@@ -31,8 +31,8 @@ describe('Test MediaPlayerFull', () => {
     useState.mockImplementationOnce((init) => [false, mockSetState]);
     useState.mockImplementationOnce((init) => [false, mockSetState]);
     useState.mockImplementationOnce((init) => [init, mockSetState]);
-    await act(() => {
-      tree = create(
+    await act(async () => {
+      tree = await create(
         wrapComponent({
           isShowFullScreenIcon: true,
           thumbnail: { uri: 'test' },
@@ -42,11 +42,11 @@ describe('Test MediaPlayerFull', () => {
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
     expect(TouchableOpacities).toHaveLength(3);
-    act(() => {
+    await act(async () => {
       TouchableOpacities[0].props.onPress();
     });
     expect(mockSetState).toBeCalledWith(false);
-    act(() => {
+    await act(async () => {
       TouchableOpacities[1].props.onPress();
       TouchableOpacities[2].props.onPress();
     });
@@ -57,8 +57,8 @@ describe('Test MediaPlayerFull', () => {
     useState.mockImplementationOnce((init) => [true, mockSetState]);
     useState.mockImplementationOnce((init) => [true, mockSetState]);
     useState.mockImplementationOnce((init) => [init, mockSetState]);
-    await act(() => {
-      tree = create(
+    await act(async () => {
+      tree = await create(
         wrapComponent({
           isShowFullScreenIcon: true,
           cameraName: 'test',
@@ -70,11 +70,11 @@ describe('Test MediaPlayerFull', () => {
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);
     expect(TouchableOpacities).toHaveLength(3);
-    act(() => {
+    await act(async () => {
       TouchableOpacities[0].props.onPress();
     });
     expect(mockSetState).toBeCalledWith(false);
-    act(() => {
+    await act(async () => {
       TouchableOpacities[1].props.onPress();
       TouchableOpacities[2].props.onPress();
     });

package/src/commons/MenuActionAddnew/__test__/MenuActionAddNew.test.js

@@ -16,14 +16,14 @@ describe('Test MenuActionAddNew', () => {
   const dataActions = [item(1), item(2)];
   let wrapper;
 
-  test('onItemClick MenuActionAddNew', () => {
+  it('onItemClick MenuActionAddNew', async () => {
     const mockFunc = jest.fn();
-    act(() => {
+    await act(async () => {
       wrapper = create(wrapComponent(dataActions));
     });
     const instance = wrapper.root;
     const imageButtons = instance.findAllByType(ImageButton);
-    act(() => {
+    await act(async () => {
       imageButtons[0].props.onPress();
     });
     expect(imageButtons.length).toEqual(2);

package/src/commons/MenuActionList/__test__/MenuActionList.test.js

@@ -9,11 +9,11 @@ describe('Test MenuActionList', () => {
   const listItem = [item(1)];
   let wrapper;
 
-  test('onItemClick MenuActionList', () => {
+  it('onItemClick MenuActionList', async () => {
     const mockOnItemClick = jest.fn();
     const mockHideModal = jest.fn();
 
-    act(() => {
+    await act(async () => {
       wrapper = create(
         <MenuActionList
           title="Title"
@@ -26,7 +26,7 @@ describe('Test MenuActionList', () => {
     const instance = wrapper.root;
     const button = instance.findByType(TouchableOpacity);
 
-    act(() => {
+    await act(async () => {
       button.props.onPress();
     });
 

package/src/commons/MenuActionMore/__test__/MenuActionMore.test.js

@@ -6,7 +6,7 @@ import MenuActionMore from '..';
 describe('Test MenuActionMore', () => {
   let wrapper;
   const mockFunc = jest.fn();
-  test('render MenuActionMore', async () => {
+  it('render MenuActionMore', async () => {
     let listMenuItem = [{ text: 'text' }];
     await act(async () => {
       wrapper = await renderer.create(
@@ -22,7 +22,7 @@ describe('Test MenuActionMore', () => {
     const instance = wrapper.root;
     const buttons = instance.findAllByType(TouchableOpacity);
     expect(buttons.length).toEqual(1);
-    act(() => {
+    await act(async () => {
       buttons[0].props.onPress();
     });
     expect(mockFunc).toHaveBeenCalled();

package/src/commons/Modal/__test__/ModalBottom.test.js

@@ -20,8 +20,8 @@ describe('Test ModalBottom', () => {
   });
 
   it('Test render with isVisible', async () => {
-    await act(() => {
-      tree = create(wrapComponent(true));
+    await act(async () => {
+      tree = await create(wrapComponent(true));
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);
@@ -29,8 +29,8 @@ describe('Test ModalBottom', () => {
   });
 
   it('Test render without isVisible', async () => {
-    await act(() => {
-      tree = create(wrapComponent());
+    await act(async () => {
+      tree = await create(wrapComponent());
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);

package/src/commons/OneTapTemplate/NumberUpDownActionTemplate.js

@@ -8,16 +8,23 @@ import { Colors } from '../../configs';
 import SelectActionCard from '../SelectActionCard';
 import Text from '../Text';
 import { useConfigGlobalState } from '../../iot/states';
-import { AccessibilityLabel } from '../../configs/Constants';
+import { AccessibilityLabel, DEVICE_TYPE } from '../../configs/Constants';
 import { ModalCustom } from '../Modal';
 
-const NumberUpDownActionTemplate = memo(({ data, onSelectAction }) => {
+const NumberUpDownActionTemplate = ({ device, data = {}, onSelectAction }) => {
   const t = useTranslations();
   const [visible, setVisible] = useState(false);
   const onClose = () => setVisible(false);
   const onPress = () => setVisible(true);
   const { configuration, template, title } = data;
-  const { config, text_format, min_value, max_value, action } = configuration;
+  const {
+    config,
+    text_format,
+    min_value,
+    max_value,
+    action,
+    allow_config_store_value,
+  } = configuration || {};
   const [configValues] = useConfigGlobalState('configValues');
   const [value, setValue] = useState();
   const [actionName, setActionName] = useState(null);
@@ -49,21 +56,40 @@ const NumberUpDownActionTemplate = memo(({ data, onSelectAction }) => {
   }, [value, max_value]);
 
   const onPressDone = useCallback(() => {
+    let data = String(value);
+    if (device?.device_type !== DEVICE_TYPE.GOOGLE_HOME) {
+      data = { temperature: value };
+      if (allow_config_store_value && config) {
+        data.config_id = config;
+        data.config_value = value;
+      }
+    } else if (device?.device_type === DEVICE_TYPE.LG_THINQ) {
+      data = {
+        temperature: {
+          targetTemperature: value,
+          unit: 'C',
+          locationName: 'FREEZER',
+        },
+      };
+    }
     setActionName(text_format.replace('{number}', value));
     onSelectAction &&
       onSelectAction({
         action,
-        data: {
-          temperature: {
-            targetTemperature: value,
-            unit: 'C',
-            locationName: 'FREEZER',
-          },
-        },
+        data: data,
         template,
       });
     onClose();
-  }, [text_format, value, action, template, onSelectAction]);
+  }, [
+    device?.device_type,
+    text_format,
+    value,
+    onSelectAction,
+    action,
+    template,
+    allow_config_store_value,
+    config,
+  ]);
 
   return (
     <>
@@ -141,6 +167,6 @@ const NumberUpDownActionTemplate = memo(({ data, onSelectAction }) => {
       </ModalCustom>
     </>
   );
-});
+};
 
-export default NumberUpDownActionTemplate;
+export default memo(NumberUpDownActionTemplate);

package/src/commons/OneTapTemplate/OptionsDropdownActionTemplate.js

@@ -8,9 +8,9 @@ import styles from './OptionsDropdownActionTemplateStyles';
 import { Colors } from '../../configs';
 import SelectActionCard from '../SelectActionCard';
 import Text from '../Text';
-import { AccessibilityLabel } from '../../configs/Constants';
+import { AccessibilityLabel, DEVICE_TYPE } from '../../configs/Constants';
 
-const OptionsDropdownActionTemplate = memo(({ data, onSelectAction }) => {
+const OptionsDropdownActionTemplate = ({ device, data, onSelectAction }) => {
   const t = useTranslations();
   const [visible, setVisible] = useState(false);
   const [actionName, setActionName] = useState(null);
@@ -18,29 +18,49 @@ const OptionsDropdownActionTemplate = memo(({ data, onSelectAction }) => {
   const onClose = () => setVisible(false);
   const onPress = () => setVisible(true);
   const { title, configuration, template } = data;
-  const { options, action } = configuration;
+  const { options, action, config, allow_config_store_value } = configuration;
 
   const handleOnPressItem = useCallback(
-    (item, index) => {
+    (index) => {
       setActiveAction(index);
     },
     [setActiveAction]
   );
 
   const onPressDone = useCallback(() => {
+    const { value_text, value_int } = options[activeAction];
+    let data = { level: value_text, key_code: value_int };
+    if (allow_config_store_value && config) {
+      data.config_id = config;
+      data.config_value = value_int;
+    } else if (device?.device_type === DEVICE_TYPE.LG_THINQ) {
+      data = {
+        airFlow: {
+          windStrength: value_text,
+        },
+      };
+    } else if (device?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+      data = value_text;
+    }
+
     onSelectAction &&
       onSelectAction({
         action,
-        data: {
-          airFlow: {
-            windStrength: options[activeAction]?.value_text,
-          },
-        },
+        data: data,
         template,
       });
     setActionName(options[activeAction]?.text);
     setVisible(false);
-  }, [onSelectAction, setVisible, activeAction, action, template, options]);
+  }, [
+    options,
+    activeAction,
+    allow_config_store_value,
+    config,
+    device?.device_type,
+    onSelectAction,
+    action,
+    template,
+  ]);
 
   return (
     <View>
@@ -65,7 +85,7 @@ const OptionsDropdownActionTemplate = memo(({ data, onSelectAction }) => {
                 <View style={styles.lineBottom} key={index}>
                   <TouchableOpacity
                     style={styles.flexRow}
-                    onPress={() => handleOnPressItem(item, index)}
+                    onPress={() => handleOnPressItem(index)}
                     accessibilityLabel={
                       AccessibilityLabel.OPTIONS_DROPDOWN_ACTION_CHOOSING_ITEM
                     }
@@ -112,6 +132,5 @@ const OptionsDropdownActionTemplate = memo(({ data, onSelectAction }) => {
       </Modal>
     </View>
   );
-});
-
-export default OptionsDropdownActionTemplate;
+};
+export default memo(OptionsDropdownActionTemplate);

package/src/commons/OneTapTemplate/StatesGridActionTemplate.js

@@ -8,7 +8,7 @@ import { AccessibilityLabel } from '../../configs/Constants';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { ModalCustom } from '../Modal';
 
-const StatesGridActionTemplate = memo(({ data, onSelectAction }) => {
+const StatesGridActionTemplate = ({ device, data, onSelectAction }) => {
   const t = useTranslations();
   const [visible, setVisible] = useState(false);
   const [actionName, setActionName] = useState(null);
@@ -19,11 +19,16 @@ const StatesGridActionTemplate = memo(({ data, onSelectAction }) => {
 
   const hanleSelectAction = useCallback(
     (item) => {
+      let data = null;
+      const { allow_config_store_value, config, is_on_value } = item;
+      if (allow_config_store_value && config) {
+        data = { config_id: config, config_value: is_on_value };
+      }
       setActionName(item.text);
       onSelectAction &&
         onSelectAction({
           action: item.action,
-          data: null,
+          data: data,
           template,
         });
       setVisible(false);
@@ -64,6 +69,6 @@ const StatesGridActionTemplate = memo(({ data, onSelectAction }) => {
       </ModalCustom>
     </View>
   );
-});
+};
 
-export default StatesGridActionTemplate;
+export default memo(StatesGridActionTemplate);

package/src/commons/OneTapTemplate/__test__/NumberUpDownActionTemplate.test.js

@@ -40,9 +40,9 @@ describe('Test NumberUpDownActionTemplate', () => {
       text_format: '{number} *C',
     },
   };
-  test('Test onPressDown', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('Test onPressDown', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const touchableOpacity = instance.find(
@@ -56,15 +56,15 @@ describe('Test NumberUpDownActionTemplate', () => {
         item.props.accessibilityLabel ===
           AccessibilityLabel.NUMBER_UP_DOWN_ACTION_TEXT && item.type === Text
     );
-    act(() => {
+    await act(async () => {
       touchableOpacity.props.onPress();
     });
     expect(textElement.props.children).toEqual('27 *C');
   });
 
-  test('Test onPressUp', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('Test onPressUp', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const touchableOpacity = instance.find(
@@ -78,15 +78,15 @@ describe('Test NumberUpDownActionTemplate', () => {
         item.props.accessibilityLabel ===
           AccessibilityLabel.NUMBER_UP_DOWN_ACTION_TEXT && item.type === Text
     );
-    act(() => {
+    await act(async () => {
       touchableOpacity.props.onPress();
     });
     expect(textElement.props.children).toEqual('29 *C');
   });
 
-  test('Test onPressDone', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('Test onPressDone', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const touchableOpacity = instance.find(
@@ -95,9 +95,22 @@ describe('Test NumberUpDownActionTemplate', () => {
           AccessibilityLabel.NUMBER_UP_DOWN_ACTION_DONE &&
         item.type === TouchableOpacity
     );
-    act(() => {
+    await act(async () => {
       touchableOpacity.props.onPress();
     });
     expect(mockOnSelectAction).toHaveBeenCalled();
   });
+  it('Test config null show valueDefault', async () => {
+    data.configuration.config = null;
+    await act(async () => {
+      tree = await create(wrapComponent(data));
+    });
+    const instance = tree.root;
+    const textElement = instance.find(
+      (item) =>
+        item.props.accessibilityLabel ===
+          AccessibilityLabel.NUMBER_UP_DOWN_ACTION_TEXT && item.type === Text
+    );
+    expect(textElement.props.children).toEqual('28 *C');
+  });
 });

package/src/commons/OneTapTemplate/__test__/OptionsDropdownActionTemplate.test.js

@@ -75,9 +75,9 @@ describe('Test OptionsDropdownActionTemplate', () => {
       icon_kit: 43,
     },
   };
-  test('Test render OptionsDropdownActionTemplate', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('Test render OptionsDropdownActionTemplate', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAll(
@@ -89,9 +89,9 @@ describe('Test OptionsDropdownActionTemplate', () => {
     expect(touchOpacity).toHaveLength(7);
   });
 
-  test('Test handleOnPressItem', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('Test handleOnPressItem', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAll(
@@ -102,15 +102,15 @@ describe('Test OptionsDropdownActionTemplate', () => {
     );
     const radioCircle = instance.findAllByType(RadioCircle);
 
-    act(() => {
+    await act(async () => {
       touchOpacity[0].props.onPress(data.configuration.options[0], 0);
     });
     expect(radioCircle[0].props.active).toEqual(true);
   });
 
-  test('Test onPressDone', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it.only('Test onPressDone', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const selectOptions = instance.findAll(
@@ -126,9 +126,9 @@ describe('Test OptionsDropdownActionTemplate', () => {
         item.type === TouchableOpacity
     );
 
-    act(() => {
-      selectOptions[0].props.onPress(data.configuration.options[0], 0);
-      touchOpacity.props.onPress();
+    await act(async () => {
+      await selectOptions[0].props.onPress(0);
+      await touchOpacity.props.onPress();
     });
     expect(mockOnSelectAction).toHaveBeenCalled();
   });

package/src/commons/OneTapTemplate/__test__/StatesGridActionTemplate.test.js

@@ -64,9 +64,9 @@ describe('Test StatesGridActionTempalte', () => {
       ],
     },
   };
-  test('Test render StatesGridActionTempalte', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('Test render StatesGridActionTempalte', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAll(
@@ -78,9 +78,9 @@ describe('Test StatesGridActionTempalte', () => {
     expect(touchOpacity).toHaveLength(4);
   });
 
-  test('Test onPress hanleSelectAction', () => {
-    act(() => {
-      tree = create(wrapComponent(data));
+  it('Test onPress hanleSelectAction', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(data));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAll(
@@ -91,7 +91,7 @@ describe('Test StatesGridActionTempalte', () => {
     );
     expect(touchOpacity).toHaveLength(4);
 
-    act(() => {
+    await act(async () => {
       touchOpacity[0].props.onPress(data.configuration.options[0]);
     });
     expect(mockOnSelectAction).toHaveBeenCalled();

package/src/commons/PreventAccess/__test__/PreventAccess.test.js

@@ -35,9 +35,11 @@ describe('Test PreventAccess.test', () => {
   let visible;
   let hidePreventAccess = () => {};
 
-  test('onItemClick MenuActionList', () => {
-    act(() => {
-      tree = create(wrapComponent(headerBodyText, visible, hidePreventAccess));
+  it('onItemClick MenuActionList', async () => {
+    await act(async () => {
+      tree = await create(
+        wrapComponent(headerBodyText, visible, hidePreventAccess)
+      );
     });
     const instance = tree.root;
     const text = instance.findAllByType(Text);
@@ -50,11 +52,11 @@ describe('Test PreventAccess.test', () => {
       (el) =>
         el.props.accessibilityLabel === AccessibilityLabel.TEXT_PREVENT_ACCESS
     );
-    act(() => {
+    await act(async () => {
       button1.props.onBackButtonPress();
     });
 
-    act(() => {
+    await act(async () => {
       button2.props.onPress();
     });
     expect(button1).toBeDefined();