@janiscommerce/app-tracking-shift 1.2.0 → 1.4.0-beta.1

package/lib/provider/ShiftTrackingProvider.js

@@ -1,5 +1,5 @@
 import React, {useEffect, useMemo, useState} from 'react';
-import {useMMKVString} from 'react-native-mmkv';
+import {useStorageValue} from '../hooks/useStorageValue';
 import ShiftTrackingContext from '../context/ShiftTrackingContext';
 import {
 	openShift,
@@ -17,20 +17,19 @@ import {
 	STAFF_AUTH,
 	WORKLOG_TYPES_DATA,
 } from '../constant';
-import {useMMKVObject} from '../hooks/useMMKVObject';
 import {isValidObject, promiseWrapper} from '../utils/helpers';
-import Storage from '../db/StorageService';
+import Shift from '../Shift';
 
 const ShiftTrackingProvider = ({children, onError = null}) => {
-	const [shiftStatus] = useMMKVString(SHIFT_STATUS);
-	const [shiftId] = useMMKVString(SHIFT_ID);
-	const [shiftData] = useMMKVObject(SHIFT_DATA, {});
+	const shiftStatus = useStorageValue(SHIFT_STATUS);
+	const shiftId = useStorageValue(SHIFT_ID);
+	const shiftData = useStorageValue(SHIFT_DATA, {});
 
-	const [currentWorkLogId] = useMMKVString(CURRENT_WORKLOG_ID);
-	const [workLogData] = useMMKVObject(WORKLOG_TYPES_DATA, {});
-	const [currentWorkLogData] = useMMKVObject(CURRENT_WORKLOG_DATA, {});
+	const currentWorkLogId = useStorageValue(CURRENT_WORKLOG_ID);
+	const workLogData = useStorageValue(WORKLOG_TYPES_DATA, {});
+	const currentWorkLogData = useStorageValue(CURRENT_WORKLOG_DATA, {});
 
-	const [staffAuthData] = useMMKVObject(STAFF_AUTH, {});
+	const staffAuthData = useStorageValue(STAFF_AUTH, {});
 
 	const [error, setError] = useState(null);
 	const [openShiftResult, setOpenShiftResult] = useState({
@@ -48,6 +47,7 @@ const ShiftTrackingProvider = ({children, onError = null}) => {
 			shiftStatus,
 			shiftData,
 			workLogTypes,
+			hasWorkTypes: !!workLogTypes?.length,
 			currentWorkLogData,
 			currentWorkLogId,
 			hasStaffAuthorization,
@@ -132,12 +132,11 @@ const ShiftTrackingProvider = ({children, onError = null}) => {
 		const isExcludedWork = EXCLUDED_WORKLOG_TYPES.includes(currentWorkLog?.referenceId);
 
 		if (isValidObject(currentWorkLog)) {
-			Storage.set(CURRENT_WORKLOG_ID, currentWorkLog.id);
-			Storage.set(CURRENT_WORKLOG_DATA, JSON.stringify(currentWorkLog));
+			Shift.setCurrentWorkLog(currentWorkLog);
 		}
 
 		if (isValidObject(currentWorkLog) && !isExcludedWork) {
-			Storage.set(SHIFT_STATUS, 'paused');
+			Shift.status = 'paused';
 		}
 
 		setOpenShiftResult((prev) => ({

package/lib/utils/helpers/index.js

@@ -1,3 +1,7 @@
+export {default as isApiError} from './isApiError';
+
+export {default as isInternetReachable} from './isInternetReachable';
+
 export const generateRandomId = () => Math.random().toString(32).slice(2);
 
 export const isFunction = (fn) => !!({}.toString.call(fn) === '[object Function]');

package/lib/utils/helpers/isApiError/index.js

@@ -0,0 +1,7 @@
+const isApiError = (error) => {
+	const {result, statusCode = null} = error || {};
+
+	return result?.message && Boolean(statusCode);
+};
+
+export default isApiError;

package/lib/utils/helpers/isInternetReachable/index.js

@@ -0,0 +1,16 @@
+import {getInternetReachability} from '@janiscommerce/app-device-info';
+
+/**
+ * Check if internet connection is reachable
+ * @returns {Promise<boolean>} true if internet is reachable, false otherwise
+ */
+const isInternetReachable = async () => {
+	try {
+		const isReachable = await getInternetReachability();
+		return isReachable;
+	} catch (error) {
+		return false;
+	}
+};
+
+export default isInternetReachable;

package/lib/utils/provider/downloadWorkLogTypes/index.js

@@ -19,7 +19,7 @@ const downloadWorkLogTypes = async (onDownloadError) => {
 			expirationTime: Date.now() + WORKLOG_TYPES_EXPIRATION_TIME,
 		};
 
-		Storage.set(WORKLOG_TYPES_DATA, JSON.stringify(data));
+		Storage.set(WORKLOG_TYPES_DATA, data);
 		return null;
 	} catch (error) {
 		const parsedError = errorParser(error);

package/lib/utils/provider/isAuthorizedToUseStaffMS/index.js

@@ -15,24 +15,24 @@ const isAuthorizedToUseStaffMS = async () => {
 
 		const isAuthorized = await Shift.checkStaffMSAuthorization();
 
-		const data = {
+		const staffAuthData = {
 			hasStaffAuthorization: isAuthorized,
 			expirationTime: Date.now() + STAFF_MS_AUTHORIZATION_EXPIRATION_TIME,
 			isExpired: false,
 		};
 
-		Storage.set(STAFF_AUTH, JSON.stringify(data));
+		Storage.set(STAFF_AUTH, staffAuthData);
 
 		return isAuthorized;
 	} catch (error) {
 		const parsedError = errorParser(error);
 		Crashlytics.recordError(parsedError, 'Error checking staff MS authorization');
-		const data = {
+		const staffAuthData = {
 			hasStaffAuthorization: false,
 			expirationTime: 0,
 			isExpired: true,
 		};
-		Storage.set(STAFF_AUTH, JSON.stringify(data));
+		Storage.set(STAFF_AUTH, staffAuthData);
 
 		return Promise.reject(parsedError);
 	}

package/lib/utils/provider/openShift/index.js

@@ -1,15 +1,11 @@
-import Storage from '../../../db/StorageService';
 import Crashlytics from '../../crashlytics';
-import {SHIFT_ID, SHIFT_STATUS, SHIFT_DATA} from '../../../constant';
 import getUserId from '../../userInfo/getUserId';
 import Shift from '../../../Shift';
 import {isFunction} from '../../helpers';
-import {deleteStoredWorkLog, setObject} from '../../storage';
 import errorParser from '../../errorParser';
 
 const openShift = async (onOpenShiftError) => {
 	try {
-		const shiftId = Storage.getString(SHIFT_ID);
 		const userId = await getUserId();
 
 		if (!userId) {
@@ -21,8 +17,7 @@ const openShift = async (onOpenShiftError) => {
 			};
 		}
 
-		const currentShift = await Shift.getUserOpenShift({id: shiftId, userId});
-
+		const currentShift = await Shift.getUserOpenShift({id: Shift.id, userId});
 		if (currentShift?.status !== 'opened') {
 			await Shift.deleteShiftRegisters();
 			const openShiftId = await Shift.open();
@@ -32,17 +27,16 @@ const openShift = async (onOpenShiftError) => {
 			};
 		}
 
-		if (shiftId === currentShift.id)
+		if (Shift.id === currentShift.id)
 			return {
 				openShiftId: currentShift.id,
 				getWorkLogs: false,
 			};
 
-		deleteStoredWorkLog();
-		Storage.set(SHIFT_ID, currentShift.id);
-		Storage.set(SHIFT_STATUS, currentShift.status);
-		setObject(SHIFT_DATA, currentShift);
-
+		Shift.deleteCurrentWorkLog();
+		Shift.id = currentShift.id;
+		Shift.status = currentShift.status;
+		Shift.data = currentShift;
 		return {
 			openShiftId: currentShift.id,
 			getWorkLogs: true,

package/lib/utils/storage/getStaffAuthorizationData/index.js

@@ -5,9 +5,11 @@ import errorParser from '../../errorParser';
 
 const getStaffAuthorizationData = () => {
 	try {
-		const staffAuthRaw = Storage.getString(STAFF_AUTH);
-		const parsedAuth = JSON.parse(staffAuthRaw);
-		const {hasStaffAuthorization = false, expirationTime = 0, isExpired = false} = parsedAuth;
+		const {
+			hasStaffAuthorization = false,
+			expirationTime = 0,
+			isExpired = false,
+		} = Storage.get(STAFF_AUTH);
 
 		return {
 			hasStaffAuthorization,

package/lib/utils/storage/getWorkLogTypesData/index.js

@@ -16,9 +16,7 @@ import errorParser from '../../errorParser';
 const getWorkLogTypesData = () => {
 	try {
 		Crashlytics.log('getWorkLogTypesData');
-		const workLogRaw = Storage.getString(WORKLOG_TYPES_DATA);
-		const parsedWorkLogs = JSON.parse(workLogRaw);
-		const {workLogTypes = [], expirationTime = 0} = parsedWorkLogs;
+		const {workLogTypes = [], expirationTime = 0} = Storage.get(WORKLOG_TYPES_DATA);
 
 		return {
 			workLogTypes,

package/lib/utils/storage/index.js

@@ -1,20 +1,2 @@
-import Storage from '../../db/StorageService';
-
 export {default as getWorkLogTypesData} from './getWorkLogTypesData';
-export {default as getShiftData} from './getShiftData';
 export {default as getStaffAuthorizationData} from './getStaffAuthorizationData';
-export {default as deleteStoredWorkLog} from './deleteStoredWorkLog';
-
-export const setObject = (key, value) => {
-	const jsonValue = JSON.stringify(value);
-	Storage.set(key, jsonValue);
-};
-
-export const getObject = (key, defaultValue = {}) => {
-	try {
-		const jsonValue = Storage.getString(key);
-		return JSON.parse(jsonValue);
-	} catch (error) {
-		return defaultValue;
-	}
-};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@janiscommerce/app-tracking-shift",
-	"version": "1.2.0",
+	"version": "1.4.0-beta.1",
 	"main": "lib/index.js",
 	"module": "lib/index.js",
 	"exports": {
@@ -46,16 +46,13 @@
 	"homepage": "https://github.com/janis-commerce/app-tracking-shift#readme",
 	"peerDependencies": {
 		"@janiscommerce/app-crashlytics": ">=2.1.0",
+		"@janiscommerce/app-device-info": "^1.1.0",
 		"@janiscommerce/app-request": ">=2.0.0",
+		"@janiscommerce/app-storage": ">=1.1.0",
 		"react": ">=17.0.2 <19",
 		"react-dom": ">=17.0.2 <19",
 		"react-native": ">=0.67.5 <0.75"
 	},
-	"dependencies": {
-		"@janiscommerce/app-device-info": "^1.1.0",
-		"@janiscommerce/oauth-native": "^1.10.2",
-		"react-native-mmkv": "2.12.2"
-	},
 	"devDependencies": {
 		"@babel/core": "^7.0.0",
 		"@babel/eslint-parser": "^7.22.5",
@@ -63,6 +60,8 @@
 		"@babel/preset-react": "^7.0.0",
 		"@janiscommerce/app-crashlytics": "^2.1.0",
 		"@janiscommerce/app-request": "^2.6.0",
+		"@janiscommerce/app-storage": "^1.1.0",
+		"@janiscommerce/oauth-native": "^1.10.2",
 		"@testing-library/react": "^16.3.0",
 		"@testing-library/react-native": "^12.0.1",
 		"babel-jest": "^29.0.0",
@@ -83,6 +82,7 @@
 		"react": "18.2.0",
 		"react-native": "0.71.6",
 		"react-native-device-info": "^10.12.0",
+		"react-native-mmkv": "2.12.2",
 		"react-native-inappbrowser-reborn": "^3.7.0",
 		"react-test-renderer": "18.2.0"
 	}

package/lib/hooks/useMMKVObject/index.js

@@ -1,21 +0,0 @@
-import {useMMKVString} from 'react-native-mmkv';
-import {useMemo} from 'react';
-import Crashlytics from '../../utils/crashlytics';
-import errorParser from '../../utils/errorParser';
-
-export const useMMKVObject = (key, defaultValue = null) => {
-	const [raw] = useMMKVString(key);
-
-	const storageValue = useMemo(() => {
-		if (!raw) return defaultValue;
-		try {
-			return JSON.parse(raw);
-		} catch (e) {
-			const parsedError = errorParser(e);
-			Crashlytics.recordError(parsedError, `Invalid JSON in MMKV key: ${key}`);
-			return defaultValue;
-		}
-	}, [raw]);
-
-	return [storageValue];
-};

package/lib/utils/storage/deleteStoredWorkLog/index.js

@@ -1,9 +0,0 @@
-import {CURRENT_WORKLOG_DATA, CURRENT_WORKLOG_ID} from '../../../constant';
-import Storage from '../../../db/StorageService';
-
-const deleteStoredWorkLog = () => {
-	Storage.delete(CURRENT_WORKLOG_ID);
-	Storage.delete(CURRENT_WORKLOG_DATA);
-};
-
-export default deleteStoredWorkLog;

package/lib/utils/storage/getShiftData/index.js

@@ -1,33 +0,0 @@
-import Storage from '../../../db/StorageService';
-import {SHIFT_DATA} from '../../../constant';
-
-/**
- * @description Get the shift data from the storage
- * @returns {Object} The shift data
- * @example
- * const shiftData = getShiftData();
- * console.log(shiftData); // {
-    "id": "631fb04c8fe08f51a8ee5949",
-    "startDate": "2024-01-15T09:00:00.000Z",
-    "dateToClose": "2024-01-15T17:00:00.000Z",
-    "dateMaxToClose": "2024-01-15T17:00:00.000Z",
-    "userId": "6a1fc1eeb5b68406e0487a10",
-    "displayId": "240715-EARPIQ",
-    "dateCreated": "2019-07-12T19:00:00.000Z",
-    "dateModified": "2019-07-20T19:00:00.000Z",
-    "userCreated": "6a1fc1eeb5b68406e0487a10",
-    "userModified": "7e1fc1eeb5b68406e048796",
-    "status": "opened"
-}
- */
-
-const getShiftData = () => {
-	const shiftData = Storage.getString(SHIFT_DATA);
-	try {
-		return JSON.parse(shiftData);
-	} catch (error) {
-		return shiftData;
-	}
-};
-
-export default getShiftData;