@eohjsc/react-native-smart-city 0.3.14 → 0.3.15

package/package.json

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

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

@@ -6,6 +6,8 @@ import { useConfigGlobalState } from '../../../iot/states';
 import OnOffButtonTemplate from './OnOffButtonTemplate';
 import OnOffSimpleTemplate from './OnOffSimpleTemplate';
 
+let temp;
+
 const getComponent = (template) => {
   switch (template) {
     case 'on_off_button_action_template': // todo refactor later with backend
@@ -20,11 +22,28 @@ 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);
 
   // eslint-disable-next-line no-unused-vars
   const [configValues, _] = useConfigGlobalState('configValues');
 
+  const getIsOnValue = useCallback(() => {
+    const { is_on_value, config } = configuration;
+    const configValue = configValues[config];
+    if (is_on_value && is_on_value.length > 0) {
+      return is_on_value.includes(configValue);
+    }
+    return !!configValue;
+  }, [configValues, configuration]);
+
+  const [isOn, setIsOn] = useState(false);
+  const [tempIsOn, setTempIsOn] = useState(getIsOnValue());
+
+  const updateStatusFromPusher = () => {
+    setTimeout(() => {
+      setTempIsOn(temp);
+    }, 2500);
+  };
+
   const actionName = useCallback(
     (text) => {
       const actionNameType = `${
@@ -34,7 +53,9 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
     },
     [actionGroup?.title, sensor?.name]
   );
+
   const triggerAction = useCallback(async () => {
+    setTempIsOn((prev) => !prev);
     switch (sensor?.device_type) {
       case DEVICE_TYPE.ZIGBEE:
         if (action_on_data && action_off_data) {
@@ -53,6 +74,13 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
           }
         }
         break;
+      case DEVICE_TYPE.LG_THINQ:
+        if (action_data) {
+          await doAction(action_data, JSON.stringify({ value: !isOn }));
+        }
+
+        updateStatusFromPusher();
+        break;
       default:
         if (action_data) {
           if (isOn) {
@@ -88,19 +116,12 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
   ]);
 
   useEffect(() => {
-    const { is_on_value, config } = configuration;
-    const configValue = configValues[config];
-    if (is_on_value && is_on_value.length > 0) {
-      setIsOn(is_on_value.includes(configValue));
-      return;
-    }
-    setIsOn(configValue);
-  }, [
-    configuration.config,
-    configValues,
-    configuration.is_on_value,
-    configuration,
-  ]);
+    setIsOn(getIsOnValue());
+  }, [getIsOnValue]);
+
+  useEffect(() => {
+    temp = isOn;
+  }, [isOn]);
 
   useEffect(() => {
     if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
@@ -118,7 +139,7 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
   return (
     <>
       <Component
-        isOn={isOn}
+        isOn={tempIsOn}
         triggerAction={triggerAction}
         actionGroup={actionGroup}
         disabled={!action_data && !action_on_data && !action_off_data}

package/src/commons/ActionGroup/TimerActionTemplate.js

@@ -90,7 +90,7 @@ const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
 
   const doActionTime = useCallback(
     (hour, minute) => {
-      doAction(configuration.action_data, [hour, minute]);
+      doAction(configuration.action_data, JSON.stringify({ hour, minute }));
       if (sensor.is_managed_by_backend) {
         hour !== undefined &&
           minute !== undefined &&
@@ -113,7 +113,7 @@ const TimerActionTemplate = ({ actionGroup = {}, doAction, sensor = {} }) => {
 
   const doActionHour = useCallback(
     (hour) => {
-      doAction(configuration.action_data, hour);
+      doAction(configuration.action_data, JSON.stringify({ hour }));
       if (
         sensor.is_managed_by_backend &&
         sensor.device_type !== 'GOOGLE_HOME'

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

@@ -1,5 +1,5 @@
 /* eslint-disable promise/prefer-await-to-callbacks */
-import { TESTID } from '../../../configs/Constants';
+import { DEVICE_TYPE, TESTID } from '../../../configs/Constants';
 import { watchMultiConfigs } from '../../../iot/Monitor';
 import React from 'react';
 import { View } from 'react-native';
@@ -149,6 +149,7 @@ describe('Test OnOffTemplate', () => {
     await act(async () => {
       tree = await create(wrapComponent(actionGroup, mockDoAction, sensor));
     });
+
     const instance = tree.root;
     const template = instance.findByType(OnOffSimpleTemplate);
     expect(template.props.isOn).toEqual(true);
@@ -230,6 +231,39 @@ describe('Test OnOffTemplate', () => {
     expect(mockDoAction).toHaveBeenCalledWith(action_data, false);
   });
 
+  test('render with template OnOffSimpleActionTemplate with just action_data lg_thinq', async () => {
+    actionGroup = {
+      template: 'OnOffSimpleActionTemplate',
+      configuration: {
+        config: 5,
+        action_data: action_data,
+        icon: 'up',
+        is_on_value: [2],
+      },
+      title: 'Turn on / off',
+    };
+    const mockDoAction = jest.fn();
+    await act(async () => {
+      tree = await create(
+        wrapComponent(actionGroup, mockDoAction, {
+          device_type: DEVICE_TYPE.LG_THINQ,
+        })
+      );
+    });
+    const instance = tree.root;
+    const template = instance.findAllByType(OnOffSimpleTemplate);
+    expect(template).toHaveLength(1);
+    expect(template[0].props.disabled).toBeFalsy();
+
+    await act(async () => {
+      await template[0].props.triggerAction();
+    });
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_data,
+      JSON.stringify({ value: false })
+    );
+  });
+
   test('render with template OnOffSimpleActionTemplate disabled', async () => {
     actionGroup = {
       template: 'OnOffSimpleActionTemplate',

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

@@ -89,6 +89,9 @@ describe('Test TimerActionTemplate without config value', () => {
       await dateTimePicker.props.onConfirm();
     });
     expect(dateTimePicker.props.isVisible).toBeFalsy();
-    expect(mockDoAction).toHaveBeenCalledWith(action_data, [11, 0]);
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_data,
+      JSON.stringify({ hour: 11, minute: 0 })
+    );
   });
 });

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -190,7 +190,6 @@ describe('Test useRemoteControl', () => {
     act(() => {
       sendRemoteCommand.current(sensor, action, data, userId, actionName);
     });
-    expect(sendCommandOverLGThinq).toBeCalledWith(sensor, action, data);
     expect(sendCommandOverBluetooth).not.toBeCalled();
     expect(sendCommandOverGoogleHome).not.toBeCalled();
     expect(sendCommandOverInternet).not.toBeCalled();

package/src/hooks/IoT/useRemoteControl.js

@@ -2,7 +2,6 @@ import { useCallback } from 'react';
 import { useSCContextSelector } from '../../context';
 import { sendCommandOverGoogleHome } from '../../iot/RemoteControl/GoogleHome';
 import { sendCommandOverInternet } from '../../iot/RemoteControl/Internet';
-import { sendCommandOverLGThinq } from '../../iot/RemoteControl/LG';
 import {
   sendCommandOverBluetooth,
   SEND_COMMAND_OVER_BLUETOOTH_FAIL,
@@ -64,10 +63,6 @@ const useRemoteControl = () => {
           data
         );
       }
-
-      if (action.command_prefer_over_lg) {
-        result = await sendCommandOverLGThinq(sensor, action, data);
-      }
       return result;
     },
     [ggHomeConnections]

package/src/iot/RemoteControl/LG.js

@@ -94,17 +94,17 @@ export async function updateStateByLgThinq(device_id, data) {
   setConfigGlobalState('configValues', { ...configValues });
 }
 
-export async function fetchDeviceStatusLG(sensor) {
+export async function fetchDeviceStatusLG(endDevice) {
   // still need some delay
   setTimeout(async () => {
     const { success, data: dataStatus } = await axiosGet(
-      API.IOT.LG.DEVICE_STATUS(sensor.id),
+      API.IOT.LG.DEVICE_STATUS(endDevice.id),
       {},
       true
     );
 
     if (success) {
-      updateStateByLgThinq(sensor.lg_device_id, dataStatus);
+      updateStateByLgThinq(endDevice.lg_device_id, dataStatus);
     }
   }, 1000);
 }
@@ -128,11 +128,11 @@ export const lgThinqConnect = async (options) => {
     const option = options[i];
     for (let j = 0; j < option.lg_devices.length; j++) {
       const lgDevice = option.lg_devices[j];
-      const sensor = {
-        id: lgDevice.sensor_id,
+      const endDevice = {
+        id: lgDevice.end_device_id,
         lg_device_id: lgDevice.device_id,
       };
-      await fetchDeviceStatusLG(sensor);
+      await fetchDeviceStatusLG(endDevice);
     }
   }
 };

package/src/iot/RemoteControl/__test__/LgThinq.test.js

@@ -107,7 +107,7 @@ describe('Remote Control LG Thinq', () => {
         lg_devices: [
           {
             id: 1,
-            sensor_id: 2,
+            end_device_id: 2,
             device_id: 'DEVICE_ID',
             configs: [
               {
@@ -188,7 +188,7 @@ describe('Remote Control LG Thinq', () => {
         lg_devices: [
           {
             id: 1,
-            sensor_id: 2,
+            end_device_id: 2,
             device_id: 'DEVICE_ID',
             configs: [
               {

package/src/screens/Device/components/SensorDisplayItem.js

@@ -49,6 +49,7 @@ export const SensorDisplayItem = ({
     },
     [sensor, userId, sendRemoteCommand]
   );
+
   if (item.configuration.type === 'compass') {
     setShowWindDirection(true);
   }