@janiscommerce/app-tracking-shift 1.7.0-beta.1 → 1.7.0-beta.3

package/lib/Formatter.js

@@ -1,4 +1,4 @@
-import {isArray, isEmptyArray, isNumber} from './utils/helpers';
+import {isArray, isEmptyArray, isNumber} from '@janiscommerce/apps-helpers';
 import {INTERNAL_WORKLOGS} from './constant';
 
 class Formatter {

package/lib/OfflineData.js

@@ -1,6 +1,6 @@
+import {isArray, isEmptyArray} from '@janiscommerce/apps-helpers';
 import {OFFLINE_DATA} from './constant';
 import Storage from './db/StorageService';
-import {isArray, isEmptyArray} from './utils/helpers';
 
 class OfflineData {
 	get hasData() {

package/lib/Shift.js

@@ -1,19 +1,11 @@
+import {isArray, isEmptyArray, isNumber} from '@janiscommerce/apps-helpers';
 import StaffService from './StaffApiServices';
 import Storage from './db/StorageService';
-import Crashlytics from './utils/crashlytics';
+import Crashlytics from './helpers/crashlytics';
 import ShiftWorklogs from './ShiftWorklogs';
-import errorParser from './utils/errorParser';
-import {
-	isArray,
-	isEmptyArray,
-	isNumber,
-	isValidObject,
-	isApiError,
-	isInternetReachable,
-	isValidDate,
-	parseToISOString,
-} from './utils/helpers';
-import {getStaffAuthorizationData} from './utils/storage';
+import errorParser from './helpers/errorParser';
+import {isApiError, isInternetReachable, isValidDate, parseToISOString} from './helpers';
+import {getStaffAuthorizationData} from './helpers/storage';
 import {
 	SHIFT_ID,
 	SHIFT_STATUS,
@@ -252,34 +244,34 @@ class Shift {
 	 * @param {string} workLog.name => Name related to the work log
 	 * @param {string} workLog.type => Type related to the work log
 	 * @param {number} workLog.suggestedTime => Suggested time related to the work log
-	 * @param {string|number} metadata.startDate => Start date related to the work log. Accepts an ISO 8601 string (e.g. "2026-03-05T10:00:00.000Z") or milliseconds since epoch (e.g. 1709636400000). Defaults to current date if omitted or invalid.
+	 * @param {string|number} workLog.startDate => Start date related to the work log. Accepts an ISO 8601 string (e.g. "2026-03-05T10:00:00.000Z") or milliseconds since epoch (e.g. 1709636400000). Defaults to current date if omitted or invalid.
 	 * @throws {Error} error
 	 * @returns {Promise<string>} workLogId => ID related to the work log that has just been opened for the user
 	 */
 
-	async openWorkLog(workLog = {}, {startDate} = {}) {
+	async openWorkLog(workLog = {}) {
 		let previousWorkLog = {};
 
 		try {
 			Crashlytics.log('openWorkLog:', workLog);
 
-			const currentDate = isValidDate(startDate)
-				? parseToISOString(startDate)
-				: new Date().toISOString();
-
-			if (!isValidObject(workLog)) return null;
+			if (!ShiftWorklogs.isValidWorkLog(workLog)) return null;
 
 			if (!this.hasStaffAuthorization) {
 				this._throwAuthorizationError();
 			}
+
+			workLog.startDate = isValidDate(workLog.startDate)
+				? parseToISOString(workLog.startDate)
+				: new Date().toISOString();
+
 			delete workLog.endDate;
 
 			if (this.hasWorkLogInProgress) {
-				const {startDate: workLogStart, ...currentRest} = this.getCurrentWorkLog();
-				previousWorkLog = {
-					...currentRest,
-					endDate: currentDate,
-				};
+				previousWorkLog = this.getCurrentWorkLog();
+				delete previousWorkLog.startDate;
+
+				previousWorkLog.endDate = workLog.startDate;
 			}
 
 			if (this._hasToPause(workLog.referenceId)) {
@@ -287,7 +279,6 @@ class Shift {
 			}
 
 			workLog.id = ShiftWorklogs.createId(workLog.referenceId);
-			workLog.startDate = currentDate;
 			this.setCurrentWorkLog(workLog);
 
 			const hasInternet = await isInternetReachable();
@@ -326,6 +317,7 @@ class Shift {
 	 * Finish a work log in the staff MS and record this event in the time tracking database.
 	 * @param {Object} workLog
 	 * @param {string} workLog.referenceId => Reference ID related to the work log
+	 * @param {string|number} workLog.endDate => End date related to the work log. Accepts an ISO 8601 string (e.g. "2026-03-05T10:00:00.000Z") or milliseconds since epoch (e.g. 1709636400000). Defaults to current date if omitted or invalid.
 	 * @throws {Error} error
 	 * @returns {Promise<string>} workLogId => ID related to the work log that has just been closed for the user
 	 */
@@ -334,7 +326,7 @@ class Shift {
 		try {
 			Crashlytics.log('finishWorkLog:', workLog);
 
-			if (!isValidObject(workLog)) return null;
+			if (!ShiftWorklogs.isValidWorkLog(workLog)) return null;
 
 			if (!this.hasStaffAuthorization) {
 				this._throwAuthorizationError();
@@ -342,7 +334,7 @@ class Shift {
 
 			const currentWorkLog = this.getCurrentWorkLog();
 
-			if (!isValidObject(currentWorkLog)) {
+			if (!ShiftWorklogs.isValidWorkLog(currentWorkLog)) {
 				throw new Error('There is no active worklog to close');
 			}
 
@@ -352,7 +344,9 @@ class Shift {
 				);
 			}
 
-			workLog.endDate = new Date().toISOString();
+			workLog.endDate = isValidDate(workLog.endDate)
+				? parseToISOString(workLog.endDate)
+				: new Date().toISOString();
 			delete workLog.startDate;
 
 			if (this.isPaused) {
@@ -406,7 +400,7 @@ class Shift {
 
 		return {
 			...(!!id && {id}),
-			...(isValidObject(data) && {...data}),
+			...(ShiftWorklogs.isValidWorkLog(data) && {...data}),
 		};
 	}
 

package/lib/ShiftWorklogs.js

@@ -1,6 +1,12 @@
+import {
+	isObject,
+	isEmptyObject,
+	isArray,
+	isEmptyArray,
+	generateRandomId,
+} from '@janiscommerce/apps-helpers';
 import {INTERNAL_WORKLOGS} from './constant';
 import StaffApiServices from './StaffApiServices';
-import {generateRandomId, isArray, isEmptyArray} from './utils/helpers';
 
 class ShiftWorklogs {
 	async open(params) {
@@ -101,6 +107,10 @@ class ShiftWorklogs {
 			})
 			.filter(Boolean);
 	}
+
+	isValidWorkLog(workLog = {}) {
+		return isObject(workLog) && !isEmptyObject(workLog);
+	}
 }
 
 export default new ShiftWorklogs();

package/lib/StaffApiServices.js

@@ -1,5 +1,5 @@
-import Request from './utils/request';
-import {isValidString} from './utils/helpers';
+import {isString} from '@janiscommerce/apps-helpers';
+import Request from './helpers/request';
 
 class StaffApiServices {
 	constructor() {
@@ -19,7 +19,7 @@ class StaffApiServices {
 				service: this.service,
 				namespace: 'shift-open',
 				body: {
-					...(isValidString(warehouseId) && {warehouseId}),
+					...(isString(warehouseId) && !!warehouseId && {warehouseId}),
 				},
 			});
 		} catch (error) {
@@ -40,7 +40,7 @@ class StaffApiServices {
 				service: this.service,
 				namespace: 'shift-update',
 				body: {
-					...(isValidString(warehouseId) && {warehouseId}),
+					...(isString(warehouseId) && !!warehouseId && {warehouseId}),
 				},
 			});
 		} catch (error) {

package/lib/helpers/index.js

@@ -0,0 +1,30 @@
+import {isNumber, isString} from '@janiscommerce/apps-helpers';
+
+export {default as isApiError} from './isApiError';
+
+export {default as isInternetReachable} from './isInternetReachable';
+
+export const reverseArray = (arr) => arr.slice().reverse();
+
+const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+const isIsoStringDate = (str) => ISO_DATE_REGEX.test(str);
+
+export const isValidDate = (date = '') => {
+	if (isNumber(date) && date > 0) {
+		const dateTime = new Date(date).getTime();
+		return isNumber(dateTime);
+	}
+	if (!isString(date) || !date?.length) return false;
+
+	if (!isIsoStringDate(date)) return false;
+
+	const dateTime = new Date(date).getTime();
+	return isNumber(dateTime);
+};
+
+export const parseToISOString = (date = '') => {
+	if (isNumber(date) && date > 0) return new Date(date).toISOString();
+	if (!isString(date) || !date?.length) return '';
+
+	return date;
+};

package/lib/{utils → helpers}/provider/downloadWorkLogTypes/index.js

@@ -1,9 +1,9 @@
+import {isFunction} from '@janiscommerce/apps-helpers';
 import Shift from '../../../Shift';
 import {getWorkLogTypesData} from '../../storage';
 import {WORKLOG_TYPES_DATA, WORKLOG_TYPES_EXPIRATION_TIME} from '../../../constant';
 import Storage from '../../../db/StorageService';
 import Crashlytics from '../../crashlytics';
-import {isFunction} from '../../helpers';
 import errorParser from '../../errorParser';
 
 const downloadWorkLogTypes = async (onDownloadError) => {

package/lib/{utils → helpers}/provider/openShift/index.js

@@ -1,7 +1,7 @@
+import {isFunction} from '@janiscommerce/apps-helpers';
 import Crashlytics from '../../crashlytics';
 import getUserId from '../../userInfo/getUserId';
 import Shift from '../../../Shift';
-import {isFunction} from '../../helpers';
 import errorParser from '../../errorParser';
 
 const openShift = async ({onOpenShiftError, warehouseId}) => {

package/lib/hooks/useStorageValue/index.js

@@ -1,7 +1,7 @@
 import {useEffect, useState, useCallback} from 'react';
 import Storage from '../../db/StorageService';
-import Crashlytics from '../../utils/crashlytics';
-import errorParser from '../../utils/errorParser';
+import Crashlytics from '../../helpers/crashlytics';
+import errorParser from '../../helpers/errorParser';
 
 export const useStorageValue = (key, defaultValue = null) => {
 	const readValue = useCallback(() => {

package/lib/provider/ShiftTrackingProvider.js

@@ -1,4 +1,5 @@
 import React, {useEffect, useMemo, useState} from 'react';
+import {promiseWrapper} from '@janiscommerce/apps-helpers';
 import {useStorageValue} from '../hooks/useStorageValue';
 import ShiftTrackingContext from '../context/ShiftTrackingContext';
 import {
@@ -6,7 +7,7 @@ import {
 	downloadWorkLogTypes,
 	isAuthorizedToUseStaffMS,
 	getShiftWorkLogsFromJanis,
-} from '../utils/provider';
+} from '../helpers/provider';
 import {
 	CURRENT_WORKLOG_DATA,
 	CURRENT_WORKLOG_ID,
@@ -17,8 +18,8 @@ import {
 	STAFF_AUTH,
 	WORKLOG_TYPES_DATA,
 } from '../constant';
-import {isValidObject, promiseWrapper} from '../utils/helpers';
 import Shift from '../Shift';
+import ShiftWorklogs from '../ShiftWorklogs';
 
 /**
  * ShiftTrackingProvider component
@@ -145,11 +146,11 @@ const ShiftTrackingProvider = ({children, additionalInfo = {}, onError = null})
 		const [currentWorkLog = {}] = openWorkLogs;
 		const isExcludedWork = EXCLUDED_WORKLOG_TYPES.includes(currentWorkLog?.referenceId);
 
-		if (isValidObject(currentWorkLog)) {
+		if (ShiftWorklogs.isValidWorkLog(currentWorkLog)) {
 			Shift.setCurrentWorkLog(currentWorkLog);
 		}
 
-		if (isValidObject(currentWorkLog) && !isExcludedWork) {
+		if (ShiftWorklogs.isValidWorkLog(currentWorkLog) && !isExcludedWork) {
 			Shift.status = 'paused';
 		}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@janiscommerce/app-tracking-shift",
-	"version": "1.7.0-beta.1",
+	"version": "1.7.0-beta.3",
 	"main": "lib/index.js",
 	"module": "lib/index.js",
 	"exports": {
@@ -60,6 +60,7 @@
 		"@janiscommerce/app-crashlytics": "^2.1.0",
 		"@janiscommerce/app-request": "^2.6.0",
 		"@janiscommerce/app-storage": "^1.1.0",
+		"@janiscommerce/apps-helpers": "^2.2.0",
 		"@janiscommerce/oauth-native": "^1.10.2",
 		"@testing-library/react": "^16.3.0",
 		"@testing-library/react-native": "^12.0.1",
@@ -81,8 +82,8 @@
 		"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-native-mmkv": "2.12.2",
 		"react-test-renderer": "18.2.0"
 	}
 }

package/lib/utils/helpers/index.js

@@ -1,49 +0,0 @@
-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]');
-
-export const isObject = (obj) => !!(obj && obj.constructor === Object);
-
-export const isEmptyObject = (obj) => isObject(obj) && !Object.keys(obj).length;
-
-export const promiseWrapper = (promise) =>
-	promise.then((data) => [data, null]).catch((error) => Promise.resolve([null, error]));
-
-export const isArray = (arr) => Array.isArray(arr);
-
-export const isEmptyArray = (arr) => isArray(arr) && !arr.length;
-
-export const reverseArray = (arr) => arr.slice().reverse();
-
-export const isNumber = (num) => typeof num === 'number' && !Number.isNaN(Number(num));
-
-export const isValidObject = (obj) => isObject(obj) && !!Object.keys(obj).length;
-
-export const isValidString = (str) => typeof str === 'string' && str.length > 0;
-
-const ISO_DATE_REGEX = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
-export const isIsoStringDate = (str) => ISO_DATE_REGEX.test(str);
-
-export const isValidDate = (date = '') => {
-	if (isNumber(date) && date > 0) {
-		const dateTime = new Date(date).getTime();
-		return !Number.isNaN(dateTime);
-	}
-	if (!isValidString(date)) return false;
-
-	if (!isIsoStringDate(date)) return false;
-
-	const dateTime = new Date(date).getTime();
-	return !Number.isNaN(dateTime);
-};
-
-export const parseToISOString = (date = '') => {
-	if (isNumber(date) && date > 0) return new Date(date).toISOString();
-	if (!isValidString(date)) return '';
-
-	return date;
-};