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

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

@@ -20,8 +20,7 @@ const getComponent = (template) => {
 const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const { configuration } = actionGroup;
   const { action_data, action_on_data, action_off_data } = configuration;
-  const [isOn, setIsOn] = useState(null);
-
+  const [isOn, setIsOn] = useState(true);
   // eslint-disable-next-line no-unused-vars
   const [configValues, _] = useConfigGlobalState('configValues');
 
@@ -106,7 +105,7 @@ const OnOffTemplate = 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) {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -9,7 +9,7 @@ import { useDropdownAction } from './hooks/useDropdownAction';
 import { useConfigGlobalState } from '../../iot/states';
 import styles from './OptionsDropdownActionTemplateStyle';
 import { watchMultiConfigs } from '../../iot/Monitor';
-import { TESTID } from '../../configs/Constants';
+import { DEVICE_TYPE, TESTID } from '../../configs/Constants';
 import IconComponent from '../../commons/IconComponent';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import SvgDoorState from '../../../assets/images/Device/door-state.svg';
@@ -61,14 +61,16 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     const value = getOptionValue(newOption);
     let actionName = `${sensor?.name} ${title?.toLowerCase()} ${value}`;
     actionName = actionName.replace(/\s+/g, ' ').trim();
-    doAction(
-      action_data,
-      JSON.stringify({ level: value, key_code: newOption?.value_int }),
-      actionName
-    );
+
+    let data = JSON.stringify({ level: value, key_code: newOption?.value_int });
+    if (sensor.device_type === DEVICE_TYPE.GOOGLE_HOME) {
+      data = value;
+    }
+
+    doAction(action_data, data, actionName);
     if (sensor?.is_managed_by_backend) {
       configuration.config &&
-        sensor.device_type !== 'GOOGLE_HOME' &&
+        sensor.device_type !== DEVICE_TYPE.GOOGLE_HOME &&
         watchMultiConfigs([configuration.config]);
     }
     hideAlertAction();

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -33,15 +33,11 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
   useEffect(() => {
     const { config } = configuration;
     const configValue = configValues[config];
-    let valueTemp = configValue;
-    if (configValue > 0) {
-      valueTemp = Math.round((configValue / 254) * 100);
-    }
-    setValueBrightness(valueTemp);
+    setValueBrightness(configValue);
   }, [configuration.config, configValues, configuration]);
 
   useEffect(() => {
-    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
+    if (sensor?.is_managed_by_backend) {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);

package/src/commons/ActionGroup/SmartTiviActionTemplate/SmartTiviActionTemplate.js

@@ -1,5 +1,5 @@
 import React, { memo, useCallback } from 'react';
-import { View, ScrollView } from 'react-native';
+import { View, ScrollView, Alert } from 'react-native';
 
 import styles from './SmartTiviActionTemplateStyles';
 import Text from '../../Text';
@@ -22,7 +22,6 @@ import {
   Youtube,
   Netflix,
 } from './component/Icon';
-import { notImplemented } from '../../../utils/Utils';
 
 const SmartTiviActionTemplate = memo(
   ({ actionGroup, doAction, scrollEnabled = true }) => {
@@ -69,7 +68,7 @@ const SmartTiviActionTemplate = memo(
           case SMART_TIVI_BUTTON.HOME_BUTTON:
           case SMART_TIVI_BUTTON.BACK_BUTTON:
           case SMART_TIVI_BUTTON.CHANNEL_BUTTON:
-            return notImplemented(t);
+            return Alert.alert(t('feature_under_development'));
           default:
             return <></>;
         }
@@ -92,10 +91,7 @@ const SmartTiviActionTemplate = memo(
     }, []);
     return (
       <>
-        <ScrollView
-          scrollEnabled={scrollEnabled}
-          scrollIndicatorInsets={{ right: 1 }}
-        >
+        <ScrollView scrollEnabled={scrollEnabled}>
           <View style={styles.wrap}>
             <View style={styles.rowOnOff}>
               <CircleButton

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__/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,81 @@ 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);
+  });
+  test('action up sensor device type is GOOGLE_HOME', async () => {
+    const mockDoAction = jest.fn();
+    await act(async () => {
+      wrapper = await create(
+        <NumberUpDownActionTemplate
+          actionGroup={actionGroup}
+          doAction={mockDoAction}
+          sensor={{
+            is_managed_by_backend: true,
+            device_type: DEVICE_TYPE.GOOGLE_HOME,
+            name: 'Device',
+          }}
+        />
+      );
+    });
+    const instance = wrapper.root;
+    const touchs = instance.find(
+      (el) =>
+        el.props.testID === TESTID.NUMBER_ACTION_UP &&
+        el.type === TouchableOpacity
+    );
+
+    await act(async () => {
+      await touchs.props.onPress();
+    });
+    expect(mockDoAction).toBeCalledWith(
+      {
+        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',
+      },
+      26,
+      'Device temp up'
+    );
+  });
 });

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();