@eohjsc/react-native-smart-city 0.2.82 → 0.2.83

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/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/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/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/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/configs/API.js

@@ -53,6 +53,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 +84,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

@@ -340,6 +340,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',
@@ -634,6 +635,7 @@ 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',

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/Device/EditDevice/__test__/EditDevice.test.js

@@ -90,7 +90,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.patch).toHaveBeenCalledWith(API.SENSOR.RENAME_SENSOR(1), {
+    expect(axios.patch).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1), {
       name: 'new_name',
     });
     expect(alertAction.props.visible).toBeFalsy();
@@ -119,7 +119,7 @@ describe('Test EditDevice', () => {
     await act(async () => {
       await alertAction.props.rightButtonClick();
     });
-    expect(axios.delete).toHaveBeenCalledWith(API.SENSOR.REMOVE_SENSOR(1));
+    expect(axios.delete).toHaveBeenCalledWith(API.SENSOR.SENSOR_DETAIL(1));
     expect(alertAction.props.visible).toBeFalsy();
     expect(mockPop).toHaveBeenCalled();
   });

package/src/screens/Device/EditDevice/index.js

@@ -29,7 +29,7 @@ const EditDevice = memo(() => {
     useEditDevice();
   const renameSensor = useCallback(async () => {
     const { success, data } = await axiosPatch(
-      API.SENSOR.RENAME_SENSOR(sensor?.id),
+      API.SENSOR.SENSOR_DETAIL(sensor?.id),
       {
         name: inputName,
       }
@@ -53,7 +53,7 @@ const EditDevice = memo(() => {
 
   const deleteSensor = useCallback(async () => {
     hideAlertAction();
-    const { success } = await axiosDelete(API.SENSOR.REMOVE_SENSOR(sensor?.id));
+    const { success } = await axiosDelete(API.SENSOR.SENSOR_DETAIL(sensor?.id));
 
     if (success) {
       navigation.pop(2);

package/src/screens/Device/__test__/detail.test.js

@@ -93,7 +93,7 @@ describe('test DeviceDetail', () => {
   beforeEach(() => {
     route = {
       params: {
-        unit: {
+        unitData: {
           id: 1,
           name: 'Unit name',
           address: '298 Dien Bien Phu',
@@ -105,10 +105,11 @@ describe('test DeviceDetail', () => {
           id: 2,
           name: 'Station name',
         },
-        sensor: {
+        sensorData: {
           id: 1,
           is_managed_by_backend: true,
           station: { id: 2, name: 'Station name' },
+          name: 'Sensor name',
         },
         title: 'Button',
       },
@@ -252,7 +253,9 @@ describe('test DeviceDetail', () => {
     });
     expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
       key: responseDisplay.data.items[1].configuration.configuration.action1,
+      data: null,
       source: 'internet',
+      action_name: undefined,
     });
 
     const button2 = instance.find(
@@ -263,7 +266,9 @@ describe('test DeviceDetail', () => {
     });
     expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
       key: responseDisplay.data.items[1].configuration.configuration.action2,
+      data: null,
       source: 'internet',
+      action_name: undefined,
     });
 
     const button3 = instance.find(
@@ -274,7 +279,9 @@ describe('test DeviceDetail', () => {
     });
     expect(axios.post).toHaveBeenCalledWith(API.SENSOR.QUICK_ACTION(1), {
       key: responseDisplay.data.items[1].configuration.configuration.action3,
+      data: null,
       source: 'internet',
+      action_name: undefined,
     });
   });
 
@@ -628,7 +635,7 @@ describe('test DeviceDetail', () => {
   });
 
   test('not fetch value if not managed by backend', async () => {
-    route.params.sensor.is_managed_by_backend = false;
+    route.params.sensorData.is_managed_by_backend = false;
 
     await act(async () => {
       tree = await create(wrapComponent(account, route));
@@ -638,7 +645,7 @@ describe('test DeviceDetail', () => {
   });
 
   test('render CurrentRainSensor but is other device', async () => {
-    route.params.sensor.is_other_device = true;
+    route.params.sensorData.is_other_device = true;
     route.params.isGGHomeConnected = true;
 
     const responseDisplay = {
@@ -708,9 +715,9 @@ describe('test DeviceDetail', () => {
   });
 
   test('Add device to Favourites', async () => {
-    const unit_id = route.params.unit.id;
+    const unit_id = route.params.unitData.id;
     const station_id = route.params.station.id;
-    const sensor = route.params.sensor;
+    const sensor = route.params.sensorData;
     sensor.is_favourite = false;
 
     await act(async () => {
@@ -736,9 +743,9 @@ describe('test DeviceDetail', () => {
   });
 
   test('Remove device from Favourites', async () => {
-    const unit_id = route.params.unit.id;
+    const unit_id = route.params.unitData.id;
     const station_id = route.params.station.id;
-    const sensor = route.params.sensor;
+    const sensor = route.params.sensorData;
     sensor.is_favourite = true;
 
     await act(async () => {
@@ -810,12 +817,12 @@ describe('test DeviceDetail', () => {
       await menu.props.onItemClick(gotoActivityLog);
     });
     expect(mockedNavigate).toHaveBeenCalledWith(Routes.ActivityLog, {
-      id: route.params.sensor.id,
+      id: route.params.sensorData.id,
       type: 'action',
-      share: route.params.unit,
+      share: route.params.unitData,
       filterEnabled: {
         date: true,
-        user: Boolean(route.params.unit.id),
+        user: Boolean(route.params.unitData.id),
       },
     });
   });

package/src/screens/Device/components/SensorConnectStatusViewHeader.js

@@ -3,7 +3,7 @@ import { ConnectedViewHeader, DisconnectedView } from '../../../commons/Device';
 import { DEVICE_TYPE } from '../../../configs/Constants';
 
 export const SensorConnectStatusViewHeader = (props) => {
-  if (!!props.sensor && !props.sensor.is_other_device) {
+  if (!!props.sensor && !props.sensor?.is_other_device) {
     if (props.connected) {
       return (
         <>
@@ -31,7 +31,7 @@ export const SensorConnectStatusViewHeader = (props) => {
       return <DisconnectedView sensor={props.sensor} />;
     }
   } else {
-    if (props.sensor.device_type === DEVICE_TYPE.LG_THINQ) {
+    if (props.sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
       return (
         <>
           <ConnectedViewHeader lastUpdated={props.lastUpdated} />

package/src/screens/Device/components/SensorDisplayItem.js

@@ -40,8 +40,8 @@ export const SensorDisplayItem = ({
   const t = useTranslations();
   const userId = useSCContextSelector((state) => state.auth.account.user.id);
   const doAction = useCallback(
-    (action, data) => {
-      sendRemoteCommand(sensor, action, data, userId);
+    (action, data, actionName) => {
+      sendRemoteCommand(sensor, action, data, userId, actionName);
     },
     [sensor, userId]
   );