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

package/src/commons/ConnectingProcess/index.js

@@ -6,13 +6,12 @@ import { useNavigation } from '@react-navigation/native';
 import ImageSuccessfully from '../../Images/Common/SuccessfullyConnected.svg';
 
 import Text from '../Text';
-import { axiosPatch, axiosPost } from '../../utils/Apis/axios';
+import { axiosPost } from '../../utils/Apis/axios';
 import { API, Colors } from '../../configs';
 import styles from './styles';
 import DeviceItem from './DeviceItem/DeviceItem';
 import Connecting from '../Connecting';
 import { useSCContextSelector } from '../../context';
-import { ToastBottomHelper } from '../../utils/Utils';
 
 const ConnectingProcess = ({ route }) => {
   const { navigate, goBack } = useNavigation();
@@ -28,31 +27,29 @@ const ConnectingProcess = ({ route }) => {
     devicePrefixName,
     wifi_ssid,
     wifi_pass,
-  } = route.params || {};
+    chip_id,
+  } = route.params;
   const [isLoading, setIsLoading] = useState(true);
   const [sensor, setSensor] = useState(null);
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
-  const [newName, setNewName] = useState('');
 
   const ConnectingDevice = useCallback(async () => {
     setIsLoading(true);
     switch (devicePrefixName) {
-      case 'SENSOR': {
-        const body = { imei: scan_sensor_data?.imei, chip: gateway?.id };
-        const { success, data } = await axiosPost(
-          API.SUB_UNIT.SENSOR_SCAN(station.id),
-          body
-        );
-        if (success) {
-          setSensor(data);
-          setNewName(data?.name);
-        } else {
-          ToastBottomHelper.error(JSON.stringify(data));
-          goBack();
+      case 'SENSOR':
+        {
+          const body = { imei: scan_sensor_data?.imei, chip: gateway?.id };
+          const { success, data } = await axiosPost(
+            API.SUB_UNIT.SENSOR_SCAN(station.id),
+            body
+          );
+          if (success) {
+            setSensor(data);
+          } else {
+            goBack();
+          }
         }
-
         break;
-      }
       case 'ROBOT': {
         const { success, data } = await axiosPost(API.UNIT.CHIP_SCAN(unit.id), {
           imei: gateway?.imei,
@@ -65,26 +62,20 @@ const ConnectingProcess = ({ route }) => {
         });
         if (success) {
           setSensor(data);
-          setNewName(data?.name);
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
       }
       case 'LITE': {
-        const { success, data } = await axiosPost(
-          API.UNIT.ADD_GATEWAY(unit_id),
-          {
-            imei: gateway?.imei,
-            chip_name: gateway?.model,
-          }
-        );
+        const { success } = await axiosPost(API.UNIT.ADD_GATEWAY(unit_id), {
+          chip: chip_id,
+          imei: gateway?.imei,
+          chip_name: gateway?.model,
+        });
         if (success) {
-          setSensor(data);
-          setNewName(data?.name || gateway?.model);
+          setSensor({ name: gateway?.model });
         } else {
-          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
@@ -104,6 +95,7 @@ const ConnectingProcess = ({ route }) => {
     wifi_pass,
     user?.phone_number,
     unit_id,
+    chip_id,
   ]);
 
   const ConnectingSuccess = useCallback(() => {
@@ -118,46 +110,12 @@ const ConnectingProcess = ({ route }) => {
             station?.name !== undefined ? '- ' + station?.name : ''
           }`}
         </Text>
-        <DeviceItem
-          icon={sensor?.icon_kit}
-          name={newName}
-          setNewName={setNewName}
-        />
+        <DeviceItem icon={sensor?.icon_kit} name={sensor?.name} />
       </View>
     );
-  }, [newName, sensor?.icon_kit, station?.name, t, unit?.name, unit_name]);
+  }, [sensor?.icon_kit, sensor?.name, station?.name, t, unit?.name, unit_name]);
 
-  const handleDone = useCallback(async () => {
-    let result, message;
-    switch (devicePrefixName) {
-      case 'SENSOR': {
-        const { success, data } = await axiosPatch(
-          API.SENSOR.SENSOR_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
-        break;
-      }
-      case 'ROBOT':
-      case 'LITE': {
-        const { success, data } = await axiosPatch(
-          API.CHIP.CHIP_DETAIL(sensor?.id),
-          {
-            name: newName,
-          }
-        );
-        result = success;
-        message = data;
-        break;
-      }
-    }
-
-    if (!result) {
-      ToastBottomHelper.error(JSON.stringify(message));
-    }
+  const handleDone = useCallback(() => {
     navigate(Routes.UnitStack, {
       screen: Routes.UnitDetail,
       params: {
@@ -167,15 +125,7 @@ const ConnectingProcess = ({ route }) => {
         stationId: station?.id,
       },
     });
-  }, [
-    devicePrefixName,
-    navigate,
-    newName,
-    sensor?.id,
-    station?.id,
-    unit,
-    unit_id,
-  ]);
+  }, [navigate, station?.id, unit, unit_id]);
 
   useEffect(() => {
     ConnectingDevice();

package/src/commons/Dashboard/MyPinnedSharedUnit/__test__/MyPinnedSharedUnit.test.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import { act, create } from 'react-test-renderer';
-import MockAdapter from 'axios-mock-adapter';
 
 import MyPinnedSharedUnit from '../index';
 import { Text } from 'react-native';
@@ -10,9 +9,9 @@ import { mockSCStore } from '../../../../context/mockStore';
 import { TESTID } from '../../../../configs/Constants';
 import { API } from '../../../../configs';
 import { TouchableOpacity } from 'react-native';
-import api from '../../../../utils/Apis/axios';
+import axios from 'axios';
 
-const mock = new MockAdapter(api.axiosInstance);
+jest.mock('axios');
 
 const mockedNavigate = jest.fn();
 jest.mock('@react-navigation/native', () => {
@@ -33,14 +32,21 @@ const wrapComponent = (route) => (
 
 describe('Test MyPinnedSharedUnit', () => {
   let tree;
+  afterEach(() => {
+    axios.get.mockClear();
+  });
 
   test('create', async () => {
-    mock.onGet(API.UNIT.SHARED_UNITS()).reply(200, [{ id: 1 }]);
-
+    const response = {
+      status: 200,
+      data: [{ id: 1 }],
+    };
+    axios.get.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await create(wrapComponent());
     });
-
     const instance = tree.root;
     const texts = instance.findAllByType(Text);
     expect(texts).toHaveLength(4);
@@ -59,15 +65,6 @@ describe('Test MyPinnedSharedUnit', () => {
       goToAllSharedUnits.props.onPress();
     });
     expect(mockedNavigate).toHaveBeenCalled();
-  });
-
-  test('render without item', async () => {
-    mock.onGet(API.UNIT.SHARED_UNITS()).reply(400, []);
-    await act(async () => {
-      tree = await create(wrapComponent());
-    });
-    const instance = tree.root;
-    const texts = instance.findAllByType(Text);
-    expect(texts).toHaveLength(4);
+    expect(axios.get).toHaveBeenCalledWith(API.UNIT.SHARED_UNITS(), {});
   });
 });

package/src/commons/Dashboard/MyPinnedSharedUnit/index.js

@@ -60,7 +60,7 @@ const MyPinnedSharedUnit = () => {
         {sharedUnits &&
           Boolean(sharedUnits.length) &&
           sharedUnits
-            .filter((sharedUnit) => sharedUnit?.is_pin)
+            .filter((sharedUnit) => sharedUnit.is_pin)
             .map((item, index) => (
               <View key={item.id}>
                 <SharedUnit

package/src/commons/Dashboard/MyUnit/__test__/MyUnit.test.js

@@ -4,7 +4,9 @@ import MyUnit from '..';
 import { TESTID } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
+import axios from 'axios';
 
+jest.mock('axios');
 const mockedNavigate = jest.fn();
 const mockUseIsFocused = jest.fn();
 const mockedDispatch = jest.fn();
@@ -34,6 +36,9 @@ const wrapComponent = () => (
 
 describe('Test MyUnit', () => {
   let tree;
+  beforeEach(() => {
+    axios.get.mockClear();
+  });
   const getElement = (instance) => {
     const goToDetail = instance.findAll(
       (item) => item.props.testID === TESTID.MY_UNIT_GO_TO_DETAIL

package/src/commons/Device/ConnectedViewHeader.js

@@ -29,7 +29,7 @@ const ConnectedViewHeader = memo(
     const t = useTranslations();
     const lastUpdatedStr = lastUpdated
       ? timeDifference(new Date(), lastUpdated)
-      : `5 ${t('seconds_ago')}`;
+      : null;
     return (
       <View style={styles.statusContainer}>
         <View style={styles.connectStatus}>

package/src/commons/Device/HistoryChart.js

@@ -151,12 +151,12 @@ const HistoryChart = memo(
       if (configuration.config !== 'power_consumption') {
         return null;
       }
-      const { price: chartPrice } = chartConfig;
-      if (chartPrice === '' || isNaN(chartPrice)) {
+      const { price } = chartConfig;
+      if (price === '' || isNaN(price)) {
         return null;
       }
       const sum = datas[0].data.reduce((a, b) => a + b.y, 0);
-      const roundedSum = sum * chartPrice;
+      const roundedSum = sum * price;
       return roundedSum.toFixed();
     }, [configuration, datas, chartConfig]);
 
@@ -239,8 +239,6 @@ const HistoryChart = memo(
           onConfirm={onConfirmStart}
           onCancel={onCancel}
           display="spinner"
-          cancelTextIOS={t('cancel')}
-          confirmTextIOS={t('confirm')}
         />
         <DateTimePickerModal
           isVisible={eventPicker.showModalEnd}
@@ -249,8 +247,6 @@ const HistoryChart = memo(
           onConfirm={onConfirmEnd}
           onCancel={onCancel}
           display="spinner"
-          cancelTextIOS={t('cancel')}
-          confirmTextIOS={t('confirm')}
         />
       </View>
     );

package/src/commons/Device/ItemDevice.js

@@ -11,9 +11,8 @@ import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import ItemQuickAction from '../../commons/Action/ItemQuickAction';
 import Text from '../../commons/Text';
-import { isDeviceConnected as isBluetoothDeviceConnected } from '../../iot/RemoteControl/Bluetooth';
+import { isDeviceConnected } from '../../iot/RemoteControl/Bluetooth';
 import { useSCContextSelector } from '../../context';
-import { useGGHomeDeviceConnected } from '../../hooks/Common';
 
 import { Colors } from '../../configs';
 import { TESTID, DEVICE_TYPE, DEVICE_SIZE } from '../../configs/Constants';
@@ -27,6 +26,7 @@ const ItemDevice = memo(
     sensor,
     unit,
     station,
+    isGGHomeConnected,
     serverDown,
     status,
     wrapStyle,
@@ -39,7 +39,6 @@ const ItemDevice = memo(
     const isNetworkConnected = useSCContextSelector(
       (state) => state.app.isNetworkConnected
     );
-    const { isConnected: isGGHomeConnected } = useGGHomeDeviceConnected(sensor);
 
     const goToSensorDisplay = useCallback(() => {
       navigation.navigate(Routes.DeviceDetail, {
@@ -47,35 +46,29 @@ const ItemDevice = memo(
         station,
         sensorData: sensor,
         title,
+        isGGHomeConnected,
       });
-    }, [navigation, sensor, station, title, unit]);
+    }, [navigation, sensor, station, title, unit, isGGHomeConnected]);
 
     const isConnectedViaInternet =
       status === undefined
         ? !serverDown && isNetworkConnected && sensor.is_connected
         : !serverDown && isNetworkConnected && status.is_connected;
-
     const isConnectedViaBLE =
       isBluetoothEnabled &&
-      isBluetoothDeviceConnected(
-        sensor?.remote_control_options?.bluetooth?.address
-      );
-
+      isDeviceConnected(sensor?.remote_control_options?.bluetooth?.address);
+    const isConnectedViaGGHome =
+      !!sensor &&
+      sensor?.is_other_device &&
+      !sensor?.device_type !== DEVICE_TYPE.LG_THINQ &&
+      isGGHomeConnected;
     const isConnected =
-      !!sensor && sensor?.is_other_device
-        ? sensor?.device_type === DEVICE_TYPE.LG_THINQ
-          ? true
-          : isGGHomeConnected
-        : isConnectedViaInternet || isConnectedViaBLE;
-
+      isConnectedViaInternet || isConnectedViaGGHome || isConnectedViaBLE;
     const borderColor = isConnected ? Colors.Gray4 : Colors.Red6;
     const textConnected = isConnected ? t('connected') : t('disconnected');
 
     return (
-      <TouchableWithoutFeedback
-        onPress={goToSensorDisplay}
-        testID={`${TESTID.SENSOR_NAME}-${sensor?.id}`}
-      >
+      <TouchableWithoutFeedback onPress={goToSensorDisplay}>
         <View
           style={[styles.container, wrapStyle, { borderColor }]}
           testID={TESTID.SUB_UNIT_DEVICES}

package/src/commons/Device/LinearChart.js

@@ -52,21 +52,6 @@ const chartOptions = {
       format: '{value:%d.%m %H:%M}',
     },
   },
-  legend: {
-    useHTML: true,
-    labelFormatter: function () {
-      if (this.visible) {
-        return (
-          '<span style="color:#333333;font-weight:bold">' +
-          this.name +
-          '</span>'
-        );
-      }
-      return (
-        '<span style="color:#cccccc;font-weight:bold">' + this.name + '</span>'
-      );
-    },
-  },
 };
 
 function LinearChart({ datas }) {

package/src/commons/Device/PMSensor/PMSensorIndicatior.js

@@ -1,5 +1,4 @@
 import React, { memo, useCallback } from 'react';
-import { View } from 'react-native';
 import { FlatList } from 'react-native';
 import QualityIndicatorItem from '../WaterQualitySensor/QualityIndicatorsItem';
 import styles from './PMSensorIndicatorStyles';
@@ -27,21 +26,18 @@ const PMSensorIndicatior = memo(({ data, style }) => {
   const isScrollMode = data.length > 3;
 
   return (
-    <View style={styles.wrap}>
-      <FlatList
-        bounces={false}
-        numColumns={1}
-        horizontal={true}
-        contentContainerStyle={[
-          styles.standard,
-          !isScrollMode && styles.centerItem,
-        ]}
-        data={data}
-        keyExtractor={keyExtractor}
-        renderItem={renderItem}
-        scrollIndicatorInsets={{ right: 1 }}
-      />
-    </View>
+    <FlatList
+      bounces={false}
+      numColumns={1}
+      horizontal={true}
+      contentContainerStyle={[
+        styles.standard,
+        !isScrollMode && styles.centerItem,
+      ]}
+      data={data}
+      keyExtractor={keyExtractor}
+      renderItem={renderItem}
+    />
   );
 });
 

package/src/commons/Device/PMSensor/PMSensorIndicatorStyles.js

@@ -10,7 +10,4 @@ export default StyleSheet.create({
     flex: 1,
     justifyContent: 'center',
   },
-  wrap: {
-    marginVertical: 16,
-  },
 });

package/src/commons/Device/SonosSpeaker/index.js

@@ -69,7 +69,7 @@ const SonosSpeaker = memo(() => {
         <View style={styles.containerSlider}>
           <Slider
             value={value}
-            onValueChange={setValue}
+            onValueChange={(value) => setValue(value)}
             step={1}
             minimumValue={0}
             maximumValue={100}

package/src/commons/Device/WaterQualitySensor/ListQualityIndicator.js

@@ -27,7 +27,6 @@ const ListQualityIndicator = ({ data, style }) => {
         showsHorizontalScrollIndicator={false}
         nestedScrollEnabled
         contentContainerStyle={[styles.flatlistContent, style]}
-        scrollIndicatorInsets={{ right: 1 }}
       />
     </View>
   );

package/src/commons/Device/WaterQualitySensor/QualityIndicatorsItem.js

@@ -37,7 +37,7 @@ const QualityIndicatorItem = memo(
             >
               <IconOutline
                 name={'info-circle'}
-                size={18}
+                size={16}
                 color={Colors.Gray8}
               />
             </TouchableOpacity>
@@ -92,11 +92,6 @@ const styles = StyleSheet.create({
     marginTop: 8,
   },
   iconInfo: {
-    width: 40,
-    height: 40,
-    justifyContent: 'center',
-    alignItems: 'center',
-    marginRight: -10,
-    marginTop: -2,
+    top: 10,
   },
 });

package/src/commons/Explore/__test__/CityItem.test.js

@@ -2,15 +2,12 @@ import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import CityItem from '../CityItem';
 import { TouchableOpacity } from 'react-native';
+import axios from 'axios';
 import { API } from '../../../configs';
 import Pin from '../../../../assets/images/Explore/Pin.svg';
 import PinOutline from '../../../../assets/images/Explore/PinOutline.svg';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import MockAdapter from 'axios-mock-adapter';
-import api from '../../../utils/Apis/axios';
-
-const mock = new MockAdapter(api.axiosInstance);
 
 const mockedDispatch = jest.fn();
 
@@ -20,6 +17,7 @@ const wrapComponent = (item, mockeSelect) => (
   </SCProvider>
 );
 
+jest.mock('axios');
 jest.mock('react-redux', () => ({
   ...jest.requireActual('react-redux'),
   useDispatch: () => mockedDispatch,
@@ -27,6 +25,9 @@ jest.mock('react-redux', () => ({
 
 describe('Test CityItem', () => {
   let tree;
+  afterEach(() => {
+    axios.post.mockClear();
+  });
 
   test('render CityItem is_pin: true', async () => {
     const item = {
@@ -37,23 +38,37 @@ describe('Test CityItem', () => {
       count_pin: 1,
     };
     const mockeSelect = jest.fn();
-    mock.onPost(API.UNIT.PIN_UNIT()).reply(200);
+    const response = {
+      status: 200,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await renderer.create(wrapComponent(item, mockeSelect));
     });
     const instance = tree.root;
     const buttons = instance.findAllByType(TouchableOpacity);
     expect(buttons.length).toBe(2);
-    await buttons[0].props.onPress();
+    await act(async () => {
+      await buttons[0].props.onPress();
+    });
     expect(mockeSelect).toHaveBeenCalledTimes(1);
+
     const pin = instance.findAllByType(Pin);
     expect(pin.length).toBe(2);
-    mock.onPost(API.UNIT.PIN_UNIT()).reply(200);
-    await pin[1].props.onPress();
+    await act(async () => {
+      await pin[1].props.onPress();
+    });
+    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNPIN_UNIT(1));
+
     const unpin = instance.findAllByType(PinOutline);
-    mock.onPost(API.UNIT.UNPIN_UNIT(1)).reply(200);
-    await unpin[1].props.onPress();
     expect(unpin.length).toBe(2);
+    await act(async () => {
+      await unpin[1].props.onPress();
+    });
+    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNPIN_UNIT(1));
   });
 
   test('render CityItem is_pin: false', async () => {
@@ -65,33 +80,24 @@ describe('Test CityItem', () => {
       count_pin: 1,
     };
     const mockeSelect = jest.fn();
+    const response = {
+      status: 200,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await renderer.create(wrapComponent(item, mockeSelect));
     });
     const instance = tree.root;
+
     const unpin = instance.findAllByType(PinOutline);
-    mock.onPost(API.UNIT.PIN_UNIT(1)).reply(200);
-    await unpin[1].props.onPress();
     expect(unpin.length).toBe(2);
-  });
-
-  test('render CityItem is_pin: false and call api false', async () => {
-    const item = {
-      id: 1,
-      name: 'name',
-      icon: 'icon',
-      is_pin: false,
-      count_pin: 1,
-    };
-    const mockeSelect = jest.fn();
     await act(async () => {
-      tree = await renderer.create(wrapComponent(item, mockeSelect));
+      await unpin[1].props.onPress();
     });
-    const instance = tree.root;
-    const unpin = instance.findAllByType(PinOutline);
-    mock.onPost(API.UNIT.PIN_UNIT(1)).reply(400);
-    await unpin[1].props.onPress();
-    expect(unpin.length).toBe(2);
+    expect(axios.post).toHaveBeenCalledWith(API.UNIT.PIN_UNIT(1));
   });
 
   test('render CityItem PinOutline axios.post response false', async () => {
@@ -103,14 +109,22 @@ describe('Test CityItem', () => {
       count_pin: 1,
     };
     const mockeSelect = jest.fn();
-    mock.onPost(API.UNIT.PIN_UNIT()).reply(200, {});
+    const response = {};
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await renderer.create(wrapComponent(item, mockeSelect));
     });
     const instance = tree.root;
+
     const unpin = instance.findAllByType(PinOutline);
-    await unpin[1].props.onPress();
     expect(unpin.length).toBe(2);
+    await act(async () => {
+      await unpin[1].props.onPress();
+    });
+    expect(axios.post).not.toHaveBeenCalledWith(API.UNIT.UNPIN_UNIT(1));
   });
 
   test('render CityItem Pin axios.post response false', async () => {
@@ -122,14 +136,21 @@ describe('Test CityItem', () => {
       count_pin: 1,
     };
     const mockeSelect = jest.fn();
-    mock.onPost(API.UNIT.UNPIN_UNIT(1)).reply(400, {});
+    const response = {};
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
     await act(async () => {
       tree = await renderer.create(wrapComponent(item, mockeSelect));
     });
     const instance = tree.root;
     const pin = instance.findAllByType(Pin);
-    await pin[1].props.onPress();
     expect(pin.length).toBe(2);
+    await act(async () => {
+      await pin[1].props.onPress();
+    });
+    expect(axios.post).toHaveBeenCalledWith(API.UNIT.UNPIN_UNIT(1));
   });
 
   test('render CityItem icon null', async () => {