@eohjsc/react-native-smart-city 0.3.53 → 0.3.54

package/src/screens/Notification/index.js

@@ -1,6 +1,7 @@
 import React, { memo, useMemo, useState, useCallback, useEffect } from 'react';
 import { View, TouchableOpacity } from 'react-native';
 import { Icon } from '@ant-design/react-native';
+import { useFocusEffect } from '@react-navigation/native';
 
 import styles from './styles/indexStyles';
 import { API, Colors } from '../../configs';
@@ -59,10 +60,12 @@ const Notification = memo(() => {
     }
   }, []);
 
-  useEffect(() => {
-    fetchNotifications(1);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  useFocusEffect(
+    useCallback(() => {
+      fetchNotifications(1);
+      // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [])
+  );
 
   const handleOnLoadMore = useCallback(() => {
     page += 1;

package/src/screens/Template/EditTemplate.js

@@ -88,7 +88,7 @@ const EditTemplate = () => {
   return (
     <View style={styles.wrap}>
       <HeaderCustom
-        title={t('edit_template')}
+        title={t('edit_dashboard')}
         wrapTitleStyle={styles.wrapTitleStyle}
         iconLeft={Images.close}
         iconBackStyle={styles.iconBackStyle}

package/src/screens/Template/Styles/indexStyles.js

@@ -15,6 +15,6 @@ export default StyleSheet.create({
   },
 
   contentContainerStyle: {
-    flex: 1,
+    height: 'auto',
   },
 });

package/src/screens/Template/detail.js

@@ -19,6 +19,7 @@ import t from '../../hooks/Common/useTranslations';
 import Routes from '../../utils/Route';
 import { SensorDisplayItem } from '../Device/components/SensorDisplayItem';
 import { axiosGet } from '../../utils/Apis/axios';
+import { watchMultiConfigs } from '../../iot/Monitor';
 
 const TemplateDetail = () => {
   const refMenuAction = useRef();
@@ -30,6 +31,23 @@ const TemplateDetail = () => {
   const [data, setData] = useState([]);
   const [isLoading, setIsLoading] = useState(true);
 
+  const listIds = useMemo(() => {
+    const configIds = [];
+    // eslint-disable-next-line no-shadow
+    data.forEach((item) => {
+      switch (item.type) {
+        case 'value':
+          (item?.configuration?.configs || []).forEach((config) => {
+            configIds.push(config.id);
+          });
+          break;
+        default:
+          configIds.push(item?.configuration?.configuration?.config);
+      }
+    });
+    return configIds;
+  }, [data]);
+
   // eslint-disable-next-line no-shadow
   const onItemClick = useCallback((item) => {
     item.doAction();
@@ -67,7 +85,7 @@ const TemplateDetail = () => {
   const listMenuItem = useMemo(
     () => [
       {
-        text: t('edit_template'),
+        text: t('edit_dashboard'),
         doAction: goToDetail(Routes.EditTemplate, { setData, data }),
       },
       {
@@ -79,7 +97,7 @@ const TemplateDetail = () => {
         doAction: goToDetail(Routes.GatewayList),
       },
       {
-        text: t('delete_template'),
+        text: t('delete_dashboard'),
         doAction: goToDetail(Routes.GatewayList),
         textStyle: { color: Colors.Red },
       },
@@ -114,6 +132,10 @@ const TemplateDetail = () => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  useEffect(() => {
+    listIds.length && watchMultiConfigs(listIds);
+  }, [listIds]);
+
   return (
     <View style={styles.wrap}>
       <WrapHeaderScrollable
@@ -121,6 +143,7 @@ const TemplateDetail = () => {
         headerAniStyle={styles.headerAniStyle}
         rightComponent={rightComponent}
         onGoBack={goBack}
+        onRefresh={getWidgets}
       >
         {!isLoading && !data?.length
           ? renderEmpty
@@ -133,6 +156,7 @@ const TemplateDetail = () => {
                   offsetTitle={'offsetTitle'}
                   setOffsetTitle={'setOffsetTitle'}
                   maxValue={100}
+                  sensor={item}
                 />
               );
             })}

package/src/screens/Template/index.js

@@ -71,7 +71,7 @@ const Template = () => {
   return (
     <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
       <View style={styles.wrap}>
-        <Label name={t('template')} />
+        <Label name={t('dashboard')} />
         <Search onSearch={onSearch} />
         <FlatList
           contentContainerStyle={styles.contentContainerStyle}

package/src/screens/Unit/MoreMenu.js

@@ -4,65 +4,63 @@ import Routes from '../../utils/Route';
 import { useNavigation } from '@react-navigation/native';
 import { MenuActionMore } from '../../commons';
 
-const MoreMenu = memo(
-  ({
-    unit,
-    isOwner,
-    hidePopover,
-    childRef,
-    showingPopover,
-    idLabelPopover,
-    idLabelScrollView,
-    idLabelItem,
-  }) => {
-    const t = useTranslations();
-    const navigation = useNavigation();
+const MoreMenu = ({
+  unit,
+  isOwner,
+  hidePopover,
+  childRef,
+  showingPopover,
+  idLabelPopover,
+  idLabelScrollView,
+  idLabelItem,
+}) => {
+  const t = useTranslations();
+  const navigation = useNavigation();
 
-    const onItemClick = useCallback(
-      ({ route: routeName, data }) => {
-        hidePopover();
-        routeName && navigation.navigate(routeName, data);
-      },
-      [hidePopover, navigation]
-    );
+  const onItemClick = useCallback(
+    ({ route: routeName, data }) => {
+      hidePopover();
+      routeName && navigation.navigate(routeName, data);
+    },
+    [hidePopover, navigation]
+  );
 
-    const listMenuItem = useMemo(() => {
-      const RouteManageUnit = {
-        id: 'mange-unit',
-        route: Routes.ManageUnit,
-        text: t('manage_unit'),
-        data: { unitId: unit.id, unit },
-      };
-      const RouteUnitMemberList = {
-        id: 'unit-member',
-        route: Routes.UnitMemberList,
-        text: t('members'),
-        data: { unitId: unit.id, unit },
-      };
-      const ListSmartAccount = {
-        id: 'smart-account',
-        route: Routes.ListSmartAccount,
-        text: t('smart_account'),
-        data: { unitId: unit.id, unit },
-      };
-      return isOwner
-        ? [RouteManageUnit, RouteUnitMemberList, ListSmartAccount]
-        : [RouteUnitMemberList];
-    }, [t, unit, isOwner]);
+  const listMenuItem = useMemo(() => {
+    const RouteManageUnit = {
+      id: 'mange-unit',
+      route: Routes.ManageUnit,
+      text: t('manage_unit'),
+      data: { unitId: unit?.id, unit },
+    };
+    const RouteUnitMemberList = {
+      id: 'unit-member',
+      route: Routes.UnitMemberList,
+      text: t('members'),
+      data: { unitId: unit?.id, unit },
+    };
+    const ListSmartAccount = {
+      id: 'smart-account',
+      route: Routes.ListSmartAccount,
+      text: t('smart_account'),
+      data: { unitId: unit?.id, unit },
+    };
+    return isOwner
+      ? [RouteManageUnit, RouteUnitMemberList, ListSmartAccount]
+      : [RouteUnitMemberList];
+  }, [t, unit, isOwner]);
 
-    return (
-      <MenuActionMore
-        isVisible={showingPopover}
-        hideMore={hidePopover}
-        listMenuItem={listMenuItem}
-        childRef={childRef}
-        onItemClick={onItemClick}
-        idLabelPopover={idLabelPopover}
-        idLabelScrollView={idLabelScrollView}
-        idLabelItem={idLabelItem}
-      />
-    );
-  }
-);
+  return (
+    <MenuActionMore
+      isVisible={showingPopover}
+      hideMore={hidePopover}
+      listMenuItem={listMenuItem}
+      childRef={childRef}
+      onItemClick={onItemClick}
+      idLabelPopover={idLabelPopover}
+      idLabelScrollView={idLabelScrollView}
+      idLabelItem={idLabelItem}
+    />
+  );
+};
 
-export default MoreMenu;
+export default memo(MoreMenu);

package/src/screens/Unit/__test__/MoreMenu.test.js

@@ -0,0 +1,59 @@
+import React from 'react';
+import { act, create } from 'react-test-renderer';
+import { MenuActionMore } from '../../../commons';
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import MoreMenu from '../MoreMenu';
+
+const mockHidePopover = jest.fn();
+
+const mockNavigate = jest.fn();
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      navigate: mockNavigate,
+    }),
+  };
+});
+
+const wrapComponent = (showingPopover) => (
+  <SCProvider initState={mockSCStore({})}>
+    <MoreMenu showingPopover={showingPopover} hidePopover={mockHidePopover} />
+  </SCProvider>
+);
+
+describe('Test MoreMenu', () => {
+  let tree;
+
+  it('Test render', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent());
+    });
+    const menuActionMore = tree.root.findByType(MenuActionMore);
+    expect(menuActionMore.props.isVisible).toBeFalsy();
+  });
+
+  it('Test show menu then hide it', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(true));
+    });
+    const menuActionMore = tree.root.findByType(MenuActionMore);
+    await act(async () => {
+      await menuActionMore.props.hideMore();
+    });
+    expect(mockHidePopover).toBeCalled();
+  });
+
+  it('Test onItemClick', async () => {
+    await act(async () => {
+      tree = await create(wrapComponent(true));
+    });
+    const menuActionMore = tree.root.findByType(MenuActionMore);
+    await act(async () => {
+      await menuActionMore.props.onItemClick({ route: 'DeviceDetail' });
+    });
+    expect(mockHidePopover).toBeCalled();
+    expect(mockNavigate).toBeCalledWith('DeviceDetail', undefined);
+  });
+});

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

@@ -43,14 +43,17 @@ export const useUnitConnectRemoteDevices = (unit) => {
   );
 
   useEffect(() => {
-    if (unit?.remote_control_options?.bluetooth && isBluetoothEnabled) {
+    if (unit?.remote_control_options?.bluetooth?.length && isBluetoothEnabled) {
       bluetoothScanDevices(unit.remote_control_options.bluetooth);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [unit, isBluetoothEnabled, bluetoothPermGranted]);
 
   useEffect(() => {
-    if (unit?.remote_control_options?.googlehome && isNetworkConnected) {
+    if (
+      unit?.remote_control_options?.googlehome?.length &&
+      isNetworkConnected
+    ) {
       (async () => {
         await connectHomeAssistant(unit.remote_control_options.googlehome);
       })();
@@ -59,7 +62,7 @@ export const useUnitConnectRemoteDevices = (unit) => {
   }, [unit, isNetworkConnected]);
 
   useEffect(() => {
-    if (unit?.remote_control_options?.lg_thinq) {
+    if (unit?.remote_control_options?.lg_thinq?.length) {
       (async () => {
         await handleLgThinqConnect(unit.remote_control_options.lg_thinq);
       })();

package/src/screens/UnitSummary/components/RunningDevices/__test__/index.test.js

@@ -52,7 +52,13 @@ describe('test RunningDevices', () => {
       let tree;
       let unit = {
         remote_control_options: {
-          googlehome: true,
+          googlehome: [
+            {
+              config_maps: [],
+              auth: {},
+              chip_id: 1,
+            },
+          ],
         },
       };
       let summaryDetail = {

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

@@ -684,7 +684,7 @@
   "text_notification_content_member_leave_unit": "**member_name**  has left **unit_name**.",
   "text_notification_content_rename_unit": "Unit **old_unit_name** has been renamed to **new_unit_name** by **owner_name**.",
   "text_notification_content_divice_disconnect": "**device_name** at **unit_name**: **sub_unit_name** has been disconnected. Please check and reconnect.",
-  "text_notification_content_rename_sub_unit": "Sub-unit **old_sub_unit_name**: **unit_name** has been renamed to **new_sub_unit_name** by **unti_owner_name**.",
+  "text_notification_content_rename_sub_unit": "Sub-unit **old_sub_unit_name**: **unit_name** has been renamed to **new_sub_unit_name** by **unit_owner_name**.",
   "text_notification_content_remove_sub_unit": "Sub-unit **sub_unit_name** has been removed from **unit_name** by **unit_owner_name**.",
   "text_notification_content_remove_device": "Device **device_name** has been removed from **unit_name** by **unit_owner_name**.",
   "text_notification_content_update_address": "New address of **unit_name** has been updated by **unit_owner_name** to **unit_address**.",
@@ -991,7 +991,7 @@
   "create_contact_success": "Create contact success!",
   "can_not_login_to_current_ssid":"Can't login to current SSID",
   "confirm_password_not_match": "Confirm password does not match",
-  "templates": "Templates",
+  "dashboard": "Dashboard",
   "template": "Template",
   "gateways": "Gateways",
   "help": "Help",
@@ -999,20 +999,20 @@
   "exit_dev_mode": "Exit developer mode",
   "developer_mode": "Developer Mode",
   "what_are_you_looking_for": "What are you looking for?",
-  "no_template_yet": "No Template yet",
-  "add_your_template": "Add your template at web app",
-  "edit_template": "Edit template",
+  "no_dashboard_yet": "No Dashboard yet",
+  "add_your_dashboard": "Add your dashboard at web app",
+  "edit_dashboard": "Edit dashboard",
   "no_gateway_yet": "No Gateway yet",
   "you_dont_have_any_gateway": "You don't have any gateway",
   "gateway_information": "Gateway information",
   "reboot": "Reboot",
   "information": "Information",
   "gateway_list": "Gateway list",
-  "delete_template": "Delete template",
-  "template_name": "Template name",
+  "delete_dashboard": "Delete dashboard",
+  "dashboard_name": "Dashboard name",
   "add_widget": "Add widget",
   "no_widgets": "No Widgets",
-  "add_your_widget": "Add your widget in dashboard template",
+  "add_your_widget": "Add your widget in dashboard",
   "label": "Label",
   "choose_type_of_device": "Choose Type of Device",
   "central_controller": "Central controller",

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

@@ -699,7 +699,7 @@
   "text_notification_content_member_leave_unit": "**member_name** vừa rời khỏi **unit_name**.",
   "text_notification_content_rename_unit": "Địa điểm **old_unit_name** vừa được đổi tên thành **new_unit_name** bởi **owner_name**.",
   "text_notification_content_divice_disconnect": "**device_name** tại **unit_name**: **sub_unit_name** vừa bị mất kết nối. Vui lòng kiểm tra và kết nối lại.",
-  "text_notification_content_rename_sub_unit": "Khu vực **old_sub_unit_name**: **unit_name** vừa được đổi tên thành **new_sub_unit_name** bởi **unti_owner_name**.",
+  "text_notification_content_rename_sub_unit": "Khu vực **old_sub_unit_name**: **unit_name** vừa được đổi tên thành **new_sub_unit_name** bởi **unit_owner_name**.",
   "text_notification_content_remove_sub_unit": "Khu vực **sub_unit_name** vừa được xoá khỏi **%unit_name** bởi **unit_owner_name**.",
   "text_notification_content_remove_device": "Thiết bị **device_name** vừa được xoá khỏi **unit_name** bởi **unit_owner_name**.",
   "text_notification_content_update_address": "Địa chỉ mới của **unit_name** vừa được cập nhật bởi **unit_owner_name** thành **unit_address**.",
@@ -990,7 +990,7 @@
   "create_contact_success": "Tạo liên hệ thành công!",
   "can_not_login_to_current_ssid":"Không thể đăng nhập vào SSID hiện tại",
   "confirm_password_not_match": "Mật khẩu xác nhận không trùng khớp",
-  "templates": "Mẫu",
+  "dashboard": "Bảng điều khiển",
   "template": "Mẫu",
   "gateways": "Cổng vào",
   "help": "Hỗ trợ",
@@ -998,18 +998,19 @@
   "exit_dev_mode": "Thoát khỏi chế độ nhà phát triển",
   "developer_mode": "Chế độ nhà phát triển",
   "what_are_you_looking_for": "Bạn đang tìm kiếm cái gì?",
-  "no_template_yet": "Chưa có mẫu nào",
-  "add_your_template": "Thêm mẫu của bạn trên web",
-  "edit_template": "Chỉnh sửa mẫu",
+  "no_dashboard_yet": "Chưa có bảng điều khiển nào",
+  "add_your_dashboard": "Thêm bảng điều khiển của bạn trên web",
+  "edit_dashboard": "Chỉnh sửa bảng điều khiển",
   "no_gateway_yet": "Chưa có cổng nào",
   "you_dont_have_any_gateway": "Bạn không có bất kỳ cổng nào",
   "gateway_information": "Thông tin cổng",
   "reboot": "Khởi động lại",
   "information": "Thông tin",
   "gateway_list": "Danh sách cổng vào",
-  "delete_template": "Xóa mẫu",
+  "delete_dashboard": "Xóa bảng điều khiển",
+  "dashboard_name": "Dashboard name",
   "add_widget": "Thêm tiện ích con",
-  "add_your_widget": "Thêm tiện ích của bạn vào mẫu trang tổng quan",
+  "add_your_widget": "Thêm tiện ích của bạn vào ba",
   "label": "Nhãn",
   "choose_type_of_device": "Chọn Loại Thiết bị",
   "central_controller": "Bộ điều khiển trung tâm",