@eohjsc/react-native-smart-city 0.2.81 → 0.2.84

package/src/commons/ActionGroup/__test__/index.test.js

@@ -75,6 +75,9 @@ describe('Test ActionGroup', () => {
     id: 20,
     key: '5ed1d4dc-a905-47cd-b0c9-f979644bd21a',
   };
+  const sensor = {
+    name: 'Sensor name',
+  };
   let actionGroupData;
   let wrapper;
 
@@ -154,7 +157,9 @@ describe('Test ActionGroup', () => {
     const actionGroup = actionGroupData;
     const mockDoAction = jest.fn();
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = renderer.create(
+        wrapComponent(actionGroup, mockDoAction, sensor)
+      );
     });
     const instance = wrapper.root;
     const buttons = instance.findAllByType(TouchableOpacity);
@@ -170,21 +175,27 @@ describe('Test ActionGroup', () => {
     });
     expect(mockDoAction).toHaveBeenCalledTimes(1);
     expect(mockDoAction).toHaveBeenCalledWith(
-      actionGroup.configuration.action1_data
+      actionGroup.configuration.action1_data,
+      null,
+      'Sensor name up'
     );
     act(() => {
       buttons[1].props.onPress();
     });
     expect(mockDoAction).toHaveBeenCalledTimes(2);
     expect(mockDoAction).toHaveBeenCalledWith(
-      actionGroup.configuration.action2_data
+      actionGroup.configuration.action2_data,
+      null,
+      'Sensor name stop'
     );
     act(() => {
       buttons[2].props.onPress();
     });
     expect(mockDoAction).toHaveBeenCalledTimes(3);
     expect(mockDoAction).toHaveBeenCalledWith(
-      actionGroup.configuration.action3_data
+      actionGroup.configuration.action3_data,
+      null,
+      'Sensor name down'
     );
   });
 
@@ -220,7 +231,9 @@ describe('Test ActionGroup', () => {
     };
     const mockDoAction = jest.fn();
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = renderer.create(
+        wrapComponent(actionGroup, mockDoAction, sensor)
+      );
     });
     const instance = wrapper.root;
     const buttons = instance.findAllByType(TouchableOpacity);
@@ -236,21 +249,27 @@ describe('Test ActionGroup', () => {
     });
     expect(mockDoAction).toHaveBeenCalledTimes(1);
     expect(mockDoAction).toHaveBeenCalledWith(
-      actionGroup.configuration.action1_data
+      actionGroup.configuration.action1_data,
+      null,
+      'Sensor name up'
     );
     act(() => {
       buttons[1].props.onPress();
     });
     expect(mockDoAction).toHaveBeenCalledTimes(2);
     expect(mockDoAction).toHaveBeenCalledWith(
-      actionGroup.configuration.action2_data
+      actionGroup.configuration.action2_data,
+      null,
+      'Sensor name stop'
     );
     act(() => {
       buttons[2].props.onPress();
     });
     expect(mockDoAction).toHaveBeenCalledTimes(3);
     expect(mockDoAction).toHaveBeenCalledWith(
-      actionGroup.configuration.action3_data
+      actionGroup.configuration.action3_data,
+      null,
+      'Sensor name down'
     );
   });
 
@@ -279,7 +298,9 @@ describe('Test ActionGroup', () => {
       },
     };
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction));
+      wrapper = renderer.create(
+        wrapComponent(actionGroup, mockDoAction, sensor)
+      );
     });
     const instance = wrapper.root;
     const buttons = instance.findAllByType(TouchableOpacity);
@@ -288,7 +309,11 @@ describe('Test ActionGroup', () => {
       buttons[0].props.onPress();
     });
     expect(mockDoAction).toHaveBeenCalledTimes(1);
