@eohjsc/react-native-smart-city 0.3.4 → 0.3.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.04",
+  "version": "0.3.05",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -1,5 +1,5 @@
 import React, { useCallback, useEffect, useState } from 'react';
-import { View, TouchableOpacity } from 'react-native';
+import { View, TouchableOpacity, ActivityIndicator } from 'react-native';
 import { IconOutline } from '@ant-design/icons-react-native';
 import { Colors } from '../../configs';
 
@@ -7,7 +7,7 @@ import Text from '../Text';
 import { useConfigGlobalState } from '../../iot/states';
 import styles from './NumberUpDownActionTemplateStyle';
 import { watchMultiConfigs } from '../../iot/Monitor';
-import { TESTID } from '../../configs/Constants';
+import { DEVICE_TYPE, TESTID } from '../../configs/Constants';
 
 const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   const { configuration, title } = actionGroup;
@@ -25,6 +25,19 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   const [value, setValue] = useState();
   const valueDefault = 28;
 
+  useEffect(() => {
+    if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
+      return;
+    }
+    if (
+      !!config &&
+      sensor?.is_managed_by_backend &&
+      sensor.device_type !== 'GOOGLE_HOME'
+    ) {
+      watchMultiConfigs([config]);
+    }
+  }, [sensor, config]);
+
   useEffect(() => {
     if (!config) {
       setValue(valueDefault);
@@ -34,11 +47,9 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
-    } else {
-      setValue(valueDefault);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [JSON.stringify(configValues)]);
 
   const doActionAndWatchConfig = useCallback(
     async (actionData, actionValue, actionName) => {
@@ -113,7 +124,11 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
         </TouchableOpacity>
 
         <Text testID={'abcd'} type="H2">
-          {text_format.replace('{number}', value)}
+          {value !== undefined ? (
+            text_format.replace('{number}', value)
+          ) : (
+            <ActivityIndicator />
+          )}
         </Text>
 
         <TouchableOpacity

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

@@ -1,8 +1,8 @@
 import React from 'react';
-import { TouchableOpacity } from 'react-native';
+import { ActivityIndicator, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import Text from '../../../commons/Text';
-import { TESTID } from '../../../configs/Constants';
+import { DEVICE_TYPE, TESTID } from '../../../configs/Constants';
 import { watchMultiConfigs } from '../../../iot/Monitor';
 import NumberUpDownActionTemplate from '../NumberUpDownActionTemplate';
 
@@ -48,7 +48,10 @@ describe('Test NumberUpDownActionTemplate', () => {
         <NumberUpDownActionTemplate
           actionGroup={actionGroup}
           doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
+          sensor={{
+            is_managed_by_backend: true,
+            device_type: DEVICE_TYPE.LG_THINQ,
+          }}
         />
       );
     });
@@ -288,4 +291,41 @@ describe('Test NumberUpDownActionTemplate', () => {
     const text = instance.findByType(Text);
     expect(text.props.children).toEqual('25 *C');
   });
+  test('render template have title', async () => {
+    const mockDoAction = jest.fn();
+    actionGroup.title = 'title';
+    await act(async () => {
+      wrapper = await create(
+        <NumberUpDownActionTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{
+            is_managed_by_backend: true,
+            device_type: DEVICE_TYPE.LG_THINQ,
+          }}
+        />
+      );
+    });
+    const instance = wrapper.root;
+    const text = instance.findAllByType(Text);
+    expect(text).toHaveLength(2);
+  });
+  test('render template watch config not exits', async () => {
+    const mockDoAction = jest.fn();
+    actionGroup.configuration.config = 100;
+    await act(async () => {
+      wrapper = await create(
+        <NumberUpDownActionTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{
+            is_managed_by_backend: true,
+          }}
+        />
+      );
+    });
+    const instance = wrapper.root;
+    const text = instance.findAllByType(ActivityIndicator);
+    expect(text).toHaveLength(1);
+  });
 });

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

@@ -1,5 +1,5 @@
 import React from 'react';
-import { TouchableOpacity, Switch } from 'react-native';
+import { TouchableOpacity, Switch, ActivityIndicator } from 'react-native';
 import renderer, { act } from 'react-test-renderer';
 import DateTimePickerModal from 'react-native-modal-datetime-picker';
 import moment from 'moment';
@@ -344,7 +344,7 @@ describe('Test ActionGroup', () => {
     expect(mockDoAction).toHaveBeenCalledTimes(1);
   });
 
-  test('render ActionGroup NumberUpDownActionTemplate', async () => {
+  test('render ActionGroup NumberUpDownActionTemplate watch config value null', async () => {
     const mockDoAction = jest.fn();
     const actionGroup = {
       template: 'NumberUpDownActionTemplate',
@@ -362,11 +362,8 @@ describe('Test ActionGroup', () => {
       );
     });
     const instance = wrapper.root;
-    const text = instance.findAllByType(Text);
-    expect(text[0].props.children).toEqual('28 *C');
-
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
+    const activity = instance.findAllByType(ActivityIndicator);
+    expect(activity.length).toEqual(1);
   });
 
   test('render ActionGroup StatesGridActionTemplate', async () => {

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

@@ -1,60 +0,0 @@
-import React from 'react';
-import { TouchableOpacity } from 'react-native';
-import { act, create } from 'react-test-renderer';
-import Text from '../../../commons/Text';
-import { watchMultiConfigs } from '../../../iot/Monitor';
-import NumberUpDownActionTemplate from '../NumberUpDownActionTemplate';
-
-jest.mock('../../../iot/Monitor');
-
-jest.mock('../../../iot/states', () => ({
-  useConfigGlobalState: () => [{ 5: null }, null],
-}));
-
-describe('Test NumberUpDownActionTemplate', () => {
-  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',
-  };
-
-  let actionGroup;
-  let wrapper;
-
-  beforeEach(() => {
-    watchMultiConfigs.mockClear();
-    actionGroup = {
-      configuration: {
-        config: 5,
-        action_data,
-        min_value: 16,
-        max_value: 30,
-        text_format: '{number} *C',
-      },
-    };
-  });
-
-  test('render template', async () => {
-    const mockDoAction = jest.fn();
-    await act(async () => {
-      wrapper = await create(
-        <NumberUpDownActionTemplate
-          actionGroup={actionGroup}
-          doAction={mockDoAction}
-          sensor={{ is_managed_by_backend: true }}
-        />
-      );
-    });
-    const instance = wrapper.root;
-    const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('28 *C');
-
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
-  });
-});