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

package/lib/Formatter.js

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

package/lib/OfflineData.js

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

package/lib/Shift.js

@@ -1,8 +1,8 @@
 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 errorParser from './helpers/errorParser';
 import {
 	isArray,
 	isEmptyArray,
@@ -12,8 +12,8 @@ import {
 	isInternetReachable,
 	isValidDate,
 	parseToISOString,
-} from './utils/helpers';
-import {getStaffAuthorizationData} from './utils/storage';
+} from './helpers';
+import {getStaffAuthorizationData} from './helpers/storage';
 import {
 	SHIFT_ID,
 	SHIFT_STATUS,
@@ -252,34 +252,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 (!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 +287,6 @@ class Shift {
 			}
 
 			workLog.id = ShiftWorklogs.createId(workLog.referenceId);
-			workLog.startDate = currentDate;
 			this.setCurrentWorkLog(workLog);
 
 			const hasInternet = await isInternetReachable();
@@ -326,6 +325,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
 	 */
@@ -352,7 +352,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) {

package/lib/ShiftWorklogs.js

@@ -1,6 +1,6 @@
 import {INTERNAL_WORKLOGS} from './constant';
 import StaffApiServices from './StaffApiServices';
-import {generateRandomId, isArray, isEmptyArray} from './utils/helpers';
+import {generateRandomId, isArray, isEmptyArray} from './helpers';
 
 class ShiftWorklogs {
 	async open(params) {

package/lib/StaffApiServices.js

@@ -1,5 +1,5 @@
-import Request from './utils/request';
-import {isValidString} from './utils/helpers';
+import Request from './helpers/request';
+import {isValidString} from './helpers';
 
 class StaffApiServices {
 	constructor() {

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

@@ -3,7 +3,7 @@ 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 {isFunction} from '../..';
 import errorParser from '../../errorParser';
 
 const downloadWorkLogTypes = async (onDownloadError) => {

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

@@ -1,7 +1,7 @@
 import Crashlytics from '../../crashlytics';
 import getUserId from '../../userInfo/getUserId';
 import Shift from '../../../Shift';
-import {isFunction} from '../../helpers';
+import {isFunction} from '../..';
 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

@@ -6,7 +6,7 @@ import {
 	downloadWorkLogTypes,
 	isAuthorizedToUseStaffMS,
 	getShiftWorkLogsFromJanis,
-} from '../utils/provider';
+} from '../helpers/provider';
 import {
 	CURRENT_WORKLOG_DATA,
 	CURRENT_WORKLOG_ID,
@@ -17,7 +17,7 @@ import {
 	STAFF_AUTH,
 	WORKLOG_TYPES_DATA,
 } from '../constant';
-import {isValidObject, promiseWrapper} from '../utils/helpers';
+import {isValidObject, promiseWrapper} from '../helpers';
 import Shift from '../Shift';
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@janiscommerce/app-tracking-shift",
-	"version": "1.7.0-beta.1",
+	"version": "1.7.0-beta.2",
 	"main": "lib/index.js",
 	"module": "lib/index.js",
 	"exports": {