@eohjsc/react-native-smart-city 0.7.27 → 0.7.30

package/src/screens/Device/detail.js

@@ -61,6 +61,7 @@ import { useReceiveNotifications } from '../../hooks';
 import useChipJsonConfiguration, {
   useConnectChipMqtt,
 } from '../../hooks/useMqtt';
+import useWatchSharedChips from '../../hooks/IoT/useWatchSharedChips';
 import { useBluetoothDevice } from './components/BluetoothDevice';
 
 const DeviceDetail = ({ route }) => {
@@ -147,14 +148,21 @@ const DeviceDetail = ({ route }) => {
 
   useDisconnectedDevice(sensorName, isDeviceHasBle, serverDown);
 
-  const { chips } = useChipJsonConfiguration(unit?.id);
+  const { chips, isFetching } = useChipJsonConfiguration({
+    dashboardId: unit?.id,
+  });
 
-  const chipFiltered = useMemo(() => {
+  const listChipsMqtt = useMemo(() => {
     return chips?.filter((item) => item?.id === device?.chip_id);
   }, [chips, device?.chip_id]);
 
-  const { mqttConfigs } = useConnectChipMqtt(chipFiltered);
-  useDeviceWatchConfigControl(device, display, mqttConfigs);
+  const { mqttConfigs } = useConnectChipMqtt(listChipsMqtt);
+  useDeviceWatchConfigControl(device, display, mqttConfigs, isFetching);
+  useWatchSharedChips({
+    dashboardId: unit?.id,
+    filterChipIds: [device?.chip_id],
+    ready: !!device?.chip_id,
+  });
 
   const isShowSetupEmergencyContact = useMemo(
     () =>
@@ -592,7 +600,7 @@ const DeviceDetail = ({ route }) => {
 
       let configIds = Array.from(configIdsSet);
       configIds = configIds.filter(Boolean);
-      configIdsTemp.current = configIds;
+      configIdsTemp.current = configIds.filter((id) => !mqttConfigs[id]);
 
       configIds.map((id) => {
         params.append('config', id);
@@ -685,7 +693,7 @@ const DeviceDetail = ({ route }) => {
     }, [])
   );
 
-  useWatchConfigs(chipFiltered.length ? [] : configIdsTemp.current);
+  useWatchConfigs(isFetching ? [] : configIdsTemp.current);
 
   const isShowEmergencyResolve =
     display.items.filter(

package/src/screens/Device/hooks/useDeviceWatchConfigControl.js

@@ -6,7 +6,8 @@ import { useWatchConfigs } from '../../../hooks/IoT';
 export const useDeviceWatchConfigControl = (
   device,
   display,
-  mqttConfigs = {}
+  mqttConfigs = {},
+  isFetching
 ) => {
   const { is_managed_by_backend, device_type } = device;
   const configsNeedWatching = useMemo(() => {
@@ -24,5 +25,5 @@ export const useDeviceWatchConfigControl = (
     }
     return configsControl;
   }, [is_managed_by_backend, device_type, display, mqttConfigs]);
-  useWatchConfigs(configsNeedWatching);
+  useWatchConfigs(isFetching ? [] : configsNeedWatching);
 };

package/src/screens/EnterPassword/__test__/EnterPassword.test.js

@@ -8,7 +8,9 @@ import { API } from '../../../configs';
 import { AccessibilityLabel } from '../../../configs/Constants';
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
+import ModalAlert from '../../../commons/ModalAlert';
 import api from '../../../utils/Apis/axios';
+import Routes from '../../../utils/Route';
 import EnterPassword from '../index';
 
 const mock = new MockAdapter(api.axiosInstance);
@@ -21,7 +23,20 @@ const wrapComponent = (route) => (
 
 describe('Test EnterPassword', () => {
   let tree;
-  const { navigate } = useNavigation();
+  const { navigate, goBack } = useNavigation();
+
+  beforeEach(() => {
+    jest.useFakeTimers();
+    mock.reset();
+    mock
+      .onGet(API.ACCOUNTS.USABLE_PASSWORD)
+      .reply(200, { has_usable_password: true });
+  });
+
+  afterEach(() => {
+    jest.useRealTimers();
+  });
+
   const buttonDone = (instance) => {
     return instance.findAll(
       (el) =>
@@ -41,6 +56,66 @@ describe('Test EnterPassword', () => {
     const instance = tree.root;
     const button = buttonDone(instance);
     expect(button).toHaveLength(1);
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    const alert = instance.findByType(ModalAlert);
+    expect(alert.props.isVisible).toBeFalsy();
+  });
+
+  it('test render EnterPassword not has usable password', async () => {
+    const route = {
+      params: { dataParams: {}, type: '' },
+    };
+    mock
+      .onGet(API.ACCOUNTS.USABLE_PASSWORD)
+      .reply(200, { has_usable_password: false });
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = buttonDone(instance);
+    expect(button).toHaveLength(1);
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    const alert = instance.findByType(ModalAlert);
+    expect(alert.props.isVisible).toBeTruthy();
+
+    await act(async () => {
+      alert.props.onRight();
+    });
+    expect(alert.props.isVisible).toBeFalsy();
+    expect(navigate).toHaveBeenCalledWith(Routes.CreatePassword);
+  });
+
+  it('test render EnterPassword not has usable password and cancel alert', async () => {
+    const route = {
+      params: { dataParams: {}, type: '' },
+    };
+    mock
+      .onGet(API.ACCOUNTS.USABLE_PASSWORD)
+      .reply(200, { has_usable_password: false });
+    await act(async () => {
+      tree = await create(wrapComponent(route));
+    });
+    const instance = tree.root;
+    const button = buttonDone(instance);
+    expect(button).toHaveLength(1);
+
+    await act(async () => {
+      jest.runAllTimers();
+    });
+    const alert = instance.findByType(ModalAlert);
+    expect(alert.props.isVisible).toBeTruthy();
+
+    await act(async () => {
+      alert.props.onLeft();
+    });
+    expect(navigate).not.toHaveBeenCalled();
+    expect(goBack).toHaveBeenCalled();
   });
 
   it('test render EnterPassword has not params', async () => {

package/src/screens/EnterPassword/index.js

@@ -1,10 +1,11 @@
-import React, { useCallback, useState } from 'react';
-import { useNavigation } from '@react-navigation/native';
+import React, { useCallback, useEffect, useState } from 'react';
+import { useNavigation, useIsFocused } from '@react-navigation/native';
 import { TouchableOpacity, View } from 'react-native';
 import { HeaderCustom } from '../../commons/Header';
+import ModalAlert from '../../commons/ModalAlert';
 import { useTranslations } from '../../hooks/Common/useTranslations';
 import _TextInputPassword from '../../commons/Form/TextInputPassword';
-import { axiosPut } from '../../utils/Apis/axios';
+import { axiosPut, axiosGet } from '../../utils/Apis/axios';
 import Text from '../../commons/Text';
 import { Colors, API } from '../../configs';
 import { FullLoading } from '../../commons';
@@ -19,9 +20,11 @@ const EnterPassword = ({ route }) => {
     type: '',
   };
   const t = useTranslations();
-  const { navigate } = useNavigation();
+  const { navigate, goBack } = useNavigation();
+  const isFocused = useIsFocused();
   const [loading, setLoading] = useState(false);
   const [password, setPassword] = useState('');
+  const [showCreatePassword, setShowCreatePassword] = useState(false);
 
   const handleDone = useCallback(async () => {
     setLoading(true);
@@ -46,6 +49,24 @@ const EnterPassword = ({ route }) => {
     setLoading(false);
   }, [dataParams?.member?.id, dataParams?.unit_id, navigate, password, type]);
 
+  const goToCreatePassword = useCallback(() => {
+    setShowCreatePassword(false);
+    navigate(Routes.CreatePassword);
+  }, [navigate]);
+
+  const getUsablePassword = useCallback(async () => {
+    const { success, data } = await axiosGet(API.ACCOUNTS.USABLE_PASSWORD);
+    if (success) {
+      setTimeout(() => {
+        setShowCreatePassword(!data.has_usable_password);
+      }, 500);
+    }
+  }, []);
+
+  useEffect(() => {
+    isFocused && getUsablePassword();
+  }, [isFocused, getUsablePassword]);
+
   return (
     <View style={styles.wrap}>
       <HeaderCustom />
@@ -79,6 +100,15 @@ const EnterPassword = ({ route }) => {
         </TouchableOpacity>
       </View>
       {!!loading && <FullLoading />}
+      <ModalAlert
+        title={t('update_your_password')}
+        description={t('you_need_to_update_password')}
+        isVisible={showCreatePassword}
+        leftText={t('cancel')}
+        rightText={t('update')}
+        onLeft={goBack}
+        onRight={goToCreatePassword}
+      />
     </View>
   );
 };

package/src/screens/EnterPassword/styles.js

@@ -29,7 +29,7 @@ export default StyleSheet.create({
     justifyContent: 'center',
     alignItems: 'center',
     marginTop: 32,
-    paddingVertical: 8,
+    paddingVertical: 12,
     borderRadius: 30,
     backgroundColor: Colors.Primary,
   },