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

package/src/commons/ConnectingProcess/index.js

@@ -6,12 +6,13 @@ import { useNavigation } from '@react-navigation/native';
 import ImageSuccessfully from '../../Images/Common/SuccessfullyConnected.svg';
 
 import Text from '../Text';
-import { axiosPost } from '../../utils/Apis/axios';
+import { axiosPatch, 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();
@@ -27,29 +28,31 @@ const ConnectingProcess = ({ route }) => {
     devicePrefixName,
     wifi_ssid,
     wifi_pass,
-    chip_id,
-  } = route.params;
+  } = 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);
-          } else {
-            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);
+          setNewName(data?.name);
+        } else {
+          ToastBottomHelper.error(JSON.stringify(data));
+          goBack();
         }
+
         break;
+      }
       case 'ROBOT': {
         const { success, data } = await axiosPost(API.UNIT.CHIP_SCAN(unit.id), {
           imei: gateway?.imei,
@@ -62,20 +65,26 @@ const ConnectingProcess = ({ route }) => {
         });
         if (success) {
           setSensor(data);
+          setNewName(data?.name);
         } else {
+          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
       }
       case 'LITE': {
-        const { success } = await axiosPost(API.UNIT.ADD_GATEWAY(unit_id), {
-          chip: chip_id,
-          imei: gateway?.imei,
-          chip_name: gateway?.model,
-        });
+        const { success, data } = await axiosPost(
+          API.UNIT.ADD_GATEWAY(unit_id),
+          {
+            imei: gateway?.imei,
+            chip_name: gateway?.model,
+          }
+        );
         if (success) {
-          setSensor({ name: gateway?.model });
+          setSensor(data);
+          setNewName(data?.name || gateway?.model);
         } else {
+          ToastBottomHelper.error(JSON.stringify(data));
           goBack();
         }
         break;
@@ -95,7 +104,6 @@ const ConnectingProcess = ({ route }) => {
     wifi_pass,
     user?.phone_number,
     unit_id,
-    chip_id,
   ]);
 
   const ConnectingSuccess = useCallback(() => {
@@ -110,12 +118,46 @@ const ConnectingProcess = ({ route }) => {
             station?.name !== undefined ? '- ' + station?.name : ''
           }`}
         </Text>
-        <DeviceItem icon={sensor?.icon_kit} name={sensor?.name} />
+        <DeviceItem
+          icon={sensor?.icon_kit}
+          name={newName}
+          setNewName={setNewName}
+        />
       </View>
     );
-  }, [sensor?.icon_kit, sensor?.name, station?.name, t, unit?.name, unit_name]);
+  }, [newName, sensor?.icon_kit, station?.name, t, unit?.name, unit_name]);
 
-  const handleDone = useCallback(() => {
+  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));
+    }
     navigate(Routes.UnitStack, {
       screen: Routes.UnitDetail,
       params: {
@@ -125,7 +167,15 @@ const ConnectingProcess = ({ route }) => {
         stationId: station?.id,
       },
     });
-  }, [navigate, station?.id, unit, unit_id]);
+  }, [
+    devicePrefixName,
+    navigate,
+    newName,
+    sensor?.id,
+    station?.id,
+    unit,
+    unit_id,
+  ]);
 
   useEffect(() => {
     ConnectingDevice();

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

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

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,9 +4,7 @@ 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();
@@ -36,9 +34,6 @@ 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)
-      : null;
+      : `5 ${t('seconds_ago')}`;
     return (
       <View style={styles.statusContainer}>
         <View style={styles.connectStatus}>

package/src/commons/Device/Hanet/ItemHanetDevice.test.js

@@ -0,0 +1,58 @@
+import React from 'react';
+import { TouchableWithoutFeedback } from 'react-native';
+import renderer, { act } from 'react-test-renderer';
+import ItemHanetDevice from './ItemHanetDevice';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+
+const wrapComponent = (props) => (
+  <SCProvider initState={mockSCStore({})}>
+    <ItemHanetDevice {...props} />
+  </SCProvider>
+);
+
+const mockNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      navigate: mockNavigate,
+    }),
+  };
+});
+
+describe('Test ItemHanetDevice', () => {
+  let tree, props;
+
+  beforeEach(() => {
+    props = {
+      svgMain: 'icon',
+      title: 'title',
+      sensor: {},
+      unit: {},
+      station: {},
+    };
+  });
+
+  test('render ItemHanetDevice', () => {
+    act(() => {
+      tree = renderer.create(wrapComponent(props));
+    });
+    const instance = tree.root;
+    const touches = instance.findAllByType(TouchableWithoutFeedback);
+    act(() => {
+      tree = touches[0].props.onPress();
+    });
+    expect(mockNavigate).toBeCalled();
+  });
+
+  test('render ItemHanetDevice sensor has icon', () => {
+    props.sensor.icon_kit = 'icon';
+    act(() => {
+      tree = renderer.create(wrapComponent(props));
+    });
+    const instance = tree.root;
+    const touches = instance.findAllByType(TouchableWithoutFeedback);
+    expect(touches.length).toBeGreaterThan(0);
+  });
+});

package/src/commons/Device/HistoryChart.js

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

package/src/commons/Device/ItemDevice.js

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

package/src/commons/Device/LinearChart.js

@@ -52,6 +52,21 @@ 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,4 +1,5 @@
 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';
@@ -26,18 +27,21 @@ const PMSensorIndicatior = memo(({ data, style }) => {
   const isScrollMode = data.length > 3;
 
   return (
-    <FlatList
-      bounces={false}
-      numColumns={1}
-      horizontal={true}
-      contentContainerStyle={[
-        styles.standard,
-        !isScrollMode && styles.centerItem,
-      ]}
-      data={data}
-      keyExtractor={keyExtractor}
-      renderItem={renderItem}
-    />
+    <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>
   );
 });
 

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

@@ -10,4 +10,7 @@ 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={(value) => setValue(value)}
+            onValueChange={setValue}
             step={1}
             minimumValue={0}
             maximumValue={100}

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

@@ -27,6 +27,7 @@ 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={16}
+                size={18}
                 color={Colors.Gray8}
               />
             </TouchableOpacity>
@@ -92,6 +92,11 @@ const styles = StyleSheet.create({
     marginTop: 8,
   },
   iconInfo: {
-    top: 10,
+    width: 40,
+    height: 40,
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginRight: -10,
+    marginTop: -2,
   },
 });