@eohjsc/react-native-smart-city 0.2.94 → 0.2.97

package/src/commons/Sharing/RowMember.js

@@ -1,13 +1,12 @@
 import React, { memo, useMemo } from 'react';
-import { StyleSheet, View } from 'react-native';
-import { IconOutline } from '@ant-design/icons-react-native';
+import { StyleSheet, View, TouchableOpacity, Image } from 'react-native';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-
 import { Colors } from '../../configs';
 import Text from '../../commons/Text';
 import { shortEmailName } from '../../utils/Utils';
-
-import BtnRemoveMember from './BtnRemoveMember';
+import { CircleView } from '../CircleView';
+import { useNavigation } from '@react-navigation/native';
+import Routes from '../../utils/Route';
 
 const arrColor = [
   Colors.GeekBlue3,
@@ -19,46 +18,88 @@ const arrColor = [
   Colors.Cyan2,
 ];
 const RowMember = memo(
-  ({ member, index, ownerId, currentUserId, onPressRemove }) => {
+  ({
+    member,
+    index,
+    ownerId,
+    unit,
+    currentUserId,
+    type,
+    leftIcon = true,
+    rightComponent = true,
+  }) => {
     const t = useTranslations();
-    const canRemoveMember = useMemo(
-      () => ownerId === currentUserId && member.id !== ownerId,
-      [currentUserId, member.id, ownerId]
-    );
+    const { navigate } = useNavigation();
     const [role, roleColor] = useMemo(
       () =>
-        member.id === ownerId
+        member?.id === ownerId
           ? [t('owner'), Colors.Primary]
-          : member.id === currentUserId
-          ? [t('me'), Colors.Gray6]
-          : ['', ''],
-      [currentUserId, member.id, ownerId, t]
+          : member?.id === currentUserId
+          ? [t('me'), Colors.Primary]
+          : [t('member'), Colors.Gray6],
+      [currentUserId, member?.id, ownerId, t]
     );
-    const paddingBottom = role ? 16 : 23;
+    const firstWordsInName = useMemo(() => {
+      const wordTemp = member?.name || shortEmailName(member?.email) || '';
+      return wordTemp?.charAt();
+    }, [member?.email, member?.name]);
+
     if (member?.id === ownerId && member?.share_id) {
       return null;
     }
+    const circleColorTypes = {
+      primary: 'primary',
+      disable: 'disable',
+      noneBG: 'none',
+    };
+    const circleColor = type
+      ? circleColorTypes[type]
+      : arrColor[index % arrColor.length];
+
+    const onPressInfo = () => {
+      navigate(Routes.UnitMemberInformation, {
+        member,
+        ownerId,
+        unit,
+      });
+    };
     return (
       <View style={styles.rowContainer}>
-        <View
-          style={[
-            styles.iconContainer,
-            { backgroundColor: arrColor[index % arrColor.length] },
-          ]}
-        >
-          <IconOutline name={'user'} size={20} color={Colors.White} />
-        </View>
-        <View style={[styles.infoContainer, { paddingBottom: paddingBottom }]}>
-          <Text style={styles.textName}>
-            {member?.name || shortEmailName(member.email) || ''}
-          </Text>
-          {!!role && (
-            <Text style={[styles.textRole, { color: roleColor }]}>{role}</Text>
-          )}
-          {canRemoveMember && (
-            <BtnRemoveMember onPressRemove={onPressRemove} member={member} />
-          )}
-        </View>
+        <TouchableOpacity onPress={onPressInfo} disabled={type === 'disable'}>
+          <View style={styles.Border}>
+            {!!leftIcon && (
+              <View style={styles.paddingLeft16}>
+                {member?.avatar ? (
+                  <Image
+                    source={{ uri: member?.avatar }}
+                    style={styles.avatar}
+                  />
+                ) : (
+                  <CircleView size={40} backgroundColor={circleColor} center>
+                    <Text color={Colors.White}>{firstWordsInName}</Text>
+                  </CircleView>
+                )}
+              </View>
+            )}
+            <View style={styles.columnFlex}>
+              <Text style={styles.titleName}>
+                {member?.name || shortEmailName(member?.email) || ''}
+              </Text>
+              {member?.phone_number && (
+                <Text style={styles.status}> {member?.phone_number}</Text>
+              )}
+            </View>
+            {!!rightComponent && (
+              <View style={styles.endFlex}>
+                {!!role && (
+                  <Text style={[styles.textRole, { color: roleColor }]}>
+                    {role}
+                  </Text>
+                )}
+              </View>
+            )}
+          </View>
+        </TouchableOpacity>
       </View>
     );
   }
@@ -68,9 +109,7 @@ export default RowMember;
 
 const styles = StyleSheet.create({
   rowContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    paddingHorizontal: 16,
+    flex: 1,
   },
   iconContainer: {
     alignItems: 'center',
@@ -107,4 +146,55 @@ const styles = StyleSheet.create({
   textCenter: {
     alignSelf: 'center',
   },
+  columnFlex: {
+    paddingLeft: 16,
+    justifyContent: 'center',
+    flexDirection: 'column',
+  },
+  rowFlex: {
+    flexDirection: 'row',
+  },
+  endFlex: {
+    flex: 1,
+    justifyContent: 'flex-start',
+    alignItems: 'flex-end',
+    paddingRight: 16,
+  },
+  Border: {
+    display: 'flex',
+    width: '100%',
+    borderWidth: 0,
+    borderColor: Colors.Gray4,
+    borderBottomWidth: 1,
+    borderStyle: 'solid',
+    flexDirection: 'row',
+    paddingTop: 16,
+    paddingBottom: 16,
+  },
+  titleName: {
+    fontSize: 16,
+    lineHeight: 24,
+    fontStyle: 'normal',
+    fontWeight: '400',
+    color: Colors.Gray9,
+  },
+  status: {
+    fontSize: 12,
+    lineHeight: 20,
+    fontStyle: 'normal',
+    fontWeight: '400',
+    color: Colors.Gray7,
+  },
+  container: {
+    paddingTop: 0,
+  },
+  paddingLeft16: {
+    paddingLeft: 16,
+  },
+  avatar: {
+    height: 40,
+    width: 40,
+    borderRadius: 40,
+    backgroundColor: Colors.Primary,
+  },
 });

package/src/commons/Sharing/__test__/MemberList.test.js

@@ -27,7 +27,7 @@ describe('MemberList', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(4);
+    expect(textInputs.length).toBe(5);
   });
   test('MemberList snapshot id dataMember !== ownerId', () => {
     const dataMember = [{ id: 1, name: 'CEO' }];
@@ -36,7 +36,7 @@ describe('MemberList', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(3);
+    expect(textInputs.length).toBe(5);
   });
   test('MemberList snapshot id dataMember === currentUserId', () => {
     const dataMember = [{ id: 1, name: 'CEO' }];
@@ -45,7 +45,7 @@ describe('MemberList', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(4);
+    expect(textInputs.length).toBe(5);
   });
   test('MemberList dataMember null', () => {
     const dataMember = [];

package/src/commons/Sharing/__test__/RowMember.test.js

@@ -26,8 +26,8 @@ describe('RowMember', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(4);
-    expect(textInputs[0].props.children).toEqual('CEO');
+    expect(textInputs.length).toBe(5);
+    expect(textInputs[1].props.children).toEqual('CEO');
   });
   test('RowMember owner dont have name show start of email ', () => {
     const dataMember = { id: 1, name: '', email: 'abc@gmail.com' };
@@ -36,7 +36,7 @@ describe('RowMember', () => {
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);
-    expect(textInputs.length).toBe(4);
-    expect(textInputs[0].props.children).toEqual('abc');
+    expect(textInputs.length).toBe(5);
+    expect(textInputs[1].props.children).toEqual('abc');
   });
 });

package/src/configs/API.js

@@ -39,6 +39,8 @@ const API = {
       SCConfig.apiRoot + `/property_manager/units/${id}/add_gateway/`,
     SENSORS_STATUS: (id) =>
       SCConfig.apiRoot + `/property_manager/units/${id}/sensors_status/`,
+    CHANGE_OWNER: (id) =>
+      SCConfig.apiRoot + `/property_manager/units/${id}/change_owner/`,
     FAVOURITE_DEVICES: (id) =>
       SCConfig.apiRoot + `/property_manager/units/${id}/favourite_devices/`,
   },
@@ -137,9 +139,9 @@ const API = {
     CHECK_SEND_EMAIL: () =>
       SCConfig.apiRoot + '/connection_manager/googlehome/check_send_email/',
   },
-  POWER_CONSUME: {
+  VALUE_CONSUME: {
     DISPLAY_HISTORY: () =>
-      SCConfig.apiRoot + '/property_manager/power_consume/display_history/',
+      SCConfig.apiRoot + '/property_manager/value_consume/display_history/',
   },
   SHARE: {
     UNITS: () => SCConfig.apiRoot + '/property_manager/sharing/units/',
@@ -150,6 +152,12 @@ const API = {
     UNITS_MEMBER_DETAIL: (id, shareId) =>
       SCConfig.apiRoot +
       `/property_manager/sharing/units/${id}/members/${shareId}/`,
+    UNIT_MEMBER_INFO: (unit_id, member_id) =>
+      SCConfig.apiRoot +
+      `/property_manager/sharing/units/${unit_id}/member/${member_id}/information/`,
+    UNIT_MEMBER_SHARE_DEVICE: (unit_id, member_id) =>
+      SCConfig.apiRoot +
+      `/property_manager/sharing/units/${unit_id}/member/${member_id}/shared_devices/`,
     SHARE: () => SCConfig.apiRoot + '/property_manager/sharing/share/',
   },
   EMERGENCY: {
@@ -157,6 +165,8 @@ const API = {
   },
   EMERGENCY_BUTTON: {
     CREATE_CONTACT: () => SCConfig.apiRoot + '/emergency_button/contacts/',
+    CREATE_BATCH: () =>
+      SCConfig.apiRoot + '/emergency_button/contacts/create_batch/',
     CONTACTS: () => SCConfig.apiRoot + '/emergency_button/contacts/',
     REMOVE_CONTACTS: (id) =>
       SCConfig.apiRoot + `/emergency_button/contacts/${id}/`,

package/src/configs/Constants.js

@@ -217,6 +217,10 @@ export const TESTID = {
   MY_UNIT_NO_UNIT: 'MY_UNIT_NO_UNIT',
   ITEM_UNIT: 'ITEM_UNIT',
 
+  //member list
+  SHARING_MEMBER: 'SHARING_MEMBER',
+  REMOVE_MEMBER: 'REMOVE_MEMBER',
+
   // SmartTiviTemplate
   SMART_TIVI_TEMPLATE: {
     BIG_BUTTON: 'BIG_BUTTON',
@@ -309,6 +313,10 @@ export const TESTID = {
   BUTTON_SELECT_VISA: 'BUTTON_SELECT_VISA',
   BUTTON_SELECT_MASTER_CARD: 'BUTTON_SELECT_MASTER_CARD',
 
+  //Enter Password
+  ENTER_PASSWORD_TEXT_INPUT_PASSWORD: 'ENTER_PASSWORD_TEXT_INPUT_PASSWORD',
+  ENTER_PASSWORD_BUTTON_DONE: 'ENTER_PASSWORD_BUTTON_DONE',
+
   // Map Dashboard
   PARKING_MARKER: 'PARKING_MARKER',
 
@@ -424,6 +432,8 @@ export const TESTID = {
   ITEM_QUICK_ACTION_PRESS: 'ITEM_QUICK_ACTION_PRESS',
   TIME_COUNT_DOWN_TEXT: 'TIME_COUNT_DOWN_TEXT',
   ACTION_ITEM: 'ACTION_ITEM',
+  // Sensor Item
+  TEXT_SENSOR_ITEM: 'TEXT_SENSOR_ITEM',
 
   // DeviceInfo
   DEVICE_INFO_BATTERY: 'DEVICE_INFO_BATTERY',

package/src/hooks/Common/useSensorsStatus.js

@@ -1,5 +1,6 @@
-import { useState, useEffect, useRef } from 'react';
+import { useState, useEffect, useRef, useCallback } from 'react';
 import { useIsFocused } from '@react-navigation/native';
+import { throttle } from 'lodash';
 import { axiosGet } from '../../utils/Apis/axios';
 import { API } from '../../configs';
 
@@ -9,35 +10,44 @@ const useSensorsStatus = (unit, sensors) => {
   const [sensorsStatus, setSensorsStatus] = useState([]);
   const [serverDown, setServerDown] = useState(false);
 
-  useEffect(() => {
-    if (isFocused) {
-      const getSensorsStatus = async () => {
-        const params = new URLSearchParams();
-        if (sensors?.length > 0) {
-          sensors.forEach((sensor) => {
-            params.append('sensors', sensor.id);
-          });
-          const { success, data, resp_status } = await axiosGet(
-            API.UNIT.SENSORS_STATUS(unit.id),
-            {
-              params: params,
-            }
-          );
-          if (success) {
-            setSensorsStatus(data);
-            setServerDown(false);
-          } else if (resp_status >= 500) {
-            setServerDown(true);
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const getSensorsStatus = useCallback(
+    throttle(async (unit, sensors) => {
+      const params = new URLSearchParams();
+      if (sensors?.length > 0) {
+        sensors.forEach((sensor) => {
+          params.append('sensors', sensor.id);
+        });
+        const { success, data, resp_status } = await axiosGet(
+          API.UNIT.SENSORS_STATUS(unit.id),
+          {
+            params: params,
           }
+        );
+        if (success) {
+          setSensorsStatus(data);
+          setServerDown(false);
+        } else if (resp_status > 500) {
+          setServerDown(true);
         }
-      };
-      const updateInterval = setInterval(getSensorsStatus, 5000);
+      }
+    }, 3000),
+    []
+  );
+
+  useEffect(() => {
+    if (isFocused) {
+      getSensorsStatus(unit, sensors);
+      const updateInterval = setInterval(
+        () => getSensorsStatus(unit, sensors),
+        5000
+      );
       intervalSensorStatus.current = updateInterval;
       return () => clearInterval(updateInterval);
     } else {
       clearInterval(intervalSensorStatus.current);
     }
-  }, [isFocused, sensors, unit.id]);
+  }, [isFocused, getSensorsStatus, unit, sensors]);
 
   const getStatus = (sensor) => {
     sensorsStatus.find((s) => s.id === sensor.id);

package/src/iot/RemoteControl/GoogleHome.js

@@ -201,8 +201,22 @@ function getServiceName(message) {
   return serviceSplit.join('_');
 }
 
+async function sendCommandSingleAction(connection, ghAction, data) {
+  const { message } = ghAction || {};
+  const name = getServiceName(message);
+
+  if (name && data) {
+    message.service_data[name] = data;
+  }
+
+  await connection.sendMessagePromise(message);
+}
+
 export async function sendCommandOverGoogleHome(sensor, action, data) {
-  if (!action.googlehome_actions || !action.googlehome_actions.length) {
+  if (
+    !(action.googlehome_actions && action.googlehome_actions.length) &&
+    !action.googlehome_action
+  ) {
     return;
   }
 
@@ -212,20 +226,19 @@ export async function sendCommandOverGoogleHome(sensor, action, data) {
     return;
   }
 
-  for (let i = 0; i < action.googlehome_actions.length; i++) {
-    const ghAction = action.googlehome_actions[i];
-    const { message } = ghAction;
-    const name = getServiceName(ghAction.message);
-
-    if (name && data) {
-      message.service_data[name] = data;
+  if (action.googlehome_actions) {
+    for (let i = 0; i < action.googlehome_actions.length; i++) {
+      await sendCommandSingleAction(
+        connection,
+        action.googlehome_actions[i],
+        data
+      );
     }
-
-    await connection.sendMessagePromise(message);
+  } else if (action.googlehome_action) {
+    await sendCommandSingleAction(connection, action.googlehome_action, data);
   }
 
   const { success } = await axiosPost(API.SENSOR.ACTIVITY_LOG(), {
-    sensor_id: sensor.id,
     action_id: action.id,
     message: 'Trigger by user action with google home',
   });

package/src/iot/RemoteControl/__test__/GoogleHome.test.js

@@ -75,6 +75,9 @@ describe('Remote Control Google Home', () => {
         message: 'message',
       },
     ],
+    googlehome_action: {
+      message: 'message',
+    },
   };
 
   const response = {
@@ -223,6 +226,35 @@ describe('Remote Control Google Home', () => {
     });
   });
 
+  it('Send command over google home action googlehome_action one to one', async () => {
+    action.googlehome_actions = null;
+    action.googlehome_action.message = {
+      type: 'call_service',
+      domain: 'climate',
+      service: 'set_temperature',
+      service_data: {
+        temperature: 0,
+        entity_id: 'climate.dqsmart_0108f6cdde',
+      },
+      id: 20,
+    };
+
+    axios.post.mockImplementation(async () => {
+      return response;
+    });
+    await googleHomeConnect(options);
+    await sendCommandOverGoogleHome(sensor, action, 19);
+
+    action.googlehome_action.message.service_data.temperature = 19;
+    expect(connection.sendMessagePromise).toBeCalledWith(
+      action.googlehome_action.message
+    );
+    expect(axios.post).toHaveBeenCalledWith(API.SENSOR.ACTIVITY_LOG(), {
+      action_id: 1,
+      message: 'Trigger by user action with google home',
+    });
+  });
+
   it('Send command over google home that not connected', async () => {
     await googleHomeConnect(options);
     await sendCommandOverGoogleHome({ chip_id: 2 }, action);

package/src/navigations/UnitStack.js

@@ -49,6 +49,8 @@ import SetUpSensor from '../screens/AddNewAction/SetupSensor';
 import EditDevice from '../screens/Device/EditDevice/index';
 import EmergencySetting from '../screens/EmergencySetting';
 import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
+import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
+import EnterPassword from '../screens/EnterPassword';
 import { HanetCameraStack } from './HanetCameraStack';
 
 import { axiosGet } from '../utils/Apis/axios';
@@ -268,6 +270,20 @@ export const UnitStack = memo((props) => {
           headerShown: false,
         }}
       />
+      <Stack.Screen
+        name={Route.UnitMemberInformation}
+        component={InfoMemberUnit}
+        options={{
+          headerShown: false,
+        }}
+      />
+      <Stack.Screen
+        name={Route.EnterPassword}
+        component={EnterPassword}
+        options={{
+          headerShown: false,
+        }}
+      />
       <Stack.Screen
         name={Route.DeviceInfo}
         component={DeviceInfo}

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -37,6 +37,7 @@ const SelectSensorDevices = memo(({ route }) => {
   const [selectedDevice, setSelectedDevice] = useState();
   const { navigate, dispatch, goBack } = useNavigation();
   const isSelectSensor = title === AUTOMATE_SELECT.SELECT_SENSOR;
+  const [loading, setLoading] = useState(true);
 
   const onSnapToItem = useCallback(
     (item, index) => {
@@ -83,6 +84,7 @@ const SelectSensorDevices = memo(({ route }) => {
         }
       }
     );
+    setLoading(false);
   }, [automate.sensor_id, isSelectSensor, unit]);
 
   useEffect(() => {
@@ -162,6 +164,9 @@ const SelectSensorDevices = memo(({ route }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     [route.params]
   );
+  if (loading) {
+    return null;
+  }
 
   return (
     <View style={styles.wrap}>
@@ -175,7 +180,7 @@ const SelectSensorDevices = memo(({ route }) => {
           {t(title)}
         </Text>
 
-        {listStation ? (
+        {listStation.length ? (
           <NavBar
             listStation={listStation}
             listMenuItem={listMenuItem}