@eohjsc/react-native-smart-city 0.2.99 → 0.3.2

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.2.99",
+  "version": "0.3.02",
   "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",
@@ -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",
@@ -99,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",
@@ -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",
@@ -174,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 "react-native-permissions"
   # ...
   # 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/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

@@ -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/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/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/OptionsDropdownActionTemplate.js

@@ -92,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) {

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/StatesGridActionTemplate.js

@@ -105,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,

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

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__/CurtainButtonTemplate.test.js

@@ -1,20 +1,37 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
-import { TouchableOpacity } from 'react-native';
+import { TouchableOpacity, Switch } from 'react-native';
 
 import CurtainButtonTemplate from '../CurtainButtonTemplate';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 
-const wrapComponent = (actionGroup) => (
+const mockDoAction = jest.fn();
+const mockActionOffData = jest.fn();
+const mockActionOnData = jest.fn();
+const mockCloseActionData = jest.fn();
+
+const wrapComponent = (actionGroup = {}, sensor = {}) => (
   <SCProvider initState={mockSCStore({})}>
-    <CurtainButtonTemplate actionGroup={actionGroup} doAction={jest.fn()} />
+    <CurtainButtonTemplate
+      actionGroup={actionGroup}
+      doAction={mockDoAction}
+      sensor={sensor}
+    />
   </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',
@@ -61,12 +78,44 @@ 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));
+      wrapper = renderer.create(wrapComponent(actionGroup, sensor));
     });
     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`
+    );
   });
 });