@eohjsc/react-native-smart-city 0.3.80 → 0.3.82

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

@@ -0,0 +1,34 @@
+import React from 'react';
+import renderer, { act } from 'react-test-renderer';
+
+import { EmergencyCountdown } from '../components/EmergencyCountdown';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import Text from '../../../commons/Text';
+
+const wrapComponent = (countUpStr, typeEmergency) => (
+  <SCProvider initState={mockSCStore({})}>
+    <EmergencyCountdown countUpStr={countUpStr} typeEmergency={typeEmergency} />
+  </SCProvider>
+);
+describe('Test EmergencyCountdown', () => {
+  let tree;
+  it(' EmergencyCountdown resolved_emergency', async () => {
+    await act(async () => {
+      tree = renderer.create(wrapComponent('stopCount', 'resolved_emergency'));
+    });
+    const instance = tree.root;
+    const texts = instance.findAllByType(Text);
+    expect(texts[1].props.children).toEqual('');
+  });
+  it(' EmergencyCountdown not resolved_emergency', async () => {
+    await act(async () => {
+      tree = renderer.create(
+        wrapComponent('stopCount', 'not_resolve_emergency')
+      );
+    });
+    const instance = tree.root;
+    const texts = instance.findAllByType(Text);
+    expect(texts[1].props.children).toEqual('stopCount');
+  });
+});

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

@@ -21,6 +21,7 @@ import { useSCContextSelector } from '../../../context';
 import { useRemoteControl } from '../../../hooks/IoT';
 import { useConfigGlobalState } from '../../../iot/states';
 import { useEvaluateValue } from '../hooks/useEvaluateValue';
+import ProgressBar from '../../../commons/Device/ProgressBar';
 
 export const SensorDisplayItem = ({
   item = {},
@@ -127,6 +128,8 @@ export const SensorDisplayItem = ({
           );
         case 'gauge':
           return <Anemometer data={getData(item)} item={item} />;
+        case 'progress_bar':
+          return <ProgressBar data={getData(item)} item={item} />;
         case 'compass':
           return <Compass data={getData(item)} />;
         case 'alert_status':

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

@@ -24,4 +24,26 @@ describe('test EmergencySetting', () => {
 
     expect(dropDownItem.length).toEqual(3);
   });
+  it('test render EmergencySetting onOpen', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const dropDownItem = instance.findAllByType(DropDownItem);
+    expect(dropDownItem[0].props.isOpen).toEqual(false);
+    await act(async () => {
+      dropDownItem[0].props.onOpen();
+    });
+  });
+  it('test render EmergencySetting onSelectItem', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const dropDownItem = instance.findAllByType(DropDownItem);
+    expect(dropDownItem[0].props.isOpen).toEqual(false);
+    await act(async () => {
+      dropDownItem[0].props.onSelectItem();
+    });
+  });
 });

package/src/screens/SyncLGDevice/AddLGDevice.js

@@ -71,10 +71,11 @@ const AddLGDevice = memo(({ route }) => {
     navigate(Routes.Dashboard);
   }, [backend_url, code, navigate, stationId, t]);
 
