@eohjsc/react-native-smart-city 0.3.6 → 0.3.7

package/src/commons/ActionGroup/StatesGridActionTemplate.js

@@ -45,20 +45,10 @@ const GridItem = ({ item, index, length, doAction, sensor, title }) => {
       actionName = actionName.replace(/\s+/g, ' ').trim();
       doAction(actionData, null, actionName);
       if (sensor?.is_managed_by_backend) {
-        config &&
-          sensor.device_type !== 'GOOGLE_HOME' &&
-          watchMultiConfigs([config]);
+        config && watchMultiConfigs([config]);
       }
     },
-    [
-      config,
-      doAction,
-      sensor?.is_managed_by_backend,
-      sensor?.name,
-      sensor?.device_type,
-      text,
-      title,
-    ]
+    [config, doAction, sensor?.is_managed_by_backend, sensor?.name, text, title]
   );
 
   const iconKit = !!icon_kit_data && icon_kit_data.icon;
@@ -105,19 +95,15 @@ const GridItem = ({ item, index, length, doAction, sensor, title }) => {
   );
 };
 
-const StatesGridActionTemplate = ({
-  actionGroup = {},
-  doAction,
-  sensor = {},
-}) => {
-  const { configuration = {}, title } = actionGroup;
+const StatesGridActionTemplate = ({ actionGroup, doAction, sensor }) => {
+  const { configuration, title } = actionGroup;
 
   // eslint-disable-next-line no-unused-vars
   const [configValues, setConfigValues] = useConfigGlobalState('configValues');
 
   const options = useMemo(() => {
-    return (configuration?.options || []).map((option) => {
-      if (configValues[option?.config] === option?.is_on_value) {
+    return configuration.options.map((option) => {
+      if (configValues[option.config] === option.is_on_value) {
         return {
           ...option,
           active: true,
@@ -128,10 +114,10 @@ const StatesGridActionTemplate = ({
   }, [configuration, configValues]);
 
   useEffect(() => {
-    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
+    if (sensor?.is_managed_by_backend) {
       watchMultiConfigs(configuration.options.map((option) => option.config));
     }
-  }, [sensor.is_managed_by_backend, sensor.device_type, configuration.options]);
+  }, [sensor.is_managed_by_backend, configuration.options]);
 
   return (
     <View style={styles.wrap}>

package/src/commons/ActionGroup/TimerActionTemplate.js

@@ -14,9 +14,9 @@ import { Colors } from '../../configs';
 import { useConfigGlobalState } from '../../iot/states';
 import BottomScrollPicker from '../BottomScrollPicker';
 
-const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
+const TimerActionTemplate = ({ actionGroup, doAction, sensor }) => {
   const t = useTranslations();
-  const { configuration = {}, title } = actionGroup;
+  const { configuration, title } = actionGroup;
   const [showTime, setShowTime] = useState(false);
   const [showHour, setShowHour] = useState(false);
 
@@ -94,7 +94,6 @@ const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
       if (sensor.is_managed_by_backend) {
         hour !== undefined &&
           minute !== undefined &&
-          sensor.device_type !== 'GOOGLE_HOME' &&
           watchMultiConfigs([
             configuration.config_hour,
             configuration.config_minute,
@@ -107,17 +106,13 @@ const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
       configuration.config_minute,
       doAction,
       sensor.is_managed_by_backend,
-      sensor.device_type,
     ]
   );
 
   const doActionHour = useCallback(
     (hour) => {
       doAction(configuration.action_data, hour);
-      if (
-        sensor.is_managed_by_backend &&
-        sensor.device_type !== 'GOOGLE_HOME'
-      ) {
+      if (sensor.is_managed_by_backend) {
         hour && watchMultiConfigs([configuration.config_hour]);
       }
     },
@@ -126,7 +121,6 @@ const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
       configuration.config_hour,
       doAction,
       sensor.is_managed_by_backend,
-      sensor.device_type,
     ]
   );
 
@@ -207,8 +201,6 @@ const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
         onConfirm={onConfirmTime}
         onCancel={onHideTime}
         display="spinner"
-        cancelTextIOS={t('cancel')}
-        confirmTextIOS={t('confirm')}
       />
       <BottomScrollPicker
         min={configuration.min}

package/src/commons/ActionGroup/TwoButtonTemplate/index.js

@@ -14,6 +14,7 @@ const TwoButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { button1, button2 } = configuration;
   const [isOn, setIsOn] = useState(true);
   const [isStart, setIsStart] = useState(true);
+  // eslint-disable-next-line no-unused-vars
   const [configValues] = useConfigGlobalState('configValues');
   const isLight = false;
 
@@ -101,7 +102,10 @@ const TwoButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
     if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
       return;
     }
-    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
+    if (
+      sensor?.is_managed_by_backend &&
+      sensor?.device_type !== 'GOOGLE_HOME'
+    ) {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);

package/src/commons/ActionGroup/__test__/CurtainButtonTemplate.test.js

@@ -1,37 +1,20 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import { TouchableOpacity, Switch } from 'react-native';
+import { TouchableOpacity } from 'react-native';
 
 import CurtainButtonTemplate from '../CurtainButtonTemplate';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-const mockDoAction = jest.fn();
-const mockActionOffData = jest.fn();
-const mockActionOnData = jest.fn();
-const mockCloseActionData = jest.fn();
-
-const wrapComponent = (actionGroup = {}, sensor = {}) => (
+const wrapComponent = (actionGroup) => (
   <SCProvider initState={mockSCStore({})}>
-    <CurtainButtonTemplate
-      actionGroup={actionGroup}
-      doAction={mockDoAction}
-      sensor={sensor}
-    />
+    <CurtainButtonTemplate actionGroup={actionGroup} doAction={jest.fn()} />
   </SCProvider>
 );
 
 describe('Test CurtainButtonTemplate', () => {
-  const sensor = {
-    name: 'test',
-  };
   const actionGroup = {
     configuration: {
-      text_open: 'open',
-      is_display_lock: true,
-      action_off_data: mockActionOffData,
-      action_on_data: mockActionOnData,
-      close_action_data: mockCloseActionData,
       action1: '2b949045-8e03-4c07-a855-7794ade2e69c',
       action1_data: {
         color: '#00979D',
@@ -78,44 +61,12 @@ describe('Test CurtainButtonTemplate', () => {
 
   let wrapper;
 
-  test('render without params', async () => {
-    await act(() => {
-      wrapper = renderer.create(wrapComponent());
-    });
-    const instance = wrapper.root;
-    const touchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(touchableOpacities.length).toEqual(3);
-  });
-
   test('render CurtainButtonTemplate', async () => {
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, sensor));
+      wrapper = renderer.create(wrapComponent(actionGroup));
     });
     const instance = wrapper.root;
     const touchableOpacities = instance.findAllByType(TouchableOpacity);
     expect(touchableOpacities.length).toEqual(3);
-    await touchableOpacities[0].props.onPress();
-    await touchableOpacities[1].props.onPress();
-    await touchableOpacities[2].props.onPress();
-    expect(mockDoAction).toBeCalledWith(
-      mockCloseActionData,
-      null,
-      sensor?.name + ' undefined'
-    );
-
-    const Switchs = instance.findAllByType(Switch);
-    expect(Switchs).toHaveLength(1);
-    await Switchs[0].props.onValueChange();
-    expect(mockDoAction).toBeCalledWith(
-      mockActionOnData,
-      null,
-      `${sensor.name} lock`
-    );
-    await Switchs[0].props.onValueChange();
-    expect(mockDoAction).toBeCalledWith(
-      mockActionOffData,
-      null,
-      `${sensor.name} unlock`
-    );
   });
 });

package/src/commons/ActionGroup/__test__/OnOffButtonTemplate.test.js

@@ -1,14 +1,6 @@
 import React, { useState } from 'react';
 import { act, create } from 'react-test-renderer';
-import OnOffTemplate from '../OnOffTemplate';
-import { mockSCStore } from '../../../context/mockStore';
-import { SCProvider } from '../../../context';
-
-const wrapComponent = (actionGroup, mockDoAction) => (
-  <SCProvider initState={mockSCStore({})}>
-    <OnOffTemplate actionGroup={actionGroup} doAction={mockDoAction} />
-  </SCProvider>
-);
+import Index from '../OnOffTemplate';
 
 jest.mock('react', () => ({
   ...jest.requireActual('react'),
@@ -57,15 +49,21 @@ describe('Test OneBigButtonTemplate', () => {
   const assertRender = (state, text) => {
     useState.mockImplementationOnce((init) => [state, setState]);
     const mockDoAction = jest.fn();
-
     act(() => {
-      wrapper = create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = create(
+        <Index actionGroup={actionGroup} doAction={mockDoAction} />
+      );
     });
 
     const renderJson = wrapper.toJSON();
 
-    expect(renderJson?.props?.visible).toEqual(false);
-    expect(renderJson?.type).toEqual('Modal');
+    expect(renderJson?.children[0].children[0].children[1].children).toEqual(
+      undefined
+    );
+
+    expect(
+      renderJson?.children[0].children[0].children[1].children
+    ).not.toEqual([text]);
   };
 
   test('render state on', () => {
@@ -80,7 +78,9 @@ describe('Test OneBigButtonTemplate', () => {
     useState.mockImplementationOnce((init) => [state, setState]);
     const mockDoAction = jest.fn();
     act(() => {
-      wrapper = create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = create(
+        <Index actionGroup={actionGroup} doAction={mockDoAction} />
+      );
     });
 
     expect(mockDoAction).not.toHaveBeenCalled();

package/src/commons/ActionGroup/__test__/OnOffTemplate.test.js

@@ -1,25 +1,11 @@
-/* eslint-disable promise/prefer-await-to-callbacks */
 import { TESTID } from '../../../configs/Constants';
 import { watchMultiConfigs } from '../../../iot/Monitor';
 import React from 'react';
 import { View } from 'react-native';
-import { useSelector } from 'react-redux';
 import { act, create } from 'react-test-renderer';
 import OnOffTemplate from '../OnOffTemplate';
 import OnOffButtonTemplate from '../OnOffTemplate/OnOffButtonTemplate';
 import OnOffSimpleTemplate from '../OnOffTemplate/OnOffSimpleTemplate';
-import { mockSCStore } from '../../../context/mockStore';
-import { SCProvider } from '../../../context';
-
-const wrapComponent = (actionGroup, mockDoAction, sensor) => (
-  <SCProvider initState={mockSCStore({})}>
-    <OnOffTemplate
-      actionGroup={actionGroup}
-      doAction={mockDoAction}
-      sensor={sensor}
-    />
-  </SCProvider>
-);
 
 jest.mock('../../../iot/Monitor');
 
@@ -27,15 +13,9 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{ 5: 2 }, null],
 }));
 
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useSelector: jest.fn(),
-}));
-
 describe('Test OnOffTemplate', () => {
+  let wrapper;
   let actionGroup;
-  let tree;
-  let sensor;
 
   const action_data = {
     color: '#00979D',
@@ -82,23 +62,20 @@ describe('Test OnOffTemplate', () => {
       },
       title: 'Turn on / off',
     };
-
-    sensor = { name: 'Sensor' };
-
-    const localState = {
-      isOnSwich: false,
-    };
-    useSelector.mockImplementation((cb) => {
-      return cb(localState);
-    });
   });
 
   test('render with template OnOffSimpleActionTemplate', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{}}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
   });
@@ -107,9 +84,15 @@ describe('Test OnOffTemplate', () => {
     actionGroup.template = 'on_off_button_action_template';
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{}}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findAllByType(OnOffButtonTemplate);
     expect(template).toHaveLength(0);
   });
@@ -118,9 +101,15 @@ describe('Test OnOffTemplate', () => {
     actionGroup.template = 'wrong_template';
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{}}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
 
     const templateOnOffButton = instance.findAll(
       (el) =>
@@ -136,20 +125,32 @@ describe('Test OnOffTemplate', () => {
   test('render with template OnOffSimpleActionTemplate with is_managed_by_backend', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{ is_managed_by_backend: true }}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
-    expect(watchMultiConfigs).toBeCalledTimes(0);
+    expect(watchMultiConfigs).toBeCalledTimes(1);
   });
 
   test('template OnOffSimpleActionTemplate doAction with is_on_value, match configValue', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{ name: 'Sensor name' }}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findByType(OnOffSimpleTemplate);
     expect(template.props.isOn).toEqual(true);
 
@@ -159,7 +160,7 @@ describe('Test OnOffTemplate', () => {
     expect(mockDoAction).toHaveBeenCalledWith(
       action_off_data,
       null,
-      'Sensor turn on / off off'
+      'Sensor name turn on / off off'
     );
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
@@ -168,9 +169,15 @@ describe('Test OnOffTemplate', () => {
     actionGroup.configuration.is_on_value = [1];
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{ name: 'Sensor name' }}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findByType(OnOffSimpleTemplate);
     expect(template.props.isOn).toEqual(false);
 
@@ -180,16 +187,22 @@ describe('Test OnOffTemplate', () => {
     expect(mockDoAction).toHaveBeenCalledWith(
       action_on_data,
       null,
-      'Sensor turn on / off on'
+      'Sensor name turn on / off on'
     );
   });
 
   test('template OnOffSimpleActionTemplate doAction with is_on_value and is_managed_by_backend', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{ name: 'Sensor name', is_managed_by_backend: true }}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findByType(OnOffSimpleTemplate);
     expect(template.props.isOn).toEqual(true);
 
@@ -199,9 +212,9 @@ describe('Test OnOffTemplate', () => {
     expect(mockDoAction).toHaveBeenCalledWith(
       action_off_data,
       null,
-      'Sensor turn on / off off'
+      'Sensor name turn on / off off'
     );
-    expect(watchMultiConfigs).toBeCalledTimes(0);
+    expect(watchMultiConfigs).toBeCalledTimes(2);
   });
 
   test('render with template OnOffSimpleActionTemplate with just action_data', async () => {
@@ -217,9 +230,15 @@ describe('Test OnOffTemplate', () => {
     };
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{ is_managed_by_backend: true }}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
     expect(template[0].props.disabled).toBeFalsy();
@@ -242,9 +261,15 @@ describe('Test OnOffTemplate', () => {
     };
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = await create(
+        <OnOffTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{ is_managed_by_backend: true }}
+        />
+      );
     });
-    const instance = tree.root;
+    const instance = wrapper.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
     expect(template).toHaveLength(1);
     expect(template[0].props.disabled).toBeTruthy();

package/src/commons/ActionGroup/__test__/OneBigButtonTemplate.test.js

@@ -1,27 +1,8 @@
-/* eslint-disable promise/prefer-await-to-callbacks */
 import React from 'react';
 import { create, act } from 'react-test-renderer';
 import { TouchableOpacity } from 'react-native';
-import { useSelector } from 'react-redux';
 
 import OneBigButtonTemplate from '../OneBigButtonTemplate';
-import { mockSCStore } from '../../../context/mockStore';
-import { SCProvider } from '../../../context';
-
-const wrapComponent = (actionGroup, mockDoAction, sensor) => (
-  <SCProvider initState={mockSCStore({})}>
-    <OneBigButtonTemplate
-      actionGroup={actionGroup}
-      doAction={mockDoAction}
-      sensor={sensor}
-    />
-  </SCProvider>
-);
-
-jest.mock('react-redux', () => ({
-  ...jest.requireActual('react-redux'),
-  useSelector: jest.fn(),
-}));
 
 describe('Test OneBigButtonTemplate', () => {
   const action_data = {
@@ -42,25 +23,24 @@ describe('Test OneBigButtonTemplate', () => {
       text: 'UP',
     },
   };
-  let tree;
-  let sensor;
-
-  beforeEach(() => {
-    const localState = {
-      isOnSwich: false,
-    };
-    useSelector.mockImplementation((cb) => {
-      return cb(localState);
-    });
-    sensor = { name: 'Sensor' };
-  });
+  const sensor = {
+    name: 'Sensor name',
+  };
+  let wrapper;
 
-  test('render OneBigButtonTemplate', async () => {
+  test('render OneBigButtonTemplate', () => {
     const mockDoAction = jest.fn();
-    await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+    act(() => {
+      wrapper = create(
+        <OneBigButtonTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={sensor}
+        />
+      );
     });
-    const instance = tree.root;
+
+    const instance = wrapper.root;
     const buttons = instance.findAllByType(TouchableOpacity);
     expect(buttons.length).toEqual(1);
 
@@ -69,6 +49,10 @@ describe('Test OneBigButtonTemplate', () => {
     });
 
     expect(mockDoAction).toHaveBeenCalledTimes(1);
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, null, 'Sensor up');
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_data,
+      null,
+      'Sensor name up'
+    );
   });
 });