@eohjsc/react-native-smart-city 0.7.39 → 0.7.41

package/package.json

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

package/src/commons/FieldTemplate/ChooseUserField/index.js

@@ -18,7 +18,11 @@ const ChooseUserField = ({ unit, dataItem, index, setDataForm, dataForm }) => {
   const [members, setMembers] = useState([]);
   const t = useTranslations();
   const fetchMembers = async () => {
-    const { success, data } = await axiosGet(API.SHARE.UNITS_MEMBERS(unit.id));
+    const { success, data } = await axiosGet(
+      API.SHARE.UNITS_MEMBERS(unit.id),
+      {},
+      true
+    );
     if (success) {
       setMembers(data);
     }

package/src/commons/SelectGateway/index.js

@@ -67,7 +67,8 @@ const SelectGateway = ({
         params: {
           type,
         },
-      }
+      },
+      true
     );
     if (success) {
       setGateways(data);

package/src/commons/SelectSubUnit/index.js

@@ -54,7 +54,11 @@ const SelectSubUnit = ({ unitId, title, subTitle, onPressNext, route }) => {
 
   const fetchDetails = useCallback(async () => {
     // todo Bang: switch to use simpler APIs
-    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId));
+    const { success, data } = await axiosGet(
+      API.UNIT.UNIT_DETAIL(unitId),
+      {},
+      true
+    );
     if (success) {
       setUnit(data);
     }

package/src/commons/SelectUnit/index.js

@@ -67,7 +67,7 @@ const SelectUnit = ({ title, subTitle, onPressNext }) => {
 
   useEffect(() => {
     (async () => {
-      const { data, success } = await axiosGet(API.SHARE.UNITS());
+      const { data, success } = await axiosGet(API.SHARE.UNITS(), {}, true);
       if (success) {
         const normalizeData = data.map((unit) => ({
           name: unit.name,

package/src/commons/UnitSummary/ConfigHistoryChart/index.js

@@ -6,13 +6,17 @@ import { axiosGet } from '../../../utils/Apis/axios';
 import { getPusher } from '../../../utils/Pusher';
 
 const fetchDataS3 = async (url) => {
-  const { data } = await axiosGet(url, {
-    // todo Bang try not to use axiosGet
-    transformRequest: (rq, headers) => {
-      delete headers.Authorization;
-      return rq;
+  const { data } = await axiosGet(
+    url,
+    {
+      // todo Bang try not to use axiosGet
+      transformRequest: (rq, headers) => {
+        delete headers.Authorization;
+        return rq;
+      },
     },
-  });
+    true
+  );
   return data;
 };
 
@@ -51,9 +55,13 @@ export const useFetchConfigHistory = (
       params.append('date_from', date_from.format('YYYY-MM-DDTHH:mm:ss'));
       params.append('date_to', date_to.format('YYYY-MM-DDTHH:mm:ss'));
 
-      const { success, data } = await axiosGet(endpoint, {
-        params,
-      });
+      const { success, data } = await axiosGet(
+        endpoint,
+        {
+          params,
+        },
+        true
+      );
       await updateConfigChart(success, data, configs, setChartData);
       setProcessing(false);
     },

package/src/hooks/IoT/useValueEvaluation.js

@@ -16,9 +16,13 @@ const useValueEvaluations = (unitId) => {
         return;
       }
       const params = { configs__end_device__station__unit: unitId, page: page };
-      const { success, data } = await axiosGet(API.VALUE_EVALUATIONS(), {
-        params,
-      });
+      const { success, data } = await axiosGet(
+        API.VALUE_EVALUATIONS(),
+        {
+          params,
+        },
+        true
+      );
       if (success) {
         setAction(Action.UPDATE_VALUE_EVALUATIONS, {
           unitId,

package/src/hooks/IoT/useWatchSharedChips.js

@@ -60,11 +60,15 @@ const useWatchSharedChips = ({ dashboardId, filterChipIds, ready = true }) => {
       return;
     }
     const getGateways = async () => {
-      const { success, data } = await axiosGet(API.CHIP.SHARED_CONFIGURATION, {
-        params: {
-          unit: dashboardId,
+      const { success, data } = await axiosGet(
+        API.CHIP.SHARED_CONFIGURATION,
+        {
+          params: {
+            unit: dashboardId,
+          },
         },
-      });
+        true
+      );
       if (success) {
         setChipIds(data.map((chip) => chip.id));
         handleUpdateConfigsById(data);

package/src/hooks/useMqtt.js

@@ -34,11 +34,15 @@ const useChipJsonConfiguration = ({ dashboardId, ready = true }) => {
   // get chip data
   useEffect(() => {
     const getGateways = async () => {
-      const { success, data } = await axiosGet(API.CHIP.JSON_CONFIGURATION, {
-        params: {
-          unit: dashboardId,
+      const { success, data } = await axiosGet(
+        API.CHIP.JSON_CONFIGURATION,
+        {
+          params: {
+            unit: dashboardId,
+          },
         },
-      });
+        true
+      );
       if (success) {
         setChips(data);
         handleUpdateConfigsById(data);

package/src/navigations/AutomateStack.js

@@ -29,7 +29,11 @@ const AutomateStack = memo(() => {
 
   useEffect(() => {
     const fetchStarredScripts = async () => {
-      const { success, data } = await axiosGet(API.AUTOMATE.STARRED_SCRIPTS());
+      const { success, data } = await axiosGet(
+        API.AUTOMATE.STARRED_SCRIPTS(),
+        {},
+        true
+      );
       success && setAction(Action.SET_STARRED_SCRIPTS, data);
     };
     fetchStarredScripts();

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

@@ -101,9 +101,13 @@ export default ({ id, type, share, filterEnabled }) => {
     }
     params.append('page', page);
 
-    const { success, data } = await axiosGet(api.url(id), {
-      params: params,
-    });
+    const { success, data } = await axiosGet(
+      api.url(id),
+      {
+        params: params,
+      },
+      true
+    );
     if (success && data) {
       const { results = [] } = data;
       if (page === 1) {
@@ -123,7 +127,11 @@ export default ({ id, type, share, filterEnabled }) => {
     if (!api?.memberUrl || !filterEnabled?.user) {
       return;
     }
-    const { success, data } = await axiosGet(api.memberUrl(share?.id));
+    const { success, data } = await axiosGet(
+      api.memberUrl(share?.id),
+      {},
+      true
+    );
     if (success) {
       data.unshift({ id: 0, name: t('all') });
       setMembers(data);

package/src/screens/AddLocationMaps/index.js

@@ -66,7 +66,8 @@ const AddLocationMaps = memo(() => {
 
       const { success, data } = await axiosGet(
         API.EXTERNAL.GOOGLE_MAP.AUTO_COMPLETE,
-        config
+        config,
+        true
       );
       if (success) {
         setSearchData(data.predictions);
@@ -103,7 +104,8 @@ const AddLocationMaps = memo(() => {
 
     const { success, data } = await axiosGet(
       API.EXTERNAL.GOOGLE_MAP.GET_LAT_LNG_BY_PLACE_ID,
-      body
+      body,
+      true
     );
     if (success) {
       const { location } = data.result.geometry;
@@ -128,7 +130,8 @@ const AddLocationMaps = memo(() => {
               latlng: `${currentLatitude},${currentLongitude}`,
               key: SCConfig.GOOGLE_MAP_API_KEY,
             },
-          }
+          },
+          true
         );
         if (success && data.results.length > 0) {
           const result = data.results[0];

package/src/screens/AddNewGateway/RenameNewDevices.js

@@ -168,7 +168,8 @@ const RenameNewDevices = memo(({ route }) => {
         API.CHIP.RENAME_DEVICES(chipId),
         {
           params,
-        }
+        },
+        true
       );
       if (success) {
         setInfo(data);

package/src/screens/Automate/AddNewAction/ChooseConfig.js

@@ -27,7 +27,8 @@ const ChooseConfig = ({ route }) => {
 
     const { success, data: automateData } = await axiosGet(
       API.AUTOMATE.DISPLAY_CONFIGS(device.id),
-      { params }
+      { params },
+      true
     );
 
     if (success) {

package/src/screens/Automate/AddNewAction/NewActionWrapper.js

@@ -22,13 +22,12 @@ const NewActionWrapper = ({
     canNext !== undefined || onNext !== undefined || nextTitle !== undefined;
   const { navigate } = useNavigation();
   const { params = {} } = useRoute();
-  const { automateId } = params;
 
   const { closeScreen } = params;
 
   const handleClose = useCallback(() => {
-    navigate(closeScreen, { ...params, automate: { id: automateId } });
-  }, [closeScreen, navigate, params, automateId]);
+    navigate(closeScreen, params);
+  }, [closeScreen, navigate, params]);
 
   const rightComponent = useMemo(
     () => (

package/src/screens/Automate/AddNewAction/ReceiverSelect.js

@@ -32,7 +32,11 @@ const ReceiverSelect = ({
   );
 
   const loadMembers = useCallback(async () => {
-    const { success, data } = await axiosGet(API.SHARE.UNITS_MEMBERS(unitId));
+    const { success, data } = await axiosGet(
+      API.SHARE.UNITS_MEMBERS(unitId),
+      {},
+      true
+    );
     if (success) {
       setMembers(
         data.map((item) => ({

package/src/screens/Automate/MultiUnits.js

@@ -48,7 +48,8 @@ const MultiUnits = () => {
       } else {
         const { success, data: automateData } = await axiosGet(
           API.AUTOMATE.GET_MULTI_UNITS(),
-          fetchParams
+          fetchParams,
+          true
         );
         success && setData(automateData);
       }

package/src/screens/Automate/ScriptDetail/index.js

@@ -97,10 +97,11 @@ const ScriptDetail = ({ route }) => {
     name,
     unit,
     can_edit,
-    id: automateId,
     is_need_all_conditions,
     conditions = [{}],
   } = automate;
+  // Create const automateId Fix error navigation from handleClose NewActionWrapper to ScriptDetail
+  const automateId = automate.id || params.automateId;
   const [needAllCondition, setNeedAllCondition] = useState(
     is_need_all_conditions
   );
@@ -276,7 +277,9 @@ const ScriptDetail = ({ route }) => {
 
   const fetchAutomateActions = useCallback(async () => {
     const { success, data: automateData } = await axiosGet(
-      API.AUTOMATE.SCRIPT_ITEMS(automateId)
+      API.AUTOMATE.SCRIPT_ITEMS(automateId),
+      {},
+      true
     );
     if (success) {
       setData(automateData.script_items || []);
@@ -285,7 +288,9 @@ const ScriptDetail = ({ route }) => {
 
   const fetchAutomate = useCallback(async () => {
     const { success, data: automateData } = await axiosGet(
-      API.AUTOMATE.FETCH_AUTOMATE(automateId)
+      API.AUTOMATE.FETCH_AUTOMATE(automateId),
+      {},
+      true
     );
     if (success) {
       setAutomate(automateData);
@@ -426,7 +431,11 @@ const ScriptDetail = ({ route }) => {
         max_conditions_per_automation - conditions.length
       );
     } else {
-      const { success, data: perms } = await axiosGet(API.AUTH.PERMISSIONS());
+      const { success, data: perms } = await axiosGet(
+        API.AUTH.PERMISSIONS(),
+        {},
+        true
+      );
       if (success) {
         setNumberConditionsUsed(
           perms.max_conditions_per_automation - conditions.length

package/src/screens/Automate/hooks/useAction.js

@@ -43,7 +43,9 @@ const useAction = (device, scriptItems, activatedScript = {}) => {
 
   const fetchDisplayActions = useCallback(async () => {
     const { success, data } = await axiosGet(
-      API.DEVICE.DISPLAY_ACTIONS(device.id)
+      API.DEVICE.DISPLAY_ACTIONS(device.id),
+      {},
+      true
     );
 
     success && setDisplayActions(data);

package/src/screens/Device/detail.js

@@ -198,7 +198,11 @@ const DeviceDetail = ({ route }) => {
   const bluetoothDevice = useBluetoothDevice(device);
 
   const fetchUnitDetail = useCallback(async () => {
-    const { success, data } = await axiosGet(API.UNIT.UNIT_DETAIL(unitId));
+    const { success, data } = await axiosGet(
+      API.UNIT.UNIT_DETAIL(unitId),
+      {},
+      true
+    );
     if (success) {
       setUnit(data);
     }
@@ -249,7 +253,9 @@ const DeviceDetail = ({ route }) => {
 
   const fetchSensorDetail = useCallback(async () => {
     const { success, data, resp_status } = await axiosGet(
-      API.DEVICE.DEVICE_DETAIL(sensorId || sensorData?.id)
+      API.DEVICE.DEVICE_DETAIL(sensorId || sensorData?.id),
+      {},
+      true
     );
     if (success) {
       setDevice(data);
@@ -611,7 +617,8 @@ const DeviceDetail = ({ route }) => {
           API.DEVICE.DISPLAY_VALUES_V2(device?.id),
           {
             params: params,
-          }
+          },
+          true
         );
 
         setLoading((preState) => {

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

@@ -128,9 +128,13 @@ export const useGetEvaluateValue = (configId, unitId) => {
 
   if (configId && valueEvaluations[configId] === undefined) {
     (async () => {
-      const { success, data } = await axiosGet(API.VALUE_EVALUATIONS(), {
-        params: { configs__id: configId },
-      });
+      const { success, data } = await axiosGet(
+        API.VALUE_EVALUATIONS(),
+        {
+          params: { configs__id: configId },
+        },
+        true
+      );
       if (success) {
         setAction(Action.INIT_VALUE_EVALUATIONS, {
           configId: configId,

package/src/screens/SelectUnit/index.js

@@ -40,7 +40,9 @@ const SelectUnit = () => {
 
   const getAllUnits = useCallback(async () => {
     const { success, data: automateData } = await axiosGet(
-      API.AUTOMATE.GET_ALL_UNITS()
+      API.AUTOMATE.GET_ALL_UNITS(),
+      {},
+      true
     );
     if (success) {
       setData(automateData);

package/src/screens/Sharing/InfoMemberUnit.js

@@ -89,7 +89,9 @@ const InfoMemberUnit = memo(({ route }) => {
   const fetchMemberInfo = useCallback(async () => {
     setIsLoading(true);
     const { success, data } = await axiosGet(
-      API.SHARE.UNIT_MEMBER_INFO(unit?.id, member?.id)
+      API.SHARE.UNIT_MEMBER_INFO(unit?.id, member?.id),
+      {},
+      true
     );
     if (success) {
       setIsLoading(false);

package/src/screens/SideMenuDetail/index.js

@@ -117,7 +117,9 @@ const SideMenuDetail = memo(({ route }) => {
 
   const fetchSideMenuDetail = useCallback(async () => {
     const { success, data } = await axiosGet(
-      API.DEVICE.SIDE_MENU_DETAIL(sensor.id, side_menu.id)
+      API.DEVICE.SIDE_MENU_DETAIL(sensor.id, side_menu.id),
+      {},
+      true
     );
     if (success) {
       setSideMenu(data);

package/src/screens/Unit/SelectAddToFavorites.js

@@ -42,10 +42,14 @@ const SelectAddToFavorites = memo(({ route }) => {
   const fetchData = useCallback(async () => {
     setLoading(true);
     const { success: successDevice, data: dataDevice } = await axiosGet(
-      API.UNIT.DEVICES_NOT_FAVORITES(unitId)
+      API.UNIT.DEVICES_NOT_FAVORITES(unitId),
+      {},
+      true
     );
     const { success: successAutomate, data: dataAutomate } = await axiosGet(
-      API.UNIT.AUTOMATE_SCRIPTS_NOT_STARRED(unitId)
+      API.UNIT.AUTOMATE_SCRIPTS_NOT_STARRED(unitId),
+      {},
+      true
     );
     if (successDevice && successAutomate) {
       const newData = dataDevice.filter((item) => item.devices.length > 0);

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

@@ -134,7 +134,8 @@ const ThreePhasePowerConsumption = memo(({ summaryDetail }) => {
         API.VALUE_CONSUME.DISPLAY_HISTORY(),
         {
           params,
-        }
+        },
+        true
       );
       if (success) {
         setData(data);

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

@@ -93,7 +93,8 @@ const PowerConsumption = memo(({ summaryDetail }) => {
         API.VALUE_CONSUME.DISPLAY_HISTORY(),
         {
           params,
-        }
+        },
+        true
       );
       if (success) {
         setData(data);

package/src/screens/UnitSummary/index.js

@@ -104,7 +104,8 @@ const UnitSummary = memo(({ route }) => {
   const fetchUnitSummary = useCallback(async () => {
     const { success, data } = await axiosGet(
       API.UNIT.UNIT_SUMMARY(unit?.id),
-      {}
+      {},
+      true
     );
     if (success) {
       const newData = data.filter((item) => item.id === summaryId);