-    expect(mockDoAction).toHaveBeenCalledWith(action_data);
+    expect(mockDoAction).toHaveBeenCalledWith(
+      action_data,
+      null,
+      'Sensor name up'
+    );
   });
 
   test('render ActionGroup on_off_button_action_template', async () => {
@@ -303,9 +328,12 @@ describe('Test ActionGroup', () => {
         icon_off: 'caret-up',
         text_off: 'OFF',
       },
+      title: 'Power',
     };
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = renderer.create(
+        wrapComponent(actionGroup, mockDoAction, sensor)
+      );
     });
     const instance = wrapper.root;
     const buttons = instance.findAllByType(TouchableOpacity);
@@ -329,7 +357,9 @@ describe('Test ActionGroup', () => {
       },
     };
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = renderer.create(
+        wrapComponent(actionGroup, mockDoAction, sensor)
+      );
     });
     const instance = wrapper.root;
     const text = instance.findAllByType(Text);
@@ -366,7 +396,9 @@ describe('Test ActionGroup', () => {
       },
     };
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = renderer.create(
+        wrapComponent(actionGroup, mockDoAction, sensor)
+      );
     });
     const instance = wrapper.root;
     const texts = instance.findAllByType(Text);
@@ -413,7 +445,9 @@ describe('Test ActionGroup', () => {
     };
     const mockDoAction = jest.fn();
     await act(() => {
-      wrapper = renderer.create(wrapComponent(actionGroup, mockDoAction, {}));
+      wrapper = renderer.create(
+        wrapComponent(actionGroup, mockDoAction, sensor)
+      );
     });
     const instance = wrapper.root;
 

package/src/commons/Automate/ItemAutomate.js

@@ -38,7 +38,7 @@ const ItemAutomate = ({
         <View style={styles.wrapIcon}>
           <Icon />
         </View>
-        <View>
+        <View style={styles.wrapTitle}>
           <Text type="H4" bold>
             {t(item?.title)}
           </Text>

package/src/commons/Automate/ItemAutomateStyles.js

@@ -28,6 +28,10 @@ export default StyleSheet.create({
   },
   wrapIcon: {
     justifyContent: 'center',
-    marginRight: 16,
+    flexDirection: 'row',
+    width: 50,
+  },
+  wrapTitle: {
+    marginLeft: 10,
   },
 });

package/src/commons/Device/HorizontalBarChart.js

@@ -33,6 +33,7 @@ const HorizontalBarChart = memo(({ datas, config }) => {
     },
     yAxis: {
       min: 0,
+      minRange: 0.5,
       title: {
         text: null,
       },
@@ -55,7 +56,12 @@ const HorizontalBarChart = memo(({ datas, config }) => {
           useHTML: true,
           formatter: function () {
             const { unit, price } = JSON.parse(this.series.name);
-            const textColor = this.color === '#00979D' ? '#FFFFFF' : '#262626';
+            const textColor =
+              this.color === '#00979D'
+                ? this.y === 0
+                  ? '#262626'
+                  : '#FFFFFF'
+                : '#262626';
             const valueStyle = `color:${textColor};font-weight:normal;font-size:12px;`;
             const costStyle = valueStyle + 'font-weight:bold;';
 

package/src/commons/Device/ItemDevice.js

@@ -30,6 +30,7 @@ const ItemDevice = memo(
     sensor,
     unit,
     station,
+    isNetworkConnected,
     isGGHomeConnected,
     status,
     wrapStyle,
@@ -39,9 +40,9 @@ const ItemDevice = memo(
 
     const goToSensorDisplay = useCallback(() => {
       navigation.navigate(Routes.DeviceDetail, {
-        unit,
+        unitData: unit,
         station,
-        sensor,
+        sensorData: sensor,
         title,
         isGGHomeConnected,
       });
@@ -56,13 +57,15 @@ const ItemDevice = memo(
       );
     };
 
-    const isNetworkConnected =
-      status === undefined ? sensor.is_connected : status.is_connected;
+    const isConnectedViaInternet =
+      status === undefined
+        ? isNetworkConnected && sensor.is_connected
+        : isNetworkConnected && status.is_connected;
     const isBLEConnected = isDeviceConnected(
       sensor?.remote_control_options?.bluetooth?.address
     );
     const isConnected =
-      isNetworkConnected || isGGHomeConnected || isBLEConnected;
+      isConnectedViaInternet || isGGHomeConnected || isBLEConnected;
     const borderColor = isConnected ? Colors.Gray4 : Colors.Red6;
     const textConnected = isConnected ? t('connected') : t('disconnected');
 

package/src/commons/Device/WaterQualitySensor/ListQualityIndicator.js

@@ -37,7 +37,7 @@ export default ListQualityIndicator;
 const styles = StyleSheet.create({
   standard: {
     flexDirection: 'row',
-    marginTop: 16,
+    marginVertical: 16,
   },
   flatlistContent: {
     paddingHorizontal: 16,

package/src/commons/Device/WaterQualitySensor/QualityIndicatorsItem.js

@@ -68,7 +68,7 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderColor: Colors.Gray4,
     marginRight: 8,
-    width: (width / 375) * 120,
+    width: ((width - 32) / 375) * 120,
   },
   rowFlex: {
     flexDirection: 'row',

package/src/commons/EmergencyButton/AlertSendConfirm.js

@@ -44,9 +44,9 @@ const AlertSendConfirm = ({
         <Text
           type="Body"
           style={styles.textLocation}
-        >{`${unit.name} - ${station.name}`}</Text>
+        >{`${unit?.name} - ${station?.name}`}</Text>
         <Text type="Body" style={styles.textAddress}>
-          {unit.address}
+          {unit?.address}
         </Text>
       </View>
     </ButtonPopup>

package/src/commons/EmergencyButton/AlertSent.js

@@ -58,7 +58,7 @@ const AlertSent = ({
       <Text
         type="H5"
         style={styles.location}
-      >{`${unit.name} - ${station.name}`}</Text>
+      >{`${unit?.name} - ${station?.name}`}</Text>
       <IconFill name="alert" size={42} style={styles.alert} />
       <Text semibold style={styles.textAlertSent}>
         {data.title}
@@ -67,7 +67,7 @@ const AlertSent = ({
         {data.message}
         {isDashboard && (
           <Text type="H4" semibold>
-            {` ${unit.name}: ${station.name}.`}
+            {` ${unit?.name}: ${station?.name}.`}
           </Text>
         )}
       </Text>

package/src/commons/FullLoading/index.js

@@ -0,0 +1,35 @@
+import React from 'react';
+import { View, ActivityIndicator, StyleSheet } from 'react-native';
+
+import { colorOpacity } from '../../utils/Converter/color';
+import { Colors } from '../../configs';
+
+const FullLoading = ({ wrapStyle, color = Colors.Primary, size = 'small' }) => (
+  <View style={[styles.wrap, wrapStyle]}>
+    <View style={styles.background}>
+      <ActivityIndicator color={color} size={size} />
+    </View>
+  </View>
+);
+
+const styles = StyleSheet.create({
+  wrap: {
+    position: 'absolute',
+    backgroundColor: colorOpacity(Colors.Black, 0.1),
+    alignItems: 'center',
+    justifyContent: 'center',
+    top: 0,
+    left: 0,
+    bottom: 0,
+    right: 0,
+    zIndex: 10,
+  },
+  background: {
+    backgroundColor: colorOpacity(Colors.White, 0.8),
+    borderRadius: 5,
+    paddingHorizontal: 32,
+    paddingVertical: 24,
+  },
+});
+
+export default FullLoading;

package/src/commons/ImagePicker/__test__/ImagePicker.test.js

@@ -41,9 +41,9 @@ describe('Test ImagePicker', () => {
     Platform.OS = 'android';
     const options = {
       mediaType: 'photo',
-      maxWidth: 1024,
-      quality: 0.8,
-      saveToPhotos: true,
+      compressImageMaxWidth: 1280,
+      compressImageMaxHeight: 720,
+      compressImageQuality: 0.8,
     };
     act(() => {
       tree = renderer.create(wrapComponent(options));
@@ -51,5 +51,26 @@ describe('Test ImagePicker', () => {
     const instance = tree.root;
     const textInputs = instance.findAllByType(ButtonPopup);
     expect(textInputs.length).toBe(1);
+    act(() => {
+      textInputs[0].props.onPressMain();
+    });
+  });
+  test('create ImagePicker onChooseFile', () => {
+    Platform.OS = 'android';
+    const options = {
+      mediaType: 'photo',
+      compressImageMaxWidth: 1280,
+      compressImageMaxHeight: 720,
+      compressImageQuality: 0.8,
+    };
+    act(() => {
+      tree = renderer.create(wrapComponent(options));
+    });
+    const instance = tree.root;
+    const textInputs = instance.findAllByType(ButtonPopup);
+    expect(textInputs.length).toBe(1);
+    act(() => {
+      textInputs[0].props.onPressSecondary();
+    });
   });
 });

package/src/commons/MediaPlayerDetail/index.js

@@ -164,6 +164,7 @@ const MediaPlayerDetail = ({
         activeOpacity={1}
         style={styles.videoBtn}
         onPress={onTapGoDetail}
+        testID={TESTID.SUB_UNIT_GO_DETAIL}
       >
         {paused ? (
           <View style={[styles.player, style]}>

package/src/commons/SubUnit/Favorites/index.js

@@ -15,6 +15,7 @@ const SubUnitFavorites = ({
   unit,
   isOwner,
   favorites,
+  isNetworkConnected,
   isGGHomeConnected,
   wrapItemStyle,
 }) => {
@@ -71,6 +72,7 @@ const SubUnitFavorites = ({
               sensor={sensor}
               unit={unit}
               station={sensor.station}
+              isNetworkConnected={isNetworkConnected}
               isGGHomeConnected={isGGHomeConnected}
               status={sensorsStatus.find((s) => s.id === sensor.id)}
               wrapStyle={wrapItemStyle}

package/src/commons/SubUnit/OneTap/ItemOneTap.js

@@ -7,6 +7,7 @@ import { API, Colors } from '../../../configs';
 import OneTap from '../../../../assets/images/OneTap.svg';
 import ValueChange from '../../../../assets/images/ValueChange.svg';
 import Schedule from '../../../../assets/images/Schedule.svg';
+import Event from '../../../../assets/images/Event.svg';
 import CheckCircle from '../../../../assets/images/CheckCircle.svg';
 import FImage from '../../FImage';
 import { timeDifference } from '../../../utils/Converter/time';
@@ -92,6 +93,8 @@ const ItemOneTap = memo(
         return <OneTap />;
       } else if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
         return <ValueChange />;
+      } else if (type === AUTOMATE_TYPE.EVENT) {
+        return <Event />;
       } else {
         return <Schedule />;
       }

package/src/commons/SubUnit/ShortDetail.js

@@ -19,7 +19,12 @@ const { standardizeWidth, standardizeHeight } = standardizeCameraScreenSize(
   Device.screenWidth - 32
 );
 
-const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
+const ShortDetailSubUnit = ({
+  unit,
+  station,
+  isNetworkConnected,
+  isGGHomeConnected,
+}) => {
   const t = useTranslations();
   const isFocused = useIsFocused();
   const { navigate } = useNavigation();
@@ -146,6 +151,7 @@ const ShortDetailSubUnit = ({ unit, station, isGGHomeConnected }) => {
               sensor={sensor}
               unit={unit}
               station={station}
+              isNetworkConnected={isNetworkConnected}
               isGGHomeConnected={isGGHomeConnected}
               status={sensorsStatus.find((s) => s.id === sensor.id)}
             />

package/src/commons/index.js

@@ -15,6 +15,7 @@ import MenuActionList from './MenuActionList';
 import RadioCircle from './RadioCircle';
 import { CircleButton } from './CircleButton';
 import HorizontalPicker from './HorizontalPicker';
+import FullLoading from './FullLoading';
 
 export {
   ButtonPopup,
@@ -34,4 +35,5 @@ export {
   RadioCircle,
   CircleButton,
   HorizontalPicker,
+  FullLoading,
 };

package/src/configs/API.js

@@ -25,6 +25,8 @@ const API = {
     MANAGE_UNIT: (id) => SCConfig.apiRoot + `/property_manager/units/${id}/`,
     CHIP_SCAN: (id) =>
       SCConfig.apiRoot + `/property_manager/units/${id}/chip_scan/`,
+    CHIP_SCAN_GET_WIFI_INFO: () =>
+      SCConfig.apiRoot + '/property_manager/units/chip_scan_get_wifi_info/',
     MANAGE_ACCESS: (id) =>
       SCConfig.apiRoot + `/property_manager/manage_access/${id}/`,
     AUTOMATE: (id) =>
@@ -53,6 +55,8 @@ const API = {
       SCConfig.apiRoot + '/property_manager/stations/check_chip_finalized/',
   },
   SENSOR: {
+    SENSOR_DETAIL: (id) =>
+      SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
     DISPLAY: (id) =>
       SCConfig.apiRoot + `/property_manager/sensors/${id}/display/`,
     DISPLAY_VALUES: (id) =>
@@ -82,10 +86,6 @@ const API = {
       `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/remove_from_favourites/`,
     DISPLAY_ACTIONS: (id) =>
       SCConfig.apiRoot + `/property_manager/sensors/${id}/display_actions/`,
-    RENAME_SENSOR: (id) =>
-      SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
-    REMOVE_SENSOR: (id) =>
-      SCConfig.apiRoot + `/property_manager/sensors/${id}/`,
     CHANGE_SUB_UNIT: (unit_id, station_id, id) =>
       SCConfig.apiRoot +
       `/property_manager/${unit_id}/sub_units/${station_id}/devices/${id}/change_sub_unit/`,

package/src/configs/Constants.js

@@ -3,6 +3,7 @@ import { RFValue } from 'react-native-responsive-fontsize';
 import OneTap from '../../assets/images/OneTap.svg';
 import ValueChange from '../../assets/images/ValueChange.svg';
 import Schedule from '../../assets/images/Schedule.svg';
+import Event from '../../assets/images/Event.svg';
 
 const X_WIDTH = 375;
 const X_HEIGHT = 812;
@@ -91,6 +92,7 @@ export const AUTOMATE_TYPE = {
   ONE_TAP: 'one_tap',
   VALUE_CHANGE: 'value_change',
   SCHEDULE: 'schedule',
+  EVENT: 'event',
   ONE_TAP_ONLY: 'one_tap_only',
   AUTOMATE: 'automate',
   AUTOMATION: 'automation',
@@ -128,6 +130,12 @@ export const AUTOMATES = {
     explanation: 'setup_the_schedule',
     icon: Schedule,
   },
+  event: {
+    value: AUTOMATE_TYPE.EVENT,
+    title: 'event',
+    explanation: 'setup_the_conditions',
+    icon: Event,
+  },
 };
 
 export const UNIT_TYPES = {
@@ -210,6 +218,7 @@ export const TESTID = {
   SUB_UNIT_STATION: 'SUB_UNIT_STATION',
   SUB_UNIT_SELECT_AUTOMATE_TYPE: 'SUB_UNIT_SELECT_AUTOMATE_TYPE',
   SUB_UNIT_TEXT_DROPDOWN: 'SUB_UNIT_TEXT_DROPDOWN',
+  SUB_UNIT_GO_DETAIL: 'SUB_UNIT_GO_DETAIL',
 
   // NavBar
   NAVBAR_ICON_BARS: 'NAVBAR_ICON_BARS',
@@ -339,6 +348,7 @@ export const TESTID = {
 
   // ADD SUB UNIT
   ADD_SUB_UNIT_BUTTON_CHOOSE_PHOTO: 'ADD_SUB_UNIT_BUTTON_CHOOSE_PHOTO',
+  ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION: 'ADD_SUB_UNIT_BUTTON_CHOOSE_LOCATION',
 
   SCANNING_RESPONSE_TITLE: 'SCANNING_RESPONSE_TITLE',
   SCANNING_RESPONSE_DESCRIPTION: 'SCANNING_RESPONSE_DESCRIPTION',
@@ -436,6 +446,7 @@ export const TESTID = {
   MANAGE_UNIT_LIST_EMERGENCY_CONTACT: 'MANAGE_UNIT_LIST_EMERGENCY_CONTACT',
   MANAGE_UNIT_DETAIL_LIST_CONTACT_BUTTON:
     'MANAGE_UNIT_DETAIL_LIST_CONTACT_BUTTON',
+  MANAGE_UNIT_GO_TO_SUBUNIT: 'MANAGE_UNIT_GO_TO_SUBUNIT',
 
   // Add Vehicle
   ADD_VEHICLE_TAKE_PHOTO: 'ADD_VEHICLE_TAKE_PHOTO',
@@ -632,9 +643,11 @@ export const NOTIFICATION_TYPES = {
   PARKING_COMPLETED_DUE_TO_CAR_LEAVE: 'PARKING_COMPLETED_DUE_TO_CAR_LEAVE',
   NOTIFY_INVITE_MEMBER: 'NOTIFY_INVITE_MEMBER',
   REMINDER: 'REMINDER',
+  NOTIFY_INDICATOR: 'NOTIFY_INDICATOR',
   NOTIFY_REMOVE_UNIT: 'NOTIFY_REMOVE_UNIT',
   NOTIFY_REMOVE_MEMBER: 'NOTIFY_REMOVE_MEMBER',
   NOTIFY_MEMBER_LEAVE_UNIT: 'NOTIFY_MEMBER_LEAVE_UNIT',
+  NOTIFY_RENAME_UNIT: 'NOTIFY_RENAME_UNIT',
 };
 
 export const ACTIVITY_LOG_TYPES = {

package/src/iot/RemoteControl/Internet.js

@@ -4,7 +4,13 @@ import { ToastBottomHelper } from '../../utils/Utils';
 import { axiosPost } from '../../utils/Apis/axios';
 import { API } from '../../configs';
 
-export const sendCommandOverInternet = async (sensor, action, data, source) => {
+export const sendCommandOverInternet = async (
+  sensor,
+  action,
+  data,
+  source,
+  actionName
+) => {
   if (data !== null) {
     if (Number.isInteger(data)) {
       data = data.toString(16).toUpperCase();
@@ -15,6 +21,7 @@ export const sendCommandOverInternet = async (sensor, action, data, source) => {
     key: action.key,
     data,
     source,
+    action_name: actionName,
   });
   if (success) {
     ToastBottomHelper.success(t('Command is sent to device via internet'));

package/src/iot/RemoteControl/index.js

@@ -12,7 +12,8 @@ export const sendRemoteCommand = async (
   sensor,
   action,
   data,
-  userId = null
+  userId = null,
+  actionName
 ) => {
   // No action, raise not authorized
   let result = false;
@@ -31,7 +32,8 @@ export const sendRemoteCommand = async (
           sensor,
           action,
           data,
-          'bluetooth'
+          'bluetooth',
+          actionName
         );
       } else {
         throw err;

package/src/screens/AddCommon/SelectSubUnit.js

@@ -24,6 +24,8 @@ const AddCommonSelectSubUnit = ({ route }) => {
     listSelectDevice,
     smart_account_id,
     smart_account_id_from_backend,
+    username,
+    brand,
   } = route.params;
   const [selectedIndex, setSelectedIndex] = useState(-1);
   const [unit, setUnit] = useState([]);
@@ -86,6 +88,8 @@ const AddCommonSelectSubUnit = ({ route }) => {
           smart_account_id: smart_account_id,
           unit_id: unit_id,
           smart_account_id_from_backend: smart_account_id_from_backend,
+          username,
+          brand,
         });
         break;
       case 'AddVconnexDevice':
@@ -115,6 +119,8 @@ const AddCommonSelectSubUnit = ({ route }) => {
     smart_account_id,
     unit_id,
     smart_account_id_from_backend,
+    username,
+    brand,
   ]);
 
   const handleSelectIndex = (index) => {