@eohjsc/react-native-smart-city 0.6.2-rc9 → 0.7.0

package/src/commons/WrapParallaxScrollView/index.js

@@ -1,5 +1,5 @@
 import React, { useCallback } from 'react';
-import { StatusBar, View, StyleSheet } from 'react-native';
+import { StatusBar, View, StyleSheet, RefreshControl } from 'react-native';
 import LinearGradient from 'react-native-linear-gradient';
 
 import { Colors, Device, Images, SCConfig } from '../../configs';
@@ -7,65 +7,42 @@ import Text from '../Text';
 import HeaderUnit from '../Unit/HeaderUnit';
 import { AccessibilityLabel } from '../../configs/Constants';
 import FImage from '../FImage';
+import { useTranslations } from '../../hooks/Common/useTranslations';
 import ParallaxScrollView from '../../libs/react-native-parallax-scroll-view';
 
 const stickyHeaderHeight =
   Device.TopbarHeight + (Device.isIOS ? 0 : StatusBar.currentHeight);
 
-const WrapParallaxScrollView = ({
-  children,
-  refreshControl,
-  title,
-  uriImg,
-  onBack,
-  onAdd,
-  onMore,
-  hideRight,
-  hideRightPlus,
-  contentBackground,
-  accessibilityLabel,
-  idButtonMore = AccessibilityLabel.HEADER_UNIT_BUTTON_MORE,
-}) => {
+const WrapParallaxScrollView = ({ children, unit, unitData, onRefresh }) => {
+  const t = useTranslations();
   const renderForeground = useCallback(
     () => (
       <View style={styles.wrap}>
-        <HeaderUnit
-          transparent
-          onBack={onBack}
-          onAdd={onAdd}
-          onMore={onMore}
-          hideRight={hideRight}
-          hideRightPlus={hideRightPlus}
-          idButtonMore={idButtonMore}
-        />
+        <HeaderUnit unit={unit} unitData={unitData} />
         <Text
           numberOfLines={1}
           semibold
           style={styles.nameUnit}
           accessibilityLabel={AccessibilityLabel.HEADER_UNIT_BUTTON_TEXT}
         >
-          {title}
+          {t('Welcome {name}', {
+            name: unit?.name ? unit.name : '',
+          })}
         </Text>
-        {contentBackground}
       </View>
     ),
-    [
-      onBack,
-      onAdd,
-      onMore,
-      hideRight,
-      hideRightPlus,
-      idButtonMore,
-      title,
-      contentBackground,
-    ]
+    [unit, unitData, t]
   );
   const renderBackground = useCallback(
     () => (
       <View style={styles.image}>
         <FImage
           style={styles.image}
-          source={uriImg ? { uri: uriImg } : SCConfig.appUnitDefaultBackground}
+          source={
+            unit?.background
+              ? { uri: unit.background }
+              : SCConfig.appUnitDefaultBackground
+          }
           defaultSource={Images.BgUnit}
           resizeMode="cover"
         />
@@ -75,23 +52,15 @@ const WrapParallaxScrollView = ({
         />
       </View>
     ),
-    [uriImg]
+    [unit]
   );
   const renderStickyHeader = useCallback(
     () => (
       <View style={styles.stickyHeader}>
-        <HeaderUnit
-          title={title}
-          onBack={onBack}
-          onAdd={onAdd}
-          onMore={onMore}
-          hideRight={hideRight}
-          hideRightPlus={hideRightPlus}
-          idButtonMore={idButtonMore}
-        />
+        <HeaderUnit unit={unit} unitData={unitData} />
       </View>
     ),
-    [title, onBack, onAdd, onMore, hideRight, hideRightPlus, idButtonMore]
+    [unit, unitData]
   );
   return (
     <ParallaxScrollView
@@ -101,9 +70,11 @@ const WrapParallaxScrollView = ({
       stickyHeaderHeight={stickyHeaderHeight}
       renderStickyHeader={renderStickyHeader}
       backgroundColor={Colors.White}
-      refreshControl={refreshControl}
+      refreshControl={
+        <RefreshControl refreshing={false} onRefresh={onRefresh} />
+      }
       showsVerticalScrollIndicator={false}
-      accessibilityLabel={accessibilityLabel}
+      accessibilityLabel={AccessibilityLabel.UNIT_DETAIL_PARALLAX_SCROLLVIEW}
     >
       {children}
     </ParallaxScrollView>

package/src/configs/API.js

@@ -195,8 +195,7 @@ const API = {
     },
   },
   NOTIFICATION: {
-    LIST_EOH_NOTIFICATIONS: (page, type) =>
-      `/notifications/eoh/?page=${page}&type=${type}`,
+    LIST_EOH_NOTIFICATIONS: (page) => `/notifications/eoh/?page=${page}`,
     SET_READ: (id) => `/notifications/eoh/${id}/set_read/`,
   },
   VALUE_EVALUATIONS: () => '/property_manager/config_value_evaluations/',

package/src/hooks/Common/__test__/useAndroidTranslucentStatusBar.test.js

@@ -4,6 +4,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useAndroidTranslucentStatusBar } from '../index';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import { useNavigation } from '@react-navigation/native';
 
 const mockedSetAction = jest.fn();
 
@@ -16,20 +17,8 @@ const mockUseContext = jest.fn().mockImplementation(() => ({
 
 React.useContext = mockUseContext;
 
-const mockAddListener = jest.fn();
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useNavigation: () => ({
-      addListener: mockAddListener,
-    }),
-  };
-});
-
 describe('test useAndroidTranslucentStatusBar', () => {
-  beforeEach(() => {
-    mockAddListener.mockClear();
-  });
+  const { addListener } = useNavigation();
 
   it('test useAndroidTranslucentStatusBar android', async () => {
     Platform.OS = 'android';
@@ -39,7 +28,7 @@ describe('test useAndroidTranslucentStatusBar', () => {
         wrapper,
       }
     );
-    expect(mockAddListener).not.toBeCalled();
+    expect(addListener).not.toBeCalled();
   });
 
   it('test useAndroidTranslucentStatusBar ios', async () => {
@@ -50,6 +39,6 @@ describe('test useAndroidTranslucentStatusBar', () => {
         wrapper,
       }
     );
-    expect(mockAddListener).not.toBeCalled();
+    expect(addListener).not.toBeCalled();
   });
 });

package/src/hooks/Common/useIsOwnerOfUnit.js

@@ -5,7 +5,7 @@ export const useIsOwnerOfUnit = (unitOwnerId) => {
   const idUser = useSCContextSelector(
     (state) => state?.auth?.account?.user?.id
   );
-  let isOwner = idUser === unitOwnerId;
+  let isOwner = unitOwnerId && idUser === unitOwnerId;
 
   return {
     isOwner,

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -45,7 +45,7 @@ describe('Test useRemoteControl', () => {
       command_prefer_over_googlehome: false,
       command_prefer_over_internet: false,
       googlehome_actions: [],
-      icon: 'caret-up',
+      icon: 'caretup',
       id: 1,
       key: '2b949045-8e03-4c07-a855-7794ade2e69c',
     };

package/src/hooks/IoT/__test__/useWatchConfigs.test.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import { renderHook } from '@testing-library/react-hooks';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
@@ -9,24 +9,6 @@ const mockedSetAction = jest.fn();
 
 const wrapper = ({ children }) => <SCProvider>{children}</SCProvider>;
 
-jest.mock('react', () => {
-  return {
-    ...jest.requireActual('react'),
-    useCallback: (func) => func(),
-    useContext: () => ({
-      stateData: mockSCStore({}),
-      setAction: mockedSetAction,
-    }),
-  };
-});
-
-jest.mock('@react-navigation/native', () => {
-  return {
-    ...jest.requireActual('@react-navigation/native'),
-    useFocusEffect: (func) => func(),
-  };
-});
-
 jest.mock('../../../iot/Monitor');
 
 describe('Test useWatchConfigs', () => {
@@ -34,14 +16,17 @@ describe('Test useWatchConfigs', () => {
     jest.useFakeTimers();
     watchMultiConfigs.mockClear();
     unwatchMultiConfigs.mockClear();
+    useContext.mockReturnValue({
+      stateData: mockSCStore({}),
+      setAction: mockedSetAction,
+    });
   });
 
   it('test unitId null', async () => {
     renderHook(() => useWatchConfigs([1]), {
       wrapper,
     });
-    jest.runAllTimers();
+    jest.runOnlyPendingTimers();
     expect(watchMultiConfigs).toBeCalledWith([1]);
-    expect(unwatchMultiConfigs).toBeCalledWith([1]);
   });
 });

package/src/iot/RemoteControl/HomeAssistant.js

@@ -127,7 +127,7 @@ export const homeAssistantConnect = async (
   for (let i = 0; i < options.length; i++) {
     const option = options[i];
 
-    option.config_maps.forEach((configMap) => {
+    option.config_maps?.forEach((configMap) => {
       if (option.text_maps) {
         textMaps[configMap.entity_id] = option.text_maps;
       }