Compare commits

..
Author SHA1 Message Date
Jeighdy Tanamal bbf6a90e18 Feat added internal notes
Runner Test / test (pull_request) Successful in 15s
Runner Test / test (push) Successful in 15s
2026-09-24 15:54:28 -07:00
11 changed files with 123 additions and 133 deletions
+1 -3
View File
@@ -120,9 +120,7 @@ export function initializeDatabase(sqlite: Database) {
created_at TEXT NOT NULL
);
`);
// Databases created before internal order notes existed keep their orders table, so add the column in place.
if (!columnExists(sqlite, "orders", "notes")) {
sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT;");
sqlite.exec("ALTER TABLE orders ADD COLUMN notes TEXT");
}
}
+6 -6
View File
@@ -96,6 +96,7 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
id: header.order.id,
orderNumber: header.order.orderNumber,
status: header.order.status as OrderDetail["status"],
notes: header.order.notes,
createdAt: header.order.createdAt,
updatedAt: header.order.updatedAt,
customer: {
@@ -104,8 +105,7 @@ export async function findOrderDetail(context: DatabaseContext, orderId: string)
email: header.customer.email
},
shippingAddress: toAddress(header.address),
items: itemRows.map(toOrderItemDetail),
notes: header.order.notes
items: itemRows.map(toOrderItemDetail)
} satisfies OrderDetail;
}
@@ -128,14 +128,14 @@ export async function updateOrderTimestamp(context: DatabaseContext, orderId: st
await context.db.update(orders).set({ updatedAt }).where(eq(orders.id, orderId));
}
export async function updateOrderStatus(context: DatabaseContext, orderId: string, status: OrderDetail["status"], updatedAt: string) {
await context.db.update(orders).set({ status, updatedAt }).where(eq(orders.id, orderId));
}
export async function updateOrderNotes(context: DatabaseContext, orderId: string, notes: string, updatedAt: string) {
await context.db.update(orders).set({ notes, updatedAt }).where(eq(orders.id, orderId));
}
export async function updateOrderStatus(context: DatabaseContext, orderId: string, status: OrderDetail["status"], updatedAt: string) {
await context.db.update(orders).set({ status, updatedAt }).where(eq(orders.id, orderId));
}
export async function updateOrderAddress(context: DatabaseContext, orderId: string, address: Address) {
const [row] = await context.db.select({ shippingAddressId: orders.shippingAddressId }).from(orders).where(eq(orders.id, orderId));
+23 -29
View File
@@ -34,10 +34,6 @@ interface CancelBody {
reason?: string;
}
interface NotesBody {
notes: string;
}
type AuthenticatedRequest = FastifyRequest & { currentUser: AuthUser };
export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async (app, options) => {
@@ -74,6 +70,29 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
app.get<{ Params: IdParams }>("/orders/:orderId/audit-events", async (request) => listAuditEvents(options.db, request.params.orderId));
app.post<{ Params: IdParams; Body: { notes: string } }>("/orders/:orderId/notes", {
schema: {
body: {
type: "object",
required: ["notes"],
properties: {
notes: { type: "string", minLength: 1, maxLength: 1000 }
}
}
}
}, async (request, reply) => {
const result = await changeOrderNotes(options.db, {
orderId: request.params.orderId,
notes: request.body.notes
});
if (result.statusCode !== 200) {
return reply.code(result.statusCode).send({ message: result.message });
}
return result.order;
});
app.post<{ Params: OrderItemParams; Body: QuantityBody }>("/orders/:orderId/items/:itemId/quantity", {
schema: {
body: {
@@ -139,31 +158,6 @@ export const registerOrderRoutes: FastifyPluginAsync<OrderRouteOptions> = async
return result.order;
});
app.post<{ Params: IdParams; Body: NotesBody }>("/orders/:orderId/notes", {
schema: {
body: {
type: "object",
required: ["notes"],
properties: {
notes: { type: "string" }
}
}
}
}, async (request, reply) => {
const currentUser = (request as AuthenticatedRequest).currentUser;
const result = await changeOrderNotes(options.db, {
orderId: request.params.orderId,
notes: request.body.notes,
actor: currentUser.username
});
if (result.statusCode !== 200) {
return reply.code(result.statusCode).send({ message: result.message });
}
return result.order;
});
app.post<{ Params: IdParams; Body: CancelBody }>("/orders/:orderId/cancel", {
schema: {
body: {
+6 -30
View File
@@ -1,43 +1,19 @@
import { maxOrderNotesLength } from "@orderops/shared";
import type { DatabaseContext } from "../db/database";
import { appendAuditEvent, findOrderDetail, updateOrderNotes } from "./order-repository";
import { findOrderDetail, updateOrderNotes } from "./order-repository";
export async function changeOrderNotes(
context: DatabaseContext,
input: {
orderId: string;
notes: string;
actor: string;
}
) {
export async function changeOrderNotes(context: DatabaseContext, input: { orderId: string; notes: string }) {
const notes = input.notes.trim();
if (!notes) {
return { statusCode: 400, message: "Notes cannot be empty." } as const;
}
if (notes.length > maxOrderNotesLength) {
return { statusCode: 400, message: `Notes cannot be longer than ${maxOrderNotesLength} characters.` } as const;
if (!notes || Array.from(input.notes).length > 1000) {
return { statusCode: 400, message: "Internal notes must contain between 1 and 1000 characters." } as const;
}
const order = await findOrderDetail(context, input.orderId);
if (!order) {
return { statusCode: 404, message: "Order not found." } as const;
}
const updatedAt = new Date().toISOString();
await updateOrderNotes(context, input.orderId, notes, updatedAt);
await appendAuditEvent(context, {
orderId: input.orderId,
actor: input.actor,
type: "order.notes_updated",
message: "Updated internal notes.",
createdAt: updatedAt
});
await updateOrderNotes(context, input.orderId, notes, new Date().toISOString());
return {
statusCode: 200,
order: await findOrderDetail(context, input.orderId)
} as const;
return { statusCode: 200, order: await findOrderDetail(context, input.orderId) } as const;
}
File diff suppressed because one or more lines are too long
+7 -7
View File
@@ -28,16 +28,16 @@ export function updateShippingAddress(orderId: string, address: Address) {
});
}
export function updateOrderNotes(orderId: string, notes: string) {
return apiRequest<OrderDetail>(`/api/orders/${orderId}/notes`, {
method: "POST",
body: JSON.stringify({ notes })
});
}
export function cancelOrder(orderId: string, reason?: string) {
return apiRequest<OrderDetail>(`/api/orders/${orderId}/cancel`, {
method: "POST",
body: JSON.stringify({ reason })
});
}
export function updateOrderNotes(orderId: string, notes: string) {
return apiRequest<OrderDetail>(`/api/orders/${orderId}/notes`, {
method: "POST",
body: JSON.stringify({ notes })
});
}
+13 -6
View File
@@ -1,7 +1,7 @@
import type { Address, AuditEvent, OrderDetail } from "@orderops/shared";
import { AuditTimeline } from "./audit-timeline";
import { OrderItemsPanel } from "./order-items-panel";
import { OrderNotesPanel } from "./order-notes-panel";
import { OrderNotesForm } from "./order-notes-form";
import { OrderSummaryPanel } from "./order-summary";
import { ShippingAddressForm } from "./shipping-address-form";
@@ -10,8 +10,8 @@ interface OrderDetailPageProps {
auditEvents: AuditEvent[];
onUpdateQuantity: (itemId: string, quantity: number) => Promise<void>;
onSaveAddress: (address: Address) => Promise<void>;
onSaveNotes: (notes: string) => Promise<void>;
onCancel: () => Promise<void>;
onSaveNotes: (notes: string) => Promise<boolean>;
}
export function OrderDetailPage({
@@ -19,13 +19,20 @@ export function OrderDetailPage({
auditEvents,
onUpdateQuantity,
onSaveAddress,
onSaveNotes,
onCancel
onCancel,
onSaveNotes
}: OrderDetailPageProps) {
return (
<div className="space-y-4">
<OrderSummaryPanel order={order} />
<div className="flex justify-end">
<div className="flex justify-end gap-3">
<button className="rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white" type="button" onClick={() => {
const input = document.getElementById("internal-order-notes");
input?.scrollIntoView({ block: "center" });
input?.focus({ preventScroll: true });
}}>
{order.notes ? "Edit internal notes" : "Add internal note"}
</button>
<button className="rounded-md bg-red-600 px-4 py-2 text-sm font-medium text-white" onClick={() => void onCancel()} type="button">
Cancel order
</button>
@@ -33,7 +40,7 @@ export function OrderDetailPage({
<OrderItemsPanel order={order} onUpdateQuantity={onUpdateQuantity} />
<ShippingAddressForm order={order} onSave={onSaveAddress} />
<AuditTimeline events={auditEvents} />
<OrderNotesPanel order={order} onSave={onSaveNotes} />
<OrderNotesForm key={order.id} notes={order.notes} onSave={onSaveNotes} />
</div>
);
}
+58
View File
@@ -0,0 +1,58 @@
import { useState } from "react";
interface OrderNotesFormProps {
notes: string | null;
onSave: (notes: string) => Promise<boolean>;
}
export function OrderNotesForm({ notes, onSave }: OrderNotesFormProps) {
const [draft, setDraft] = useState(notes ?? "");
const [isSaving, setIsSaving] = useState(false);
const length = Array.from(draft).length;
return (
<section className="rounded-xl border border-slate-200 bg-white p-4 shadow-sm">
<div className="mb-3 flex items-center gap-3">
<h3 className="text-sm font-semibold text-slate-700">Internal notes</h3>
<span className="rounded-full bg-slate-100 px-3 py-1 text-xs text-slate-600">Employees only</span>
</div>
{notes ? <p className="mb-3 whitespace-pre-wrap break-words rounded-lg border border-slate-200 p-3 text-sm text-slate-700">{notes}</p> : null}
<form onSubmit={async (event) => {
event.preventDefault();
if (isSaving || !draft.trim() || length > 1000) return;
setIsSaving(true);
try {
if (await onSave(draft)) setDraft(draft.trim());
} finally {
setIsSaving(false);
}
}}>
<label className="mb-1 block text-sm text-slate-700" htmlFor="internal-order-notes">
{notes ? "Edit internal notes" : "Add a note for your teammates"}
</label>
<textarea
id="internal-order-notes"
className="w-full rounded-lg border border-slate-300 px-3 py-2 text-sm"
aria-describedby="internal-order-notes-help"
placeholder="Add a note for your teammates..."
rows={3}
value={draft}
disabled={isSaving}
onChange={(event) => setDraft(event.target.value)}
/>
<div className="mt-2 flex items-center justify-between gap-3">
<p id="internal-order-notes-help" className="text-xs text-slate-600">
{length}/1000 characters. Saving replaces the current notes.
</p>
<button
className="rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white disabled:opacity-50"
type="submit"
disabled={isSaving || !draft.trim() || length > 1000}
>
{isSaving ? "Saving..." : notes ? "Save notes" : "Add note"}
</button>
</div>
</form>
</section>
);
}
-42
View File
@@ -1,42 +0,0 @@
import { useState } from "react";
import { maxOrderNotesLength, type OrderDetail } from "@orderops/shared";
interface OrderNotesPanelProps {
order: OrderDetail;
onSave: (notes: string) => Promise<void>;
}
export function OrderNotesPanel({ order, onSave }: OrderNotesPanelProps) {
const [notes, setNotes] = useState(order.notes ?? "");
return (
<section className="rounded-xl border border-slate-200 bg-white p-4 shadow-sm">
<h3 className="mb-3 text-sm font-semibold text-slate-700">Internal notes</h3>
<form
className="space-y-3"
onSubmit={async (event) => {
event.preventDefault();
await onSave(notes);
}}
>
<label className="block text-sm text-slate-700">
<span className="mb-1 block">Notes for the OrderOps team</span>
<textarea
className="w-full rounded-lg border border-slate-300 px-3 py-2"
maxLength={maxOrderNotesLength}
rows={4}
value={notes}
onChange={(event) => setNotes(event.target.value)}
/>
</label>
<button
className="rounded-md bg-slate-900 px-4 py-2 text-sm font-medium text-white disabled:opacity-50"
disabled={!notes.trim()}
type="submit"
>
Save notes
</button>
</form>
</section>
);
}
+7 -5
View File
@@ -55,7 +55,7 @@ export function OrderPage() {
async function runAction(action: () => Promise<OrderDetail>, successMessage: string) {
if (!orderId) {
return;
return false;
}
try {
@@ -64,11 +64,13 @@ export function OrderPage() {
setOrder(nextOrder);
await refreshOrder(orderId);
setToast({ message: successMessage, variant: "success" });
return true;
} catch (caught) {
setToast({
message: caught instanceof Error ? caught.message : "Request failed.",
variant: "error"
});
return false;
}
}
@@ -84,10 +86,10 @@ export function OrderPage() {
<OrderDetailPage
order={order}
auditEvents={auditEvents}
onUpdateQuantity={(itemId, quantity) => runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved.")}
onSaveAddress={(address: Address) => runAction(() => updateShippingAddress(order.id, address), "Shipping address saved.")}
onSaveNotes={(notes: string) => runAction(() => updateOrderNotes(order.id, notes), "Notes saved.")}
onCancel={() => runAction(() => cancelOrder(order.id), "Order cancelled.")}
onUpdateQuantity={async (itemId, quantity) => { await runAction(() => updateOrderItemQuantity(order.id, itemId, quantity), "Quantity saved."); }}
onSaveAddress={async (address: Address) => { await runAction(() => updateShippingAddress(order.id, address), "Shipping address saved."); }}
onCancel={async () => { await runAction(() => cancelOrder(order.id), "Order cancelled."); }}
onSaveNotes={(notes) => runAction(() => updateOrderNotes(order.id, notes), "Internal notes saved.")}
/>
) : null}
</div>
+1 -4
View File
@@ -3,9 +3,6 @@ import type { CustomerSummary } from "./customer";
import type { Money } from "./money";
import type { OrderStatus } from "./order-status";
// Internal order notes are capped so they stay a short follow-up context, not a document.
export const maxOrderNotesLength = 1000;
export interface OrderItemDetail {
id: string;
productId: string;
@@ -20,10 +17,10 @@ export interface OrderDetail {
id: string;
orderNumber: string;
status: OrderStatus;
notes: string | null;
createdAt: string;
updatedAt: string;
customer: CustomerSummary;
shippingAddress: Address;
items: OrderItemDetail[];
notes: string | null;
}