@nextlyhq/plugin-form-builder 0.0.2-alpha.73 → 0.0.2-alpha.74

package/dist/admin/index.d.ts

@@ -18,6 +18,11 @@ interface FormBuilderViewProps {
     fields?: unknown[];
     settings?: Record<string, unknown>;
     notifications?: unknown[];
+    /**
+     * The form's version as read, which a save sends back so one made from an
+     * older version is refused rather than replacing what someone saved since.
+     */
+    _rev?: string;
   };
   onSave?: (data: unknown) => void;
   onSuccess?: (entry?: Record<string, unknown>) => void;
@@ -49,6 +54,8 @@ interface SubmissionRow {
   submittedAt?: string | null;
   editedAt?: string | null;
   editedBy?: string | null;
+  /** The submission's version as the list read it; see `submissionPatch`. */
+  _rev?: string;
 }
 interface FormOption {
   id: string;

package/dist/admin/index.js

@@ -388,6 +388,19 @@ function SubmissionSheet({ submission, form, canUpdate, onClose, onPrev, onNext,
 *
 * @module admin/components/submissions/SubmissionsView
 */
+/**
+* What a change to a submission sends: the change, with the version its row
+* had when the list read it, so a change made from an older copy is refused
+* rather than replacing what someone saved since.
+*/
+function submissionPatch(row, changes) {
+	return typeof row?._rev === "string" ? {
+		...changes,
+		_rev: row._rev
+	} : changes;
+}
+/** What a refused change says when someone saved the submission since. */
+const SUBMISSION_CHANGED_SINCE = "Someone changed this submission since the list loaded. The list now shows their change; make yours again.";
 const STATUS_TABS = [
 	{
 		value: "all",
@@ -469,7 +482,7 @@ function SubmissionsView({ collectionSlug }) {
 				const allForms = [];
 				const formsPageSize = 200;
 				for (let formsPage = 1;; formsPage += 1) {
-					const formsRes = await fetch(`/admin/api/collections/${resolved.forms}/entries?pageSize=${formsPageSize}&page=${formsPage}`, { credentials: "include" });
+					const formsRes = await fetch(`/admin/api/collections/${resolved.forms}/entries?limit=${formsPageSize}&page=${formsPage}`, { credentials: "include" });
 					if (!formsRes.ok) break;
 					const items = (await formsRes.json()).items ?? [];
 					allForms.push(...items.map((item) => ({
@@ -513,7 +526,7 @@ function SubmissionsView({ collectionSlug }) {
 			else where.status = { equals: statusTab };
 			const params = new URLSearchParams({
 				page: String(page),
-				pageSize: String(PAGE_SIZE$1),
+				limit: String(PAGE_SIZE$1),
 				sortBy: "submittedAt",
 				sortOrder: "desc",
 				where: JSON.stringify(where)
@@ -592,14 +605,22 @@ function SubmissionsView({ collectionSlug }) {
 		formNameById,
 		hiddenFieldColumns
 	]);
+	const rowsNow = useRef(rows);
+	rowsNow.current = rows;
 	const patchSubmission = useCallback(async (id, body) => {
 		const res = await fetch(`/admin/api/collections/${submissionsSlug}/entries/${id}`, {
 			method: "PATCH",
 			headers: { "Content-Type": "application/json" },
 			credentials: "include",
-			body: JSON.stringify(body)
+			body: JSON.stringify(submissionPatch(rowsNow.current.find((row) => row.id === id), body))
 		});
-		if (!res.ok) throw new Error(`Update failed (${res.status})`);
+		if (!res.ok) {
+			if ((await res.json().catch(() => null))?.error?.code === "STALE_VERSION") {
+				await fetchRows();
+				throw new Error(SUBMISSION_CHANGED_SINCE);
+			}
+			throw new Error(`Update failed (${res.status})`);
+		}
 		await fetchRows();
 	}, [submissionsSlug, fetchRows]);
 	const deleteSubmission = useCallback(async (id) => {
@@ -619,7 +640,7 @@ function SubmissionsView({ collectionSlug }) {
 			onSelect: (target) => void patchSubmission(target.id, {
 				status: "new",
 				spamReason: null
-			})
+			}).catch((reason) => setError(reason instanceof Error ? reason.message : "Update failed."))
 		});
 		if (canDelete) actions.push({
 			id: "delete",
@@ -4407,10 +4428,32 @@ function FormPreview({ fields, formData }) {
 * @module admin/FormBuilderView
 * @since 0.1.0
 */
+/**
+* The key a form's version travels under, as the admin reads and sends it.
+* Spelled here because the plugin reaches the admin only through the SDK,
+* which does not publish it.
+*/
+const DOCUMENT_VERSION_KEY = "_rev";
+/**
+* What a save sends: an existing form's save names the version the editor's
+* copy started from, where it has one, so a save from an older copy is refused.
+*/
+function saveBody(saveData, isCreating, startedFrom) {
+	return isCreating || startedFrom === void 0 ? saveData : {
+		...saveData,
+		[DOCUMENT_VERSION_KEY]: startedFrom
+	};
+}
+/** The version a save answered, or the copy's own where it names none. */
+function versionAfterSave(saved, previous) {
+	const answered = saved[DOCUMENT_VERSION_KEY];
+	return typeof answered === "string" ? answered : previous;
+}
 function slugify(text) {
 	return text.toLowerCase().trim().replace(/[^\w\s-]/g, "").replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
 }
-function FormBuilderViewInner({ isCreating = false, collectionSlug = "forms", entryId, onSave, onSuccess, onCancel, documentLock }) {
+function FormBuilderViewInner({ isCreating = false, collectionSlug = "forms", entryId, onSave, onSuccess, onCancel, documentLock, version }) {
+	const startedFrom = useRef(version);
 	const { fields, activeTab, isDirty, formData, settings, notifications, setActiveTab, addField, selectField, seedNotifications, updateFormData, markAsSaved } = useFormBuilder();
 	const queryClient = useQueryClient();
 	const [isSaving, setIsSaving] = useState(false);
@@ -4497,11 +4540,12 @@ function FormBuilderViewInner({ isCreating = false, collectionSlug = "forms", en
 				method: isCreating ? "POST" : "PATCH",
 				headers: { "Content-Type": "application/json" },
 				credentials: "include",
-				body: JSON.stringify(saveData)
+				body: JSON.stringify(saveBody(saveData, isCreating, startedFrom.current))
 			});
 			if (!response.ok) throw new Error(saveErrorMessage(await response.json().catch(() => ({})), response.statusText));
 			const result = await response.json();
 			const savedEntry = result.item ?? result;
+			startedFrom.current = versionAfterSave(savedEntry, startedFrom.current);
 			queryClient.invalidateQueries({ queryKey: [
 				"entries",
 				"list",
@@ -4744,6 +4788,10 @@ function FormBuilderViewInner({ isCreating = false, collectionSlug = "forms", en
 */
 function saveErrorMessage(body, statusText) {
 	const error = body?.error;
+	if (error?.code === "STALE_VERSION") {
+		const name = error.data?.changedBy?.name;
+		return `${typeof name === "string" && name.trim() !== "" ? name.trim() : "Someone"} changed this form since you opened it. Reload to see their change; your edits are still here, not saved.`;
+	}
 	return (error?.data?.errors ?? []).map((issue) => issue.message).filter((message) => Boolean(message)).join(" ") || error?.message || `Failed to save form: ${statusText}`;
 }
 function FormBuilderView({ id, entryId, collection, collectionSlug, isCreating, initialData, onSave, onSuccess, onCancel, documentLock }) {
@@ -4771,7 +4819,8 @@ function FormBuilderView({ id, entryId, collection, collectionSlug, isCreating,
 			onSave,
 			onSuccess,
 			onCancel,
-			documentLock
+			documentLock,
+			version: initialData?._rev
 		})
 	}, providerKey);
 }
@@ -4808,7 +4857,10 @@ function markReadRequest(collection, id) {
 					id: { equals: id },
 					status: { equals: "new" }
 				},
-				data: { status: READ_STATUS }
+				data: {
+					status: READ_STATUS,
+					_overwrite: true
+				}
 			})
 		}
 	};