@eohjsc/react-native-smart-city 0.2.61 → 0.2.65

package/src/screens/Unit/Detail.js

@@ -30,7 +30,9 @@ import { AUTOMATE_TYPE } from '../../configs/Constants';
 
 const UnitDetail = ({ route }) => {
   const t = useTranslations();
+
   const { unitId, unitData, isOneTap, routeName, isAddSubUnit } = route.params;
+
   const isFocused = useIsFocused();
   const { stateData, setAction } = useContext(SCContext);
   const { navigate } = useNavigation();
@@ -39,7 +41,7 @@ const UnitDetail = ({ route }) => {
   const [appState, setAppState] = useState(AppState.currentState);
   const [listMenuItem, setListMenuItem] = useState([]);
   const [listStation, setListStation] = useState([]);
-  const [oneTap, setOneTap] = useState([]);
+  const [listAutomate, setListAutomate] = useState([]);
   const [favorites, setFavorites] = useState({
     devices: [],
     automates: [],
@@ -106,12 +108,23 @@ const UnitDetail = ({ route }) => {
     await fetchWithCache(
       API.UNIT.AUTOMATE(unitId),
       {
-        params: { type: AUTOMATE_TYPE.ONE_TAP },
+        params: { type: AUTOMATE_TYPE.ALL },
       },
       (response) => {
         const { success, data } = response;
         if (success) {
-          setOneTap([...data]);
+          setListAutomate([
+            {
+              text: t(AUTOMATE_TYPE.SCENARIO),
+              data: data.filter((item) => item.type === AUTOMATE_TYPE.ONE_TAP),
+              type: AUTOMATE_TYPE.ONE_TAP,
+            },
+            {
+              text: t(AUTOMATE_TYPE.AUTOMATION),
+              data: data.filter((item) => item.type !== AUTOMATE_TYPE.ONE_TAP),
+              type: AUTOMATE_TYPE.AUTOMATION,
+            },
+          ]);
           setFavorites((prevData) => ({
             ...prevData,
             automates: data.filter((item) => item.script.is_star),
@@ -119,7 +132,7 @@ const UnitDetail = ({ route }) => {
         }
       }
     );
-  }, [unitId]);
+  }, [t, unitId]);
 
   const onRefresh = useCallback(() => {
     fetchDetails();
@@ -242,13 +255,14 @@ const UnitDetail = ({ route }) => {
   };
 
   const renderDetailSubUnit = () => {
-    if (station.isFavorites) {
+    if (station?.isFavorites) {
       return (
         <SubUnitFavorites
           unit={unit}
           isOwner={isOwner}
           favorites={favorites}
           wrapItemStyle={styles.wrapItemStyle}
+          isGGHomeConnected={isGGHomeConnected}
         />
       );
     }
@@ -264,8 +278,7 @@ const UnitDetail = ({ route }) => {
       return (
         <SubUnitAutomate
           isOwner={isOwner}
-          type={AUTOMATE_TYPE.ONE_TAP}
-          automates={oneTap}
+          listAutomate={listAutomate}
           unit={unit}
           wrapItemStyle={styles.wrapItemStyle}
         />

package/src/screens/Unit/ManageUnit.js

@@ -6,11 +6,7 @@ import { useTranslations } from '../../hooks/Common/useTranslations';
 import { Colors, API, Images } from '../../configs';
 import Routes from '../../utils/Route';
 import { ToastBottomHelper } from '../../utils/Utils';
-import {
-  createFormData,
-  axiosPatch,
-  axiosDelete,
-} from '../../utils/Apis/axios';
+import { createFormData, axiosPatch } from '../../utils/Apis/axios';
 import useBoolean from '../../hooks/Common/useBoolean';
 import useKeyboardAnimated from '../../hooks/Explore/useKeyboardAnimated';
 
@@ -128,13 +124,14 @@ const ManageUnit = ({ route }) => {
 
   const [showRemove, setshowRemove, setHideRemove] = useBoolean();
   const goRemove = useCallback(async () => {
-    const { success } = await axiosDelete(API.UNIT.MANAGE_UNIT(unit.id));
-    if (success) {
-      setHideRemove(true);
-      ToastBottomHelper.success(t('unit_deleted_successfully'));
-      navigation.navigate(Routes.Dashboard);
-    }
-  }, [unit.id, setHideRemove, t, navigation]);
+    navigation.navigate(Routes.UnitStack, {
+      screen: Routes.ConfirmUnitDeletion,
+      params: {
+        unit,
+      },
+    });
+    setHideRemove(true);
+  }, [setHideRemove, navigation, unit]);
 
   const goToManageSubUnit = useCallback(() => {
     navigation.navigate(Routes.UnitStack, {

package/src/screens/Unit/SmartAccount.js

@@ -7,17 +7,16 @@ import React, {
   useState,
   memo,
 } from 'react';
-import { View } from 'react-native';
+import { TouchableOpacity, View } from 'react-native';
 import styles from './SmartAccountStyles';
 import { API, Colors } from '../../configs';
 import Routes from '../../utils/Route';
 import { useNavigation } from '@react-navigation/native';
 import { axiosDelete, axiosGet } from '../../utils/Apis/axios';
 import { SmartAccountItem } from './SmartAccountItem';
-import { usePopover, useBoolean } from '../../hooks/Common';
-import { AlertAction, MenuActionMore } from '../../commons';
+import { usePopover } from '../../hooks/Common';
+import { MenuActionMore } from '../../commons';
 import { useTranslations } from '../../hooks/Common/useTranslations';
-import { useStateAlertRemove } from '../Unit/hook/useStateAlertRemove';
 
 const ListSmartAccount = ({ route }) => {
   const { unitId } = route?.params || {};
@@ -38,10 +37,6 @@ const ListSmartAccount = ({ route }) => {
   const { childRef, showingPopover, showPopoverWithRef, hidePopover } =
     usePopover();
 
-  const [lockShowing, acquireLockShowing, releaseLockShowing] = useBoolean();
-  const { stateAlertRemove, onShowRemoveAlert, hideAlertAction } =
-    useStateAlertRemove();
-
   useEffect(() => {
     getAllSmartAccounts();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -55,21 +50,7 @@ const ListSmartAccount = ({ route }) => {
     [showPopoverWithRef]
   );
 
-  const onItemClick = useCallback(
-    (item) => {
-      if (!smartAccountRef?.current) {
-        return;
-      }
-      if (item.action === 'delete') {
-        acquireLockShowing();
-        onShowRemoveAlert(smartAccountRef.current.brand)();
-      }
-    },
-    [acquireLockShowing, onShowRemoveAlert]
-  );
-
   const deleteSmartAccount = useCallback(async () => {
-    hideAlertAction();
     if (!smartAccountRef?.current) {
       return;
     }
@@ -78,10 +59,22 @@ const ListSmartAccount = ({ route }) => {
       API.SMART_ACCOUNT.REMOVE_SMART_ACCOUNT(id)
     );
     success && getAllSmartAccounts();
-  }, [hideAlertAction, getAllSmartAccounts]);
+  }, [getAllSmartAccounts]);
+
+  const onItemClick = useCallback(
+    (item) => {
+      if (!smartAccountRef?.current) {
+        return;
+      }
+      if (item.action === 'remove') {
+        deleteSmartAccount();
+      }
+    },
+    [deleteSmartAccount]
+  );
 
   const listMenuItem = useMemo(() => {
-    return [{ action: 'delete', text: t('delete') }];
+    return [{ action: 'remove', text: t('remove_account') }];
   }, [t]);
 
   const gotoSmartAccountDetail = useCallback(
@@ -104,33 +97,24 @@ const ListSmartAccount = ({ route }) => {
         headerAniStyle={styles.headerAniStyle}
       >
         <View style={styles.wrapContent}>
-          {data.map((item) => {
+          {data.map((item, index) => {
             return (
-              <SmartAccountItem
-                gotoSmartAccountDetail={gotoSmartAccountDetail}
-                item={item}
-                onShowMenuMore={onShowMenuMore}
-              />
+              <TouchableOpacity key={index}>
+                <SmartAccountItem
+                  gotoSmartAccountDetail={gotoSmartAccountDetail}
+                  item={item}
+                  onShowMenuMore={onShowMenuMore}
+                />
+              </TouchableOpacity>
             );
           })}
         </View>
-        <AlertAction
-          visible={stateAlertRemove.visible && !lockShowing}
-          hideModal={hideAlertAction}
-          title={stateAlertRemove.title}
-          message={stateAlertRemove.message}
-          leftButtonTitle={stateAlertRemove.leftButton}
-          leftButtonClick={hideAlertAction}
-          rightButtonTitle={stateAlertRemove.rightButton}
-          rightButtonClick={deleteSmartAccount}
-        />
         <MenuActionMore
           isVisible={showingPopover}
           hideMore={hidePopover}
           listMenuItem={listMenuItem}
           childRef={childRef}
           onItemClick={onItemClick}
-          hideComplete={releaseLockShowing}
         />
       </WrapHeaderScrollable>
     </View>

package/src/screens/Unit/SmartAccountItem.js

@@ -23,6 +23,7 @@ export const SmartAccountItem = memo(
         <TouchableOpacity
           style={styles.wrapText}
           onPress={onPressGotoSmartAccountDetail}
+          testID={TESTID.SMART_ACCOUNT_ITEM}
         >
           <FImage
             source={{ uri: item?.logo }}
@@ -39,7 +40,7 @@ export const SmartAccountItem = memo(
           </View>
         </TouchableOpacity>
         <TouchableOpacity
-          testID={TESTID.ITEM_QUICK_ACTION_PRESS}
+          testID={TESTID.SMART_ACCOUNT_ITEM_PRESSMORE}
           onPress={onPressMore}
           ref={buttonMoreRef}
         >

package/src/screens/Unit/SmartAccountStyles.js

@@ -26,7 +26,6 @@ export default StyleSheet.create({
   },
   wrapText: {
     flexDirection: 'row',
-    alignItems: 'space-around',
   },
   icon: {
     width: 48,

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

@@ -3,7 +3,6 @@ import { act, create } from 'react-test-renderer';
 import axios from 'axios';
 
 import { ToastBottomHelper } from '../../../utils/Utils';
-import API from '../../../configs/API';
 import { TESTID } from '../../../configs/Constants';
 
 import ManageUnit from '../ManageUnit';
@@ -131,7 +130,6 @@ describe('Test Manage Unit', () => {
   });
 
   test('remove Unit success', async () => {
-    const spyToast = jest.spyOn(ToastBottomHelper, 'success');
     await act(async () => {
       tree = create(wrapComponent(route));
     });
@@ -165,11 +163,7 @@ describe('Test Manage Unit', () => {
       await bottomButton.props.onPress();
     });
 
-    expect(axios.delete).toBeCalledWith(API.UNIT.MANAGE_UNIT(1));
     expect(mockedDispatch).not.toBeCalled();
-    expect(spyToast).toBeCalled();
-    spyToast.mockReset();
-    spyToast.mockRestore();
   });
 
   test('rename Unit sucess', async () => {

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

@@ -6,6 +6,7 @@ import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
 import ListSmartAccount from '../SmartAccount';
 import { SmartAccountItem } from '../SmartAccountItem';
+import { MenuActionMore } from '../../../commons';
 
 const wrapComponent = (route, navigation) => (
   <SCProvider initState={mockSCStore({})}>
@@ -13,6 +14,17 @@ const wrapComponent = (route, navigation) => (
   </SCProvider>
 );
 
+const mockedNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      goBack: mockedNavigate,
+    }),
+  };
+});
+
 jest.mock('react', () => {
   return {
     ...jest.requireActual('react'),
@@ -55,4 +67,16 @@ describe('Test SmartAccount', () => {
     const smartAccountItem = instance.findAllByType(SmartAccountItem);
     expect(smartAccountItem.length).toEqual(3);
   });
+
+  test('test render SmartAccountItem', async () => {
+    await act(async () => {
+      tree = await renderer.create(wrapComponent());
+    });
+    const instance = tree.root;
+    const menuActionMore = instance.findByType(MenuActionMore);
+    await act(async () => {
+      menuActionMore.props.onItemClick();
+    });
+    expect(menuActionMore.props.isVisible).toEqual(false);
+  });
 });

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

@@ -0,0 +1,72 @@
+import React from 'react';
+import renderer, { act } from 'react-test-renderer';
+
+import { SCProvider } from '../../../context';
+import { mockSCStore } from '../../../context/mockStore';
+import { SmartAccountItem } from '../SmartAccountItem';
+import { TouchableOpacity } from 'react-native';
+import { TESTID } from '../../../configs/Constants';
+
+const mockedOnShowMenuMore = jest.fn();
+const mockedGotoSmartAccountDetail = jest.fn();
+
+const wrapComponent = (route) => (
+  <SCProvider initState={mockSCStore({})}>
+    <SmartAccountItem
+      onShowMenuMore={mockedOnShowMenuMore}
+      gotoSmartAccountDetail={mockedGotoSmartAccountDetail}
+    />
+  </SCProvider>
+);
+
+const mockedNavigate = jest.fn();
+
+jest.mock('@react-navigation/native', () => {
+  return {
+    ...jest.requireActual('@react-navigation/native'),
+    useNavigation: () => ({
+      goBack: mockedNavigate,
+    }),
+  };
+});
+
+jest.mock('react', () => {
+  return {
+    ...jest.requireActual('react'),
+    memo: (x) => x,
+  };
+});
+
+jest.mock('axios');
+describe('Test SmartAccountItem', () => {
+  let tree;
+  test('test render SmartAccountItem', async () => {
+    await act(async () => {
+      tree = await renderer.create(wrapComponent());
+    });
+    const instance = tree.root;
+
+    const onPressGotoSmartAccountDetail = instance.find(
+      (el) =>
+        el.props.testID === TESTID.SMART_ACCOUNT_ITEM &&
+        el.type === TouchableOpacity
+    );
+
+    await act(async () => {
+      onPressGotoSmartAccountDetail.props.onPress();
+    });
+
+    expect(mockedGotoSmartAccountDetail).toHaveBeenCalled();
+
+    const onPressMore = instance.find(
+      (el) =>
+        el.props.testID === TESTID.SMART_ACCOUNT_ITEM_PRESSMORE &&
+        el.type === TouchableOpacity
+    );
+
+    await act(async () => {
+      onPressMore.props.onPress();
+    });
+    expect(mockedOnShowMenuMore).toHaveBeenCalled();
+  });
+});

package/src/screens/UnitSummary/components/3PPowerConsumption/index.js

@@ -189,7 +189,7 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
   }, [listConfigs]);
 
   const [startDate, setStartDate] = useState(
-    moment().subtract(7, 'days').valueOf()
+    moment().subtract(6, 'days').valueOf()
   );
   const [endDate, setEndDate] = useState(moment().valueOf());
   const [groupBy, setGroupBy] = useState('date');
@@ -251,6 +251,7 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
             startDate={startDate}
             setEndDate={setEndDate}
             setStartDate={setStartDate}
+            groupBy={groupBy}
             setGroupBy={setGroupBy}
             configuration={{
               type: 'horizontal_bar_chart',

package/src/screens/UnitSummary/components/PowerConsumption/index.js

@@ -78,7 +78,7 @@ const PowerConsumption = memo(({ summaryDetail }) => {
   dataTotal.push(totalPower);
 
   const [startDate, setStartDate] = useState(
-    moment().subtract(7, 'days').valueOf()
+    moment().subtract(6, 'days').valueOf()
   );
   const [endDate, setEndDate] = useState(moment().valueOf());
   const [groupBy, setGroupBy] = useState('date');

package/src/screens/UnitSummary/components/Temperature/ItemTemperature/index.js

@@ -10,13 +10,13 @@ const ItemTemperature = memo((props) => {
   const { svgMain, title, des, value } = props;
   return (
     <View style={styles.container}>
-      <Text size={14} color={Colors.Gray8} style={styles.textTitle}>
+      <Text type="H4" color={Colors.Gray8} style={styles.textTitle}>
         {title}
       </Text>
       <Text size={24} color={Colors.Gray9} style={styles.textValue}>
         {value}
       </Text>
-      <Text size={12} color={Colors.Gray8}>
+      <Text type="H4" color={Colors.Gray8}>
         {des}
       </Text>
       <View style={styles.boxSvg}>{svgMain}</View>

package/src/screens/WaterQualityGuide/index.js

@@ -450,9 +450,9 @@ const styles = StyleSheet.create({
     position: 'absolute',
     fontSize: 20,
     transform: [{ rotate: '90deg' }],
-    left: -28,
+    left: -40,
     bottom: 8,
-    width: 115,
+    width: 150,
     height: 28,
     textAlign: 'center',
   },

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

@@ -471,7 +471,7 @@
   "scan_qr_code_at_%{spot}": "Scan QR code at spot %{spot}",
   "extend": "Extend",
   "verify_qr_code": "Verifying code...",
-  "tds_infomation": "TDS Infomation",
+  "tds_information": "TDS Information",
   "what_is_tds_title": "What is TDS?",
   "what_is_tds_text": "TDS: is the total dissolved solids present in a certain amount of water - (the total number of charged ions, including salts, minerals or metals) that exist in a certain volume of water. High TDS is also responsible for turbidity and sedimentation in water. TDS is expressed in mg / L or parts per million (parts per million).",
   "tds_guidlines_title": "TDS guidlines for drinking water",
@@ -744,7 +744,7 @@
   "rssi_node": "RSSI Node",
   "edit_actions_list": "Edit Actions List",
   "des_edit_actions_list": "Hold and hover to rearrange actions order",
-  "please_add_your_phone_number_and_chip_name": "Please add gateway name",
+  "please_add_your_phone_number_and_chip_name": "Please add your phone number and chip name",
   "phone_number_of_data_sim": "Phone number of data sim",
   "select_a_sub_unit": "Select a sub-unit that you want to add this gateway",
   "all_camera": "All Cameras",
@@ -781,6 +781,8 @@
   "Script": "Script",
   "One-Tap": "One-Tap",
   "Scenario": "Scenario",
+  "one_tap": "One-Tap",
+  "scenario": "Scenario",
   "automation": "Automation",
   "set_schedule": "Set schedule",
   "select_date": "Select date",
@@ -854,5 +856,15 @@
   "volume": "Volume",
   "this_notification_will_be_updated_soon": "This notification will be updated soon",
   "text_submit": "Submit",
-  "tap_to_add_new_schedule": "Tap + to add new schedule"
+  "remove_account": "Remove Account",
+  "text_sub_unit_not_have_device": "You don't have sub-unit with a device to control",
+  "tap_to_add_new_schedule": "Tap + to add new schedule",
+  "confirmation": "Confirmation",
+  "enter_yes_to_perform": "You need to enter 'YES' to perform this action",
+  "please_enter_correct":"Please enter correct",
+  "add_schedule": "Add Schedule",
+  "curtain_opens": "Curtain opens",
+  "curtain_closes": "Curtain closes",
+  "schedule_name": "Schedule name",
+  "enter_name": "Enter name"
 }

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

@@ -57,7 +57,7 @@
   "%{number}_filter_need_to_be_replaced": "%{number} lõi lọc cần được thay thế.",
   "replace_all_filters": "Tất cả lõi lọc cần được thay thế.",
   "auth_already_have_an_account": "Bạn đã có tài khoản? ",
-  "tds_infomation": "Chỉ số TDS",
+  "tds_information": "Chỉ số TDS",
   "what_is_tds_title": "TDS là gì?",
   "set_a_number": "Đặt một số",
   "add_action": "Thêm hành động",
@@ -747,7 +747,7 @@
   "request_fail": "Request fail",
   "modbus_fail": "Modbus failrate",
   "rssi_node": "RSSI Node",
-  "please_add_your_phone_number_and_chip_name": "Vui lòng thêm tên gateway",
+  "please_add_your_phone_number_and_chip_name": "Vui lòng thêm số điện thoại và tên chip của bạn",
   "phone_number_of_data_sim": "Số điện thoại của dữ liệu sim",
   "select_a_sub_unit": "Lựa chọn một khu vực mà bạn muốn thêm gateway",
   "all_camera": "All Cameras",
@@ -783,6 +783,8 @@
   "Script": "Kịch bản",
   "One-Tap": "Một chạm",
   "Scenario": "Kịch bản",
+  "one_tap": "Một chạm",
+  "scenario": "Kịch bản",
   "automation": "Tự động",
   "set_schedule": "Đặt lịch",
   "select_date": "Chọn ngày",
@@ -856,5 +858,15 @@
   "this_notification_will_be_updated_soon": "Thông báo này sẽ sớm được cập nhật",
   "text_submit": "Xác nhận",
   "tap_to_add_new_schedule": "Nhấn + để thêm lịch trình mới",
-  "choose_at_least_one": "Vui lòng chọn ít nhất 1 thiết bị."
+  "remove_account": "Xóa tài khoản",
+   "text_subunit_not_have_device": "Bạn không có khu vực nào có thiết bị để điều khiển",
+  "choose_at_least_one": "Vui lòng chọn ít nhất 1 thiết bị.",
+  "confirmation": "Xác Nhận",
+  "enter_yes_to_perform": "Bạn cần nhập 'YES' để thực hiện hành động này",
+  "please_enter_correct":"Vui lòng nhập đúng",
+  "add_schedule": "Thêm lịch trình",
+  "curtain_opens": "Rèm mở",
+  "curtain_closes": "Rèm đóng",
+  "schedule_name": "Tên lịch trình",
+  "enter_name": "Nhập tên"
 }

package/src/utils/Route/index.js

@@ -121,6 +121,7 @@ const Routes = {
   ListDeviceSmartAccount: 'ListDeviceSmartAccount',
   SmartAccountConnecting: 'SmartAccountConnecting',
   EmergencySetting: 'EmergencySetting',
+  ConfirmUnitDeletion: 'ConfirmUnitDeletion',
 };
 
 export default Routes;

package/src/utils/Utils.js

@@ -120,6 +120,10 @@ export const removeFromString = (str, index) => {
   return str.substr(0, index) + str.substr(index + 1);
 };
 
+export const arePropsEqual = (prevProps, nextProps) => {
+  return JSON.stringify(prevProps) === JSON.stringify(nextProps);
+};
+
 export default {
   validateEmail,
   isObjectEmpty,