@eohjsc/react-native-smart-city 0.6.0-rc5 → 0.6.0-rc6

package/src/screens/Unit/Detail.js

@@ -1,17 +1,15 @@
 import React, {
   useCallback,
-  useEffect,
-  useState,
   useContext,
+  useEffect,
   useMemo,
+  useState,
 } from 'react';
-import { RefreshControl, View, Platform } from 'react-native';
-import { useIsFocused } from '@react-navigation/native';
+import { Platform, View } from 'react-native';
+import { useIsFocused, useNavigation } from '@react-navigation/native';
 
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import styles from './styles';
-import AddMenu from './AddMenu';
-import MoreMenu from './MoreMenu';
 import Summaries from './Summaries';
 
 import Text from '../../commons/Text';
@@ -20,7 +18,6 @@ import {
   useBlockBackAndroid,
   useBoolean,
   useIsOwnerOfUnit,
-  usePopover,
 } from '../../hooks/Common';
 import { useFavorites } from './hook/useFavorites';
 import { useUnitConnectRemoteDevices } from './hook/useUnitConnectRemoteDevices';
@@ -32,20 +29,19 @@ import WrapParallaxScrollView from '../../commons/WrapParallaxScrollView';
 import { SCContext, useSCContextSelector } from '../../context';
 import { Action } from '../../context/actionType';
 import CameraDevice from '../../commons/CameraDevice';
-import { useNavigation } from '@react-navigation/native';
 import Routes from '../../utils/Route';
 import SubUnitAutomate from '../../commons/SubUnit/OneTap';
 import SubUnitFavorites from '../../commons/SubUnit/Favorites';
 import {
+  AccessibilityLabel,
+  AUTOMATE_TABS,
   AUTOMATE_TYPE,
   Constants,
   NOTIFICATION_TYPES,
-  AccessibilityLabel,
-  AUTOMATE_TABS,
 } from '../../configs/Constants';
 import {
-  watchNotificationData,
   unwatchNotificationData,
+  watchNotificationData,
 } from '../../utils/Monitor';
 import PreventAccess from '../../commons/PreventAccess';
 import MediaPlayerDetail from '../../commons/MediaPlayerDetail';
