@eohjsc/react-native-smart-city 0.4.39 → 0.4.41

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

@@ -12,9 +12,9 @@ jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: jest.fn(),
 }));
 
-const wrapComponent = (actionGroup, mockDoAction) => (
+const wrapComponent = (item, mockDoAction) => (
   <SCProvider initState={mockSCStore({})}>
-    <OnOffTemplate actionGroup={actionGroup} doAction={mockDoAction} />
+    <OnOffTemplate item={item} doAction={mockDoAction} />
   </SCProvider>
 );
 
@@ -26,7 +26,7 @@ jest.mock('@react-navigation/native', () => {
 });
 
 describe('Test OneBigButtonTemplate', () => {
-  const action_on_data = {
+  const actionOnData = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,
     command_prefer_over_googlehome: false,
@@ -37,7 +37,7 @@ describe('Test OneBigButtonTemplate', () => {
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
 
-  const action_off_data = {
+  const actionOffData = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,
     command_prefer_over_googlehome: false,
@@ -47,14 +47,14 @@ describe('Test OneBigButtonTemplate', () => {
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
-  const actionGroup = {
+  const displayItem = {
     configuration: {
       action_on: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
-      action_on_data: action_on_data,
+      action_on_data: actionOnData,
       icon_on: 'caret-up',
       text_on: 'ON',
       action_off: '5ed1d4dc-a905-47cd-b0c9-f979644bd21b',
-      action_off_data: action_off_data,
+      action_off_data: actionOffData,
       icon_off: 'caret-up',
       text_off: 'OFF',
       config: 1,
@@ -72,7 +72,7 @@ describe('Test OneBigButtonTemplate', () => {
     const mockDoAction = jest.fn();
 
     await act(async () => {
-      wrapper = create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = create(wrapComponent(displayItem, mockDoAction));
     });
 
     const instance = wrapper.root;
@@ -115,7 +115,7 @@ describe('Test OneBigButtonTemplate', () => {
     ]);
     const mockDoAction = jest.fn();
     await act(async () => {
-      wrapper = create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = create(wrapComponent(displayItem, mockDoAction));
     });
     const instance = wrapper.root;
     const button = instance.findByType(TouchableOpacity);
@@ -126,10 +126,10 @@ describe('Test OneBigButtonTemplate', () => {
   };
 
   it('action state on', async () => {
-    await assertActionCall(true, action_on_data, { state: 0, value: 0 });
+    await assertActionCall(true, actionOnData, { state: 0, value: 0 });
   });
 
   it('action state off', async () => {
-    await assertActionCall(false, action_off_data, { state: 1, value: 1 });
+    await assertActionCall(false, actionOffData, { state: 1, value: 1 });
   });
 });

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

@@ -20,21 +20,17 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-const wrapComponent = (actionGroup, doAction, sensor) => (
+const wrapComponent = (item, doAction, sensor) => (
   <SCProvider initState={mockSCStore({})}>
-    <OnOffSmartLock
-      actionGroup={actionGroup}
-      doAction={doAction}
-      sensor={sensor}
-    />
+    <OnOffSmartLock item={item} doAction={doAction} sensor={sensor} />
   </SCProvider>
 );
 
 describe('Test OnOffTemplate', () => {
   let wrapper;
-  let actionGroup;
+  let displayItem;
 
-  const action_on_data = {
+  const actionOnData = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,
     command_prefer_over_googlehome: false,
@@ -44,7 +40,7 @@ describe('Test OnOffTemplate', () => {
     id: 20,
     key: 'key-2',
   };
-  const action_off_data = {
+  const actionOffData = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,
     command_prefer_over_googlehome: false,
@@ -58,12 +54,12 @@ describe('Test OnOffTemplate', () => {
   beforeEach(() => {
     watchMultiConfigs.mockClear();
     mockDoAction.mockClear();
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSmartLockActionTemplate',
       configuration: {
         config: 5,
-        action_on_data: action_on_data,
-        action_off_data: action_off_data,
+        action_on_data: actionOnData,
+        action_off_data: actionOffData,
         icon: 'up',
         is_on_value: '2',
       },
@@ -78,7 +74,7 @@ describe('Test OnOffTemplate', () => {
     ]);
     const sensor = { is_managed_by_backend: true, name: 'Sensor' };
     await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      wrapper = await create(wrapComponent(displayItem, mockDoAction, sensor));
     });
     const instance = wrapper.root;
     const button = instance.find(
@@ -87,18 +83,18 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(action_on_data, '{"door_lock":0}');
+    expect(mockDoAction).toBeCalledWith(actionOnData, '{"door_lock":0}');
   });
 
   it('render with template OnOffSmartLockActionTemplate doAction unlock', async () => {
-    actionGroup.configuration.is_on_value = null;
+    displayItem.configuration.is_on_value = null;
     const sensor = { is_managed_by_backend: false, name: 'Sensor' };
     useConfigGlobalState.mockImplementation(() => [
       { 5: { value: 0 } },
       jest.fn(),
     ]);
     await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      wrapper = await create(wrapComponent(displayItem, mockDoAction, sensor));
     });
     const instance = wrapper.root;
     const button = instance.find(
@@ -107,6 +103,6 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await button.props.onPress();
     });
-    expect(mockDoAction).toBeCalledWith(action_off_data, '{"door_lock":1}');
+    expect(mockDoAction).toBeCalledWith(actionOffData, '{"door_lock":1}');
   });
 });

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

@@ -10,13 +10,9 @@ import OnOffSimpleTemplate from '../OnOffTemplate/OnOffSimpleTemplate';
 import { mockSCStore } from '../../../context/mockStore';
 import { SCProvider } from '../../../context';
 
-const wrapComponent = (actionGroup, mockDoAction, sensor) => (
+const wrapComponent = (item, mockDoAction, sensor) => (
   <SCProvider initState={mockSCStore({})}>
-    <OnOffTemplate
-      actionGroup={actionGroup}
-      doAction={mockDoAction}
-      sensor={sensor}
-    />
+    <OnOffTemplate item={item} doAction={mockDoAction} sensor={sensor} />
   </SCProvider>
 );
 
@@ -34,11 +30,11 @@ jest.mock('@react-navigation/native', () => {
 });
 
 describe('Test OnOffTemplate', () => {
-  let actionGroup;
+  let displayItem;
   let tree;
   let sensor;
 
-  const action_data = {
+  const actionData = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,
     command_prefer_over_googlehome: false,
@@ -48,7 +44,7 @@ describe('Test OnOffTemplate', () => {
     id: 20,
     key: 'key-1',
   };
-  const action_on_data = {
+  const actionOnData = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,
     command_prefer_over_googlehome: false,
@@ -58,7 +54,7 @@ describe('Test OnOffTemplate', () => {
     id: 20,
     key: 'key-2',
   };
-  const action_off_data = {
+  const actionOffData = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,
     command_prefer_over_googlehome: false,
@@ -73,12 +69,12 @@ describe('Test OnOffTemplate', () => {
     watchMultiConfigs.mockClear();
     jest.useFakeTimers();
 
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSimpleActionTemplate',
       configuration: {
         config: 5,
-        action_on_data: action_on_data,
-        action_off_data: action_off_data,
+        action_on_data: actionOnData,
+        action_off_data: actionOffData,
         icon: 'up',
         is_on_value: [2],
       },
@@ -91,7 +87,7 @@ describe('Test OnOffTemplate', () => {
   it('render with template OnOffSimpleActionTemplate', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      tree = await create(wrapComponent(displayItem, mockDoAction, {}));
     });
     const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
@@ -99,10 +95,10 @@ describe('Test OnOffTemplate', () => {
   });
 
   it('render with template on_off_button_action_template', async () => {
-    actionGroup.template = 'on_off_button_action_template';
+    displayItem.template = 'on_off_button_action_template';
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      tree = await create(wrapComponent(displayItem, mockDoAction, {}));
     });
     const instance = tree.root;
     const template = instance.findAllByType(OnOffButtonTemplate);
@@ -110,10 +106,10 @@ describe('Test OnOffTemplate', () => {
   });
 
   it('render with wrong template', async () => {
-    actionGroup.template = 'wrong_template';
+    displayItem.template = 'wrong_template';
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      tree = await create(wrapComponent(displayItem, mockDoAction, {}));
     });
     const instance = tree.root;
 
@@ -131,7 +127,7 @@ describe('Test OnOffTemplate', () => {
   it('render with template OnOffSimpleActionTemplate with is_managed_by_backend', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      tree = await create(wrapComponent(displayItem, mockDoAction, {}));
     });
     const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
@@ -142,7 +138,7 @@ describe('Test OnOffTemplate', () => {
   it('template OnOffSimpleActionTemplate doAction with is_on_value, match configValue', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      tree = await create(wrapComponent(displayItem, mockDoAction, sensor));
     });
 
     const instance = tree.root;
@@ -152,15 +148,15 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, undefined);
+    expect(mockDoAction).toHaveBeenCalledWith(actionOffData, undefined);
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
   it('template OnOffSimpleActionTemplate doAction with is_on_value, not match configValue', async () => {
-    actionGroup.configuration.is_on_value = [1];
+    displayItem.configuration.is_on_value = [1];
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      tree = await create(wrapComponent(displayItem, mockDoAction, sensor));
     });
     const instance = tree.root;
     const template = instance.findByType(OnOffSimpleTemplate);
@@ -169,13 +165,13 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_on_data, undefined);
+    expect(mockDoAction).toHaveBeenCalledWith(actionOnData, undefined);
   });
 
   it('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));
+      tree = await create(wrapComponent(displayItem, mockDoAction, sensor));
     });
     const instance = tree.root;
     const template = instance.findByType(OnOffSimpleTemplate);
@@ -184,16 +180,16 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template.props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, undefined);
+    expect(mockDoAction).toHaveBeenCalledWith(actionOffData, undefined);
     expect(watchMultiConfigs).toBeCalledTimes(0);
   });
 
   it('render with template OnOffSimpleActionTemplate with just action_data', async () => {
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSimpleActionTemplate',
       configuration: {
         config: 5,
-        action_data: action_data,
+        action_data: actionData,
         icon: 'up',
         is_on_value: [2],
       },
@@ -201,7 +197,7 @@ describe('Test OnOffTemplate', () => {
     };
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      tree = await create(wrapComponent(displayItem, mockDoAction, {}));
     });
     const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);
@@ -211,16 +207,16 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template[0].props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, undefined);
+    expect(mockDoAction).toHaveBeenCalledWith(actionData, undefined);
   });
 
   it('render with template OnOffSimpleActionTemplate with just action_data lg_thinq', async () => {
     jest.useFakeTimers();
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSimpleActionTemplate',
       configuration: {
         config: 5,
-        action_data: action_data,
+        action_data: actionData,
         icon: 'up',
         is_on_value: [2],
       },
@@ -229,7 +225,7 @@ describe('Test OnOffTemplate', () => {
     const mockDoAction = jest.fn();
     await act(async () => {
       tree = await create(
-        wrapComponent(actionGroup, mockDoAction, {
+        wrapComponent(displayItem, mockDoAction, {
           device_type: DEVICE_TYPE.LG_THINQ,
           is_managed_by_backend: true,
         })
@@ -246,16 +242,16 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       jest.runAllTimers();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, undefined);
+    expect(mockDoAction).toHaveBeenCalledWith(actionData, undefined);
   });
 
   it('render with template OnOffSimpleActionTemplate with action_data zigbee trigger off', async () => {
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSimpleActionTemplate',
       configuration: {
         config: 5,
-        action_on_data: action_on_data,
-        action_off_data: action_off_data,
+        action_on_data: actionOnData,
+        action_off_data: actionOffData,
         icon: 'up',
         is_on_value: [2],
         allow_config_store_value: true,
@@ -265,7 +261,7 @@ describe('Test OnOffTemplate', () => {
     const mockDoAction = jest.fn();
     await act(async () => {
       tree = await create(
-        wrapComponent(actionGroup, mockDoAction, {
+        wrapComponent(displayItem, mockDoAction, {
           device_type: DEVICE_TYPE.ZIGBEE,
         })
       );
@@ -276,19 +272,19 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template[0].props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_off_data, {
+    expect(mockDoAction).toHaveBeenCalledWith(actionOffData, {
       config_id: 5,
       config_value: 0,
     });
   });
 
   it('render with template OnOffSimpleActionTemplate with action_data zigbee trigger on', async () => {
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSimpleActionTemplate',
       configuration: {
         config: 5,
-        action_on_data: action_on_data,
-        action_off_data: action_off_data,
+        action_on_data: actionOnData,
+        action_off_data: actionOffData,
         icon: 'up',
         is_on_value: [1],
         allow_config_store_value: true,
@@ -298,7 +294,7 @@ describe('Test OnOffTemplate', () => {
     const mockDoAction = jest.fn();
     await act(async () => {
       tree = await create(
-        wrapComponent(actionGroup, mockDoAction, {
+        wrapComponent(displayItem, mockDoAction, {
           device_type: DEVICE_TYPE.ZIGBEE,
         })
       );
@@ -309,14 +305,14 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       await template[0].props.triggerAction();
     });
-    expect(mockDoAction).toHaveBeenCalledWith(action_on_data, {
+    expect(mockDoAction).toHaveBeenCalledWith(actionOnData, {
       config_id: 5,
       config_value: 1,
     });
   });
 
   it('render with template OnOffSimpleActionTemplate with zigbee device wrong action_data', async () => {
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSimpleActionTemplate',
       configuration: {
         config: 5,
@@ -329,7 +325,7 @@ describe('Test OnOffTemplate', () => {
     const mockDoAction = jest.fn();
     await act(async () => {
       tree = await create(
-        wrapComponent(actionGroup, mockDoAction, {
+        wrapComponent(displayItem, mockDoAction, {
           device_type: DEVICE_TYPE.ZIGBEE,
         })
       );
@@ -344,7 +340,7 @@ describe('Test OnOffTemplate', () => {
   });
 
   it('render with template OnOffSimpleActionTemplate disabled', async () => {
-    actionGroup = {
+    displayItem = {
       template: 'OnOffSimpleActionTemplate',
       configuration: {
         config: 5,
@@ -355,7 +351,7 @@ describe('Test OnOffTemplate', () => {
     };
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, {}));
+      tree = await create(wrapComponent(displayItem, mockDoAction, {}));
     });
     const instance = tree.root;
     const template = instance.findAllByType(OnOffSimpleTemplate);

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

@@ -5,11 +5,12 @@ import { TouchableOpacity } from 'react-native';
 import OneBigButtonTemplate from '../OneBigButtonTemplate';
 import { mockSCStore } from '../../../context/mockStore';
 import { SCProvider } from '../../../context';
+import Text from '../../Text';
 
-const wrapComponent = (actionGroup, mockDoAction, sensor) => (
+const wrapComponent = (displayItem, mockDoAction, sensor) => (
   <SCProvider initState={mockSCStore({})}>
     <OneBigButtonTemplate
-      actionGroup={actionGroup}
+      item={displayItem}
       doAction={mockDoAction}
       sensor={sensor}
     />
@@ -17,27 +18,32 @@ const wrapComponent = (actionGroup, mockDoAction, sensor) => (
 );
 
 describe('Test OneBigButtonTemplate', () => {
-  const action_data = {
-    color: '#00979D',
-    command_prefer_over_bluetooth: true,
-    command_prefer_over_googlehome: false,
-    command_prefer_over_internet: false,
-    googlehome_actions: [],
-    icon: 'caret-up',
-    id: 20,
-    key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
-  };
-  const actionGroup = {
-    configuration: {
-      action: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
-      action_data: action_data,
-      icon: 'caret-up',
-      text: 'UP',
-    },
-  };
+  let actionData;
+  let displayItem;
   let tree;
   let sensor;
 
+  beforeEach(() => {
+    actionData = {
+      color: '#00979D',
+      command_prefer_over_bluetooth: true,
+      command_prefer_over_googlehome: false,
+      command_prefer_over_internet: false,
+      googlehome_actions: [],
+      icon: 'caret-up',
+      id: 20,
+      key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
+    };
+    displayItem = {
+      configuration: {
+        action: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
+        action_data: actionData,
+        icon: 'caret-up',
+        text: 'UP',
+      },
+    };
+  });
+
   beforeEach(() => {
     sensor = { name: 'Sensor' };
   });
@@ -45,7 +51,7 @@ describe('Test OneBigButtonTemplate', () => {
   it('render OneBigButtonTemplate', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
-      tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
+      tree = await create(wrapComponent(displayItem, mockDoAction, sensor));
     });
     const instance = tree.root;
     const buttons = instance.findAllByType(TouchableOpacity);
@@ -56,6 +62,34 @@ describe('Test OneBigButtonTemplate', () => {
     });
 
     expect(mockDoAction).toHaveBeenCalledTimes(1);
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, null);
+    expect(mockDoAction).toHaveBeenCalledWith(actionData, null);
+  });
+
+  it('render with title', async () => {
+    const mockDoAction = jest.fn();
+    displayItem.title = 'xxx';
+
+    await act(async () => {
+      tree = await create(wrapComponent(displayItem, mockDoAction, sensor));
+    });
+    const instance = tree.root;
+    const texts = instance.findAll(
+      (el) => el.type === Text && el.props.type === 'H3'
+    );
+    expect(texts).toHaveLength(1);
+
+    expect(texts[0].props.children).toEqual('xxx');
+  });
+  it('render with no configuration', async () => {
+    const mockDoAction = jest.fn();
+    delete displayItem.configuration;
+
+    await act(async () => {
+      tree = await create(wrapComponent(displayItem, mockDoAction, sensor));
+    });
+    const instance = tree.root;
+    const texts = instance.findAllByType(Text);
+
+    expect(texts[0].props.children).toEqual(undefined);
   });
 });