@eohjsc/react-native-smart-city 0.2.96 → 0.2.99

package/src/screens/SyncLGDevice/AddLGDevice.js

@@ -99,6 +99,7 @@ const AddLGDevice = memo(({ route }) => {
       <ScrollView
         style={styles.scrollContainer}
         showsVerticalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       >
         <Section type={'border'}>
           <GroupCheckBox

package/src/screens/TDSGuide/index.js

@@ -13,7 +13,10 @@ const TDSGuide = memo(() => {
 
   return (
     <View style={styles.container}>
-      <ScrollView style={styles.paddingHorizontal16}>
+      <ScrollView
+        style={styles.paddingHorizontal16}
+        scrollIndicatorInsets={{ right: 1 }}
+      >
         <Text
           type="H3"
           semibold

package/src/screens/UVIndexGuide/index.js

@@ -73,7 +73,7 @@ const UVIndexGuide = memo(() => {
   const onPress = useCallback((item) => {}, []);
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         {titles.map((item, index) => {
           const { title, des } = item;
           return (

package/src/screens/Unit/Detail.js

@@ -47,6 +47,7 @@ import {
   watchNotificationData,
   unwatchNotificationData,
 } from '../../utils/Monitor';
+import PreventAccess from '../../commons/PreventAccess';
 
 const UnitDetail = ({ route }) => {
   const t = useTranslations();
@@ -63,14 +64,17 @@ const UnitDetail = ({ route }) => {
 
   const isFocused = useIsFocused();
   const { stateData, setAction } = useContext(SCContext);
-  const { navigate } = useNavigation();
+  const { navigate, goBack } = useNavigation();
   const RouterHardware = useCallback(
     (routeHardware) => () => {
       navigate(routeHardware);
     },
     [navigate]
   );
-  useBlockBackAndroid(RouterHardware(Routes.Dashboard));
+
+  useBlockBackAndroid(
+    isSuccessfullyConnected ? RouterHardware(Routes.Dashboard) : goBack
+  );
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const isLavidaSource = useSCContextSelector(
     (state) => state.app.isLavidaSource
@@ -84,6 +88,8 @@ const UnitDetail = ({ route }) => {
   const [station, setStation] = useState({});
   const [indexStation, setIndexStation] = useState(0);
   const [showAdd, setShowAdd, setHideAdd] = useBoolean();
+  const [showPreventAccess, setShowPreventAccess, setHidePreventAccess] =
+    useBoolean(false);
   const [isFullScreen, setIsFullScreen] = useState(false);
   const [dataFullScreen, setDataFullScreen] = useState();
   const appState = useRef(AppState.currentState);
@@ -122,16 +128,18 @@ const UnitDetail = ({ route }) => {
 
   const fetchDetails = useCallback(async () => {
     getAutomates();
-    const { success, data } = await axiosGet(
+    const { success, data, resp_status } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unitId),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {
       prepareData(data);
       setUnit(data);
+    } else if (resp_status === 404) {
+      setShowPreventAccess();
     }
-  }, [setUnit, unitId, prepareData, getAutomates]);
+  }, [getAutomates, unitId, prepareData, setShowPreventAccess]);
 
   const getAutomates = useCallback(async () => {
     await fetchWithCache(
@@ -395,6 +403,11 @@ const UnitDetail = ({ route }) => {
         modalStyles={styles.modal}
         onClose={onClose}
       />
+      <PreventAccess
+        visible={showPreventAccess}
+        hidePreventAccess={setHidePreventAccess}
+        headerBodyText={'unit'}
+      />
     </WrapParallaxScrollView>
   );
 };

package/src/screens/Unit/SelectAddress.js

@@ -163,7 +163,10 @@ const SelectAddress = memo(({ route }) => {
     <View style={styles.wrap}>
       <View style={styles.searchLocation}>
         <SearchBarLocation input={input} onTextInput={onTextInput} />
-        <ScrollView style={styles.searchData}>
+        <ScrollView
+          style={styles.searchData}
+          scrollIndicatorInsets={{ right: 1 }}
+        >
           {searchData.map((item, index) => (
             <RowLocation key={index} item={item} onPress={onPressRowLocation} />
           ))}

package/src/screens/Unit/Station/index.js

@@ -70,6 +70,7 @@ const Station = ({ listStation = [], onSnapToItem, indexStation }) => {
         extraData={data}
         renderItem={renderItem}
         showsHorizontalScrollIndicator={false}
+        scrollIndicatorInsets={{ right: 1 }}
       />
     </View>
   );

package/src/screens/Unit/Summaries.js

@@ -85,7 +85,7 @@ const Summaries = memo(({ unit }) => {
   return (
     <>
       {!unitSummaries || !unitSummaries.length ? null : (
-        <ScrollView horizontal={true}>
+        <ScrollView horizontal={true} scrollIndicatorInsets={{ right: 1 }}>
           {unitSummaries.map((item, index) => (
             <SummaryItem key={index} item={item} goToSummary={goToSummary} />
           ))}

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

@@ -96,7 +96,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route));
     });
 
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit detail no network then load from cache', async () => {
@@ -118,7 +122,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route, account));
     });
 
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit detail no network and fail load from cache', async () => {
@@ -129,7 +137,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route, account));
     });
 
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit summary empty', async () => {
@@ -193,7 +205,11 @@ describe('Test UnitDetail', () => {
       await renderer.create(wrapComponent(route, account));
     });
 
-    expect(axios.get).not.toHaveBeenCalledWith(summaryUnitApiUrl, {});
+    expect(axios.get).not.toHaveBeenCalledWith(summaryUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('fetch unit detail when refresh', async () => {
@@ -206,7 +222,11 @@ describe('Test UnitDetail', () => {
     await act(async () => {
       refreshControl.props.onRefresh();
     });
-    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {});
+    expect(axios.get).toHaveBeenCalledWith(detailUnitApiUrl, {
+      headers: {
+        'Cache-Control': 'no-cache',
+      },
+    });
   });
 
   test('when unit has google home action then connect to google home', async () => {

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

@@ -43,6 +43,7 @@ describe('Test UnitSummary', () => {
     Date.now = jest.fn(() => new Date('2021-01-24T12:00:00.000Z'));
     route = {
       params: {
+        unitId: 1,
         unitData: {
           id: 1,
         },
@@ -114,6 +115,37 @@ describe('Test UnitSummary', () => {
     );
   });
 
+  test('render fetchUnitDetail success', async () => {
+    route = {
+      params: {
+        unitId: 1,
+        unitData: null,
+        summaryData: {
+          id: 1,
+          name: '',
+          screen: Routes.AirQuality,
+        },
+      },
+    };
+    jest.useFakeTimers();
+    const response = {
+      status: 200,
+      data: {
+        data: {},
+      },
+    };
+    axios.get.mockImplementation(async (url) => response);
+
+    act(() => {
+      tree = create(wrapComponent(route));
+    });
+    act(() => {
+      jest.runOnlyPendingTimers();
+    });
+    expect(axios.get).toHaveBeenCalled();
+    expect(axios.get).toHaveBeenCalledWith(API.UNIT.UNIT_DETAIL(1), {});
+  });
+
   let list_value = [
     Routes.AirQuality,
     Routes.PowerConsumption,

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

@@ -207,7 +207,7 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
       params.append('date_from', moment(startDate).format('YYYY-MM-DD'));
       params.append('date_to', moment(endDate).format('YYYY-MM-DD'));
       const { success, data } = await axiosGet(
-        API.VALUE_CONSUME.DISPLAY_HISTORY,
+        API.VALUE_CONSUME.DISPLAY_HISTORY(),
         {
           params,
         }

package/src/screens/WaterQualityGuide/index.js

@@ -270,7 +270,7 @@ const WaterQualityGuide = memo(({ route }) => {
 
   return (
     <SafeAreaView style={styles.container}>
-      <ScrollView style={styles.container}>
+      <ScrollView style={styles.container} scrollIndicatorInsets={{ right: 1 }}>
         <View style={styles.wrapScroll}>
           {titles.map((item, index) => {
             const { title, des } = item;

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

@@ -982,5 +982,9 @@
   "saving_contact_successful" : "Saving contact successful",
   "maxmium_contacts": "Maxmium contacts",
   "enter_password": "Enter Your Password",
-  "you_need_to_enter_password": "You need to enter password to perform this action"
+  "you_need_to_enter_password": "You need to enter password to perform this action",
+  "note": "Note",
+  "back": "Back",
+  "invaild_data": "Invaild data",
+  "This {name} was removed!" : "This {name} was removed!"
 }

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

@@ -982,5 +982,9 @@
   "search": "Tìm kiếm",
   "connect_home_wifi" : "Kết nối Wifi của gia đình",
   "saving_contact_successful" : "Lưu liên hệ thành công",
-  "maxmium_contacts": "Địa chỉ liên hệ tối đa"
+  "maxmium_contacts": "Địa chỉ liên hệ tối đa",
+  "note": "Lưu ý ",
+  "back": "Quay lại",
+  "invaild_data": "Dữ liệu không hợp lệ",
+  "This {name} was removed!" : "{Name} này đã bị xóa!"
 }

package/src/utils/Route/index.js

@@ -136,6 +136,7 @@ const Routes = {
   SmartAccount: 'SmartAccount',
   SmartHomeDashboard: 'SmartHomeDashboard',
   SetupGeneratePasscode: 'SetupGeneratePasscode',
+  SideMenuDetail: 'SideMenuDetail',
   SelectDeviceType: 'SelectDeviceType',
   SelectBrand: 'SelectBrand',
   GroupButtonByType: 'GroupButtonByType',