-  const stations = unit.stations.map((item) => ({
-    ...item,
-    title: item.name,
-  }));
+  const stations =
+    unit?.stations?.map((item) => ({
+      ...item,
+      title: item.name,
+    })) || [];
 
   return (
     <View style={styles.wrap}>

package/src/screens/Unit/Detail.js

@@ -143,16 +143,17 @@ const SubUnitList = ({
   }, [stationId, listStation]);
 
   useEffect(() => {
-    if (unit.stations) {
-      let listMenu = unit.stations.map((item, index) => ({
-        text: item.name,
-        station: item,
-        id: item.id,
-      }));
+    if (unit?.stations) {
+      let listMenu =
+        unit.stations?.map((item, index) => ({
+          text: item.name,
+          station: item,
+          id: item.id,
+        })) || [];
       setListMenuItem(listMenu);
       setListStation(listMenu.concat([{ text: '' }]));
     }
-  }, [unit.stations]);
+  }, [unit?.stations]);
 
   useEffect(() => {
     if (!unit?.stations || !unit.stations[indexStation]) {

package/src/screens/Unit/hook/useFavorites.js

@@ -11,7 +11,7 @@ export const useFavorites = (stations, automatesData) => {
 
   const favoriteDevices = useMemo(() => {
     return []
-      .concat(...stations.map((station) => station.sensors || []))
+      .concat(...stations?.map((station) => station.sensors || []))
       .filter((device) => favoriteDeviceIds.includes(device.id));
   }, [stations, favoriteDeviceIds]);
 

package/src/utils/Converter/__test__/timer.test.js

@@ -2,6 +2,13 @@ import { getDateData, getTitleFromTime, timeDifference } from '../time';
 
 describe('Test timer', () => {
   let result;
+  it('Test timeDifference when elapsed < msPerMinute and second<0', async () => {
+    result = await timeDifference(
+      new Date('2022-08-01T03:24:01'),
+      new Date('2022-08-01T03:24:03')
+    );
+    expect(result).toBe('0 seconds ago');
+  });
   it('Test timeDifference when elapsed < msPerMinute and symbol=false', async () => {
     result = await timeDifference(
       new Date('2022-08-01T03:24:01'),

package/src/utils/Functions/preloadImages.js

@@ -25,7 +25,7 @@ export const preloadImagesFromUnits = async (units, storeKey) => {
       // eslint-disable-next-line promise/prefer-await-to-then
     ).then((results) => {
       const icons = results
-        .map((item) => item?.stations.map((i) => i?.background))
+        .map((item) => item?.stations?.map((i) => i?.background) || [])
         .flat()
         .filter(Boolean);
       FastImage.preload(

package/src/utils/I18n/translations/en.json

@@ -11,6 +11,7 @@
   "add_user_note": "Please note that your personal data including records of your control of the connected devices and services will be shared with other members in the same unit.",
   "add_user_invitation_sent": "Invitation sent",
   "cancel": "Cancel",
+  "max_value": "Max value",
   "text_password": "Password",
   "text_sign_up": "Sign up",
   "text_sign_up_capitalize": "Sign up",

package/src/utils/I18n/translations/vi.json

@@ -717,6 +717,7 @@
   "command_homeassistant_ready": "Home Assistant kết nối thành công",
   "command_homeassistant_lost": "Home Assistant bị mất kết nối. Đang kết nối lại...",
   "confirm": "Xác nhận",
+  "max_value": "Giá trị lớn nhất",
   "pick_a_date": "Chọn ngày",
   "car_validate_warning": "Vui lòng nhập đúng định dạng biển số xe \nVD: %{example}",
   "are_you_sure_this_resolved": "Bạn có chắc tình huống khẩn cấp này đã được xử lý xong? Các thành viên thuộc địa điểm này cũng sẽ nhận được thông báo.",

package/src/utils/Utils.js

@@ -9,18 +9,15 @@ import {
   RASPBERRY_PI_DIGITAL,
   RASPBERRY_PI_ANALOG_WRITE,
   RASPBERRY_PI_ANALOG_READ,
-  STM32_DIGITAL_READ,
-  STM32_ANALOG_READ,
-  STM32_DIGITAL_WRITE,
-  STM32_ANALOG_WRITE,
+  ESP8266_DIGITAL,
+  ESP8266_ANALOG_READ,
+  ESP8266_ANALOG_WRITE,
+  STM32_PIN,
   READ_DIGITAL_PIN_MODE,
   READ_ANALOG_PIN_MODE,
   WRITE_DIGITAL_PIN_MODE,
   WRITE_ANALOG_PIN_MODE,
   LANGUAGE,
-  ESP8266_DIGITAL,
-  ESP8266_ANALOG_READ,
-  ESP8266_ANALOG_WRITE,
 } from '../configs/IOPinConstants';
 
 export const setAxiosDefaultAuthToken = (token) => {
@@ -154,7 +151,11 @@ export const notImplemented = (t) => {
 
 export const roundNumber = (value, round = 2) => {
   if (typeof value === 'string') {
-    return Math.round((isNaN(value) ? 0 : value) * 10 ** round) / 10 ** round;
+    const temp = value.split(' ');
+    return (
+      Math.round((isNaN(temp[0]) ? 0 : temp[0]) * 10 ** round) / 10 ** round +
+      ` ${temp[1] || ''}`
+    );
   }
   return value;
 };
@@ -193,12 +194,22 @@ export const PIN_MAPPING = {
   },
   stm32: {
     read: {
-      boolean: STM32_DIGITAL_READ,
-      integer: STM32_ANALOG_READ,
+      boolean: STM32_PIN,
+      integer: STM32_PIN,
+    },
+    write: {
+      boolean: STM32_PIN,
+      integer: STM32_PIN,
+    },
+  },
+  stm32_wifi: {
+    read: {
+      boolean: STM32_PIN,
+      integer: STM32_PIN,
     },
     write: {
-      boolean: STM32_DIGITAL_WRITE,
-      integer: STM32_ANALOG_WRITE,
+      boolean: STM32_PIN,
+      integer: STM32_PIN,
     },
   },
   raspberry_pi: {

package/src/utils/__test__/Utils.test.js

@@ -174,10 +174,10 @@ describe('Test utils', () => {
 
   it('Test roundNumber', async () => {
     let result;
-    result = await roundNumber('abc');
-    expect(result).toBe(0);
-    result = await roundNumber('123.123');
-    expect(result).toBe(123.12);
+    result = await roundNumber('NaN kwh');
+    expect(result).toBe('0 kwh');
+    result = await roundNumber('123.123 kwh');
+    expect(result).toBe('123.12 kwh');
     result = await roundNumber(12.12);
     expect(result).toBe(12.12);
   });