@eohjsc/react-native-smart-city 0.7.11 → 0.7.12

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.7.11",
+  "version": "0.7.12",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/screens/SubUnit/ManageSubUnit.js

@@ -1,18 +1,19 @@
+import { Image, TouchableOpacity, View } from 'react-native';
 import React, { useEffect } from 'react';
-import { View, TouchableOpacity, Image } from 'react-native';
 import { useIsFocused, useNavigation } from '@react-navigation/native';
+
+import { AccessibilityLabel } from '../../configs/Constants';
 import { Colors } from '../../configs';
-import { useTranslations } from '../../hooks/Common/useTranslations';
-import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
-import Text from '../../commons/Text';
-import styles from './ManageSubUnitStyles';
 import { IconOutline } from '@ant-design/icons-react-native';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons';
-import Routes from '../../utils/Route';
 import NoSubUnitImage from '../../../assets/images/Illustrations.svg';
-import useManageSubUnit from './hooks/useManageSubUnit';
-import { AccessibilityLabel } from '../../configs/Constants';
+import Routes from '../../utils/Route';
 import { RowItem } from '../../commons/RowItem';
+import Text from '../../commons/Text';
+import WrapHeaderScrollable from '../../commons/Sharing/WrapHeaderScrollable';
+import styles from './ManageSubUnitStyles';
+import useManageSubUnit from './hooks/useManageSubUnit';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 
 const RightComponent = ({ onAddSubUnit, onRearrangeSubUnit }) => (
   <View style={styles.rightComponent}>
@@ -50,7 +51,9 @@ const StationList = ({ stations, onEditSubUnit }) => {
             />
           }
           text={item.name}
-          subtext={`${item.devices?.length}  ${t('devices').toLowerCase()}`}
+          subtext={`${item.devices?.length || 0}  ${t(
+            'devices'
+          ).toLowerCase()}`}
           onPress={() => onEditSubUnit(item)}
           rightComponent={
             <IconOutline name="right" size={20} color={Colors.Gray6} />

package/src/screens/SubUnit/RearrageSubUnit.js

@@ -1,15 +1,16 @@
 import React, { useState } from 'react';
-import { View, TouchableOpacity } from 'react-native';
-import { isEqual } from 'lodash';
+import { TouchableOpacity, View } from 'react-native';
+
 import { API } from '../../configs';
-import { axiosPost } from '../../utils/Apis/axios';
-import styles from './RearrrageSubUnitStyle';
-import Text from '../../commons/Text';
 import FlatListDnD from '../../commons/FlatListDnD';
-import ViewButtonBottom from '../../commons/ViewButtonBottom';
 import { HeaderCustom } from '../../commons/Header';
 import Rearrange from '../../../assets/images/Rearrange.svg';
+import Text from '../../commons/Text';
 import { ToastBottomHelper } from '../../utils/Utils';
+import ViewButtonBottom from '../../commons/ViewButtonBottom';
+import { axiosPost } from '../../utils/Apis/axios';
+import { isEqual } from 'lodash';
+import styles from './RearrrageSubUnitStyle';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 
@@ -55,7 +56,7 @@ const RearrangeSubUnit = ({ route }) => {
         >
           <Text style={styles.indexText}>{item.name}</Text>
           <Text style={styles.deviceText}>
-            {`${item.devices.length} ${t('devices').toLowerCase()}`}
+            {`${item.devices?.length || 0} ${t('devices').toLowerCase()}`}
           </Text>
         </View>
       </View>

package/src/screens/SubUnit/__test__/ManageSubUnit.test.js

@@ -1,17 +1,18 @@
-import React from 'react';
 import { ScrollView, TouchableOpacity } from 'react-native';
-import { create } from 'react-test-renderer';
-import { act } from '@testing-library/react-hooks';
-import ManageSubUnit from '../ManageSubUnit';
-import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
-import { RowItem } from '../../../commons/RowItem';
-import Routes from '../../../utils/Route';
+
+import API from '../../../configs/API';
 import { AccessibilityLabel } from '../../../configs/Constants';
+import ManageSubUnit from '../ManageSubUnit';
 import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
+import Routes from '../../../utils/Route';
+import { RowItem } from '../../../commons/RowItem';
+import { SCProvider } from '../../../context';
+import { act } from '@testing-library/react-hooks';
 import api from '../../../utils/Apis/axios';
+import { create } from 'react-test-renderer';
+import { mockSCStore } from '../../../context/mockStore';
 import { useNavigation } from '@react-navigation/native';
-import API from '../../../configs/API';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -58,6 +59,20 @@ describe('Test ManageSubUnit', () => {
       screen: Routes.EditSubUnit,
     });
   });
+
+  it('render ManageSubUnit station without device', async () => {
+    data = [{ id: 1, name: 'station' }];
+    mock.onGet(API.UNIT.UNIT_DETAIL(1)).reply(200, { stations: data });
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const subUnitScrollViews = instance.findAllByType(ScrollView);
+    expect(subUnitScrollViews).toHaveLength(1);
+    const rowItem = instance.findAllByType(RowItem);
+    expect(rowItem).toHaveLength(1);
+  });
+
   it('ManageSubUnit add sub unit', async () => {
     await act(async () => {
       tree = await create(wrapComponent(route));

package/src/screens/SubUnit/__test__/RearrangeSubUnit.test.js

@@ -1,16 +1,16 @@
-import React from 'react';
-import { create } from 'react-test-renderer';
-import { act } from '@testing-library/react-hooks';
 import { API } from '../../../configs';
-import { ViewButtonBottom } from '../../../commons';
+import DraggableFlatList from 'react-native-draggable-flatlist';
+import MockAdapter from 'axios-mock-adapter';
+import React from 'react';
+import RearrageSubUnit from '../RearrageSubUnit';
 import { SCProvider } from '../../../context';
-import { mockSCStore } from '../../../context/mockStore';
+import { ToastBottomHelper } from '../../../utils/Utils';
+import { ViewButtonBottom } from '../../../commons';
+import { act } from '@testing-library/react-hooks';
 import api from '../../../utils/Apis/axios';
-import RearrageSubUnit from '../RearrageSubUnit';
-import MockAdapter from 'axios-mock-adapter';
+import { create } from 'react-test-renderer';
+import { mockSCStore } from '../../../context/mockStore';
 import { useNavigation } from '@react-navigation/native';
-import { ToastBottomHelper } from '../../../utils/Utils';
-import DraggableFlatList from 'react-native-draggable-flatlist';
 
 const mock = new MockAdapter(api.axiosInstance);
 
@@ -93,6 +93,16 @@ describe('Test RearrangeSubUnit', () => {
   });
 
   it('test call api error', async () => {
+    route = {
+      params: {
+        unit: { id: 1, name: 'unit 1' },
+        stations: [
+          { id: 1, name: 'station 1', devices: [{ id: 1, name: 'device 1' }] },
+          { id: 2, name: 'station 2' },
+        ],
+      },
+    };
+
     await act(async () => {
       tree = await create(wrapComponent(route));
     });
@@ -106,7 +116,7 @@ describe('Test RearrangeSubUnit', () => {
     expect(flatListDnD.props.data).toEqual(route.params.stations);
 
     const swappedStations = [
-      { id: 2, name: 'station 2', devices: [{ id: 1, name: 'device 2' }] },
+      { id: 2, name: 'station 2' },
       { id: 1, name: 'station 1', devices: [{ id: 1, name: 'device 1' }] },
     ];