@eohjsc/react-native-smart-city 0.3.15 → 0.3.18

package/package.json

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

package/src/commons/ActionGroup/NumberUpDownActionTemplate.js

@@ -22,8 +22,8 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
 
   // eslint-disable-next-line no-unused-vars
   const [configValues, setConfigValues] = useConfigGlobalState('configValues');
-  const [value, setValue] = useState();
   const valueDefault = 28;
+  const [value, setValue] = useState(valueDefault);
 
   useEffect(() => {
     if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
@@ -40,15 +40,12 @@ const NumberUpDownActionTemplate = ({ actionGroup, doAction, sensor }) => {
 
   useEffect(() => {
     if (!config) {
-      setValue(valueDefault);
       return;
     }
 
     const configValue = configValues[config];
     if (configValue !== null && configValue !== undefined) {
       setValue(configValue);
-    } else {
-      setValue(valueDefault);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(configValues)]);

package/src/commons/ConnectingProcess/index.js

@@ -14,6 +14,35 @@ import Connecting from '../Connecting';
 import { useSCContextSelector } from '../../context';
 import { ToastBottomHelper } from '../../utils/Utils';
 
+const ConnectingSuccess = ({
+  unit,
+  sensor,
+  station,
+  unit_name,
+  newName,
+  setNewName,
+}) => {
+  const t = useTranslations();
+  return (
+    <View style={styles.ConnectingSuccess}>
+      <ImageSuccessfully />
+      <Text bold style={styles.connectingText}>
+        {t('successfully_connected')}
+      </Text>
+      <Text size={14} style={styles.textHome}>
+        {`${unit?.name || unit_name} ${
+          station?.name !== undefined ? '- ' + station?.name : ''
+        }`}
+      </Text>
+      <DeviceItem
+        icon={sensor?.icon_kit}
+        name={newName}
+        setNewName={setNewName}
+      />
+    </View>
+  );
+};
+
 const ConnectingProcess = ({ route }) => {
   const { navigate, goBack } = useNavigation();
   const t = useTranslations();
@@ -34,7 +63,7 @@ const ConnectingProcess = ({ route }) => {
   const user = useSCContextSelector((state) => state?.auth?.account?.user);
   const [newName, setNewName] = useState('');
 
-  const ConnectingDevice = useCallback(async () => {
+  const connectingDevice = useCallback(async () => {
     setIsLoading(true);
     switch (devicePrefixName) {
       case 'SENSOR': {
@@ -106,27 +135,6 @@ const ConnectingProcess = ({ route }) => {
     unit_id,
   ]);
 
-  const ConnectingSuccess = useCallback(() => {
-    return (
-      <View style={styles.ConnectingSuccess}>
-        <ImageSuccessfully />
-        <Text bold style={styles.connectingText}>
-          {t('successfully_connected')}
-        </Text>
-        <Text size={14} style={styles.textHome}>
-          {`${unit?.name || unit_name} ${
-            station?.name !== undefined ? '- ' + station?.name : ''
-          }`}
-        </Text>
-        <DeviceItem
-          icon={sensor?.icon_kit}
-          name={newName}
-          setNewName={setNewName}
-        />
-      </View>
-    );
-  }, [newName, sensor?.icon_kit, station?.name, t, unit?.name, unit_name]);
-
   const handleDone = useCallback(async () => {
     let result, message;
     switch (devicePrefixName) {
@@ -178,8 +186,8 @@ const ConnectingProcess = ({ route }) => {
   ]);
 
   useEffect(() => {
-    ConnectingDevice();
-  }, [ConnectingDevice]);
+    connectingDevice();
+  }, [connectingDevice]);
 
   return (
     <SafeAreaView style={styles.wrap}>
@@ -188,7 +196,16 @@ const ConnectingProcess = ({ route }) => {
           {t('connect_device')}
         </Text>
         {!!isLoading && <Connecting isLoading={isLoading} />}
-        {!isLoading && <ConnectingSuccess />}
+        {!isLoading && (
+          <ConnectingSuccess
+            unit={unit}
+            sensor={sensor}
+            station={station}
+            unit_name={unit_name}
+            newName={newName}
+            setNewName={setNewName}
+          />
+        )}
       </View>
       {!isLoading && (
         <TouchableOpacity style={styles.buttonDone} onPress={handleDone}>

package/src/commons/SubUnit/Favorites/index.js

@@ -24,7 +24,7 @@ const SubUnitFavorites = ({
   const { getStatus, serverDown } = useSensorsStatus(unit, favoriteDevices);
 
   const handleOnAddNew = () => {
-    navigate(Routes.SelectDevices, {
+    navigate(Routes.SelectFavoritesDevices, {
       unitId: unit.id,
     });
   };

package/src/hooks/IoT/__test__/useRemoteControl.test.js

@@ -113,6 +113,7 @@ describe('Test useRemoteControl', () => {
       'bluetooth',
       actionName
     );
+    expect(sendCommandOverInternet).toBeCalledTimes(1);
     expect(sendCommandOverGoogleHome).not.toBeCalled();
     expect(sendCommandOverLGThinq).not.toBeCalled();
   });

package/src/hooks/IoT/useRemoteControl.js

@@ -18,6 +18,7 @@ const useRemoteControl = () => {
     async (sensor, action, data, userId, actionName) => {
       // No action, raise not authorized
       let result = false;
+
       if (!action) {
         ToastBottomHelper.error(
           t('your_account_has_not_been_authorized_to_control')
@@ -29,6 +30,7 @@ const useRemoteControl = () => {
         try {
           result = await sendCommandOverBluetooth(sensor, action, data, userId);
         } catch (err) {
+          result = false;
           if (err === SEND_COMMAND_OVER_BLUETOOTH_FAIL) {
             result = await sendCommandOverInternet(
               sensor,
@@ -44,8 +46,9 @@ const useRemoteControl = () => {
       }
 
       if (
-        action.command_prefer_over_internet ||
-        action.command_prefer_over_bluetooth
+        (action.command_prefer_over_internet ||
+          action.command_prefer_over_bluetooth) &&
+        !result
       ) {
         result = await sendCommandOverInternet(
           sensor,
@@ -55,7 +58,7 @@ const useRemoteControl = () => {
         );
       }
 
-      if (action.command_prefer_over_googlehome) {
+      if (action.command_prefer_over_googlehome && !result) {
         result = await sendCommandOverGoogleHome(
           ggHomeConnections,
           sensor,

package/src/navigations/UnitStack.js

@@ -51,7 +51,7 @@ import EmergencySetting from '../screens/EmergencySetting';
 import ConfirmUnitDeletion from '../screens/ConfirmUnitDeletion';
 import InfoMemberUnit from '../screens/Sharing/InfoMemberUnit';
 import EnterPassword from '../screens/EnterPassword';
-import SelectDevices from '../screens/Unit/SelectDevices';
+import SelectFavoritesDevices from '../screens/Unit/SelectFavoritesDevices';
 import { HanetCameraStack } from './HanetCameraStack';
 import { axiosGet } from '../utils/Apis/axios';
 import { API } from '../configs';
@@ -402,8 +402,8 @@ export const UnitStack = memo((props) => {
         }}
       />
       <Stack.Screen
-        name={Route.SelectDevices}
-        component={SelectDevices}
+        name={Route.SelectFavoritesDevices}
+        component={SelectFavoritesDevices}
         options={{
           headerShown: false,
         }}

package/src/screens/AddCommon/SelectSubUnit.js

@@ -64,7 +64,7 @@ const AddCommonSelectSubUnit = ({ route }) => {
   const fetchDetails = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/screens/AddNewAction/SelectAction.js

@@ -41,6 +41,7 @@ const SelectAction = memo(({ route }) => {
     isAutomateTab,
     isCreateNewAction,
     isMultiUnits,
+    oldType,
   } = route.params;
   const [data, setData] = useState([]);
   const [actions, setActions] = useState([]);
@@ -257,7 +258,7 @@ const SelectAction = memo(({ route }) => {
       navigate(Routes.ScriptDetail, {
         id: automateId,
         name: scriptName,
-        type: type,
+        type: oldType,
         havePermission: true,
         unit,
         isMultiUnits,

package/src/screens/AddNewAction/SelectSensorDevices.js

@@ -116,6 +116,7 @@ const SelectSensorDevices = memo(({ route }) => {
       isAutomateTab,
       isCreateNewAction,
       isMultiUnits,
+      oldType,
     });
   }, [
     navigate,
@@ -131,6 +132,7 @@ const SelectSensorDevices = memo(({ route }) => {
     isAutomateTab,
     isCreateNewAction,
     isMultiUnits,
+    oldType,
   ]);
 
   const onPressClose = useCallback(() => {

package/src/screens/AddNewDevice/hooks/ConnectDevices.js

@@ -13,7 +13,7 @@ const useConnectDevices = (new_sensor, station_id, unit_id) => {
   const fetchDetails = useCallback(async () => {
     const { success: fetchSuccess, data: unit } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     const station = unit.stations.find((item) => item.id === station_id);

package/src/screens/AddNewDevice/index.js

@@ -27,7 +27,7 @@ const AddNewDevice = memo(({ route }) => {
   const fetchDetails = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/screens/AddNewGateway/hooks/index.js

@@ -9,7 +9,7 @@ const useConnectGateway = (unit_id) => {
   const fetchDetails = useCallback(async () => {
     const { success: fetchSuccess, data: unit } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     return { fetchSuccess, unit };

package/src/screens/SubUnit/hooks/useManageSubUnit.js

@@ -11,7 +11,7 @@ export default (unit) => {
     setIsLoading(true);
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit?.id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/screens/SyncLGDevice/AddLGDevice.js

@@ -24,7 +24,7 @@ const AddLGDevice = memo(({ route }) => {
   const fetchDetails = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit_id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/screens/Unit/{SelectDevices.js → SelectFavoritesDevices.js}

@@ -20,9 +20,9 @@ import { SCContext } from '../../context';
 import { Action } from '../../context/actionType';
 import { axiosGet, axiosPost } from '../../utils/Apis/axios';
 import { API, Colors } from '../../configs';
-import styles from './SelectDevicesStyles';
+import styles from './SelectFavoritesDevicesStyles';
 
-const SelectDevices = memo(({ route }) => {
+const SelectFavoritesDevices = memo(({ route }) => {
   const t = useTranslations();
   const { goBack } = useNavigation();
   const { unitId } = route.params;
@@ -32,7 +32,7 @@ const SelectDevices = memo(({ route }) => {
   const [indexStation, setIndexStation] = useState(0);
   const [stations, setStations] = useState([]);
   const [selectedIds, setSelectedIds] = useState([]);
-  const [loading, setLoading] = useState(false);
+  const [loading, setLoading] = useState(true);
 
   const fetchData = useCallback(async () => {
     setLoading(true);
@@ -116,7 +116,7 @@ const SelectDevices = memo(({ route }) => {
           {t('select_device')}
         </Text>
 
-        {listStation.length ? (
+        {!!listStation.length && (
           <NavBar
             listStation={listStation}
             listMenuItem={listMenuItem}
@@ -124,7 +124,8 @@ const SelectDevices = memo(({ route }) => {
             indexStation={indexStation}
             style={styles.navbar}
           />
-        ) : (
+        )}
+        {!listStation.length && !loading && (
           <View style={styles.noneData}>
             <Text center>{t('text_unit_add_to_favorites_no_devices')}</Text>
           </View>
@@ -155,4 +156,4 @@ const SelectDevices = memo(({ route }) => {
   );
 });
 
-export default SelectDevices;
+export default SelectFavoritesDevices;

package/src/screens/Unit/__test__/{SelectDevices.test.js → SelectFavoritesDevices.test.js}

@@ -4,7 +4,7 @@ import MockAdapter from 'axios-mock-adapter';
 
 import { SCProvider } from '../../../context';
 import { mockSCStore } from '../../../context/mockStore';
-import SelectDevices from '../SelectDevices';
+import SelectFavoritesDevices from '../SelectFavoritesDevices';
 import Device from '../../AddNewAction/Device';
 import BottomButtonView from '../../../commons/BottomButtonView';
 import { API } from '../../../configs';
@@ -12,7 +12,7 @@ import api from '../../../utils/Apis/axios';
 
 const wrapComponent = (route) => (
   <SCProvider initState={mockSCStore({})}>
-    <SelectDevices route={route} />
+    <SelectFavoritesDevices route={route} />
   </SCProvider>
 );
 
@@ -35,7 +35,7 @@ jest.mock('react', () => {
   };
 });
 
-describe('Test SelectDevices', () => {
+describe('Test SelectFavoritesDevices', () => {
   let tree, route;
 
   beforeAll(() => {

package/src/screens/UnitSummary/index.js

@@ -93,7 +93,7 @@ const UnitSummary = memo(({ route }) => {
   const fetchUnitDetail = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_DETAIL(unit?.id),
-      {},
+      { headers: { 'Cache-Control': 'no-cache' } },
       true
     );
     if (success) {

package/src/utils/Route/index.js

@@ -146,7 +146,7 @@ const Routes = {
   ItemPasscode: 'ItemPasscode',
   UnitMemberInformation: 'UnitMemberInformation',
   EnterPassword: 'EnterPassword',
-  SelectDevices: 'SelectDevices',
+  SelectFavoritesDevices: 'SelectFavoritesDevices',
 };
 
 export default Routes;