@eohjsc/react-native-smart-city 0.3.24 → 0.3.27

package/package.json

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

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -12,11 +12,11 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
   const t = useTranslations();
   const { configuration } = actionGroup;
   const [valueBrightness, setValueBrightness] = useState(0);
+  const [valueBrightnessTemp, setValueBrightnessTemp] = useState(0);
   const [configValues] = useConfigGlobalState('configValues');
 
   const onChangeBrightness = useCallback(
     (value) => {
-      setValueBrightness(value);
       doAction(
         configuration?.action_brightness_data,
         JSON.stringify({ value_brness: value })
@@ -26,17 +26,17 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
   );
 
   const percentBrightness = useMemo(() => {
-    return valueBrightness || 0;
-  }, [valueBrightness]);
+    return valueBrightnessTemp || valueBrightness || 0;
+  }, [valueBrightness, valueBrightnessTemp]);
 
   useEffect(() => {
     const { config } = configuration;
     const configValue = configValues[config];
     let valueBrness = configValue?.value;
-    if (valueBrness >= 0) {
+    if (valueBrness >= 0 && valueBrightness >= 0) {
       setValueBrightness(valueBrness);
     }
-  }, [configuration.config, configValues, configuration]);
+  }, [configuration.config, configValues, configuration, valueBrightness]);
 
   return (
     <View style={styles.viewBrightness}>
@@ -49,9 +49,9 @@ const SliderRangeTemplate = memo(({ actionGroup, doAction, sensor }) => {
       <View style={styles.RightBrightness}>
         <View style={styles.slider}>
           <SliderRange
-            value={valueBrightness}
+            value={valueBrightnessTemp}
             onSlidingComplete={onChangeBrightness}
-            onValueChange={setValueBrightness}
+            onValueChange={setValueBrightnessTemp}
             step={1}
             minimumValue={0}
             maximumValue={100}

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

@@ -1,12 +1,17 @@
 import React from 'react';
 import renderer, { act } from 'react-test-renderer';
+import MockAdapter from 'axios-mock-adapter';
 import MyUnit from '..';
+import MyUnitDevice from '../../../../screens/Unit/components/MyUnitDevice';
 import { TESTID } from '../../../../configs/Constants';
 import { SCProvider } from '../../../../context';
 import { mockSCStore } from '../../../../context/mockStore';
+import api from '../../../../utils/Apis/axios';
+import { API } from '../../../../configs';
+
+const mock = new MockAdapter(api.axiosInstance);
 
 const mockedNavigate = jest.fn();
-const mockUseIsFocused = jest.fn();
 const mockedDispatch = jest.fn();
 
 jest.mock('@react-navigation/native', () => {
@@ -15,9 +20,8 @@ jest.mock('@react-navigation/native', () => {
     useNavigation: () => ({
       navigate: mockedNavigate,
     }),
-    useIsFocused: () => ({
-      isFocused: mockUseIsFocused,
-    }),
+    useIsFocused: () => true,
+    useFocusEffect: jest.fn(),
   };
 });
 
@@ -34,6 +38,42 @@ const wrapComponent = () => (
 
 describe('Test MyUnit', () => {
   let tree;
+  let data = [
+    {
+      id: 1,
+      name: 'name',
+      background: 'background',
+      abstract_devices: [
+        {
+          id: 1,
+          name: 'device',
+          is_managed_by_backend: true,
+          device_type: 'GOOGLE_HOME',
+          station_name: 'name',
+        },
+        {
+          id: 2,
+          name: 'device',
+          is_managed_by_backend: true,
+          device_type: '',
+          station_name: 'name',
+          quick_action: {
+            config_id: 1,
+          },
+        },
+      ],
+    },
+    {
+      id: 2,
+      name: 'name2',
+      background: 'background',
+    },
+  ];
+
+  beforeEach(() => {
+    mock.resetHistory();
+  });
+
   const getElement = (instance) => {
     const goToDetail = instance.findAll(
       (item) => item.props.testID === TESTID.MY_UNIT_GO_TO_DETAIL
@@ -44,7 +84,7 @@ describe('Test MyUnit', () => {
     return { goToDetail, textNoUnit };
   };
 
-  test('create MyUnit no Unit', async () => {
+  test('MyUnit no Unit', async () => {
     await act(async () => {
       tree = await renderer.create(wrapComponent());
     });
@@ -52,4 +92,14 @@ describe('Test MyUnit', () => {
     const { textNoUnit } = getElement(instance);
     expect(textNoUnit[0]).toBeDefined();
   });
+
+  test('MyUnit with unit', async () => {
+    mock.onGet(API.UNIT.MY_UNITS()).replyOnce(200, data);
+    await act(async () => {
+      tree = await renderer.create(wrapComponent());
+    });
+    const instance = tree.root;
+    const devices = instance.findAllByType(MyUnitDevice);
+    expect(devices).toHaveLength(2);
+  });
 });

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

@@ -1,5 +1,18 @@
-import React, { memo, useCallback, useEffect, useState } from 'react';
+import React, {
+  memo,
+  useCallback,
+  useEffect,
+  useState,
+  useContext,
+  useMemo,
+} from 'react';
 import { View, Image, TouchableOpacity, Dimensions } from 'react-native';
+import {
+  useNavigation,
+  useIsFocused,
+  useFocusEffect,
+} from '@react-navigation/native';
+import NetInfo from '@react-native-community/netinfo';
 import { API, Colors, Images } from '../../../configs';
 import Text from '../../Text';
 import { fetchWithCache } from '../../../utils/Apis/axios';
@@ -7,10 +20,13 @@ import { fetchWithCache } from '../../../utils/Apis/axios';
 import styles from './styles';
 import { Section } from '../../Section';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
-import { useNavigation, useIsFocused } from '@react-navigation/native';
+import { useUnitConnectRemoteDevices } from '../../../screens/Unit/hook/useUnitConnectRemoteDevices';
+import { useWatchConfigs } from '../../../hooks/IoT';
+import { SCContext } from '../../../context';
+import { Action } from '../../../context/actionType';
 
 import Carousel from 'react-native-snap-carousel';
-import { TESTID } from '../../../configs/Constants';
+import { TESTID, DEVICE_TYPE } from '../../../configs/Constants';
 import Routes from '../../../utils/Route';
 import MyUnitDevice from '../../../screens/Unit/components/MyUnitDevice';
 
@@ -20,21 +36,49 @@ const MyUnit = () => {
   const isFocused = useIsFocused();
   const navigation = useNavigation();
   const [myUnits, setMyUnits] = useState([]);
+  const [slideIndex, setSlideIndex] = useState(0);
+  const { setAction } = useContext(SCContext);
 
   const fetchMyUnitDashboard = useCallback(async () => {
     await fetchWithCache(API.UNIT.MY_UNITS(), {}, (response) => {
       const { success, data } = response;
-      if (success) {
-        setMyUnits(data);
-      }
+      success && setMyUnits(data);
     });
   }, [setMyUnits]);
 
   useEffect(() => {
-    if (isFocused) {
-      fetchMyUnitDashboard();
-    }
+    isFocused && fetchMyUnitDashboard();
   }, [fetchMyUnitDashboard, isFocused]);
+
+  useFocusEffect(
+    useCallback(() => {
+      const unsubscribe = NetInfo.addEventListener((state) => {
+        setAction(Action.SET_NETWORK_CONNECTED, state.isConnected);
+      });
+      return () => unsubscribe();
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
+  );
+
+  useUnitConnectRemoteDevices(myUnits[slideIndex]);
+
+  const configsNeedWatching = useMemo(() => {
+    const configIds = [];
+    myUnits.forEach((unit) => {
+      (unit?.abstract_devices || []).forEach((device) => {
+        if (
+          device?.quick_action?.config_id &&
+          device?.device_type !== DEVICE_TYPE.GOOGLE_HOME
+        ) {
+          configIds.push(device.quick_action.config_id);
+        }
+      });
+    });
+    return configIds;
+  }, [myUnits]);
+
+  useWatchConfigs(configsNeedWatching);
+
   const goToDetail = useCallback(
     (item) => {
       navigation.navigate(Routes.UnitStack, {
@@ -47,6 +91,7 @@ const MyUnit = () => {
     },
     [navigation]
   );
+
   const _renderItem = useCallback(
     ({ item, index }) => {
       const paddingLeft = index === 0 ? 0 : 8;
@@ -73,14 +118,15 @@ const MyUnit = () => {
             />
             <Text style={styles.title}>{item.name}</Text>
           </TouchableOpacity>
-          {item.abstract_sensors.map((sensor, indexSensor) => (
-            <MyUnitDevice key={indexSensor} sensor={sensor} unit={item} />
+          {(item?.abstract_devices || []).map((device, indexDevice) => (
+            <MyUnitDevice key={indexDevice} device={device} unit={item} />
           ))}
         </View>
       );
     },
     [myUnits.length, goToDetail]
   );
+
   return (
     <>
       <Section style={styles.boxTxtMyUnit}>
@@ -96,6 +142,7 @@ const MyUnit = () => {
               itemWidth={screenWidth - 32}
               renderItem={_renderItem}
               inactiveSlideScale={1}
+              onSnapToItem={setSlideIndex}
             />
           ) : (
             <View>

package/src/commons/MenuActionMore/index.js

@@ -1,6 +1,6 @@
 import React, { memo, useCallback, useEffect, useState } from 'react';
 import { TouchableOpacity, ScrollView } from 'react-native';
-import Popover from 'react-native-popover-view';
+import Popover from '../Popover';
 
 import styles from './MenuActionMoreStyles';
 import Text from '../Text';
@@ -12,7 +12,6 @@ const MenuActionMore = memo(
   ({
     isVisible,
     hideMore,
-    hideComplete,
     listMenuItem,
     childRef,
     onItemClick,
@@ -46,7 +45,6 @@ const MenuActionMore = memo(
         placement="bottom"
         from={childRef}
         onRequestClose={hideMore}
-        onCloseComplete={hideComplete}
         isVisible={isVisible}
         arrowStyle={styles.wrap}
       >

package/src/commons/Popover/index.js

@@ -0,0 +1,26 @@
+import React, { useContext } from 'react';
+import Popover from 'react-native-popover-view';
+import { SCContext } from '../../context';
+import { Action } from '../../context/actionType';
+
+const PopoverComponent = (props) => {
+  const { setAction } = useContext(SCContext);
+
+  const onCloseStart = () => {
+    setAction(Action.SET_POPOVER_ANIMATING, true);
+  };
+
+  const onCloseComplete = () => {
+    setAction(Action.SET_POPOVER_ANIMATING, false);
+  };
+
+  return (
+    <Popover
+      onCloseStart={onCloseStart}
+      onCloseComplete={onCloseComplete}
+      {...props}
+    />
+  );
+};
+
+export default PopoverComponent;

package/src/configs/Constants.js

@@ -858,3 +858,7 @@ export const PROBLEM_CODE = {
   UNKNOWN_ERROR: 'UNKNOWN_ERROR',
   CANCEL_ERROR: 'CANCEL_ERROR',
 };
+
+export const DATE_TIME_FORMAT = {
+  YMD: 'YYYY-MM-DD',
+};

package/src/context/actionType.ts

@@ -23,6 +23,7 @@ export const Action = {
   NEED_UPDATE_VALUE_EVALUATIONS: 'NEED_UPDATE_VALUE_EVALUATIONS',
   ON_RECEIVE_NOTIFICATION: 'ON_RECEIVE_NOTIFICATION',
   SET_DEVICES_STATUS: 'SET_DEVICES_STATUS',
+  SET_POPOVER_ANIMATING: 'SET_POPOVER_ANIMATING',
 };
 
 export type AuthData = {
@@ -80,6 +81,7 @@ export type AppType = {
   isNetworkConnected: boolean;
   camera_opened: any[];
   notificationData: any;
+  popoverAnimating: boolean;
 };
 
 export type IoTType = {

package/src/context/reducer.ts

@@ -60,6 +60,7 @@ export const initialState = {
     isNetworkConnected: false,
     camera_opened: [],
     notificationData: null,
+    popoverAnimating: false,
   },
   iot: {
     googlehome: {
@@ -342,6 +343,15 @@ export const reducer = (currentState: ContextData, action: Action) => {
         },
       };
 
+    case Action.SET_POPOVER_ANIMATING:
+      return {
+        ...currentState,
+        app: {
+          ...currentState.app,
+          popoverAnimating: payload,
+        },
+      };
+
     default:
       return currentState;
   }

package/src/hooks/Common/useGGHomeDeviceConnected.js

@@ -1,11 +1,18 @@
 import { useSCContextSelector } from '../../context';
 
 const useGGHomeDeviceConnected = (device) => {
-  const { connections } = useSCContextSelector((state) => state.iot.googlehome);
+  const connections = useSCContextSelector(
+    (state) => state.iot.googlehome.connections
+  );
+  const isNetworkConnected = useSCContextSelector(
+    (state) => state.app.isNetworkConnected
+  );
 
-  const isConnecting = !!device?.chip_id && !(device.chip_id in connections);
+  const isConnecting =
+    isNetworkConnected && !!device?.chip_id && !(device.chip_id in connections);
 
   const isConnected =
+    isNetworkConnected &&
     !!device?.chip_id &&
     device.chip_id in connections &&
     !!connections[device.chip_id];

package/src/hooks/Common/usePopover.js

@@ -2,14 +2,12 @@ import { useCallback, useState, useRef } from 'react';
 
 const usePopover = () => {
   const [showingPopover, setShowingPopover] = useState(false);
-  const [hidingPopoverComplete, setHidingPopoverComplete] = useState(true);
   const childRef = useRef(null);
 
   const showPopoverWithRef = useCallback(
     (ref) => {
       childRef.current = ref.current;
       setShowingPopover(true);
-      setHidingPopoverComplete(false);
     },
     [childRef]
   );
@@ -19,17 +17,11 @@ const usePopover = () => {
     setShowingPopover(false);
   }, [childRef]);
 
-  const hidePopoverComplete = useCallback(() => {
-    setHidingPopoverComplete(true);
-  }, []);
-
   return {
     childRef,
     showingPopover,
     showPopoverWithRef,
     hidePopover,
-    hidingPopoverComplete,
-    hidePopoverComplete,
   };
 };
 

package/src/hooks/IoT/useGGHomeConnection.js

@@ -71,7 +71,6 @@ const useGGHomeConnection = () => {
         onReconnected
       );
     },
-    // eslint-disable-next-line react-hooks/exhaustive-deps
     [connections, onEstablished, onDisconnected, onReconnected]
   );
 

package/src/navigations/UnitStack.js

@@ -93,7 +93,11 @@ export const UnitStack = memo((props) => {
       if (!id) {
         return;
       }
-      const { success, data } = await axiosGet(API.UNIT.FAVOURITE_DEVICES(id));
+      const { success, data } = await axiosGet(
+        API.UNIT.FAVOURITE_DEVICES(id),
+        {},
+        true
+      );
       success && setAction(Action.SET_FAVORITE_DEVICES, data);
     };
     fetchFavoriteDevices();
@@ -102,7 +106,11 @@ export const UnitStack = memo((props) => {
 
   useEffect(() => {
     const fetchStarredScripts = async () => {
-      const { success, data } = await axiosGet(API.AUTOMATE.STARRED_SCRIPTS());
+      const { success, data } = await axiosGet(
+        API.AUTOMATE.STARRED_SCRIPTS(),
+        {},
+        true
+      );
       success && setAction(Action.SET_STARRED_SCRIPTS, data);
     };
     fetchStarredScripts();

package/src/screens/GuestInfo/index.js

@@ -1,5 +1,5 @@
 import React, { useState, useCallback, useEffect, memo } from 'react';
-import { View, ActivityIndicator } from 'react-native';
+import { View, ActivityIndicator, Image } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import { useNavigation } from '@react-navigation/native';
 
@@ -106,9 +106,16 @@ const GuestInfo = ({ route }) => {
           <>
             {!!guest && (
               <View style={styles.userWrap}>
-                <CircleView size={88} center style={styles.avatar}>
-                  <IconOutline name="user" size={44} color={Colors.Pink1} />
-                </CircleView>
+                {guest?.avatar ? (
+                  <Image
+                    source={{ uri: guest?.avatar }}
+                    style={styles.avatar}
+                  />
+                ) : (
+                  <CircleView size={88} center style={styles.avatar}>
+                    <IconOutline name="user" size={44} color={Colors.Pink1} />
+                  </CircleView>
+                )}
                 <Text type="H3" bold>
                   {guest.name}
                 </Text>

package/src/screens/GuestInfo/styles/indexStyles.js

@@ -11,6 +11,13 @@ export default StyleSheet.create({
     alignItems: 'center',
   },
   avatar: {
+    height: 88,
+    width: 88,
+    borderRadius: 44,
+    borderWidth: 0.5,
+    borderColor: Colors.Gray5,
+    justifyContent: 'center',
+    alignItems: 'center',
     marginBottom: 16,
     backgroundColor: Colors.Primary,
   },

package/src/screens/ManageAccess/index.js

@@ -1,5 +1,6 @@
 import React, { useEffect, memo } from 'react';
 import {
+  Image,
   View,
   ScrollView,
   RefreshControl,
@@ -67,11 +68,19 @@ const ManageAccessScreen = memo(({ route }) => {
                       key={index.toString()}
                       index={index}
                       leftIcon={
-                        <IconOutline
-                          name="user"
-                          size={20}
-                          color={Colors.White}
-                        />
+                        item.user?.avatar ? (
+                          <Image
+                            source={{ uri: item.user?.avatar }}
+                            style={styles.avatar}
+                            // testID={TESTID.SIDE_MENU_AVATAR_USER}
+                          />
+                        ) : (
+                          <IconOutline
+                            name="user"
+                            size={20}
+                            color={Colors.White}
+                          />
+                        )
                       }
                       text={
                         item.user?.name ||

package/src/screens/ManageAccess/styles/ManageAccessStyles.js

@@ -61,6 +61,15 @@ export default StyleSheet.create({
   paddingLeft16: {
     paddingLeft: 16,
   },
+  avatar: {
+    height: 40,
+    width: 40,
+    borderRadius: 20,
+    borderWidth: 0.5,
+    borderColor: Colors.Gray5,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
   textNoGuest: {
     alignSelf: 'center',
     marginTop: Constants.height * 0.3,

package/src/screens/PlayBackCamera/Timer.js

@@ -25,6 +25,7 @@ const Timer = ({
   normalHeight = 20,
   value,
   selected,
+  onScrollEndDrag,
 }) => {
   const scrollViewRef = useRef();
   const [scrollX] = useState(new Animated.Value(0));
@@ -113,6 +114,8 @@ const Timer = ({
           ],
           { useNativeDriver: true }
         )}
+        onScrollEndDrag={onScrollEndDrag}
+        onMomentumScrollEnd={onScrollEndDrag}
       >
         {renderTime}
       </Animated.ScrollView>

package/src/screens/PlayBackCamera/__test__/index.test.js

@@ -1,6 +1,8 @@
 import moment from 'moment';
 import React from 'react';
 import { Animated, TouchableOpacity } from 'react-native';
+import { Calendar } from 'react-native-calendars';
+
 import { act, create } from 'react-test-renderer';
 import PlayBackCamera from '..';
 import { ModalCustom } from '../../../commons/Modal';
@@ -58,6 +60,11 @@ describe('Test PlayBackCamera', () => {
     await textOpenModal[0].props.onPress();
     expect(mockSetState).toBeCalledWith(true);
 
+    const Calendars = instance.findAllByType(Calendar);
+    expect(Calendars).toHaveLength(1);
+    await Calendars[0].props.onDayPress({ dateString: '2022-07-01' });
+    expect(mockSetState).toBeCalledWith('2022-07-01');
+
     mockSetState.mockClear();
     const buttonCancel = instance.findAll(
       (el) =>
@@ -83,7 +90,7 @@ describe('Test PlayBackCamera', () => {
         el.type === TouchableOpacity
     );
     await buttonAddDate[0].props.onPress();
-    expect(mockSetState).not.toBeCalled();
+    expect(mockSetState).toBeCalled();
 
     mockSetState.mockClear();
     const buttonSubDate = instance.findAll(