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:
@@ -1,258 +0,0 @@
|
||||
|
||||
SSUUMMMMAARRYY OOFF LLEESSSS CCOOMMMMAANNDDSS
|
||||
|
||||
Commands marked with * may be preceded by a number, _N.
|
||||
Notes in parentheses indicate the behavior if _N is given.
|
||||
A key preceded by a caret indicates the Ctrl key; thus ^K is ctrl-K.
|
||||
|
||||
h H Display this help.
|
||||
q :q Q :Q ZZ Exit.
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
MMOOVVIINNGG
|
||||
|
||||
e ^E j ^N CR * Forward one line (or _N lines).
|
||||
y ^Y k ^K ^P * Backward one line (or _N lines).
|
||||
f ^F ^V SPACE * Forward one window (or _N lines).
|
||||
b ^B ESC-v * Backward one window (or _N lines).
|
||||
z * Forward one window (and set window to _N).
|
||||
w * Backward one window (and set window to _N).
|
||||
ESC-SPACE * Forward one window, but don't stop at end-of-file.
|
||||
d ^D * Forward one half-window (and set half-window to _N).
|
||||
u ^U * Backward one half-window (and set half-window to _N).
|
||||
ESC-) RightArrow * Right one half screen width (or _N positions).
|
||||
ESC-( LeftArrow * Left one half screen width (or _N positions).
|
||||
ESC-} ^RightArrow Right to last column displayed.
|
||||
ESC-{ ^LeftArrow Left to first column.
|
||||
F Forward forever; like "tail -f".
|
||||
ESC-F Like F but stop when search pattern is found.
|
||||
r ^R ^L Repaint screen.
|
||||
R Repaint screen, discarding buffered input.
|
||||
---------------------------------------------------
|
||||
Default "window" is the screen height.
|
||||
Default "half-window" is half of the screen height.
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
SSEEAARRCCHHIINNGG
|
||||
|
||||
/_p_a_t_t_e_r_n * Search forward for (_N-th) matching line.
|
||||
?_p_a_t_t_e_r_n * Search backward for (_N-th) matching line.
|
||||
n * Repeat previous search (for _N-th occurrence).
|
||||
N * Repeat previous search in reverse direction.
|
||||
ESC-n * Repeat previous search, spanning files.
|
||||
ESC-N * Repeat previous search, reverse dir. & spanning files.
|
||||
ESC-u Undo (toggle) search highlighting.
|
||||
ESC-U Clear search highlighting.
|
||||
&_p_a_t_t_e_r_n * Display only matching lines.
|
||||
---------------------------------------------------
|
||||
A search pattern may begin with one or more of:
|
||||
^N or ! Search for NON-matching lines.
|
||||
^E or * Search multiple files (pass thru END OF FILE).
|
||||
^F or @ Start search at FIRST file (for /) or last file (for ?).
|
||||
^K Highlight matches, but don't move (KEEP position).
|
||||
^R Don't use REGULAR EXPRESSIONS.
|
||||
^W WRAP search if no match found.
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
JJUUMMPPIINNGG
|
||||
|
||||
g < ESC-< * Go to first line in file (or line _N).
|
||||
G > ESC-> * Go to last line in file (or line _N).
|
||||
p % * Go to beginning of file (or _N percent into file).
|
||||
t * Go to the (_N-th) next tag.
|
||||
T * Go to the (_N-th) previous tag.
|
||||
{ ( [ * Find close bracket } ) ].
|
||||
} ) ] * Find open bracket { ( [.
|
||||
ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>.
|
||||
ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_>.
|
||||
---------------------------------------------------
|
||||
Each "find close bracket" command goes forward to the close bracket
|
||||
matching the (_N-th) open bracket in the top line.
|
||||
Each "find open bracket" command goes backward to the open bracket
|
||||
matching the (_N-th) close bracket in the bottom line.
|
||||
|
||||
m_<_l_e_t_t_e_r_> Mark the current top line with <letter>.
|
||||
M_<_l_e_t_t_e_r_> Mark the current bottom line with <letter>.
|
||||
'_<_l_e_t_t_e_r_> Go to a previously marked position.
|
||||
'' Go to the previous position.
|
||||
^X^X Same as '.
|
||||
ESC-M_<_l_e_t_t_e_r_> Clear a mark.
|
||||
---------------------------------------------------
|
||||
A mark is any upper-case or lower-case letter.
|
||||
Certain marks are predefined:
|
||||
^ means beginning of the file
|
||||
$ means end of the file
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
CCHHAANNGGIINNGG FFIILLEESS
|
||||
|
||||
:e [_f_i_l_e] Examine a new file.
|
||||
^X^V Same as :e.
|
||||
:n * Examine the (_N-th) next file from the command line.
|
||||
:p * Examine the (_N-th) previous file from the command line.
|
||||
:x * Examine the first (or _N-th) file from the command line.
|
||||
:d Delete the current file from the command line list.
|
||||
= ^G :f Print current file name.
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
MMIISSCCEELLLLAANNEEOOUUSS CCOOMMMMAANNDDSS
|
||||
|
||||
-_<_f_l_a_g_> Toggle a command line option [see OPTIONS below].
|
||||
--_<_n_a_m_e_> Toggle a command line option, by name.
|
||||
__<_f_l_a_g_> Display the setting of a command line option.
|
||||
___<_n_a_m_e_> Display the setting of an option, by name.
|
||||
+_c_m_d Execute the less cmd each time a new file is examined.
|
||||
|
||||
!_c_o_m_m_a_n_d Execute the shell command with $SHELL.
|
||||
|XX_c_o_m_m_a_n_d Pipe file between current pos & mark XX to shell command.
|
||||
s _f_i_l_e Save input to a file.
|
||||
v Edit the current file with $VISUAL or $EDITOR.
|
||||
V Print version number of "less".
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
OOPPTTIIOONNSS
|
||||
|
||||
Most options may be changed either on the command line,
|
||||
or from within less by using the - or -- command.
|
||||
Options may be given in one of two forms: either a single
|
||||
character preceded by a -, or a name preceded by --.
|
||||
|
||||
-? ........ --help
|
||||
Display help (from command line).
|
||||
-a ........ --search-skip-screen
|
||||
Search skips current screen.
|
||||
-A ........ --SEARCH-SKIP-SCREEN
|
||||
Search starts just after target line.
|
||||
-b [_N] .... --buffers=[_N]
|
||||
Number of buffers.
|
||||
-B ........ --auto-buffers
|
||||
Don't automatically allocate buffers for pipes.
|
||||
-c ........ --clear-screen
|
||||
Repaint by clearing rather than scrolling.
|
||||
-d ........ --dumb
|
||||
Dumb terminal.
|
||||
-D xx_c_o_l_o_r . --color=xx_c_o_l_o_r
|
||||
Set screen colors.
|
||||
-e -E .... --quit-at-eof --QUIT-AT-EOF
|
||||
Quit at end of file.
|
||||
-f ........ --force
|
||||
Force open non-regular files.
|
||||
-F ........ --quit-if-one-screen
|
||||
Quit if entire file fits on first screen.
|
||||
-g ........ --hilite-search
|
||||
Highlight only last match for searches.
|
||||
-G ........ --HILITE-SEARCH
|
||||
Don't highlight any matches for searches.
|
||||
-h [_N] .... --max-back-scroll=[_N]
|
||||
Backward scroll limit.
|
||||
-i ........ --ignore-case
|
||||
Ignore case in searches that do not contain uppercase.
|
||||
-I ........ --IGNORE-CASE
|
||||
Ignore case in all searches.
|
||||
-j [_N] .... --jump-target=[_N]
|
||||
Screen position of target lines.
|
||||
-J ........ --status-column
|
||||
Display a status column at left edge of screen.
|
||||
-k [_f_i_l_e] . --lesskey-file=[_f_i_l_e]
|
||||
Use a lesskey file.
|
||||
-K ........ --quit-on-intr
|
||||
Exit less in response to ctrl-C.
|
||||
-L ........ --no-lessopen
|
||||
Ignore the LESSOPEN environment variable.
|
||||
-m -M .... --long-prompt --LONG-PROMPT
|
||||
Set prompt style.
|
||||
-n -N .... --line-numbers --LINE-NUMBERS
|
||||
Don't use line numbers.
|
||||
-o [_f_i_l_e] . --log-file=[_f_i_l_e]
|
||||
Copy to log file (standard input only).
|
||||
-O [_f_i_l_e] . --LOG-FILE=[_f_i_l_e]
|
||||
Copy to log file (unconditionally overwrite).
|
||||
-p [_p_a_t_t_e_r_n] --pattern=[_p_a_t_t_e_r_n]
|
||||
Start at pattern (from command line).
|
||||
-P [_p_r_o_m_p_t] --prompt=[_p_r_o_m_p_t]
|
||||
Define new prompt.
|
||||
-q -Q .... --quiet --QUIET --silent --SILENT
|
||||
Quiet the terminal bell.
|
||||
-r -R .... --raw-control-chars --RAW-CONTROL-CHARS
|
||||
Output "raw" control characters.
|
||||
-s ........ --squeeze-blank-lines
|
||||
Squeeze multiple blank lines.
|
||||
-S ........ --chop-long-lines
|
||||
Chop (truncate) long lines rather than wrapping.
|
||||
-t [_t_a_g] .. --tag=[_t_a_g]
|
||||
Find a tag.
|
||||
-T [_t_a_g_s_f_i_l_e] --tag-file=[_t_a_g_s_f_i_l_e]
|
||||
Use an alternate tags file.
|
||||
-u -U .... --underline-special --UNDERLINE-SPECIAL
|
||||
Change handling of backspaces.
|
||||
-V ........ --version
|
||||
Display the version number of "less".
|
||||
-w ........ --hilite-unread
|
||||
Highlight first new line after forward-screen.
|
||||
-W ........ --HILITE-UNREAD
|
||||
Highlight first new line after any forward movement.
|
||||
-x [_N[,...]] --tabs=[_N[,...]]
|
||||
Set tab stops.
|
||||
-X ........ --no-init
|
||||
Don't use termcap init/deinit strings.
|
||||
-y [_N] .... --max-forw-scroll=[_N]
|
||||
Forward scroll limit.
|
||||
-z [_N] .... --window=[_N]
|
||||
Set size of window.
|
||||
-" [_c[_c]] . --quotes=[_c[_c]]
|
||||
Set shell quote characters.
|
||||
-~ ........ --tilde
|
||||
Don't display tildes after end of file.
|
||||
-# [_N] .... --shift=[_N]
|
||||
Set horizontal scroll amount (0 = one half screen width).
|
||||
--file-size
|
||||
Automatically determine the size of the input file.
|
||||
--follow-name
|
||||
The F command changes files if the input file is renamed.
|
||||
--incsearch
|
||||
Search file as each pattern character is typed in.
|
||||
--line-num-width=N
|
||||
Set the width of the -N line number field to N characters.
|
||||
--mouse
|
||||
Enable mouse input.
|
||||
--no-keypad
|
||||
Don't send termcap keypad init/deinit strings.
|
||||
--no-histdups
|
||||
Remove duplicates from command history.
|
||||
--rscroll=C
|
||||
Set the character used to mark truncated lines.
|
||||
--save-marks
|
||||
Retain marks across invocations of less.
|
||||
--status-col-width=N
|
||||
Set the width of the -J status column to N characters.
|
||||
--use-backslash
|
||||
Subsequent options use backslash as escape char.
|
||||
--use-color
|
||||
Enables colored text.
|
||||
--wheel-lines=N
|
||||
Each click of the mouse wheel moves N lines.
|
||||
|
||||
|
||||
---------------------------------------------------------------------------
|
||||
|
||||
LLIINNEE EEDDIITTIINNGG
|
||||
|
||||
These keys can be used to edit text being entered
|
||||
on the "command line" at the bottom of the screen.
|
||||
|
||||
RightArrow ..................... ESC-l ... Move cursor right one character.
|
||||
LeftArrow ...................... ESC-h ... Move cursor left one character.
|
||||
ctrl-RightArrow ESC-RightArrow ESC-w ... Move cursor right one word.
|
||||
ctrl-LeftArrow ESC-LeftArrow ESC-b ... Move cursor left one word.
|
||||
HOME ........................... ESC-0 ... Move cursor to start of line.
|
||||
END ............................ ESC-$ ... Move cursor to end of line.
|
||||
BACKSPACE ................................ Delete char to left of cursor.
|
||||
DELETE ......................... ESC-x ... Delete char under cursor.
|
||||
ctrl-BACKSPACE ESC-BACKSPACE ........... Delete word to left of cursor.
|
||||
ctrl-DELETE .... ESC-DELETE .... ESC-X ... Delete word under cursor.
|
||||
ctrl-U ......... ESC (MS-DOS only) ....... Delete entire line.
|
||||
UpArrow ........................ ESC-k ... Retrieve previous command line.
|
||||
DownArrow ...................... ESC-j ... Retrieve next command line.
|
||||
TAB ...................................... Complete filename & cycle.
|
||||
SHIFT-TAB ...................... ESC-TAB Complete filename & reverse cycle.
|
||||
ctrl-L ................................... Complete filename, list all.
|
||||
-35
@@ -1,35 +0,0 @@
|
||||
column_name | data_type | is_nullable | column_default
|
||||
---------------------+-----------------------------+-------------+--------------------
|
||||
id | integer | NO |
|
||||
uid | text | NO |
|
||||
name | text | NO |
|
||||
notes | text | YES |
|
||||
oppNarrative | text | YES |
|
||||
typeId | integer | NO |
|
||||
stageId | integer | YES |
|
||||
statusId | integer | YES |
|
||||
interest | USER-DEFINED | YES |
|
||||
probability | double precision | NO | 0
|
||||
source | text | YES |
|
||||
primarySalesRepId | text | YES |
|
||||
secondarySalesRepId | text | YES |
|
||||
companyId | integer | YES |
|
||||
contactId | integer | YES |
|
||||
siteId | integer | YES |
|
||||
customerPO | text | YES |
|
||||
locationId | integer | YES |
|
||||
departmentId | integer | YES |
|
||||
expectedCloseDate | timestamp without time zone | YES |
|
||||
pipelineChangeDate | timestamp without time zone | YES |
|
||||
dateBecameLead | timestamp without time zone | YES |
|
||||
closedDate | timestamp without time zone | YES |
|
||||
closedFlag | boolean | NO | false
|
||||
closedById | text | YES |
|
||||
productSequence | ARRAY | YES | ARRAY[]::integer[]
|
||||
updatedBy | text | NO |
|
||||
eneteredBy | text | NO |
|
||||
createdAt | timestamp without time zone | NO | CURRENT_TIMESTAMP
|
||||
updatedAt | timestamp without time zone | NO |
|
||||
taxCodeId | integer | YES |
|
||||
(31 rows)
|
||||
|
||||
@@ -34,6 +34,8 @@ import { default as fetchByUserId } from "./opportunities/fetchByUserId";
|
||||
import { default as workflowDispatch } from "./opportunities/[id]/workflow/dispatch";
|
||||
import { default as workflowStatus } from "./opportunities/[id]/workflow/status";
|
||||
import { default as workflowHistory } from "./opportunities/[id]/workflow/history";
|
||||
import { default as addTime } from "./opportunities/[id]/time";
|
||||
import { default as fetchActivities } from "./opportunities/[id]/activities";
|
||||
|
||||
export {
|
||||
addProduct,
|
||||
@@ -72,4 +74,6 @@ export {
|
||||
workflowDispatch,
|
||||
workflowStatus,
|
||||
workflowHistory,
|
||||
addTime,
|
||||
fetchActivities,
|
||||
};
|
||||
|
||||
@@ -0,0 +1,51 @@
|
||||
import { createRoute } from "../../../../modules/api-utils/createRoute";
|
||||
import { apiResponse } from "../../../../modules/api-utils/apiResponse";
|
||||
import { ContentfulStatusCode } from "hono/utils/http-status";
|
||||
import { authMiddleware } from "../../../middleware/authorization";
|
||||
import { opportunities } from "../../../../managers/opportunities";
|
||||
import { activityCw } from "../../../../modules/cw-utils/activities/activities";
|
||||
import { OptimaType } from "../../../../workflows/wf.opportunity";
|
||||
|
||||
/* GET /v1/sales/opportunities/opportunity/:identifier/activities */
|
||||
export default createRoute(
|
||||
"get",
|
||||
["/opportunities/opportunity/:identifier/activities"],
|
||||
async (c) => {
|
||||
const identifier = c.req.param("identifier");
|
||||
|
||||
const opportunity = await opportunities.fetchItem(identifier);
|
||||
|
||||
const rawActivities = await activityCw.fetchByOpportunityDirect(
|
||||
opportunity.cwOpportunityId,
|
||||
);
|
||||
|
||||
// Return only open workflow activities (status != 2)
|
||||
const openActivities = rawActivities
|
||||
.filter((a: any) => a.status?.id !== 2)
|
||||
.map((a: any) => {
|
||||
const optimaTypeField = a.customFields?.find(
|
||||
(f: any) => f.id === OptimaType.FIELD_ID || f.caption === "Optima_Type",
|
||||
);
|
||||
const parentActivityField = a.customFields?.find(
|
||||
(f: any) => f.id === 50 || f.caption === "Parent_Activity",
|
||||
);
|
||||
return {
|
||||
cwActivityId: a.id,
|
||||
name: a.name,
|
||||
optimaType: optimaTypeField?.value ?? null,
|
||||
parentActivityId: parentActivityField?.value
|
||||
? parseInt(parentActivityField.value, 10) || null
|
||||
: null,
|
||||
status: a.status,
|
||||
dateStart: a.dateStart ?? null,
|
||||
dateEnd: a.dateEnd ?? null,
|
||||
};
|
||||
});
|
||||
|
||||
const response = apiResponse.successful("Open activities fetched.", {
|
||||
activities: openActivities,
|
||||
});
|
||||
return c.json(response, response.status as ContentfulStatusCode);
|
||||
},
|
||||
authMiddleware({ permissions: ["sales.opportunity.view"] }),
|
||||
);
|
||||
@@ -0,0 +1,112 @@
|
||||
import { z } from "zod";
|
||||
import { createRoute } from "../../../../modules/api-utils/createRoute";
|
||||
import { apiResponse } from "../../../../modules/api-utils/apiResponse";
|
||||
import { ContentfulStatusCode } from "hono/utils/http-status";
|
||||
import { authMiddleware } from "../../../middleware/authorization";
|
||||
import { opportunities } from "../../../../managers/opportunities";
|
||||
import { cwMembers } from "../../../../managers/cwMembers";
|
||||
import { activityCw } from "../../../../modules/cw-utils/activities/activities";
|
||||
import { submitTimeEntry } from "../../../../services/cw.opportunityService";
|
||||
import { OptimaType } from "../../../../workflows/wf.opportunity";
|
||||
import GenericError from "../../../../Errors/GenericError";
|
||||
|
||||
const addTimeSchema = z.object({
|
||||
/** CW activity ID to log time against. */
|
||||
activityId: z.number().int().positive(),
|
||||
/** ISO-8601 datetime when work started. */
|
||||
timeStarted: z.string().datetime(),
|
||||
/** ISO-8601 datetime when work ended. */
|
||||
timeEnded: z.string().datetime(),
|
||||
/** Optional notes for the time entry. */
|
||||
notes: z.string().optional(),
|
||||
});
|
||||
|
||||
/* POST /v1/sales/opportunities/opportunity/:identifier/time */
|
||||
export default createRoute(
|
||||
"post",
|
||||
["/opportunities/opportunity/:identifier/time"],
|
||||
async (c) => {
|
||||
const identifier = c.req.param("identifier");
|
||||
const body = await c.req.json();
|
||||
const data = addTimeSchema.parse(body);
|
||||
|
||||
const user = c.get("user");
|
||||
|
||||
if (!user.cwIdentifier) {
|
||||
throw new GenericError({
|
||||
status: 400,
|
||||
name: "MissingCwIdentifier",
|
||||
message:
|
||||
"Your account is not linked to a ConnectWise member. A CW member association is required to log time.",
|
||||
});
|
||||
}
|
||||
|
||||
// Verify the opportunity exists and belongs to the correct identifier
|
||||
const opportunity = await opportunities.fetchItem(identifier);
|
||||
|
||||
const cwMember = await cwMembers.fetch(user.cwIdentifier);
|
||||
|
||||
// Fetch the activity to verify it belongs to this opportunity and is open
|
||||
const activity = await activityCw.fetch(data.activityId);
|
||||
|
||||
if (activity.opportunity?.id !== opportunity.cwOpportunityId) {
|
||||
throw new GenericError({
|
||||
status: 400,
|
||||
name: "ActivityMismatch",
|
||||
message: "The specified activity does not belong to this opportunity.",
|
||||
});
|
||||
}
|
||||
|
||||
if (activity.status?.id === 2) {
|
||||
throw new GenericError({
|
||||
status: 400,
|
||||
name: "ActivityClosed",
|
||||
message: "Cannot log time against a closed activity.",
|
||||
});
|
||||
}
|
||||
|
||||
// Submit the time entry
|
||||
const result = await submitTimeEntry({
|
||||
activityId: data.activityId,
|
||||
cwMemberId: cwMember.cwMemberId,
|
||||
timeStart: data.timeStarted,
|
||||
timeEnd: data.timeEnded,
|
||||
notes: data.notes ?? "",
|
||||
});
|
||||
|
||||
if (!result.success) {
|
||||
throw new GenericError({
|
||||
status: 502,
|
||||
name: "TimeEntryFailed",
|
||||
message: result.message,
|
||||
});
|
||||
}
|
||||
|
||||
// If the activity is a Schedule Entry (Optima_Type = "Schedule Entry"),
|
||||
// close it now that time has been logged against it.
|
||||
const optimaTypeField = activity.customFields?.find(
|
||||
(f: any) => f.id === OptimaType.FIELD_ID || f.caption === "Optima_Type",
|
||||
);
|
||||
if (optimaTypeField?.value === OptimaType.ScheduleEntry) {
|
||||
try {
|
||||
await activityCw.update(data.activityId, [
|
||||
{ op: "replace", path: "status", value: { id: 2 } },
|
||||
]);
|
||||
} catch (closeErr) {
|
||||
// Non-fatal — time entry was already submitted successfully
|
||||
console.error(
|
||||
`[AddTime] Failed to close Schedule Entry activity ${data.activityId}:`,
|
||||
closeErr,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
const response = apiResponse.successful("Time entry submitted successfully.", {
|
||||
cwTimeEntryId: result.cwTimeEntryId,
|
||||
activityId: data.activityId,
|
||||
activityWasClosed: optimaTypeField?.value === OptimaType.ScheduleEntry,
|
||||
});
|
||||
return c.json(response, response.status as ContentfulStatusCode);
|
||||
},
|
||||
authMiddleware({ permissions: ["sales.opportunity.update"] }),
|
||||
);
|
||||
@@ -5,6 +5,10 @@ import { ContentfulStatusCode } from "hono/utils/http-status";
|
||||
import { authMiddleware } from "../../../middleware/authorization";
|
||||
import GenericError from "../../../../Errors/GenericError";
|
||||
import { z } from "zod";
|
||||
import {
|
||||
OpportunityStatus,
|
||||
StatusIdToKey,
|
||||
} from "../../../../workflows/wf.opportunity";
|
||||
|
||||
const updateSchema = z
|
||||
.object({
|
||||
@@ -46,6 +50,21 @@ export default createRoute(
|
||||
|
||||
const item = await opportunities.fetchRecord(identifier);
|
||||
|
||||
// Read-only guard: only New and Active statuses allow opportunity data mutations.
|
||||
const editableStatuses = new Set<number>([
|
||||
OpportunityStatus.New,
|
||||
OpportunityStatus.Active,
|
||||
]);
|
||||
const currentStatusId = item.statusCwId ?? null;
|
||||
if (currentStatusId !== null && !editableStatuses.has(currentStatusId)) {
|
||||
const statusKey = StatusIdToKey[currentStatusId] ?? `ID ${currentStatusId}`;
|
||||
throw new GenericError({
|
||||
status: 422,
|
||||
name: "OpportunityReadOnly",
|
||||
message: `Opportunity data cannot be edited in "${statusKey}" status. Only "New" and "Active" opportunities are editable.`,
|
||||
});
|
||||
}
|
||||
|
||||
try {
|
||||
const updated = await item.updateOpportunity(data);
|
||||
|
||||
|
||||
@@ -91,6 +91,19 @@ const dispatchSchema = z.discriminatedUnion("action", [
|
||||
action: z.literal("reopen"),
|
||||
payload: noteRequiredPayload,
|
||||
}),
|
||||
z.object({
|
||||
action: z.literal("sendBackForRevision"),
|
||||
payload: noteRequiredPayload,
|
||||
}),
|
||||
z.object({
|
||||
action: z.literal("createScheduleEntry"),
|
||||
payload: basePayload.extend({
|
||||
activityTypeValue: z.enum(["Follow-Up", "Appointment", "Admin"]),
|
||||
dueDate: z.string().optional(),
|
||||
startTime: z.string().optional(),
|
||||
endTime: z.string().optional(),
|
||||
}),
|
||||
}),
|
||||
]);
|
||||
|
||||
// ── Route ─────────────────────────────────────────────────────────────────
|
||||
|
||||
@@ -22,6 +22,7 @@ const OPTIMA_TYPE_VALUES = new Set<string>([
|
||||
OptimaType.Revision,
|
||||
OptimaType.Finalized,
|
||||
OptimaType.Converted,
|
||||
OptimaType.ScheduleEntry,
|
||||
]);
|
||||
|
||||
/** QuoteID custom field ID (matches wf.opportunity.ts QUOTE_ID_FIELD_ID). */
|
||||
|
||||
@@ -248,6 +248,15 @@ const ACTION_MAP: Record<number, AvailableAction[]> = {
|
||||
requiresPermission: null,
|
||||
payloadHints: { needsRevision: "true" },
|
||||
},
|
||||
{
|
||||
action: "sendBackForRevision",
|
||||
label: "Send Back for Revision",
|
||||
targetStatuses: [
|
||||
{ key: "PendingRevision", id: OpportunityStatus.PendingRevision },
|
||||
],
|
||||
requiresNote: true,
|
||||
requiresPermission: null,
|
||||
},
|
||||
],
|
||||
|
||||
[OpportunityStatus.Active]: [
|
||||
|
||||
@@ -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}"`);
|
||||
|
||||
@@ -1,17 +0,0 @@
|
||||
import { Client } from "pg";
|
||||
|
||||
const url = process.env.DATABASE_URL ?? "postgresql://optima:123web123@localhost:5432/optima";
|
||||
const c = new Client(url);
|
||||
await c.connect();
|
||||
|
||||
const r = await c.query(
|
||||
"SELECT column_name, is_nullable, column_default FROM information_schema.columns WHERE table_name = 'Opportunity' ORDER BY ordinal_position"
|
||||
);
|
||||
|
||||
console.log("Opportunity columns:");
|
||||
for (const row of r.rows) {
|
||||
const nullable = row.is_nullable === "YES" ? "nullable" : "NOT NULL";
|
||||
console.log(` ${row.column_name}: ${nullable}${row.column_default ? ` (default: ${row.column_default})` : ""}`);
|
||||
}
|
||||
|
||||
await c.end();
|
||||
Reference in New Issue
Block a user