@eohjsc/react-native-smart-city 0.2.97 → 0.3.0

package/README.md

@@ -1,19 +1,26 @@
 ## react-native-smart-city
 
 ## Getting started
+
 1. Install package dependencies:
-  - Using [Yarn](https://yarnpkg.com/): `yarn add react-native-reanimated@^1.10.1`
+
+- Using [Yarn](https://yarnpkg.com/): `yarn add react-native-reanimated@^1.10.1`
 
 2. Install:
-  - Using [npm](https://www.npmjs.com/#getting-started): `npm install @eohjsc/react-native-smart-city --save`
-  - Using [Yarn](https://yarnpkg.com/): `yarn add @eohjsc/react-native-smart-city`
+
+- Using [npm](https://www.npmjs.com/#getting-started): `npm install @eohjsc/react-native-smart-city --save`
+- Using [Yarn](https://yarnpkg.com/): `yarn add @eohjsc/react-native-smart-city`
 
 3. Compile application using react-native run-android
+
 ### Mostly automatic installation
+
 `$ react-native link @eohjsc/react-native-smart-city`
 
 ## Usage
+
 1. StackNavigator
+
 ```javascript
 import {
   UnitStack,
@@ -30,7 +37,7 @@ import {
 } from '@eohjsc/react-native-smart-city';
 import { createStackNavigator } from '@react-navigation/stack';
 
-// TODO: What to do with the module?   
+// TODO: What to do with the module?
 const Stack = createStackNavigator();
 
 const YourStack = () => {
@@ -84,7 +91,9 @@ const MainTab = () => {
   );
 };
 ```
+
 2. Use components
+
 ```javascript
 import React from 'react';
 import { View } from 'react-native';
@@ -93,13 +102,15 @@ import { MyPinnedSharedUnit, MyUnit } from '@eohjsc/react-native-smart-city';
 const MyScreen = () => {
   return (
     <View>
-        <MyUnit />
-        <MyPinnedSharedUnit />
+      <MyUnit />
+      <MyPinnedSharedUnit />
     </View>
   );
 };
 ```
+
 3. Trigger quick action
+
 ```javascript
 import React from 'react';
 import { View, Button } from 'react-native';
@@ -126,23 +137,33 @@ export const MyFunctionalComponent = () => {
     lg_actions: [],
     name: 'Garage Up',
   };
-  const handleQuickAction = async() => {
+  const handleQuickAction = async () => {
     const result = await sendRemoteCommand(sensor, action); // Action Garage Up
-    if (result){
-      console.log('Successful control')
-    }else {
-      console.log('Control failed')
+    if (result) {
+      console.log('Successful control');
+    } else {
+      console.log('Control failed');
     }
   };
   return (
     <View>
-      <Button onPress={handleQuickAction} title="Example trigger quick action control Garage Up" />
+      <Button
+        onPress={handleQuickAction}
+        title="Example trigger quick action control Garage Up"
+      />
     </View>
   );
 };
 ```
-- sendRemoteCommand user needs to `have permission to control the device`, you pass in the `sensor and action` to it and it will run after calling render.  
-- `sensor` is a device in your Unit and action is the `action` key of the device.. 
+
+- sendRemoteCommand user needs to `have permission to control the device`, you pass in the `sensor and action` to it and it will run after calling render.
+- `sensor` is a device in your Unit and action is the `action` key of the device..
 - You can take out the sensor and action from your Unit when calling the `API.UNIT.UNIT_DETAIL(unitId)` it will return all devices in 1 unit.
 - Or get sensor from `API.SENSOR.DISPLAY(sensor.id)` returns all actions of 1 device.
 - Refer YourProjectPath /node_modules/@eohjsc/react-native-smart-city/src/screens/Unit/Detail.js
+
+## Sync file to EoH source
+
+```
+  yarn install && yarn watch
+```

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.97",
+  "version": "0.3.0",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -74,6 +74,7 @@
     "@types/react": "^17.0.0",
     "@types/react-native": "^0.63.43",
     "@types/react-test-renderer": "^17.0.0",
+    "axios-mock-adapter": "^1.21.1",
     "babel-jest": "^26.6.3",
     "detox": "^18.3.1",
     "eslint": "7.14.0",
@@ -124,6 +125,7 @@
     "@react-navigation/stack": "^5.7.0",
     "@sentry/react-native": "^1.7.1",
     "@testing-library/react-hooks": "^6.0.0",
+    "apisauce": "^2.1.5",
     "axios": "^0.19.2",
     "dotenv": "^8.2.0",
     "google-libphonenumber": "^3.2.10",
@@ -190,7 +192,7 @@
     "react-native-unimodules": "^0.11.0",
     "react-native-version-check": "^3.4.2",
     "react-native-vlc-media-player": "^1.0.39",
-    "react-native-webview": "^10.9.3",
+    "react-native-webview": "11.17.2",
     "react-native-wheel-color-picker": "^1.2.0",
     "react-native-wheel-scrollview-picker": "^1.2.2",
     "react-native-wifi-reborn": "^4.5.0",

package/src/commons/Action/ItemQuickAction.js

@@ -43,8 +43,9 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
   useEffect(() => {
     sensor.quick_action &&
       sensor.quick_action.config_id &&
+      sensor.device_type !== 'GOOGLE_HOME' &&
       watchMultiConfigs([sensor.quick_action.config_id]);
-  }, [sensor.quick_action]);
+  }, [sensor.quick_action, sensor?.device_type]);
 
   useEffect(() => {
     if (!sensor.quick_action) {
@@ -59,7 +60,9 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
   const userId = useSCContextSelector((state) => state?.auth.account.user.id);
   const onActionPress = useCallback(() => {
     sendRemoteCommand(sensor, action, null, userId);
-    sensor.quick_action && watchMultiConfigs([sensor.quick_action.config_id]);
+    sensor.quick_action &&
+      sensor.device_type !== 'GOOGLE_HOME' &&
+      watchMultiConfigs([sensor.quick_action.config_id]);
     setIsSendingCommand(true);
 
     if (!sensor.quick_action) {

package/src/commons/ActionGroup/ColorPickerTemplate.js

@@ -35,7 +35,7 @@ const ColorPickerTemplate = memo(({ actionGroup, doAction, sensor }) => {
   }, [configuration.config, configValues, configuration]);
 
   useEffect(() => {
-    if (sensor?.is_managed_by_backend) {
+    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);

package/src/commons/ActionGroup/CurtainButtonTemplate.js

@@ -17,6 +17,11 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
     close_action_data,
     action_off_data,
     action_on_data,
+    is_display_lock,
+    text1,
+    text2,
+    text3,
+    text_door_lock,
   } = configuration || {};
   const [lock, setLock] = useState(false);
 
@@ -52,21 +57,21 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
       {
         style: styles.buttonActionCurtain,
         icon: Images.buttonLeftCurtain,
-        text: configuration.text1,
+        text: text1,
         onPress: onButtonOpenPress,
         testID: TESTID.BUTTON_TEMPLATE_1,
       },
       {
         style: styles.buttonActionCurtainCenter,
         icon: Images.buttonPauseCurtain,
-        text: configuration.text2,
+        text: text2,
         onPress: onButtonStopPress,
         testID: TESTID.BUTTON_TEMPLATE_2,
       },
       {
         style: styles.buttonActionCurtain,
         icon: Images.buttonRightCurtain,
-        text: configuration.text3,
+        text: text3,
         onPress: onButtonClosePress,
         testID: TESTID.BUTTON_TEMPLATE_3,
       },
@@ -96,7 +101,7 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
             style={styles.textLockDoor}
             testID={TESTID.TEXT_DOOR_LOOK_ON_OFF}
           >
-            {configuration.text_door_lock}{' '}
+            {text_door_lock}{' '}
           </Text>
         </View>
         <Switch
@@ -115,7 +120,7 @@ const CurtainButtonTemplate = memo(({ actionGroup, doAction, sensor }) => {
         <RenderThreeButtonActions />
       </View>
       <View style={styles.lockSwitch}>
-        {configuration.is_display_lock &&
+        {is_display_lock &&
           itemLock(
             lock ? 'lock' : 'unlock',
             lock ? Colors.Primary : Colors.Gray6

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -38,8 +38,8 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   }, [configValues, config, keep_track_config]);
 
   const doActionAndWatchConfig = useCallback(
-    (actionData, actionValue, actionName) => {
-      doAction(
+    async (actionData, actionValue, actionName) => {
+      await doAction(
         actionData,
         JSON.stringify({ temperature: actionValue }),
         actionName
@@ -54,9 +54,17 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
         return;
       }
 
-      config && watchMultiConfigs([config]);
+      config &&
+        sensor.device_type !== 'GOOGLE_HOME' &&
+        watchMultiConfigs([config]);
     },
-    [config, doAction, keep_track_config, sensor.is_managed_by_backend]
+    [
+      config,
+      doAction,
+      keep_track_config,
+      sensor.is_managed_by_backend,
+      sensor.device_type,
+    ]
   );
 
   const doActionUp = useCallback(async () => {

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

@@ -1,5 +1,6 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
+import { Switch } from 'react-native';
 
 import AutoLock from '../index';
 import { mockSCStore } from '../../../../../context/mockStore';
@@ -38,6 +39,9 @@ describe('Test AutoLock', () => {
     });
 
     const instance = tree.root;
+    const switchs = instance.findByType(Switch);
+    await switchs.props.onValueChange();
+
     const { buttonEnable, buttonInstant, buttonRelockTiming } =
       getElement(instance);
 

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

@@ -17,7 +17,7 @@ const OnOffSmartLock = memo(({ actionGroup, doAction, sensor }) => {
   const [isUnlock, setisUnlock] = useState(true);
   const [configValues] = useConfigGlobalState('configValues');
 
-  const handleActionSmartLock = useCallback(() => {
+  const handleActionSmartLock = useCallback(async () => {
     if (action_on_data && action_off_data) {
       if (isUnlock) {
         let actionName = `${
@@ -25,17 +25,19 @@ const OnOffSmartLock = memo(({ actionGroup, doAction, sensor }) => {
         } ${actionGroup?.title?.toLowerCase()} lock`;
         actionName = actionName.replace(/\s+/g, ' ').trim();
         const dataLock = { door_lock: 0 };
-        doAction(action_on_data, JSON.stringify(dataLock), actionName);
+        await doAction(action_on_data, JSON.stringify(dataLock), actionName);
       } else {
         let actionName = `${
           sensor?.name
         } ${actionGroup?.title?.toLowerCase()} unlock`;
         actionName = actionName.replace(/\s+/g, ' ').trim();
         const dataUnlock = { door_lock: 1 };
-        doAction(action_off_data, JSON.stringify(dataUnlock), actionName);
+        await doAction(action_off_data, JSON.stringify(dataUnlock), actionName);
       }
       if (sensor?.is_managed_by_backend) {
-        configuration.config && watchMultiConfigs([configuration.config]);
+        configuration.config &&
+          sensor.device_type !== 'GOOGLE_HOME' &&
+          watchMultiConfigs([configuration.config]);
       }
     }
   }, [
@@ -47,6 +49,7 @@ const OnOffSmartLock = memo(({ actionGroup, doAction, sensor }) => {
     sensor?.name,
     configuration,
     sensor?.is_managed_by_backend,
+    sensor?.device_type,
   ]);
 
   useEffect(() => {

package/src/commons/ActionGroup/OnOffSmartLock/PasscodeList/ItemPasscode.js

@@ -19,7 +19,7 @@ const ButtonWrapper = ({ item, textHeadline }) => {
 };
 
 const ItemPasscode = memo(({ route }) => {
-  const { item } = route.params;
+  const { item = {} } = route.params || {};
 
   return (
     <SafeAreaView style={styles.container}>

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

@@ -0,0 +1,24 @@
+import React from 'react';
+import { TouchableOpacity } from 'react-native';
+import { act, create } from 'react-test-renderer';
+import { SCProvider } from '../../../../../context';
+import { mockSCStore } from '../../../../../context/mockStore';
+import ItemPasscode from '../ItemPasscode';
+
+const wrapComponent = (route = {}) => (
+  <SCProvider initState={mockSCStore({})}>
+    <ItemPasscode route={route} />
+  </SCProvider>
+);
+
+describe('Test ItemPasscode', () => {
+  let tree;
+  test('test render without params', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(TouchableOpacities).toHaveLength(2);
+  });
+});

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

@@ -40,6 +40,7 @@ describe('Test SetupGeneratePasscode', () => {
     const changeDuration = instance.findAll(
       (item) => item.props.testID === TESTID.GENERATE_PASSCODE_SET_DURATION
     );
+
     return {
       changeName,
       changeTime,
@@ -58,5 +59,18 @@ describe('Test SetupGeneratePasscode', () => {
     expect(changeName[0]).toBeDefined();
     expect(changeTime[0]).toBeDefined();
     expect(changeDuration[0]).toBeDefined();
+
+    await changeDuration[0].props.onPressSetMinute();
+    await changeDuration[0].props.onPressSelectCircle();
+    await changeTime[0].props.onPressSetTime();
+
+    const wheelDateTimePicker = instance.findAll(
+      (item) =>
+        item.props.testID ===
+        `${TESTID.WHEEL_DATE_TIME_PICKER_BUTTON}${TESTID.VIEW_BUTTON_BOTTOM_RIGHT_BUTTON}`
+    );
+    await wheelDateTimePicker[5].props.onClick();
+    await wheelDateTimePicker[11].props.onClick();
+    await wheelDateTimePicker[17].props.onClick();
   });
 });

package/src/commons/ActionGroup/OnOffSmartLock/SetupGeneratePasscode/index.js

@@ -180,6 +180,7 @@ const SetupGeneratePasscode = memo(() => {
         showsVerticalScrollIndicator={false}
         showsHorizontalScrollIndicator={false}
         style={styles.scrollview}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <View style={styles.wrap}>
           <ButtonWrapper

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

@@ -12,22 +12,22 @@ const OnOffSimpleTemplate = ({
   actionGroup,
   disabled,
 }) => {
-  const isEnabled = !!isOn;
-
   return (
     <View style={styles.wrap}>
       <View style={styles.iconAndText}>
         <IconOutline name="poweroff" size={20} style={styles.marginRight} />
         <Text type="H4">{actionGroup.title}</Text>
       </View>
-      <Switch
-        trackColor={{ false: Colors.Gray4, true: Colors.Primary }}
-        thumbColor={isEnabled ? Colors.White : Colors.Gray6}
-        ios_backgroundColor={Colors.Gray4}
-        onValueChange={triggerAction}
-        value={isEnabled}
-        disabled={disabled}
-      />
+      {isOn !== null && (
+        <Switch
+          trackColor={{ false: Colors.Gray4, true: Colors.Primary }}
+          thumbColor={isOn ? Colors.White : Colors.Gray6}
+          ios_backgroundColor={Colors.Gray4}
+          onValueChange={triggerAction}
+          value={!!isOn}
+          disabled={disabled}
+        />
+      )}
     </View>
   );
 };

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

@@ -20,7 +20,8 @@ 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(true);
+  const [isOn, setIsOn] = useState(null);
+
   // eslint-disable-next-line no-unused-vars
   const [configValues, _] = useConfigGlobalState('configValues');
 
@@ -33,51 +34,53 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
     },
     [actionGroup?.title, sensor?.name]
   );
-  const triggerAction = useCallback(() => {
+  const triggerAction = useCallback(async () => {
     switch (sensor?.device_type) {
       case DEVICE_TYPE.ZIGBEE:
         if (action_on_data && action_off_data) {
           if (isOn) {
-            doAction(
+            await doAction(
               action_off_data,
               JSON.stringify({ state: 0 }),
               actionName('off')
             );
           } else {
-            doAction(
+            await doAction(
               action_on_data,
               JSON.stringify({ state: 1 }),
               actionName('on')
             );
           }
         }
-        return;
+        break;
       default:
         if (action_data) {
           if (isOn) {
-            doAction(action_data, false);
+            await doAction(action_data, false);
           } else {
-            doAction(action_data, true);
+            await doAction(action_data, true);
           }
         }
         if (action_on_data && action_off_data) {
           if (isOn) {
-            doAction(action_off_data, null, actionName('off'));
+            await doAction(action_off_data, null, actionName('off'));
           } else {
-            doAction(action_on_data, null, actionName('on'));
+            await doAction(action_on_data, null, actionName('on'));
           }
         }
-        if (sensor?.is_managed_by_backend) {
-          configuration.config && watchMultiConfigs([configuration.config]);
-        }
-        return;
+        break;
+    }
+    if (sensor?.is_managed_by_backend) {
+      configuration?.config &&
+        sensor?.device_type !== 'GOOGLE_HOME' &&
+        watchMultiConfigs([configuration?.config]);
     }
   }, [
     actionName,
     action_data,
     action_off_data,
     action_on_data,
-    configuration.config,
+    configuration?.config,
     doAction,
     isOn,
     sensor?.device_type,
@@ -103,7 +106,7 @@ const OnOffTemplate = memo(({ actionGroup, doAction, sensor }) => {
     if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
       return;
     }
-    if (sensor?.is_managed_by_backend) {
+    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -67,7 +67,9 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
       actionName
     );
     if (sensor?.is_managed_by_backend) {
-      configuration.config && watchMultiConfigs([configuration.config]);
+      configuration.config &&
+        sensor.device_type !== 'GOOGLE_HOME' &&
+        watchMultiConfigs([configuration.config]);
     }
     hideAlertAction();
   }, [
@@ -79,6 +81,7 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     selectedIndex,
     sensor?.is_managed_by_backend,
     sensor?.name,
+    sensor?.device_type,
     title,
   ]);
 
@@ -89,7 +92,7 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
       return t('not_available');
     }
     return selectedOption.text;
-  }, [configuration.config, selectedOption.text, t]);
+  }, [configuration?.config, selectedOption?.text, t]);
 
   const iconSvg = useMemo(() => {
     switch (icon) {
@@ -145,7 +148,10 @@ const OptionsDropdownActionTemplate = ({ actionGroup, doAction, sensor }) => {
         rightButtonClick={onDone}
       >
         <View style={styles.wrapRename}>
-          <ScrollView style={styles.scrollView}>
+          <ScrollView
+            style={styles.scrollView}
+            scrollIndicatorInsets={{ right: 1 }}
+          >
             {!action_data && (
               <Text
                 color={Colors.Gray6}

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -37,7 +37,7 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
   }, [configuration.config, configValues, configuration]);
 
   useEffect(() => {
-    if (sensor?.is_managed_by_backend) {
+    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
       watchMultiConfigs([configuration.config]);
     }
   }, [sensor, configuration.config]);

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

@@ -91,7 +91,10 @@ const SmartTiviActionTemplate = memo(
     }, []);
     return (
       <>
-        <ScrollView scrollEnabled={scrollEnabled}>
+        <ScrollView
+          scrollEnabled={scrollEnabled}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           <View style={styles.wrap}>
             <View style={styles.rowOnOff}>
               <CircleButton

package/src/commons/ActionGroup/StatesGridActionTemplate.js

@@ -45,10 +45,20 @@ 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 && watchMultiConfigs([config]);
+        config &&
+          sensor.device_type !== 'GOOGLE_HOME' &&
+          watchMultiConfigs([config]);
       }
     },
-    [config, doAction, sensor?.is_managed_by_backend, sensor?.name, text, title]
+    [
+      config,
+      doAction,
+      sensor?.is_managed_by_backend,
+      sensor?.name,
+      sensor?.device_type,
+      text,
+      title,
+    ]
   );
 
   const iconKit = !!icon_kit_data && icon_kit_data.icon;
@@ -95,15 +105,19 @@ 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,
@@ -114,10 +128,10 @@ const StatesGridActionTemplate = ({ actionGroup, doAction, sensor }) => {
   }, [configuration, configValues]);
 
   useEffect(() => {
-    if (sensor?.is_managed_by_backend) {
+    if (sensor?.is_managed_by_backend && sensor.device_type !== 'GOOGLE_HOME') {
       watchMultiConfigs(configuration.options.map((option) => option.config));
     }
-  }, [sensor.is_managed_by_backend, configuration.options]);
+  }, [sensor.is_managed_by_backend, sensor.device_type, configuration.options]);
 
   return (
     <View style={styles.wrap}>