feat: schedule entries, add time modal, and proxy routes
- Add CreateScheduleEntryModal with pill-based type selector and split date/time inputs - Rewrite AddTimeModal to self-fetch activities with loading/empty states - Empty state offers 'Create Schedule Entry' shortcut when no open activities - Add SvelteKit proxy routes for /activities and /time endpoints - Split datetime-local inputs into separate date+time fields across modals - Fix CW date format: strip milliseconds from ISO strings (keep Z) - Add ScheduleEntry to workflow history type whitelist - Show open schedule entries panel in WorkflowPanel - Auto-refresh ActivityTab after workflow actions - Reduce activity dot size and fix connector width overflow - Hide creation date row for Schedule Entry activities in timeline
This commit is contained in:
@@ -123,6 +123,7 @@ export const OptimaType = {
|
||||
Revision: "Revision",
|
||||
Finalized: "Finalized",
|
||||
Converted: "Converted",
|
||||
ScheduleEntry: "Schedule Entry",
|
||||
} as const;
|
||||
|
||||
/** CW custom field ID for the QuoteID field on activities. */
|
||||
@@ -131,6 +132,9 @@ const QUOTE_ID_FIELD_ID = 48;
|
||||
/** CW custom field ID for the Close Date field on activities. */
|
||||
const CLOSE_DATE_FIELD_ID = 49;
|
||||
|
||||
/** CW custom field ID for the Parent Activity field on activities. */
|
||||
export const PARENT_ACTIVITY_FIELD_ID = 50;
|
||||
|
||||
/**
|
||||
* Optima_Type values whose activities should remain Open until the
|
||||
* next workflow transition closes them automatically.
|
||||
@@ -139,6 +143,7 @@ const STAYS_OPEN_TYPES = new Set<OptimaTypeValue>([
|
||||
OptimaType.OpportunitySetup,
|
||||
OptimaType.OpportunityReview,
|
||||
OptimaType.Revision,
|
||||
OptimaType.ScheduleEntry,
|
||||
]);
|
||||
|
||||
export type OptimaTypeValue =
|
||||
@@ -151,7 +156,8 @@ export type OptimaTypeValue =
|
||||
| typeof OptimaType.QuoteGenerated
|
||||
| typeof OptimaType.Revision
|
||||
| typeof OptimaType.Finalized
|
||||
| typeof OptimaType.Converted;
|
||||
| typeof OptimaType.Converted
|
||||
| typeof OptimaType.ScheduleEntry;
|
||||
|
||||
/** Permission nodes required by gated transitions. */
|
||||
export const WorkflowPermissions = {
|
||||
@@ -210,6 +216,7 @@ const ALLOWED_TRANSITIONS: Record<number, Set<number>> = {
|
||||
OpportunityStatus.PendingWon,
|
||||
OpportunityStatus.PendingLost,
|
||||
OpportunityStatus.Active,
|
||||
OpportunityStatus.PendingRevision, // needs revision
|
||||
OpportunityStatus.InternalReview, // cold automation only
|
||||
]),
|
||||
|
||||
@@ -219,6 +226,7 @@ const ALLOWED_TRANSITIONS: Record<number, Set<number>> = {
|
||||
OpportunityStatus.PendingLost,
|
||||
OpportunityStatus.Active,
|
||||
OpportunityStatus.InternalReview, // cold automation only
|
||||
OpportunityStatus.PendingRevision, // send back for revision
|
||||
]),
|
||||
|
||||
[OpportunityStatus.Active]: new Set([
|
||||
@@ -317,7 +325,7 @@ export interface SendQuotePayload extends BaseActionPayload {
|
||||
|
||||
/**
|
||||
* Quote needs revision.
|
||||
* Creates a revision activity and transitions to Active.
|
||||
* Creates a revision activity and transitions to PendingRevision.
|
||||
*/
|
||||
needsRevision?: boolean;
|
||||
}
|
||||
@@ -342,6 +350,25 @@ export interface ResurrectPayload extends BaseActionPayload {
|
||||
/** Begin revision from PendingRevision → Active. */
|
||||
export interface BeginRevisionPayload extends BaseActionPayload {}
|
||||
|
||||
/** Send back for revision from ConfirmedQuote → PendingRevision. */
|
||||
export interface SendBackForRevisionPayload extends BaseActionPayload {
|
||||
note: string; // required
|
||||
}
|
||||
|
||||
/** Create a Schedule Entry activity (no status change). */
|
||||
export interface CreateScheduleEntryPayload extends BaseActionPayload {
|
||||
/** Activity type value: Follow-Up, Appointment, or Admin. */
|
||||
activityTypeValue: "Follow-Up" | "Appointment" | "Admin";
|
||||
/** ISO-8601 due date. */
|
||||
dueDate?: string;
|
||||
/** ISO-8601 start time. */
|
||||
startTime?: string;
|
||||
/** ISO-8601 end time. */
|
||||
endTime?: string;
|
||||
/** Optional notes for the schedule entry. */
|
||||
note?: string;
|
||||
}
|
||||
|
||||
/** Re-send from Active → QuoteSent. */
|
||||
export interface ResendQuotePayload extends SendQuotePayload {}
|
||||
|
||||
@@ -371,7 +398,9 @@ export type WorkflowAction =
|
||||
| { action: "beginRevision"; payload: BeginRevisionPayload }
|
||||
| { action: "resendQuote"; payload: ResendQuotePayload }
|
||||
| { action: "cancel"; payload: CancelPayload }
|
||||
| { action: "reopen"; payload: ReopenPayload };
|
||||
| { action: "reopen"; payload: ReopenPayload }
|
||||
| { action: "sendBackForRevision"; payload: SendBackForRevisionPayload }
|
||||
| { action: "createScheduleEntry"; payload: CreateScheduleEntryPayload };
|
||||
|
||||
// -----------------------------------------------------------------------
|
||||
// Result
|
||||
@@ -1083,9 +1112,9 @@ export async function transitionToQuoteSent(
|
||||
return ok(currentStatus, targetStatus, activities);
|
||||
}
|
||||
|
||||
// ── needsRevision flag → Active ────────────────────────────────────
|
||||
// ── needsRevision flag → PendingRevision ────────────────────────────
|
||||
if (payload.needsRevision) {
|
||||
const targetStatus = OpportunityStatus.Active;
|
||||
const targetStatus = OpportunityStatus.PendingRevision;
|
||||
|
||||
const wasAlsoConfirmed = !!payload.quoteConfirmed;
|
||||
|
||||
@@ -1518,6 +1547,117 @@ export async function beginRevision(
|
||||
return ok(currentStatus, targetStatus, activities);
|
||||
}
|
||||
|
||||
/**
|
||||
* ConfirmedQuote → PendingRevision
|
||||
*
|
||||
* Sends the opportunity back for revision from ConfirmedQuote.
|
||||
* Requires a mandatory note explaining why.
|
||||
*/
|
||||
export async function sendBackForRevision(
|
||||
opportunity: OpportunityController,
|
||||
user: WorkflowUser,
|
||||
payload: SendBackForRevisionPayload,
|
||||
): Promise<WorkflowResult> {
|
||||
const currentStatus = opportunity.statusCwId;
|
||||
if (currentStatus == null) return fail("Opportunity has no current status.");
|
||||
|
||||
const noteErr = assertNotePresent(payload.note);
|
||||
if (noteErr) return fail(noteErr, currentStatus);
|
||||
|
||||
const targetStatus = OpportunityStatus.PendingRevision;
|
||||
|
||||
const transErr = assertTransitionAllowed(currentStatus, targetStatus);
|
||||
if (transErr) return fail(transErr, currentStatus);
|
||||
|
||||
const activity = await createWorkflowActivity({
|
||||
name: `[Workflow] Sent back for revision — ${opportunity.name}`,
|
||||
opportunityCwId: opportunity.cwOpportunityId,
|
||||
companyCwId: opportunity.companyCwId,
|
||||
assignToCwMemberId: user.cwMemberId,
|
||||
notes: payload.note,
|
||||
optimaType: OptimaType.Revision,
|
||||
});
|
||||
|
||||
await syncOpportunityStatus({
|
||||
opportunityId: opportunity.cwOpportunityId,
|
||||
statusCwId: targetStatus,
|
||||
});
|
||||
|
||||
await handleTimeEntry(
|
||||
activity.cwActivityId,
|
||||
user.cwMemberId,
|
||||
payload,
|
||||
payload.note,
|
||||
);
|
||||
|
||||
return ok(currentStatus, targetStatus, [activity]);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create a Schedule Entry activity without changing the opportunity status.
|
||||
*
|
||||
* Schedule Entry activities stay open until time is logged against them.
|
||||
*/
|
||||
export async function createScheduleEntry(
|
||||
opportunity: OpportunityController,
|
||||
user: WorkflowUser,
|
||||
payload: CreateScheduleEntryPayload,
|
||||
): Promise<WorkflowResult> {
|
||||
const currentStatus = opportunity.statusCwId;
|
||||
if (currentStatus == null) return fail("Opportunity has no current status.");
|
||||
|
||||
// CW activities require ISO-8601 without milliseconds, e.g. "2026-04-19T20:15:00Z"
|
||||
const toCwDateTime = (iso: string): string => iso.replace(/\.\d+Z$/, "Z");
|
||||
|
||||
const dateStart = payload.startTime
|
||||
? toCwDateTime(payload.startTime)
|
||||
: payload.dueDate
|
||||
? toCwDateTime(payload.dueDate)
|
||||
: undefined;
|
||||
const dateEnd = payload.endTime ? toCwDateTime(payload.endTime) : undefined;
|
||||
|
||||
const activity = await ActivityController.create({
|
||||
name: `[Schedule Entry] ${payload.activityTypeValue} — ${opportunity.name}`,
|
||||
type: { id: 3 }, // HistoricEntry
|
||||
opportunity: { id: opportunity.cwOpportunityId },
|
||||
...(opportunity.companyCwId ? { company: { id: opportunity.companyCwId } } : {}),
|
||||
assignTo: { id: user.cwMemberId },
|
||||
notes: payload.note ?? "",
|
||||
...(dateStart ? { dateStart } : {}),
|
||||
...(dateEnd ? { dateEnd } : {}),
|
||||
});
|
||||
|
||||
// Set Optima_Type to Schedule Entry (stays open)
|
||||
await activity.update([
|
||||
{
|
||||
op: "replace",
|
||||
path: "customFields",
|
||||
value: [
|
||||
{
|
||||
id: OptimaType.FIELD_ID,
|
||||
caption: "Optima_Type",
|
||||
type: "Text",
|
||||
entryMethod: "List",
|
||||
numberOfDecimals: 0,
|
||||
value: OptimaType.ScheduleEntry,
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
|
||||
// Return a no-transition result (status unchanged)
|
||||
return {
|
||||
success: true,
|
||||
previousStatusId: currentStatus,
|
||||
newStatusId: currentStatus,
|
||||
previousStatus: StatusIdToKey[currentStatus] ?? null,
|
||||
newStatus: StatusIdToKey[currentStatus] ?? null,
|
||||
activitiesCreated: [activity],
|
||||
coldCheck: null,
|
||||
error: null,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Any cancelable status → Canceled
|
||||
*
|
||||
@@ -1732,6 +1872,9 @@ async function closeOpenWorkflowActivities(
|
||||
// Only close activities whose type is in the stays-open set
|
||||
if (!STAYS_OPEN_TYPES.has(optimaField.value as OptimaTypeValue)) continue;
|
||||
|
||||
// Never auto-close Schedule Entry activities — they close only when time is logged
|
||||
if (optimaField.value === OptimaType.ScheduleEntry) continue;
|
||||
|
||||
const closeDate = new Date().toISOString();
|
||||
const existingFields = (raw.customFields ?? []).map((f: any) =>
|
||||
f.id === CLOSE_DATE_FIELD_ID ? { ...f, value: closeDate } : f,
|
||||
@@ -1797,7 +1940,10 @@ export async function processOpportunityAction(
|
||||
}
|
||||
|
||||
// ── Close any open workflow activities from previous stage ──────────
|
||||
await closeOpenWorkflowActivities(opportunity.cwOpportunityId);
|
||||
// Skip for createScheduleEntry — we intentionally preserve open activities.
|
||||
if (action !== "createScheduleEntry") {
|
||||
await closeOpenWorkflowActivities(opportunity.cwOpportunityId);
|
||||
}
|
||||
|
||||
// ── Route to transition function ────────────────────────────────────
|
||||
let result: WorkflowResult;
|
||||
@@ -1856,6 +2002,16 @@ export async function processOpportunityAction(
|
||||
result = await reopenCancelledOpportunity(opportunity, user, payload);
|
||||
break;
|
||||
|
||||
case "sendBackForRevision":
|
||||
result = await sendBackForRevision(opportunity, user, payload);
|
||||
break;
|
||||
|
||||
case "createScheduleEntry":
|
||||
// Schedule Entry does not close open activities — skip that step.
|
||||
// We call it directly rather than falling through closeOpenWorkflowActivities.
|
||||
result = await createScheduleEntry(opportunity, user, payload);
|
||||
break;
|
||||
|
||||
default: {
|
||||
const _exhaustive: never = action;
|
||||
return fail(`Unknown workflow action: "${_exhaustive}"`);
|
||||
|
||||
Reference in New Issue
Block a user