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

package/package.json

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

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

@@ -80,4 +80,16 @@ describe('Test SetupGeneratePasscode', () => {
     const wheelDateTimePicker = instance.findAllByType(WheelDateTimePicker);
     expect(wheelDateTimePicker).toHaveLength(3);
   });
+
+  it('Test onTimePicked', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const instance = tree.root;
+    const wheelDateTimePickers = instance.findAllByType(WheelDateTimePicker);
+    await act(async () => {
+      wheelDateTimePickers[0].props.onPicked(new Date(2022, 10, 10));
+    });
+    expect(wheelDateTimePickers[0].props.defaultValue).toBe(1668038400000);
+  });
 });

package/src/commons/ActionGroup/OptionsDropdownActionTemplate.js

@@ -17,10 +17,10 @@ import SvgCurrentState from '../../../assets/images/Device/current-state.svg';
 import SvgWindStrength from '../../../assets/images/Device/wind-strength.svg';
 
 function getOptionValue(option, allow_config_store_value) {
-  if (option.value_text && !allow_config_store_value) {
-    return option.value_text;
+  if (option?.value_text && !allow_config_store_value) {
+    return option?.value_text;
   }
-  return option.value_int;
+  return option?.value_int;
 }
 
 const OptionsDropdownActionTemplate = ({
@@ -29,7 +29,7 @@ const OptionsDropdownActionTemplate = ({
   sensor = {},
 }) => {
   const t = useTranslations();
-  const { configuration = {}, title } = actionGroup;
+  const { configuration = {}, title = '' } = actionGroup;
   const {
     action_data,
     options = [],
@@ -105,7 +105,7 @@ const OptionsDropdownActionTemplate = ({
     if (!config) {
       return t('not_available');
     }
-    return selectedOption.text;
+    return selectedOption?.text;
   }, [config, selectedOption?.text, t]);
 
   const iconSvg = useMemo(() => {
@@ -155,7 +155,7 @@ const OptionsDropdownActionTemplate = ({
       <AlertAction
         visible={stateAlert.visible}
         hideModal={hideAlertAction}
-        title={stateAlert.title}
+        title={title}
         message={stateAlert.message}
         leftButtonTitle={stateAlert.leftButton}
         leftButtonClick={hideAlertAction}
@@ -190,7 +190,7 @@ const OptionsDropdownActionTemplate = ({
                     setSelectedIndex(index);
                   }}
                 >
-                  <Text style={styles.text}>{item.text}</Text>
+                  <Text style={styles.text}>{item?.text}</Text>
                 </TouchableOpacity>
               </View>
             ))}

package/src/commons/ActionGroup/SliderRangeTemplate.js

@@ -30,19 +30,14 @@ const SliderRangeTemplate = memo(({ actionGroup = {}, doAction, sensor }) => {
   const [valueBrightness, setValueBrightness] = useState(getPercent());
   const [isFirstTime, setIsFirstTime] = useState(true);
 
-  // TODO Thinh: remove action_brightness_data
   const onChangeBrightness = useCallback(
     async (value) => {
       await doAction(
-        configuration?.action_brightness_data || configuration?.action_data,
+        configuration?.action_data,
         JSON.stringify({ value_brness: value, value: value })
       );
     },
-    [
-      configuration?.action_brightness_data,
-      configuration?.action_data,
-      doAction,
-    ]
+    [configuration?.action_data, doAction]
   );
 
   useEffect(() => {

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

@@ -250,7 +250,7 @@ describe('Test NumberUpDownActionTemplate', () => {
     });
 
     const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('24 *C'); // TODO should 24, configValues make changes again
+    expect(text.props.children).toEqual('24 *C');
   });
 
   it('action up with allow_config_store_value false', async () => {
@@ -276,7 +276,7 @@ describe('Test NumberUpDownActionTemplate', () => {
     });
 
     const text = instance.findByType(Text);
-    expect(text.props.children).toEqual('26 *C'); // TODO should 26, configValues make changes again
+    expect(text.props.children).toEqual('26 *C');
   });
 
   it('action down limit ', async () => {

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

@@ -66,26 +66,6 @@ describe('Test SliderRangeTemplate', () => {
     );
   });
 
-  it('render template SliderRangeTemplate with data backward compatible', async () => {
-    actionGroup.configuration.action_data = undefined;
-    actionGroup.configuration.action_brightness_data = action_data;
-    useConfigGlobalState.mockImplementation(() => [{}, jest.fn()]);
-    const sensor = { is_managed_by_backend: true, name: 'Sensor' };
-    await act(async () => {
-      wrapper = await create(wrapComponent(actionGroup, mockDoAction, sensor));
-    });
-    const instance = wrapper.root;
-    const silderRange = instance.findAllByType(SliderRange);
-    expect(silderRange).toHaveLength(1);
-    await act(async () => {
-      await silderRange[0].props.onSlidingComplete(50);
-    });
-    expect(mockDoAction).toHaveBeenCalledWith(
-      action_data,
-      JSON.stringify({ value_brness: 50, value: 50 })
-    );
-  });
-
   it('render template SliderRangeTemplate with config value not null', async () => {
     useConfigGlobalState.mockImplementation(() => [
       {

package/src/commons/ActionGroup/hooks/useDropdownAction.js

@@ -5,7 +5,6 @@ export const useDropdownAction = () => {
   const t = useTranslations();
   const [stateAlert, setStateAlert] = useState({
     visible: false,
-    title: 'Fan Speed',
     message: '',
     leftButton: t('cancel'),
     rightButton: t('done'),

package/src/commons/Device/FlatListItems.js

@@ -49,7 +49,7 @@ const FlatListItems = memo(({ data, style, title, offsetTitle }) => {
         key={item?.id}
         standard={item.standard}
         value={item.value}
-        measure={item.measure}
+        measure={item.unit}
         evaluate={item.evaluate}
         style={styles.boxStatus}
         descriptionScreen={Routes.TDSGuide}

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

@@ -17,7 +17,7 @@ const ListQualityIndicator = ({ data, style }) => {
         standard={item.standard}
         value={getValue}
         evaluate={item.evaluate}
-        measure={item.measure}
+        measure={item.unit}
       />
     );
   }, []);

package/src/commons/SelectGateway/index.js

@@ -122,7 +122,7 @@ const SelectGateway = ({
           onRightClick={onRightClickNext}
           accessibilityLabelPrefix={AccessibilityLabel.PREFIX.SELECT_UNIT}
         />
-        <ModalCustom // todo Huy - make reused component
+        <ModalCustom // todo Nhat - make reused component
           onBackButtonPress={goBack}
           isVisible={showPopupGuide}
           style={styles.modal}

package/src/configs/API.js

@@ -53,7 +53,7 @@ const API = {
   },
   DEVICE: {
     SENSOR_DETAIL: (id) => `/property_manager/sensors/${id}/`,
-    DISPLAY: (id) => `/property_manager/sensors/${id}/display/`,
+    DISPLAY: (id) => `/property_manager/devices/${id}/display/`,
     SIDE_MENU_DETAIL: (id, side_menu_id) =>
       `/property_manager/devices/${id}/display/side_menu/${side_menu_id}/`,
     DISPLAY_VALUES_V2: (id) =>

package/src/configs/Constants.js

@@ -260,6 +260,8 @@ export const NOTIFICATION_TYPES = {
   NOTIFY_REMOVE_SUB_UNIT: 'NOTIFY_REMOVE_SUB_UNIT',
   NOTIFY_REMOVE_DEVICE: 'NOTIFY_REMOVE_DEVICE',
   NOTIFY_EMERGENCY: 'NOTIFY_EMERGENCY',
+  NOTIFY_CHANGE_UNIT_OLD_OWNER: 'NOTIFY_CHANGE_UNIT_OLD_OWNER',
+  NOTIFY_CHANGE_UNIT_NEW_OWNER: 'NOTIFY_CHANGE_UNIT_NEW_OWNER',
   AIR_QUALITY: 'AIR_QUALITY',
   TURBIDITY: 'TURBIDITY',
   PH: 'PH',

package/src/configs/IOPinConstants.js

@@ -283,3 +283,36 @@ export const STM32_ANALOG_WRITE = [
   { key: '73', value: 'PB14' },
   { key: '74', value: 'PB4' },
 ];
+
+export const ESP8266_DIGITAL = [
+  { key: '0', value: 'GPIO 0 - D3' },
+  { key: '1', value: 'GPIO 1 - D10 - UART 0 TX' },
+  { key: '2', value: 'GPIO 2 - D4 - UART 0 TX2' },
+  { key: '3', value: 'GPIO 3 - D9 - UART 0 RX' },
+  { key: '4', value: 'GPIO 4 - D2' },
+  { key: '5', value: 'GPIO 5 - D1' },
+  { key: '12', value: 'GPIO 12 - D6' },
+  { key: '13', value: 'GPIO 13 - D7 - UART 1 RX' },
+  { key: '14', value: 'GPIO 14 - D5' },
+  { key: '15', value: 'GPIO 15 - D8 - UART 1 TX' },
+  { key: '16', value: 'GPIO 16 - D0' },
+];
+
+export const ESP8266_ANALOG_READ = [{ key: '17', value: 'GPIO 17 - A0' }];
+
+export const ESP8266_ANALOG_WRITE = [
+  { key: '0', value: 'GPIO 0 - D3' },
+  { key: '1', value: 'GPIO 1 - D10 - UART 0 TX' },
+  { key: '2', value: 'GPIO 2 - D4 - UART 0 TX2' },
+  { key: '3', value: 'GPIO 3 - D9 - UART 0 RX' },
+  { key: '4', value: 'GPIO 4 - D2' },
+  { key: '5', value: 'GPIO 5 - D1' },
+  { key: '12', value: 'GPIO 12 - D6' },
+  { key: '13', value: 'GPIO 13 - D7 - UART 1 RX' },
+  { key: '14', value: 'GPIO 14 - D5' },
+  { key: '15', value: 'GPIO 15 - D8 - UART 1 TX' },
+];
+
+export const LANGUAGE = {
+  DEFAULT: 'vi',
+};

package/src/screens/AddNewAction/SelectAction.js

@@ -169,7 +169,7 @@ const SelectAction = memo(({ route }) => {
       Alert.alert('', t('choose_only_one'));
       return;
     }
-    if (isSelectSensor || isSetupEvent) {
+    if (isSelectSensor || sensorData?.length > 0) {
       await checkConditionToContinue();
     } else {
       if (automateId) {
@@ -441,7 +441,7 @@ const SelectAction = memo(({ route }) => {
               onSelectAction={handleOnSelectAction}
               accessibilityLabel={AccessibilityLabel.ACTION_ITEM}
             />
-            {/* TODO: Huy - refactor/combine with value_change case */}
+            {/* TODO: Nhat - refactor/combine with value_change case */}
             {!!sensorData &&
               sensorData.map((item) => {
                 const isHasValue = !!item?.value;

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

@@ -1,11 +1,11 @@
 export const getConfigControlFromDeviceDisplay = (deviceDisplay) => {
   const configIds = [];
-  deviceDisplay?.items.map((item) => {
+  (deviceDisplay?.items || []).map((item) => {
     if (item.type !== 'action') {
       return;
     }
-    const actionGroup = item.configuration;
-    const { configuration } = actionGroup;
+    const actionGroup = item?.configuration || {};
+    const { configuration = {} } = actionGroup;
 
     switch (actionGroup.template) {
       case 'on_off_button_action_template':
@@ -21,7 +21,7 @@ export const getConfigControlFromDeviceDisplay = (deviceDisplay) => {
         }
         break;
       case 'StatesGridActionTemplate':
-        configuration.options.forEach((option) => {
+        (configuration?.options || []).forEach((option) => {
           configIds.push(option.config);
         });
         break;

package/src/screens/Notification/__test__/NotificationItem.test.js

@@ -54,6 +54,7 @@ describe('test NotificationItem', () => {
     NOTIFICATION_TYPES.NOTIFY_MEMBER_LEAVE_UNIT,
     NOTIFICATION_TYPES.NOTIFY_REMOVE_SUB_UNIT,
     NOTIFICATION_TYPES.NOTIFY_REMOVE_DEVICE,
+    NOTIFICATION_TYPES.NOTIFY_CHANGE_UNIT_OLD_OWNER,
   ];
 
   for (const content_code of listCase2) {
@@ -76,6 +77,7 @@ describe('test NotificationItem', () => {
     NOTIFICATION_TYPES.NOTIFY_UPDATE_ADDRESS,
     NOTIFICATION_TYPES.NOTIFY_RENAME_SUB_UNIT,
     NOTIFICATION_TYPES.NOTIFY_INVITE_MEMBER,
+    NOTIFICATION_TYPES.NOTIFY_CHANGE_UNIT_NEW_OWNER,
   ];
 
   for (const content_code of listCaseUnitDetail) {

package/src/screens/Notification/components/NotificationItem.js

@@ -355,6 +355,29 @@ const NotificationItem = memo(({ item }) => {
           default:
             return null;
         }
+      case NOTIFICATION_TYPES.NOTIFY_CHANGE_UNIT_OLD_OWNER:
+        return {
+          content: customColorText(
+            t('text_notification_content_change_unit_for_old_owner')
+          ),
+          redirect: () => null,
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
+      case NOTIFICATION_TYPES.NOTIFY_CHANGE_UNIT_NEW_OWNER:
+        return {
+          content: customColorText(
+            t('text_notification_content_change_unit_for_new_owner')
+          ),
+          redirect: () => {
+            navigation.navigate(Routes.UnitStack, {
+              screen: Routes.UnitDetail,
+              params: {
+                unitId,
+              },
+            });
+          },
+          iconContent: <Image source={Images.logo} style={styles.logo} />,
+        };
       default:
         return null;
     }

package/src/screens/ScriptDetail/index.js

@@ -419,7 +419,7 @@ const ScriptDetail = ({ route }) => {
       [AUTOMATE_TYPE.EVENT, AUTOMATE_TYPE.EVENT_ACTION].includes(type)
     ) {
       const { action, end_device_name, config_name, sensor_type, value } =
-        automate?.event;
+        automate?.event || automate?.event_action || automate?.event_sensor;
       let textEvent = '';
       if (config_name) {
         const stateConditionData = STATE_VALUE_SENSOR_TYPES.find(

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

@@ -35,7 +35,11 @@ jest.mock('@react-navigation/native', () => {
 
 describe('Test Detail', () => {
   useRoute.mockReturnValue({
-    params: {},
+    params: {
+      item: {
+        id: 1,
+      },
+    },
   });
   let tree;
 
@@ -43,9 +47,9 @@ describe('Test Detail', () => {
     mock.onGet(API.DEV_MODE.DASHBOARD.GET_WIDGETS(1)).reply(200, [
       {
         id: 1,
-        type: 'camera',
+        type: 'value',
         configuration: {
-          uri: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
+          configs: [{ id: 1 }],
         },
       },
     ]);
@@ -81,8 +85,21 @@ describe('Test Detail', () => {
       await TouchableOpacities[1].props.onPress();
     });
     const menuActionMore = instance.findByType(MenuActionMore);
+    const mockDoAction = jest.fn();
+    const item = {
+      text: 'text',
+      doAction: mockDoAction,
+    };
+    await act(async () => {
+      await menuActionMore.props.onItemClick(item);
+    });
+    expect(mockDoAction).toBeCalled();
     const modalPopupCT = instance.findByType(ModalPopupCT);
     mock.onGet(API.DEV_MODE.DASHBOARD.DETAIL(1)).reply(200);
+    await act(async () => {
+      await menuActionMore.props.listMenuItem[0].doAction();
+    });
+    expect(mockNavigate).toHaveBeenCalled();
     await act(async () => {
       await menuActionMore.props.listMenuItem[3].doAction();
     });

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

@@ -690,6 +690,8 @@
   "text_notification_content_emergency": "The Emergency button has been activated at **unit_name**: **sub_unit_name**. Please check now!",
   "text_notification_content_emergency_resolve": "Emergency situation activated at **unit_name**: **sub_unit_name** has resolved.",
   "text_notification_content_invite_member": "**unit_owner_name** invited you to join **unit_name**.",
+  "text_notification_content_change_unit_for_old_owner": "Your ownership of **unit_name** has been assigned to **new_owner_name**.",
+  "text_notification_content_change_unit_for_new_owner": "You are now the owner of **unit_name**.",
   "this_spot_does_not_exsit": "This spot does not exist",
   "please_scan_again_or_contact_the_parking_manager": "Please scan again or contact the parking manager",
   "this_spot_does_not_support_to_scan": "This spot does not support to scan",

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

@@ -704,6 +704,8 @@
   "text_notification_content_emergency": "Một tình huống khẩn cấp vừa được kích hoạt tại **unit_name**: **sub_unit_name**. Vui lòng kiểm tra ngay!",
   "text_notification_content_emergency_resolve": "Tình huống khẩn cấp được kích hoạt tại **unit_name**: **sub_unit_name** đã được giải quyết.",
   "text_notification_content_invite_member": "**unit_owner_name** mời bạn đến địa điểm **unit_name**.",
+  "text_notification_content_change_unit_for_old_owner": "Quyền sở hữu **unit_name** của bạn đã được chỉ định cho **new_owner_name**.",
+  "text_notification_content_change_unit_for_new_owner": "Bạn hiện là chủ sở hữu của **unit_name**.",
   "this_spot_does_not_exsit": "Vị trí đỗ này không tồn tại",
   "please_scan_again_or_contact_the_parking_manager": "Vui lòng quét lại hoặc liên hệ với người quản lý bãi đậu xe",
   "this_spot_does_not_support_to_scan": "Vị trí đỗ này không hỗ trợ quét",

package/src/utils/Utils.js

@@ -18,6 +18,9 @@ import {
   WRITE_DIGITAL_PIN_MODE,
   WRITE_ANALOG_PIN_MODE,
   LANGUAGE,
+  ESP8266_DIGITAL,
+  ESP8266_ANALOG_READ,
+  ESP8266_ANALOG_WRITE,
 } from '../configs/IOPinConstants';
 
 export const setAxiosDefaultAuthToken = (token) => {
@@ -150,8 +153,8 @@ export const notImplemented = (t) => {
 };
 
 export const roundNumber = (value, round = 2) => {
-  if (!isNaN) {
-    return Math.round((value || 0) * 10 ** round) / 10 ** round;
+  if (typeof value === 'string') {
+    return Math.round((isNaN(value) ? 0 : value) * 10 ** round) / 10 ** round;
   }
   return value;
 };
@@ -168,6 +171,16 @@ export const PIN_MODE_MAPPING = {
 };
 
 export const PIN_MAPPING = {
+  esp8266: {
+    read: {
+      boolean: ESP8266_DIGITAL,
+      integer: ESP8266_ANALOG_READ,
+    },
+    write: {
+      boolean: ESP8266_DIGITAL,
+      integer: ESP8266_ANALOG_WRITE,
+    },
+  },
   esp32: {
     read: {
       boolean: ESP32_DIGITAL,

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

@@ -19,6 +19,7 @@ import {
   ToastBottomHelper,
   objectIds,
   notImplemented,
+  roundNumber,
 } from '../Utils';
 
 describe('Test utils', () => {
@@ -50,6 +51,9 @@ describe('Test utils', () => {
   it('test setAxiosDefaultLanguage', () => {
     setAxiosDefaultLanguage('en');
     expect(api.headers['Accept-Language']).toBe('en');
+
+    setAxiosDefaultLanguage();
+    expect(api.headers['Accept-Language']).toBe('vi');
   });
 
   it('test setAxiosDefaultAuthToken', () => {
@@ -134,6 +138,7 @@ describe('Test utils', () => {
       configIds: [],
     });
   });
+
   it('test objectIds with devices', async () => {
     const data = await objectIds([
       {
@@ -166,4 +171,14 @@ describe('Test utils', () => {
     });
     expect(mockTranslate).toBeCalledWith('feature_under_development');
   });
+
+  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(12.12);
+    expect(result).toBe(12.12);
+  });
 });