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

package/README.md

@@ -159,7 +159,7 @@ export const MyFunctionalComponent = () => {
 - 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.
+- Or get sensor from `API.DEVICE.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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.0",
+  "version": "0.3.03",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -18,7 +18,7 @@
     "ios": "react-native run-ios",
     "start": "react-native start",
     "test": "yarn run lint && yarn run jest",
-    "lint": "eslint .  --ext js --ext ts --ext tsx",
+    "lint": "eslint .  --ext js --ext ts --ext tsx --max-warnings 5",
     "lint-fix": "eslint . --fix",
     "type-check": "npx tsc",
     "pod": "cd ios && pod install",
@@ -100,7 +100,7 @@
     "@ant-design/icons-react-native": "^2.2.1",
     "@ant-design/react-native": "^4.0.5",
     "@babel/helper-environment-visitor": "^7.16.7",
-    "@eohjsc/highcharts": "^1.0.8",
+    "@eohjsc/highcharts": "^1.0.9",
     "@eohjsc/react-native-keyboard-aware-scroll-view": "^0.9.5",
     "@formatjs/intl-getcanonicallocales": "^1.4.5",
     "@formatjs/intl-numberformat": "^5.6.2",
@@ -176,7 +176,7 @@
     "react-native-pager-view": "^5.4.1",
     "react-native-parallax-scroll-view": "^0.21.3",
     "react-native-parsed-text": "^0.0.22",
-    "react-native-permissions": "^2.1.5",
+    "react-native-permissions": "3.0.3",
     "react-native-popover-view": "^4.0.3",
     "react-native-progress": "^5.0.0",
     "react-native-reanimated": "1.10.1",

package/react-native-smart-city.podspec

@@ -22,6 +22,7 @@ Pod::Spec.new do |s|
   s.requires_arc = true
 
   s.dependency "React"
+  s.dependency "RNPermissions"
   # ...
   # s.dependency "..."
 end

package/src/commons/Action/ItemQuickAction.js

@@ -3,7 +3,7 @@ import { TouchableOpacity, View } from 'react-native';
 import { TESTID } from '../../configs/Constants';
 import { useSCContextSelector } from '../../context';
 import { watchMultiConfigs } from '../../iot/Monitor';
-import { sendRemoteCommand } from '../../iot/RemoteControl';
+import { useRemoteControl } from '../../hooks/IoT';
 import { useConfigGlobalState } from '../../iot/states';
 import IconComponent from '../IconComponent';
 
@@ -13,6 +13,8 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
   // eslint-disable-next-line no-unused-vars
   const [configValues, _] = useConfigGlobalState('configValues');
 
+  const sendRemoteCommand = useRemoteControl();
+
   const revertActionUpdate = useCallback(
     (value, on_action, on_status, off_action, off_status) => {
       setIsSendingCommand(false);
@@ -81,7 +83,14 @@ const ItemQuickAction = memo(({ sensor, wrapperStyle, setStatus, unit }) => {
         statusCallback(action.id === sensor.quick_action.on_action.id);
       }, sensor.quick_action.interval);
     }
-  }, [sensor, action, userId, revertActionUpdate, statusCallback]);
+  }, [
+    sensor,
+    action,
+    userId,
+    revertActionUpdate,
+    statusCallback,
+    sendRemoteCommand,
+  ]);
 
   if (!action) {
     return <View />;

package/src/commons/Action/__test__/ItemQuickAction.test.js

@@ -5,7 +5,6 @@ import ItemQuickAction from '../ItemQuickAction';
 import { Colors } from '../../../configs';
 import { TESTID } from '../../../configs/Constants';
 import { factory } from 'factory-girl';
-import { sendRemoteCommand } from '../../../iot/RemoteControl';
 
 class Sensor {}
 
@@ -21,7 +20,13 @@ jest.mock('react', () => {
 
 useState.mockImplementation((init) => [init, mockSetState]);
 
-jest.mock('../../../iot/RemoteControl');
+const mockSendRemoteControl = jest.fn();
+jest.mock('../../../hooks/IoT', () => {
+  return {
+    ...jest.requireActual('../../../hooks/IoT'),
+    useRemoteControl: () => mockSendRemoteControl,
+  };
+});
 
 jest.mock('../../../iot/states', () => ({
   useConfigGlobalState: () => [{}, null],
@@ -83,9 +88,9 @@ describe('Test ItemQuickAction', () => {
   };
 
   test('render with no action', async () => {
-    const sensor = await factory.build('Sensor');
+    const newSensor = await factory.build('Sensor');
     act(() => {
-      tree = create(<ItemQuickAction sensor={sensor} />);
+      tree = create(<ItemQuickAction sensor={newSensor} />);
     });
     const instance = tree.root;
     const buttonOnActionPress = instance.findAll(
@@ -121,7 +126,7 @@ describe('Test ItemQuickAction', () => {
     act(() => {
       buttonOnActionPress.props.onPress();
     });
-    expect(sendRemoteCommand).toBeCalled();
+    expect(mockSendRemoteControl).toBeCalled();
     expect(mockSetState).toBeCalledTimes(1);
 
     jest.runAllTimers();
@@ -154,7 +159,7 @@ describe('Test ItemQuickAction', () => {
     act(() => {
       buttonOnActionPress.props.onPress();
     });
-    expect(sendRemoteCommand).toBeCalled();
+    expect(mockSendRemoteControl).toBeCalled();
     expect(mockSetState).toBeCalledTimes(1);
 
     jest.runAllTimers();

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -7,6 +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';
 
 const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
   const { configuration, title } = actionGroup;
@@ -15,39 +16,39 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
     max_value,
     min_value,
     text_format,
-    keep_track_config,
     config,
+    allow_config_store_value,
   } = configuration;
 
   // eslint-disable-next-line no-unused-vars
   const [configValues, setConfigValues] = useConfigGlobalState('configValues');
-  const [value, setValue] = useState((config && configValues[config]) || 28);
+  const [value, setValue] = useState();
+  const valueDefault = 28;
 
   useEffect(() => {
-    if (!keep_track_config) {
-      return;
-    }
     if (!config) {
+      setValue(valueDefault);
       return;
     }
 
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
+    } else {
+      setValue(valueDefault);
     }
-  }, [configValues, config, keep_track_config]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
 
   const doActionAndWatchConfig = useCallback(
     async (actionData, actionValue, actionName) => {
-      await doAction(
-        actionData,
-        JSON.stringify({ temperature: actionValue }),
-        actionName
-      );
-      if (!sensor?.is_managed_by_backend) {
-        return;
+      const data = { temperature: actionValue };
+      if (allow_config_store_value && config) {
+        data.config_id = config;
+        data.value = actionValue;
       }
-      if (!keep_track_config) {
+      await doAction(actionData, JSON.stringify(data), actionName);
+      if (!sensor?.is_managed_by_backend) {
         return;
       }
       if (!config) {
@@ -59,11 +60,11 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
         watchMultiConfigs([config]);
     },
     [
-      config,
       doAction,
-      keep_track_config,
-      sensor.is_managed_by_backend,
+      sensor?.is_managed_by_backend,
       sensor.device_type,
+      allow_config_store_value,
+      config,
     ]
   );
 
@@ -103,13 +104,23 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
       )}
 
       <View style={styles.controlPannel}>
-        <TouchableOpacity style={styles.downButton} onPress={doActionDown}>
+        <TouchableOpacity
+          style={styles.downButton}
+          onPress={doActionDown}
+          testID={TESTID.NUMBER_ACTION_DOWN}
+        >
           <IconOutline name="down" size={32} color={Colors.Primary} />
         </TouchableOpacity>
 
-        <Text type="H2">{text_format.replace('{number}', value)}</Text>
+        <Text testID={'abcd'} type="H2">
+          {text_format.replace('{number}', value)}
+        </Text>
 
-        <TouchableOpacity style={styles.upButton} onPress={doActionUp}>
+        <TouchableOpacity
+          style={styles.upButton}
+          onPress={doActionUp}
+          testID={TESTID.NUMBER_ACTION_UP}
+        >
           <IconOutline name="up" size={32} color={Colors.Primary} />
         </TouchableOpacity>
       </View>

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

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

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

@@ -14,7 +14,6 @@ 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;
 

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import Text from '../../../commons/Text';
+import { TESTID } from '../../../configs/Constants';
 import { watchMultiConfigs } from '../../../iot/Monitor';
 import NumberUpDownActionTemplate from '../NumberUpDownActionTemplate';
 
@@ -30,7 +31,7 @@ describe('Test NumberUpDownActionTemplate', () => {
     watchMultiConfigs.mockClear();
     actionGroup = {
       configuration: {
-        keep_track_config: false,
+        allow_config_store_value: false,
         config: 5,
         action_data,
         min_value: 16,
@@ -57,28 +58,10 @@ describe('Test NumberUpDownActionTemplate', () => {
 
     const touchs = instance.findAllByType(TouchableOpacity);
     expect(touchs).toHaveLength(2);
-  });
-
-  test('do action call watchConfigs', async () => {
-    actionGroup.configuration.keep_track_config = true;
-    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 touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
 
     await act(async () => {
       await touchs[0].props.onPress();
     });
-
     expect(watchMultiConfigs).toBeCalled();
   });
 
@@ -104,8 +87,9 @@ describe('Test NumberUpDownActionTemplate', () => {
     expect(watchMultiConfigs).not.toBeCalled();
   });
 
-  test('do action not call watchConfigs cause keep track config false', async () => {
+  test('do action watchConfigs cause allow_config_store_value true', async () => {
     const mockDoAction = jest.fn();
+    actionGroup.configuration.allow_config_store_value = true;
     await act(async () => {
       wrapper = await create(
         <NumberUpDownActionTemplate
@@ -123,11 +107,11 @@ describe('Test NumberUpDownActionTemplate', () => {
       await touchs[0].props.onPress();
     });
 
-    expect(watchMultiConfigs).not.toBeCalled();
+    expect(watchMultiConfigs).toBeCalled();
   });
 
   test('action down without config', async () => {
-    actionGroup.configuration.keep_track_config = true;
+    actionGroup.configuration.allow_config_store_value = true;
     actionGroup.configuration.config = undefined;
     const mockDoAction = jest.fn();
     await act(async () => {
@@ -150,8 +134,10 @@ describe('Test NumberUpDownActionTemplate', () => {
     expect(watchMultiConfigs).not.toBeCalled();
   });
 
-  test('action down without keep track config', async () => {
+  test('action down allow_config_store_value true', async () => {
     const mockDoAction = jest.fn();
+    actionGroup.configuration.allow_config_store_value = true;
+    actionGroup.configuration.config = null;
     await act(async () => {
       wrapper = await create(
         <NumberUpDownActionTemplate
@@ -162,19 +148,23 @@ describe('Test NumberUpDownActionTemplate', () => {
       );
     });
     const instance = wrapper.root;
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
-
+    const touchs = instance.find(
+      (el) =>
+        el.props.testID === TESTID.NUMBER_ACTION_DOWN &&
+        el.type === TouchableOpacity
+    );
     await act(async () => {
-      await touchs[0].props.onPress();
+      await touchs.props.onPress();
     });
 
     const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('24 *C');
+    expect(text.props.children).toEqual('27 *C');
   });
 
-  test('action up without keep track config', async () => {
+  test('action up allow_config_store_value true', async () => {
     const mockDoAction = jest.fn();
+    actionGroup.configuration.allow_config_store_value = true;
+    actionGroup.configuration.config = null;
     await act(async () => {
       wrapper = await create(
         <NumberUpDownActionTemplate
@@ -185,19 +175,21 @@ describe('Test NumberUpDownActionTemplate', () => {
       );
     });
     const instance = wrapper.root;
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
-
+    const touchs = instance.find(
+      (el) =>
+        el.props.testID === TESTID.NUMBER_ACTION_UP &&
+        el.type === TouchableOpacity
+    );
     await act(async () => {
-      await touchs[1].props.onPress();
+      await touchs.props.onPress();
     });
-
-    const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('26 *C');
+    const text = instance.find(
+      (el) => el.props.testID === 'abcd' && el.type === Text
+    );
+    expect(text.props.children).toEqual('29 *C');
   });
 
-  test('action down with keep track config', async () => {
-    actionGroup.configuration.keep_track_config = true;
+  test('action down with allow_config_store_value false', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
       wrapper = await create(
@@ -209,19 +201,21 @@ describe('Test NumberUpDownActionTemplate', () => {
       );
     });
     const instance = wrapper.root;
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
+    const touchs = instance.find(
+      (el) =>
+        el.props.testID === TESTID.NUMBER_ACTION_DOWN &&
+        el.type === TouchableOpacity
+    );
 
     await act(async () => {
-      await touchs[0].props.onPress();
+      await touchs.props.onPress();
     });
 
     const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('25 *C'); // TODO should 24, configValues make changes again
+    expect(text.props.children).toEqual('24 *C'); // TODO should 24, configValues make changes again
   });
 
-  test('action up with keep track config', async () => {
-    actionGroup.configuration.keep_track_config = true;
+  test('action up with allow_config_store_value false', async () => {
     const mockDoAction = jest.fn();
     await act(async () => {
       wrapper = await create(
@@ -233,15 +227,18 @@ describe('Test NumberUpDownActionTemplate', () => {
       );
     });
     const instance = wrapper.root;
-    const touchs = instance.findAllByType(TouchableOpacity);
-    expect(touchs).toHaveLength(2);
+    const touchs = instance.find(
+      (el) =>
+        el.props.testID === TESTID.NUMBER_ACTION_UP &&
+        el.type === TouchableOpacity
+    );
 
     await act(async () => {
-      await touchs[1].props.onPress();
+      await touchs.props.onPress();
     });
 
     const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('25 *C'); // TODO should 26, configValues make changes again
+    expect(text.props.children).toEqual('26 *C'); // TODO should 26, configValues make changes again
   });
 
   test('action down limit ', async () => {

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

@@ -356,8 +356,8 @@ describe('Test ActionGroup', () => {
         text_format: '{number} *C',
       },
     };
-    await act(() => {
-      wrapper = renderer.create(
+    await act(async () => {
+      wrapper = await renderer.create(
         wrapComponent(actionGroup, mockDoAction, sensor)
       );
     });

package/src/commons/ConnectingProcess/DeviceItem/DeviceItem.js

@@ -2,13 +2,17 @@ import React, { memo } from 'react';
 import { View } from 'react-native';
 import styles from './DeviceItemStyles';
 import FImage from '../../FImage';
-import Text from '../../Text';
+import _TextInput from '../../Form/TextInput';
 
-const DeviceItem = memo(({ icon, name }) => {
+const DeviceItem = memo(({ icon, name, setNewName }) => {
   return (
     <View style={styles.container}>
       {!!icon && <FImage source={{ uri: icon }} style={styles.iconSensor} />}
-      <Text style={styles.textItem}>{name}</Text>
+      <_TextInput
+        value={name}
+        textInputStyle={styles.textItem}
+        onChange={setNewName}
+      />
     </View>
   );
 });

package/src/commons/ConnectingProcess/DeviceItem/DeviceItemStyles.js

@@ -1,23 +1,14 @@
 import { StyleSheet } from 'react-native';
-import { Constants, Colors } from '../../../configs';
-
-const marginItem = 12;
-const marginHorizontal = 5;
-const widthItem = (Constants.width - marginHorizontal * 2 - marginItem) / 2;
-const heightItem = (widthItem / 166) * 60;
+import { Colors } from '../../../configs';
 
 export default StyleSheet.create({
   container: {
-    paddingHorizontal: 15,
     borderRadius: 10,
     width: 250,
-    height: heightItem,
     borderWidth: 1,
     borderColor: Colors.Gray4,
     backgroundColor: Colors.White,
     justifyContent: 'center',
-    alignItems: 'center',
-    marginBottom: 16,
     flexDirection: 'row',
     shadowColor: Colors.Shadow,
     shadowOffset: {
@@ -36,7 +27,13 @@ export default StyleSheet.create({
     resizeMode: 'contain',
   },
   textItem: {
-    marginLeft: 15,
+    borderWidth: 0,
+    borderBottomWidth: 1,
+    borderBottomColor: Colors.Primary,
+    textAlign: 'center',
+    marginTop: -10,
+    padding: 5,
     fontSize: 16,
+    height: 50,
   },
 });

package/src/commons/ConnectingProcess/__test__/DeviceItem.test.js

@@ -2,7 +2,8 @@ import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import DeviceItem from '../DeviceItem/DeviceItem';
 import FImage from '../../FImage';
-import Text from '../../Text';
+import _TextInput from '../../Form/TextInput';
+
 describe('Test DeviceItem button', () => {
   let tree;
   test('create DeviceItem button', () => {
@@ -11,7 +12,7 @@ describe('Test DeviceItem button', () => {
     });
     const instance = tree.root;
     const image = instance.findAllByType(FImage);
-    const text = instance.findAllByType(Text);
+    const text = instance.findAllByType(_TextInput);
     expect(image).toHaveLength(0);
     expect(text).toHaveLength(1);
   });