@@ -197,7 +193,6 @@ const UnitDetail = ({ route }) => {
   const {
     unitId,
     unitData,
-    routeName,
     isOneTap,
     stationId,
     isAddSubUnit,
@@ -218,19 +213,16 @@ const UnitDetail = ({ route }) => {
     isSuccessfullyConnected ? RouterHardware(Routes.Dashboard) : goBack
   );
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
-  const { isLavidaSource, isFirstOpenCamera, appState } = useSCContextSelector(
+  const { isFirstOpenCamera, appState } = useSCContextSelector(
     (state) => state.app
   );
 
   const [unit, setUnit] = useState(unitData || { id: unitId });
   const [listAutomate, setListAutomate] = useState([]);
-  const [showAdd, setShowAdd, setHideAdd] = useBoolean();
+
   const [showPreventAccess, setShowPreventAccess, setHidePreventAccess] =
     useBoolean(false);
 
-  const { childRef, showingPopover, showPopoverWithRef, hidePopover } =
-    usePopover();
-
   const { isOwner } = useIsOwnerOfUnit(unit.user_id);
 
   const prepareData = useCallback(
@@ -317,14 +309,6 @@ const UnitDetail = ({ route }) => {
     }
   }, [fetchDetails, isFocused]);
 
-  const onBack = useCallback(() => {
-    navigate(isLavidaSource ? Routes.SmartHomeDashboard : routeName);
-  }, [navigate, routeName, isLavidaSource]);
-
-  const Dashboard = useCallback(() => {
-    navigate(isLavidaSource ? Routes.SmartHomeDashboard : Routes.Dashboard);
-  }, [isLavidaSource, navigate]);
-
   useEffect(() => {
     watchNotificationData(user, onRefresh);
     return () => unwatchNotificationData(user);
@@ -342,19 +326,9 @@ const UnitDetail = ({ route }) => {
 
   return (
     <WrapParallaxScrollView
-      uriImg={unit.background}
-      title={t('Welcome {name}', {
-        name: unit.name ? unit.name : '',
-      })}
-      refreshControl={
-        <RefreshControl refreshing={false} onRefresh={onRefresh} />
-      }
-      onAdd={setShowAdd}
-      onMore={showPopoverWithRef}
-      hideRightPlus={!isOwner}
-      onBack={(isSuccessfullyConnected && Dashboard) || (routeName && onBack)}
-      accessibilityLabel={AccessibilityLabel.UNIT_DETAIL_PARALLAX_SCROLLVIEW}
-      idButtonMore={AccessibilityLabel.UNIT_DETAIL_PARALLAX_BUTTON_MORE}
+      unit={unit}
+      unitData={unitData}
+      onRefresh={onRefresh}
     >
       {isFirstOpenCamera && isIOS && (
         <MediaPlayerDetail
@@ -375,21 +349,6 @@ const UnitDetail = ({ route }) => {
         isAddSubUnit={isAddSubUnit}
         isEditSubUnit={isEditSubUnit}
       />
-      <AddMenu
-        unit={unit}
-        afterItemClick={hidePopover}
-        showAdd={showAdd}
-        setHideAdd={setHideAdd}
-      />
-      <MoreMenu
-        unit={unit}
-        hidePopover={hidePopover}
-        isOwner={isOwner}
-        childRef={childRef}
-        showingPopover={showingPopover}
-        idLabelPopover={AccessibilityLabel.UNIT_DETAIL_POPUP_MORE}
-        idLabelItem={AccessibilityLabel.UNIT_DETAIL_POPUP_MORE_ITEM}
-      />
       <PreventAccess
         visible={showPreventAccess}
         hidePreventAccess={setHidePreventAccess}

package/src/screens/Unit/Station/__test__/index.test.js

@@ -50,8 +50,8 @@ describe('Test Station', () => {
         zoomScale: 1,
       },
     });
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    await TouchableOpacities[0].props.onPress();
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
+    await touchableOpacities[0].props.onPress();
     expect(mockOnSnapToItem).toBeCalled();
   });
 });

package/src/screens/Unit/__test__/Detail.test.js

@@ -8,6 +8,7 @@ import {
   useIsFocused,
   useNavigation,
   useFocusEffect,
+  useRoute,
 } from '@react-navigation/native';
 import AsyncStorage from '@react-native-async-storage/async-storage';
 import UnitDetail from '../Detail';
@@ -497,8 +498,9 @@ describe('Test UnitDetail', () => {
 
   it('test get automate onPress goBack', async () => {
     Platform.OS = 'ios';
-    route.params.isSuccessfullyConnected = true;
+    route.params.routeName = Routes.Dashboard;
     jest.useFakeTimers();
+
     mock.onGet(getAutomates).reply(200, [{}]);
     await act(async () => {
       tree = await renderer.create(wrapComponent(route, account));
@@ -509,23 +511,23 @@ describe('Test UnitDetail', () => {
     const instance = tree.root;
     const preventAccess = instance.findByType(PreventAccess);
     expect(preventAccess).toBeDefined();
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
+
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
     await act(async () => {
-      await TouchableOpacities[0].props.onPress();
+      await touchableOpacities[0].props.onPress();
     });
-    expect(global.mockedNavigate).toBeCalled();
+    expect(global.mockedGoBack).toBeCalled();
   });
 
   it('test onPress goBack with routeName', async () => {
-    route.params.routeName = 'test';
-    route.params.isSuccessfullyConnected = false;
+    useRoute.mockReturnValue({ params: { routeName: Routes.Dashboard } });
     await act(async () => {
       tree = await renderer.create(wrapComponent(route, account));
     });
     const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
     await act(async () => {
-      await TouchableOpacities[0].props.onPress();
+      await touchableOpacities[0].props.onPress();
     });
     expect(global.mockedNavigate).toBeCalled();
   });

package/src/screens/UnitSummary/components/3PPowerConsumption/__test__/3PPowerConsumption.test.js

@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React from 'react';
 import renderer, { act } from 'react-test-renderer';
 import { AccessibilityLabel } from '../../../../../configs/Constants';
 import { API } from '../../../../../configs';
@@ -7,18 +7,9 @@ import { SCProvider } from '../../../../../context';
 import { mockSCStore } from '../../../../../context/mockStore';
 import MockAdapter from 'axios-mock-adapter';
 import api from '../../../../../utils/Apis/axios';
+import PMSensorIndicator from '../../../../../commons/Device/PMSensor/PMSensorIndicator';
 
 const mock = new MockAdapter(api.axiosInstance);
-const mockSetState = jest.fn();
-
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    useState: jest.fn(),
-  };
-});
-
-useState.mockImplementation((init) => [init, mockSetState]);
 
 const wrapComponent = (summaryDetail) => (
   <SCProvider initState={mockSCStore({})}>
@@ -47,7 +38,6 @@ describe('Test 3PPowerConsumption', () => {
         power_factor_1: 8,
         power_factor_2: 9,
         power_factor_3: 10,
-        total_power: 11,
       },
     };
     await act(async () => {
@@ -73,6 +63,9 @@ describe('Test 3PPowerConsumption', () => {
       { id: 10, color: '#52C41A', title: 'Power Factor 3', measure: '' },
     ];
     expect(listIndicator.props.data).toEqual(resultList);
+
+    const indicator = instance.findByType(PMSensorIndicator);
+    expect(indicator.props.data).toHaveLength(0);
   });
 
   it('render 3PPowerConsumption with total_power', async () => {
@@ -88,6 +81,8 @@ describe('Test 3PPowerConsumption', () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent(summaryDetail));
     });
-    expect(mockSetState).toHaveBeenCalledWith([{}]);
+    const instance = tree.root;
+    const indicator = instance.findByType(PMSensorIndicator);
+    expect(indicator.props.data).toHaveLength(1);
   });
 });

package/src/screens/UnitSummary/components/__test__/UnitSummary.test.js

@@ -22,8 +22,8 @@ describe('Test UnitSummary', () => {
       tree = await create(<UnitSummary {...defaultProps} index={0} />);
     });
     const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities[0].props.style).toEqual([
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(touchableOpacities[0].props.style).toEqual([
       styles.summaryContainer,
       { borderTopLeftRadius: 10 },
     ]);
@@ -34,8 +34,8 @@ describe('Test UnitSummary', () => {
       tree = await create(<UnitSummary {...defaultProps} index={1} />);
     });
     const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities[0].props.style).toEqual([
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(touchableOpacities[0].props.style).toEqual([
       styles.summaryContainer,
       { borderTopRightRadius: 10 },
     ]);
@@ -46,8 +46,8 @@ describe('Test UnitSummary', () => {
       tree = await create(<UnitSummary {...defaultProps} index={1} len={2} />);
     });
     const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities[0].props.style).toEqual([
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(touchableOpacities[0].props.style).toEqual([
       styles.summaryContainer,
       { borderBottomRightRadius: 10 },
     ]);
@@ -58,8 +58,8 @@ describe('Test UnitSummary', () => {
       tree = await create(<UnitSummary {...defaultProps} index={2} len={3} />);
     });
     const instance = tree.root;
-    const TouchableOpacities = instance.findAllByType(TouchableOpacity);
-    expect(TouchableOpacities[0].props.style).toEqual([
+    const touchableOpacities = instance.findAllByType(TouchableOpacity);
+    expect(touchableOpacities[0].props.style).toEqual([
       styles.summaryContainer,
       { borderBottomLeftRadius: 10 },
     ]);