law-common 14.0.1-beta.4 → 14.0.1-beta.6

package/dist/src/api/interface/timesheet.entity.response.interface.d.ts

@@ -17,8 +17,9 @@ export type ITimesheetEntityGet = {
 };
 /**
  * LW-828: this used to re-declare the flow-config shape by hand. It is now an alias of the shared
- * `FlowConfig`, whose action config carries the optional `isApplicable` and `validActionPastThreshold`
- * this entity relies on. Kept as a named type so every existing consumer keeps compiling unchanged.
+ * `FlowConfig`, whose action config carries the `isApplicable` runtime guard this entity relies on
+ * (LW-830 collapse — the previous `validActionPastThreshold` boolean is commented out in
+ * `IFlowConfigActionConfig`). Kept as a named type so every existing consumer keeps compiling unchanged.
  */
 export type ITimesheetFlowConfig = FlowConfig<TimesheetStatusEnum, TimesheetActionEnum, ITimesheetFlowContextData>;
 export type ITimesheetFlowContextData = {

package/dist/src/entities/flow-configs/base-flow-config.factory.d.ts

@@ -114,19 +114,21 @@ export type ActionMap<A extends string, S extends string> = {
  *
  * @property isApplicable            runtime guard evaluated against the same context as `next()`
  * @property validActionPastThreshold whether the action survives a consumer's data-entry threshold
+ *                                   (commented out below since the LW-830 collapse — see note)
+ * @property isAvailable             unified runtime guard introduced by LW-830; preferred over
+ *                                   `isApplicable` when both are present (commented out below
+ *                                   since the LW-830 collapse — see note)
  * @property description             human-readable copy for this transition. Already part of
  *                                   `IFlowConfigActionConfig` and rendered by the entity-flow
  *                                   component, so a converted config must be able to emit it.
  */
 export type ActionConfigOptions<CTX> = {
     isApplicable?: (context: CTX) => boolean;
-    validActionPastThreshold?: boolean;
     description?: string;
 };
 export declare function createFlowConfigFactory<CTX = never>(): <A extends string, S extends string, AM extends ActionMap<A, S>>(actionMap: AM) => {
     createActionConfig: <Act extends A, Subset extends { [key in A]: AM[key]["reachableStatues"]; }[Act][number] = { [key in A]: AM[key]["reachableStatues"]; }[Act][number]>(action: Act, nextStatus: Subset | ((context: CTX) => Subset), overridePermissions?: string[], options?: ActionConfigOptions<CTX>) => {
         description?: string | undefined;
-        validActionPastThreshold?: boolean | undefined;
         isApplicable?: ((context: CTX) => boolean) | undefined;
         permissions: string[];
         next: (context: CTX) => Subset;

package/dist/src/entities/flow-configs/base-flow-config.factory.js

@@ -99,7 +99,7 @@ function createFlowConfigFactory() {
          *                   (currentStatus, action) pair. Must be a subtype of
          *                   `StatusForAction<Act>`.
          */
-        const createActionConfig = (action, nextStatus, overridePermissions, options) => (Object.assign(Object.assign(Object.assign({ permissions: overridePermissions !== null && overridePermissions !== void 0 ? overridePermissions : actionMap[action].permissions, next: createTransition(nextStatus) }, ((options === null || options === void 0 ? void 0 : options.isApplicable) !== undefined ? { isApplicable: options.isApplicable } : {})), ((options === null || options === void 0 ? void 0 : options.validActionPastThreshold) !== undefined ? { validActionPastThreshold: options.validActionPastThreshold } : {})), ((options === null || options === void 0 ? void 0 : options.description) !== undefined ? { description: options.description } : {})));
+        const createActionConfig = (action, nextStatus, overridePermissions, options) => (Object.assign(Object.assign({ permissions: overridePermissions !== null && overridePermissions !== void 0 ? overridePermissions : actionMap[action].permissions, next: createTransition(nextStatus) }, ((options === null || options === void 0 ? void 0 : options.isApplicable) !== undefined ? { isApplicable: options.isApplicable } : {})), ((options === null || options === void 0 ? void 0 : options.description) !== undefined ? { description: options.description } : {})));
         return { createActionConfig, createTransition };
     };
 }

package/dist/src/entities/flow-configs/billing_transaction_flow.config.d.ts

@@ -10,7 +10,8 @@ export interface IBillingTransactionContextFlowData {
 /**
  * LW-828: this used to re-declare the flow-config shape by hand. It is now an alias of the shared
  * `FlowConfig`, which is a strict superset of the old declaration — same `permissions` and `next`, plus
- * the optional `description` / `isApplicable` / `validActionPastThreshold` this entity does not use.
+ * the optional `description` / `isApplicable` this entity does not use (`validActionPastThreshold` was
+ * commented out of the shared type during the LW-830 collapse).
  * Kept as a named type so every existing consumer keeps compiling unchanged.
  */
 export type IBillingTransactionFlowConfig = FlowConfig<BillingTransactionStatusEnum, BillingTransactionActionEnum, IBillingTransactionContextFlowData>;

package/dist/src/entities/flow-configs/flow-config.type.d.ts

@@ -69,13 +69,6 @@ export interface IFlowConfigActionConfig<STATUS_ENUM_TYPE extends string, CONTEX
      * to the row in its current state.
      */
     isApplicable?: (data: CONTEXT_DATA_TYPE) => boolean;
-    /**
-     * Optional flag read by consumers that enforce a data-entry threshold: whether this action
-     * stays available once the row is older than that threshold. Absent means "yes" — consumers
-     * read it as `validActionPastThreshold ?? true`. It is a plain boolean rather than a
-     * function so it survives serialisation to clients that receive the flow config over HTTP.
-     */
-    validActionPastThreshold?: boolean;
 }
 /**
  * A flow whose parent and child rows each have their own status/action vocabulary.

package/dist/src/entities/flow-configs/timesheet_flow.config.js

@@ -112,8 +112,8 @@ const transitionOntimeStatusUpdateAction = createActionConfig(timesheet_action_e
         return timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING;
     }
     return isBackdated(data) ? timesheet_status_enum_1.TimesheetStatusEnum.ONTIME : timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING;
-}, undefined, { validActionPastThreshold: false });
-const transitionOntimeStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
+}, undefined, { isApplicable: makeThresholdApplicability(false) });
+const transitionOntimeStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionOntimeStatusDeleteAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.DELETE, (data) => {
     // non-billable timesheets: auto-delete
     const nonBillableStatus = resolveStatusForNonBillableTimesheet(data);
@@ -123,18 +123,16 @@ const transitionOntimeStatusDeleteAction = createActionConfig(timesheet_action_e
         return timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING;
     }
     return isBackdated(data) ? timesheet_status_enum_1.TimesheetStatusEnum.DELETED : timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING;
-}, undefined, { validActionPastThreshold: false });
+}, undefined, { isApplicable: makeThresholdApplicability(false) });
 const transitionOntimeStatusBillingUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.ONTIME);
 const transitionOntimeStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.ONTIME, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
-    validActionPastThreshold: true,
+    isApplicable: makeThresholdApplicability(true),
 });
 const transitionOntimeStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.ONTIME, undefined, {
-    isApplicable: () => true,
-    validActionPastThreshold: true,
+    isApplicable: makeThresholdApplicability(true),
 });
 // CREATE_APPROVAL_PENDING status transitions
-const transitionCreateApprovalPendingStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: false });
+const transitionCreateApprovalPendingStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(false) });
 const transitionCreateApprovalPendingStatusDeleteAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.DELETE, (data) => {
     // non-billable timesheets: auto-delete
     const nonBillableStatus = resolveStatusForNonBillableTimesheet(data);
@@ -144,26 +142,25 @@ const transitionCreateApprovalPendingStatusDeleteAction = createActionConfig(tim
     //   return TimesheetStatusEnum.DELETE_APPROVAL_PENDING;
     // }
     return timesheet_status_enum_1.TimesheetStatusEnum.DELETED;
-}, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: false });
+}, undefined, { isApplicable: makeThresholdApplicability(false) });
 const transitionCreateApprovalPendingStatusApproveAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.APPROVE, (data) => {
     // non-billable timesheets: auto-approve pending or delete
     const nonBillableStatus = resolveStatusForNonBillableTimesheet(data);
     if (nonBillableStatus)
         return nonBillableStatus;
     return timesheet_status_enum_1.TimesheetStatusEnum.APPROVED;
-}, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold });
+}, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionCreateApprovalPendingStatusRejectAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.REJECT, timesheet_status_enum_1.TimesheetStatusEnum.REJECTED, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
+    isApplicable: makeThresholdApplicability(true),
 });
-const transitionCreateApprovalPendingStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
+const transitionCreateApprovalPendingStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionCreateApprovalPendingStatusBillingUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING);
-const transitionCreateApprovalPendingStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
-const transitionCreateApprovalPendingStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING, undefined, { isApplicable: () => true, validActionPastThreshold: true });
+const transitionCreateApprovalPendingStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(true) });
+const transitionCreateApprovalPendingStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.CREATE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(true) });
 // UPDATE_APPROVAL_PENDING status transitions
-const transitionUpdateApprovalPendingStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: false });
+const transitionUpdateApprovalPendingStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(false) });
 const transitionUpdateApprovalPendingStatusRecallAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.RECALL, timesheet_status_enum_1.TimesheetStatusEnum.DELETED, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
-    validActionPastThreshold: false,
+    isApplicable: makeThresholdApplicability(false),
 });
 const transitionUpdateApprovalPendingStatusApproveAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.APPROVE, (data) => {
     // non-billable timesheets: auto-approve pending or delete
@@ -171,19 +168,18 @@ const transitionUpdateApprovalPendingStatusApproveAction = createActionConfig(ti
     if (nonBillableStatus)
         return nonBillableStatus;
     return timesheet_status_enum_1.TimesheetStatusEnum.APPROVED;
-}, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold });
+}, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionUpdateApprovalPendingStatusRejectAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.REJECT, timesheet_status_enum_1.TimesheetStatusEnum.RESOLVED_REJECTED, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
+    isApplicable: makeThresholdApplicability(true),
 });
-const transitionUpdateApprovalPendingStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
+const transitionUpdateApprovalPendingStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionUpdateApprovalPendingStatusBillingUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING);
-const transitionUpdateApprovalPendingStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
-const transitionUpdateApprovalPendingStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING, undefined, { isApplicable: () => true, validActionPastThreshold: true });
+const transitionUpdateApprovalPendingStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(true) });
+const transitionUpdateApprovalPendingStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(true) });
 // DELETE_APPROVAL_PENDING status transitions
-const transitionDeleteApprovalPendingStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: false });
+const transitionDeleteApprovalPendingStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(false) });
 const transitionDeleteApprovalPendingStatusRecallAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.RECALL, timesheet_status_enum_1.TimesheetStatusEnum.DELETED, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
-    validActionPastThreshold: false,
+    isApplicable: makeThresholdApplicability(false),
 });
 const transitionDeleteApprovalPendingStatusApproveAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.APPROVE, (data) => {
     // non-billable timesheets: auto-approve pending or delete
@@ -191,18 +187,17 @@ const transitionDeleteApprovalPendingStatusApproveAction = createActionConfig(ti
     if (nonBillableStatus)
         return nonBillableStatus;
     return timesheet_status_enum_1.TimesheetStatusEnum.DELETED;
-}, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold });
+}, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionDeleteApprovalPendingStatusRejectAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.REJECT, timesheet_status_enum_1.TimesheetStatusEnum.RESOLVED_REJECTED, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
+    isApplicable: makeThresholdApplicability(true),
 });
-const transitionDeleteApprovalPendingStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
+const transitionDeleteApprovalPendingStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionDeleteApprovalPendingStatusBillingUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING);
-const transitionDeleteApprovalPendingStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
-const transitionDeleteApprovalPendingStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING, undefined, { isApplicable: () => true, validActionPastThreshold: true });
+const transitionDeleteApprovalPendingStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(true) });
+const transitionDeleteApprovalPendingStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING, undefined, { isApplicable: makeThresholdApplicability(true) });
 // RESOLVED_REJECTED status transitions
 const transitionResolvedRejectedStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
-    validActionPastThreshold: false,
+    isApplicable: makeThresholdApplicability(false),
 });
 const transitionResolvedRejectedStatusDeleteAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.DELETE, (data) => {
     // non-billable timesheets: auto-delete
@@ -210,14 +205,13 @@ const transitionResolvedRejectedStatusDeleteAction = createActionConfig(timeshee
     if (nonBillableStatus)
         return nonBillableStatus;
     return timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING;
-}, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold });
-const transitionResolvedRejectedStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
+}, undefined, { isApplicable: makeThresholdApplicability(true) });
+const transitionResolvedRejectedStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionResolvedRejectedStatusBillingUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.RESOLVED_REJECTED);
 const transitionResolvedRejectedStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.RESOLVED_REJECTED, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
-    validActionPastThreshold: true,
+    isApplicable: makeThresholdApplicability(true),
 });
-const transitionResolvedRejectedStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.RESOLVED_REJECTED, undefined, { isApplicable: () => true, validActionPastThreshold: true });
+const transitionResolvedRejectedStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.RESOLVED_REJECTED, undefined, { isApplicable: makeThresholdApplicability(true) });
 // APPROVED status transitions
 const transitionApprovedStatusUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.UPDATE, (data) => {
     // non-billable timesheets: keep ontime/approved on edit
@@ -225,32 +219,30 @@ const transitionApprovedStatusUpdateAction = createActionConfig(timesheet_action
     if (nonBillableStatus)
         return nonBillableStatus;
     return timesheet_status_enum_1.TimesheetStatusEnum.UPDATE_APPROVAL_PENDING;
-}, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: false });
-const transitionApprovedStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
+}, undefined, { isApplicable: makeThresholdApplicability(false) });
+const transitionApprovedStatusMoveTimesheetAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionApprovedStatusDeleteAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.DELETE, (data) => {
     // non-billable timesheets: auto-delete
     const nonBillableStatus = resolveStatusForNonBillableTimesheet(data);
     if (nonBillableStatus)
         return nonBillableStatus;
     return timesheet_status_enum_1.TimesheetStatusEnum.DELETE_APPROVAL_PENDING;
-}, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: false });
+}, undefined, { isApplicable: makeThresholdApplicability(false) });
 const transitionApprovedStatusBillingUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.APPROVED);
 const transitionApprovedStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.APPROVED, undefined, {
-    isApplicable: isValidActionAfterTimesheetEnterThreshold,
-    validActionPastThreshold: true,
+    isApplicable: makeThresholdApplicability(true),
 });
 const transitionApprovedStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.APPROVED, undefined, {
-    isApplicable: () => true,
-    validActionPastThreshold: true,
+    isApplicable: makeThresholdApplicability(true),
 });
 // MOVING_TIMESHEET_PENDING_APPROVAL status transitions
 const transitionMovingTimesheetPendingApprovalStatusApproveAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.APPROVE, (data) => getNextStatusForMovingTimesheetActions(data), // <== currentEntity will always have status
 // ?? TimesheetStatusEnum.APPROVED,
-undefined, { validActionPastThreshold: true });
-const transitionMovingTimesheetPendingApprovalStatusRejectAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.REJECT, (data) => getNextStatusForMovingTimesheetActions(data), undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
+undefined, { isApplicable: makeThresholdApplicability(true) });
+const transitionMovingTimesheetPendingApprovalStatusRejectAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.REJECT, (data) => getNextStatusForMovingTimesheetActions(data), undefined, { isApplicable: makeThresholdApplicability(true) });
 const transitionMovingTimesheetPendingApprovalStatusBillingUpdateAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL);
-const transitionMovingTimesheetPendingApprovalStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: isValidActionAfterTimesheetEnterThreshold, validActionPastThreshold: true });
-const transitionMovingTimesheetPendingApprovalStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: () => true, validActionPastThreshold: true });
+const transitionMovingTimesheetPendingApprovalStatusClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
+const transitionMovingTimesheetPendingApprovalStatusAutoClassifyAction = createActionConfig(timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY, timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL, undefined, { isApplicable: makeThresholdApplicability(true) });
 exports.timesheetFlowConfig = {
     [timesheet_status_enum_1.TimesheetStatusEnum.ONTIME]: {
         actions: {
@@ -354,39 +346,20 @@ function isBackdated(data) {
     }
     return booleanValue;
 }
-function isValidActionAfterTimesheetEnterThreshold(data) {
-    var _a;
-    // here its assumed that record date is post threshold
-    const { currentTimesheet, dto, timesheetEnterThresholdValue } = data;
-    let isValidAction = true;
-    if (currentTimesheet && dto && timesheetEnterThresholdValue) {
-        const currentTimesheetRecordDate = new utils_1.DateCodeModel(currentTimesheet.dateCode);
-        // subtract threshold days from today
+function makeThresholdApplicability(availableWhenPastThreshold) {
+    return (data) => {
+        const { currentTimesheet, timesheetEnterThresholdValue } = data;
+        if (!currentTimesheet || !timesheetEnterThresholdValue) {
+            return true;
+        }
+        const recordDateModel = new utils_1.DateCodeModel(currentTimesheet.dateCode);
         const todayModel = new utils_1.DateCodeModel(utils_1.DateCodeModel.fromDate(new Date()));
-        const dateUptoWhichTimesheetCanBeCreatedModel = todayModel.getByOffset(timesheetEnterThresholdValue);
-        if (currentTimesheetRecordDate.dateCode < dateUptoWhichTimesheetCanBeCreatedModel.dateCode) {
-            const actionConfig = exports.timesheetFlowConfig[currentTimesheet.status];
-            if (!actionConfig) {
-                return false;
-            }
-            if (!dto.actionData) {
-                throw new exceptions_1.AppBadRequestException({
-                    key: error_key_enum_1.ErrorKeyEnum.ACTION_DATA,
-                    message: ["Action data is required when updating a timesheet."],
-                });
-            }
-            // return actionConfig.validAction.includes(dto.actionData.action);
-            const actionConfigForAction = actionConfig.actions[dto.actionData.action];
-            if (!actionConfigForAction) {
-                throw new exceptions_1.AppBadRequestException({
-                    key: error_key_enum_1.ErrorKeyEnum.ACTION,
-                    message: [`No config found for action: ${dto.actionData.action}. Please try with a valid action.`],
-                });
-            }
-            isValidAction = (_a = actionConfigForAction.validActionPastThreshold) !== null && _a !== void 0 ? _a : true;
+        const thresholdDateModel = todayModel.getByOffset(timesheetEnterThresholdValue);
+        if (recordDateModel.dateCode < thresholdDateModel.dateCode) {
+            return availableWhenPastThreshold;
         }
-    }
-    return isValidAction;
+        return true;
+    };
 }
 function getNextStatusForMovingTimesheetActions(contextData) {
     var _a;

package/dist/src/entities/model/timesheet.entity.model.d.ts

@@ -1,4 +1,6 @@
+import { ITimesheetEntityUpdateDto, ITimesheetFlowContextData } from "../../api";
 import { CurrencyEnum } from "../../enums";
+import { TimesheetActionEnum } from "../enums/timesheet_action_enum";
 import { TimesheetClassificationStatusEnum } from "../enums/timesheet_classification_status_enum";
 import { TimesheetStatusEnum } from "../enums/timesheet_status_enum";
 import { IDesignationEntity } from "../interface/designation.entity.interface";
@@ -23,6 +25,11 @@ export interface SortableTimesheet {
     resourceName?: string;
     dateCodeForsorting?: Date;
 }
+export interface ITimesheetActionItem {
+    label: string;
+    value: TimesheetActionEnum | string;
+    disabled?: boolean;
+}
 export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIMESHEET> implements ITimesheetEntity {
     id: number;
     userId: number;
@@ -51,6 +58,13 @@ export declare class TimesheetEntityModel extends BaseEntityModel<EntityEnum.TIM
     getTimesheetAmount(projectCurrency: CurrencyEnum): number;
     get formattedDate(): string;
     get userName(): string | undefined;
+    getUpdateActionVisibility(currentUser: UserEntityModel, currentUserProjectIds?: number[]): {
+        [key: string]: () => boolean;
+    };
+    getAvailableActions(currentUser: UserEntityModel, contextData?: ITimesheetFlowContextData, currentUserProjectIds?: number[], options?: {
+        mergeApproveReject?: boolean;
+    }): ITimesheetActionItem[];
+    getNextStatus(currentUser: UserEntityModel, dto: ITimesheetEntityUpdateDto, contextData?: ITimesheetFlowContextData): TimesheetStatusEnum;
     get approvers(): UserEntityModel[];
     get latestStatusFromHistory(): TimesheetStatusEnum | undefined;
     getDateCodeDay(): number;

package/dist/src/entities/model/timesheet.entity.model.js

@@ -2,10 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimesheetEntityModel = void 0;
 const date_fns_1 = require("date-fns");
+const error_key_enum_1 = require("../../enums/error.key.enum");
+const exceptions_1 = require("../../exceptions");
 const utils_1 = require("../../utils");
 const relation_type_enum_1 = require("../enums/relation_type_enum");
+const timesheet_action_enum_1 = require("../enums/timesheet_action_enum");
 const timesheet_classification_status_enum_1 = require("../enums/timesheet_classification_status_enum");
 const timesheet_status_enum_1 = require("../enums/timesheet_status_enum");
+const timesheet_flow_config_1 = require("../flow-configs/timesheet_flow.config");
 const entity_utils_interface_1 = require("../interface/entity.utils.interface");
 const base_entity_model_1 = require("./base.entity.model");
 // Use this mdoel for UI & BACKEND
@@ -45,6 +49,148 @@ class TimesheetEntityModel extends base_entity_model_1.BaseEntityModel {
         var _a;
         return (_a = this.user) === null || _a === void 0 ? void 0 : _a.name;
     }
+    getUpdateActionVisibility(currentUser, currentUserProjectIds) {
+        var _a, _b;
+        const projectIds = (_b = currentUserProjectIds !== null && currentUserProjectIds !== void 0 ? currentUserProjectIds : (_a = currentUser.projecUserMappings) === null || _a === void 0 ? void 0 : _a.map((mapping) => mapping.projectId)) !== null && _b !== void 0 ? _b : [];
+        const isProjectOwnerOrSelf = (projectId) => projectIds.includes(projectId) || currentUser.id === this.userId;
+        return {
+            TIMESHEETS_UPDATE_SELF: () => currentUser.id === this.userId,
+            TIMESHEETS_UPDATE_ORG: () => true,
+            TIMESHEETS_UPDATE_PROJECT: () => isProjectOwnerOrSelf(this.projectId),
+            TIMESHEETS_DELETE_SELF: () => currentUser.id === this.userId,
+            TIMESHEETS_DELETE_PROJECT: () => isProjectOwnerOrSelf(this.projectId),
+            TIMESHEETS_DELETE_ORG: () => true,
+            TIMESHEETS_APPROVER_PROJECT: () => isProjectOwnerOrSelf(this.projectId),
+            TIMESHEETS_APPROVER_ORG: () => true,
+        };
+    }
+    getAvailableActions(currentUser, contextData = {}, currentUserProjectIds, options) {
+        var _a, _b;
+        if (this.status === timesheet_status_enum_1.TimesheetStatusEnum.MOVING_TIMESHEET_PENDING_APPROVAL)
+            return [];
+        const flowForStatus = timesheet_flow_config_1.timesheetFlowConfig[this.status];
+        if (!flowForStatus)
+            return [];
+        const actionVisibilityConfig = this.getUpdateActionVisibility(currentUser, currentUserProjectIds);
+        const context = Object.assign(Object.assign({}, contextData), { currentTimesheet: this });
+        let actions = Object.entries(flowForStatus.actions)
+            .filter(([actionKey]) => {
+            if ([timesheet_action_enum_1.TimesheetActionEnum.BILLING_UPDATE, timesheet_action_enum_1.TimesheetActionEnum.MOVE_TIMESHEET, timesheet_action_enum_1.TimesheetActionEnum.AUTO_CLASSIFY].includes(actionKey))
+                return false;
+            if (actionKey === timesheet_action_enum_1.TimesheetActionEnum.CLASSIFY)
+                return false;
+            if (actionKey === timesheet_action_enum_1.TimesheetActionEnum.UPDATE && this.classificationStatus && this.classificationStatus !== timesheet_classification_status_enum_1.TimesheetClassificationStatusEnum.PENDING)
+                return false;
+            return true;
+        })
+            .map(([actionKey, actionConfig]) => {
+            const actionPermissions = actionConfig.permissions || [];
+            const hasPermission = actionPermissions.some((permission) => { var _a; return (_a = currentUser.permissions) === null || _a === void 0 ? void 0 : _a.includes(permission); });
+            if (!hasPermission)
+                return null;
+            const isVisible = actionPermissions.some((permission) => actionVisibilityConfig[permission] && actionVisibilityConfig[permission]());
+            if (!isVisible)
+                return null;
+            // LW-830 collapse: `isApplicable` is the single runtime guard. Previous 3-way logic
+            // (isAvailable ?? isApplicable, else validActionPastThreshold ?? true) is commented out:
+            // const predicate = actionConfig.isAvailable ?? actionConfig.isApplicable;
+            // let available = true;
+            // if (predicate) {
+            //   available = predicate(context);
+            // } else {
+            //   available = actionConfig.validActionPastThreshold ?? true;
+            // }
+            const predicate = actionConfig.isApplicable;
+            let available = true;
+            if (predicate) {
+                available = predicate(context);
+            }
+            return {
+                label: timesheet_action_enum_1.TimesheetActionEnum.getLabel(actionKey),
+                value: actionKey,
+                disabled: !available,
+            };
+        })
+            .filter(Boolean);
+        const hasApprove = actions.some((a) => a.value === timesheet_action_enum_1.TimesheetActionEnum.APPROVE);
+        const hasReject = actions.some((a) => a.value === timesheet_action_enum_1.TimesheetActionEnum.REJECT);
+        if ((options === null || options === void 0 ? void 0 : options.mergeApproveReject) !== false && hasApprove && hasReject) {
+            const approveDisabled = (_a = actions.find((a) => a.value === timesheet_action_enum_1.TimesheetActionEnum.APPROVE)) === null || _a === void 0 ? void 0 : _a.disabled;
+            const rejectDisabled = (_b = actions.find((a) => a.value === timesheet_action_enum_1.TimesheetActionEnum.REJECT)) === null || _b === void 0 ? void 0 : _b.disabled;
+            actions = actions.filter((a) => a.value !== timesheet_action_enum_1.TimesheetActionEnum.APPROVE && a.value !== timesheet_action_enum_1.TimesheetActionEnum.REJECT);
+            actions.push({
+                label: "Approve/Reject",
+                value: "APPROVE_REJECT",
+                disabled: approveDisabled && rejectDisabled,
+            });
+        }
+        return actions;
+    }
+    getNextStatus(currentUser, dto, contextData = {}) {
+        if (!this.status) {
+            throw new exceptions_1.AppBadRequestException({
+                key: error_key_enum_1.ErrorKeyEnum.STATUS,
+                message: [`Status not found: ${this.status}`],
+            });
+        }
+        const flowForStatus = timesheet_flow_config_1.timesheetFlowConfig[this.status];
+        if (!flowForStatus) {
+            throw new exceptions_1.AppBadRequestException({
+                key: error_key_enum_1.ErrorKeyEnum.STATUS,
+                message: [`No flow configuration found for status: ${this.status}`],
+            });
+        }
+        if (!(dto === null || dto === void 0 ? void 0 : dto.actionData)) {
+            throw new exceptions_1.AppBadRequestException({
+                key: error_key_enum_1.ErrorKeyEnum.ACTION_DATA,
+                message: ["dto.actionData is required"],
+            });
+        }
+        const matchingPermissionConfig = flowForStatus.actions[dto.actionData.action];
+        if (!matchingPermissionConfig) {
+            throw new exceptions_1.AppBadRequestException({
+                key: error_key_enum_1.ErrorKeyEnum.ACTION,
+                message: [`Action '${dto.actionData.action}' is not valid for the current status '${this.status}'.`],
+            });
+        }
+        if (!currentUser.permissions || currentUser.permissions.length === 0) {
+            throw new exceptions_1.AppBadRequestException({
+                key: error_key_enum_1.ErrorKeyEnum.PERMISSIONS,
+                message: ["Permission not available for currentUser"],
+            });
+        }
+        const hasPermission = matchingPermissionConfig.permissions.some((permission) => { var _a; return (_a = currentUser.permissions) === null || _a === void 0 ? void 0 : _a.includes(permission); });
+        if (!hasPermission) {
+            throw new exceptions_1.AppBadRequestException({
+                key: error_key_enum_1.ErrorKeyEnum.PERMISSION,
+                message: [
+                    `Current user does not have permission to ${dto.actionData.action} timesheet. Required permissions: ${matchingPermissionConfig.permissions.join(", ")}`,
+                ],
+            });
+        }
+        const context = Object.assign(Object.assign({}, contextData), { currentTimesheet: this });
+        // LW-830 collapse: `isApplicable` is the single runtime guard.
+        // const predicate = matchingPermissionConfig.isAvailable ?? matchingPermissionConfig.isApplicable;
+        // if (predicate) {
+        //   const isActionAvailable = predicate(context);
+        //   if (!isActionAvailable) {
+        //     throw new AppBadRequestException({
+        //       key: ErrorKeyEnum.ACTION,
+        //       message: [`Action ${dto.actionData.action} is not applicable for current timesheet status: ${this.status}.`],
+        //     });
+        //   }
+        // }
+        if (matchingPermissionConfig.isApplicable) {
+            const isApplicable = matchingPermissionConfig.isApplicable(context);
+            if (!isApplicable) {
+                throw new exceptions_1.AppBadRequestException({
+                    key: error_key_enum_1.ErrorKeyEnum.ACTION,
+                    message: [`Action ${dto.actionData.action} is not applicable for current timesheet status: ${this.status}.`],
+                });
+            }
+        }
+        return matchingPermissionConfig.next(context);
+    }
     get approvers() {
         var _a, _b, _c;
         return (_c = (_b = (_a = this.project) === null || _a === void 0 ? void 0 : _a.partnersOwnerUsersOfProject) === null || _b === void 0 ? void 0 : _b.filter((u) => u.email)) !== null && _c !== void 0 ? _c : [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "law-common",
-  "version": "14.0.1-beta.4",
+  "version": "14.0.1-beta.6",
   "description": "",
   "main": "dist/index.js",
   "files": [