Frontend submissions review fixes: portal-scoped posting and galleries

pr-review findings:
- submitForm filters the persisted fields record to the portal's own
  config: the store is shared across portals, so a leftover key from
  another portal 422'd every submit with an error about a field that
  has no input on the page — and the only recovery (Reset) destroyed
  the user's text.
- Unparseable map links no longer submit silently with map_ref=null;
  the user is told the link couldn't be read.
- require_email_confirm is actually enforced (checkValidity never saw
  the match rule, so 'confirm your email' accepted any non-empty text).
- Portal pages' comment galleries are scoped to their portal: the CMS
  injects portalId into comment_gallery blocks and the gallery passes
  it through — an empty editor tags field listed EVERY portal's
  submissions, and user tag filters (OR semantics) widened it back.
- Unknown config fields warn loudly instead of silently rendering an
  unsubmittable form (3-file registry lockstep drift).
- 422 details render one message per error ('; '-joined) and FastAPI's
  object-shaped validation errors no longer print [object Object].
- Backend tests pin the loosened public list boundary: portal_id
  optional spans portals, ids narrows, and ids can NOT fish out hidden
  rows or drafts.
- Dead code removed: the legacy FORM_ATTRIBUTES DOM plumbing (form
  blocks render via StreamRenderer's block.value spread), MapLink's
  unreachable zone badge, and the orphaned comment/commenter types.
- zustand migrate() added so v0 drafts drop without a console error.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Author: nofurtherinformation

app/src/app/components/Cms/RichTextEditor/extensions/CommentGallery/CommentGallery.tsx

@@ -62,6 +62,9 @@ function useDebouncedValue<T>(value: T, delay: number): T {
 /** Props for CommentGallery - matches attributes defined in CommentGalleryNode */
 export interface CommentGalleryProps {
   ids?: number[];
+  /** Injected by the CMS on portal pages: scopes the gallery to one portal
+   * regardless of tag filters (tags are OR'd and user-extendable). */
+  portalId?: string;
   tags?: string[];
   place?: string;
   state?: string;
@@ -247,6 +250,7 @@ const FilterControls: React.FC<{
 
 export const CommentGallery: React.FC<CommentGalleryProps> = ({
   ids,
+  portalId,
   tags: initialTags,
   place: initialPlace,
   state: initialState,
@@ -288,6 +292,7 @@ export const CommentGallery: React.FC<CommentGalleryProps> = ({
   const filters: CommentFilters = useMemo(
     () => ({
       ids: ids,
+      portalId: portalId,
       // Merge initial tags with user-added tags
       tags:
         initialTags || debouncedUserFilters.tags.length > 0
@@ -304,6 +309,7 @@ export const CommentGallery: React.FC<CommentGalleryProps> = ({
     }),
     [
       ids,
+      portalId,
       initialTags,
       debouncedUserFilters,
       initialPlace,

app/src/app/components/Cms/RichTextEditor/extensions/CommentGallery/CommentGalleryRenderers.tsx

@@ -64,7 +64,7 @@ const ReportButton: React.FC<{submissionId: number}> = ({submissionId}) => {
 };
 
 /** Map link component for comments with associated maps */
-const MapLink: React.FC<{publicId: number; zone?: number | null}> = ({publicId, zone}) => (
+const MapLink: React.FC<{publicId: number}> = ({publicId}) => (
   <a
     href={`/map/${publicId}`}
     target="_blank"
@@ -74,11 +74,6 @@ const MapLink: React.FC<{publicId: number; zone?: number | null}> = ({publicId,
   >
     <GlobeIcon className="w-4 h-4" />
     View Map
-    {zone !== null && zone !== undefined && (
-      <Badge size="1" color="blue" variant="soft">
-        Zone {zone}
-      </Badge>
-    )}
   </a>
 );
 

app/src/app/components/Forms/SubmissionForm.tsx

@@ -69,6 +69,17 @@ export const SubmissionForm: React.FC<SubmissionFormProps> = ({
 
   const required = new Set(requiredFields ?? []);
   const shown = FIELD_ORDER.filter(name => fields.includes(name));
+  // Registry drift (a config field this frontend build doesn't know) would
+  // otherwise render no input while the backend keeps requiring it — an
+  // unsubmittable form with no visible cause.
+  const unknown = fields.filter(name => !(name in FIELD_REGISTRY));
+  if (unknown.length) {
+    console.warn(
+      `SubmissionForm: unknown field(s) in portal config: ${unknown.join(', ')} — ` +
+        'update fieldRegistry.tsx (3-file lockstep with backend fields.py and ' +
+        'the CMS SUBMISSION_FIELD_CHOICES).'
+    );
+  }
   const submissionFields = shown.filter(name => FIELD_REGISTRY[name].section === 'submission');
   const aboutFields = shown.filter(name => FIELD_REGISTRY[name].section === 'about');
 
@@ -142,8 +153,13 @@ export const SubmissionForm: React.FC<SubmissionFormProps> = ({
       <form
         onSubmit={e => {
           e.preventDefault();
-          if (captchaToken && formIsValid) {
-            submitForm(portalId);
+          // checkValidity() only sees native constraints, so the confirm
+          // field's match rule must be enforced here — otherwise
+          // require_email_confirm degrades to "type anything twice".
+          const emailConfirmed =
+            !requireEmailConfirm || (shown.includes('email') && emailConfirm === emailValue);
+          if (captchaToken && formIsValid && emailConfirmed) {
+            submitForm(portalId, shown);
           }
         }}
         ref={formRef}

app/src/app/components/RichTextRenderer/CustomRenderers/DomNodeRenderers.tsx

@@ -1,7 +1,6 @@
 import {DOMNode} from 'html-react-parser';
 import BoilerplateNodeRenderer from '../../Cms/RichTextEditor/extensions/Boilerplate/BoilerplateNodeRenderer';
 import {ContentHeader} from '../../Static/ContentHeader';
-import {SubmissionForm} from '../../Forms/SubmissionForm';
 import {
   PlanGallery,
   PlanGalleryProps,
@@ -19,7 +18,6 @@ import {
   RICH_TEXT_NODE_TYPES,
   BOILERPLATE_ATTRIBUTE_NAME,
   SECTION_HEADER_ATTRIBUTE_NAME,
-  FORM_ATTRIBUTES,
   MAP_CREATE_BUTTONS_ATTRIBUTES,
   COMMENT_GALLERY_ATTRIBUTES,
   PLAN_GALLERY_ATTRIBUTES,
@@ -48,17 +46,6 @@ export const domNodeReplacers = (disabled: boolean) => {
           ) as PlanGalleryProps;
           return <PlanGallery {...props} />;
         }
-        case RICH_TEXT_NODE_TYPES.FORM: {
-          const props = Object.fromEntries(
-            FORM_ATTRIBUTES.map(attr => [
-              attr.name,
-              JSON.parse(domNode.attribs[attr.name] ?? 'null'),
-            ])
-          );
-          // Legacy embedded form nodes carry no form config; SubmissionForm
-          // renders nothing without one (converted pages use stream blocks).
-          return <SubmissionForm disabled={disabled} {...(props as any)} />;
-        }
         case RICH_TEXT_NODE_TYPES.MAP_CREATE_BUTTONS: {
           const props = Object.fromEntries(
             MAP_CREATE_BUTTONS_ATTRIBUTES.map(attr => [

app/src/app/constants/cms.ts

@@ -16,16 +16,10 @@ export const RICH_TEXT_NODE_TYPES = {
 export const BOILERPLATE_ATTRIBUTE_NAME = 'data-custom-content';
 export const SECTION_HEADER_ATTRIBUTE_NAME = 'data-title';
 
-export const FORM_ATTRIBUTES = [
-  {name: 'mandatoryTags', default: []},
-  {name: 'allowListModules', default: null},
-  // Injected by the CMS content API from the portal's FormConfig
-  // (cms/content/api.py::_inject_form_config).
-  {name: 'portalId', default: null},
-  {name: 'fields', default: null},
-  {name: 'requiredFields', default: null},
-  {name: 'requireEmailConfirm', default: false},
-] as const;
+// NOTE: form blocks render through StreamRenderer, which spreads the
+// CMS-injected block.value straight into SubmissionForm — there is no
+// DOM-attribute plumbing for them (the legacy FORM_ATTRIBUTES list was dead
+// code and was removed).
 
 type MapCreateButtonsAttrSpec<K extends keyof MapCreateButtonsProps> = {
   name: K;

app/src/app/store/formState.ts

@@ -22,7 +22,7 @@ export interface FormState {
   /** The pasted/selected map link; parsed to a document ref at submit. */
   mapRef: string;
   setMapRef: (mapRef: string) => void;
-  submitForm: (portalId: string) => Promise<void>;
+  submitForm: (portalId: string, allowedFields: string[]) => Promise<void>;
   clear: () => void;
   error: string;
   setError: (error: string) => void;
@@ -106,7 +106,7 @@ export const useFormState = create<FormState>()(
       },
       error: '',
       success: '',
-      submitForm: async (portalId: string) => {
+      submitForm: async (portalId: string, allowedFields: string[]) => {
         const {
           clear,
           setIsSubmitting,
@@ -126,11 +126,27 @@ export const useFormState = create<FormState>()(
           set({error: 'Please acknowledge all statements', isSubmitting: false});
           return;
         }
+        // The persisted store is shared across portals, so it can hold keys
+        // this portal's config doesn't allow — posting them verbatim would
+        // 422 with an error about a field that has no input on the page,
+        // unrecoverably (clear() only runs on success).
+        const allowed = new Set(allowedFields);
+        const portalFields = Object.fromEntries(
+          Object.entries(fields).filter(([key]) => allowed.has(key))
+        );
+        const mapRefParsed = showMapSelector ? parseMapRef(mapRef) : null;
+        if (showMapSelector && mapRef.trim() && !mapRefParsed) {
+          set({
+            error: 'We could not read that map link — paste the share URL or map id.',
+            isSubmitting: false,
+          });
+          return;
+        }
         const response = await postSubmission({
           portal_id: portalId,
-          fields,
+          fields: portalFields,
           tags: Array.from(tags),
-          map_ref: showMapSelector ? parseMapRef(mapRef) : null,
+          map_ref: mapRefParsed,
           turnstile_token: captchaToken,
         });
         set({
@@ -182,7 +198,11 @@ export const useFormState = create<FormState>()(
       name: 'form-state',
       storage: createJSONStorage(() => localStorage),
       // v2: comment/commenter split replaced by the sparse fields record.
+      // migrate: dropping v0/v1 drafts is deliberate (the shape changed);
+      // without it zustand logs a scary console.error for returning
+      // visitors while doing the same thing.
       version: 2,
+      migrate: () => ({}),
       partialize: state => ({
         fields: state.fields,
         tags: state.tags,

app/src/app/utils/api/apiHandlers/postSubmission.ts

@@ -17,7 +17,13 @@ export interface SubmissionCreated {
 type Result = {ok: true; data: SubmissionCreated} | {ok: false; error: string};
 
 const formatError = (detail: unknown): string =>
-  Array.isArray(detail) ? detail.join(' ') : String(detail);
+  // Aggregated validation errors are list[str]; FastAPI's own request
+  // validation is list[{msg,...}] — normalize both, never "[object Object]".
+  Array.isArray(detail)
+    ? detail
+        .map(d => (typeof d === 'string' ? d : ((d as {msg?: string})?.msg ?? JSON.stringify(d))))
+        .join('; ')
+    : String(detail);
 
 export const postSubmission = async (body: SubmissionCreate): Promise<Result> => {
   const response = await post<SubmissionCreate, SubmissionCreated>('submissions')({body});

app/src/app/utils/api/apiHandlers/types.ts

@@ -167,54 +167,6 @@ export type MapGroup = {
   slug: string;
 };
 
-export interface CommentCreate {
-  title: string;
-  comment: string;
-  commenter_id: number | null;
-  document_id: string | null;
-}
-
-export interface CommentPublic {
-  created_at: string | null;
-  updated_at: string | null;
-}
-
-export interface CommenterCreate {
-  first_name: string;
-  email: string;
-  salutation: string | null;
-  last_name: string | null;
-  place: string | null;
-  state: string | null;
-  zip_code: string | null;
-}
-
-export interface CommenterPublic {
-  created_at: string | null;
-  updated_at: string | null;
-}
-
-export interface TagPublic {
-  slug: string;
-}
-
-export interface TagCreate {
-  tag: string;
-}
-
-export interface FullCommentForm {
-  comment: CommentCreate;
-  commenter: CommenterCreate;
-  tags: TagCreate[];
-  turnstile_token: string;
-}
-
-export interface FullCommentFormResponse {
-  comment: CommentPublic;
-  commenter: CommenterPublic;
-  tags: TagPublic[];
-}
-
 export interface Overlay {
   overlay_id: string;
   name: string;

backend/tests/test_submissions.py

@@ -593,3 +593,48 @@ def test_form_config_shape(self, client, form_config):
         assert body["required_fields"] == form_config.required_fields
         assert "admin_teams" not in body
         assert "id" not in body
+
+
+class TestPublicListParams:
+    """The public list's newly-loosened boundary: portal_id optional (cross-
+    portal galleries) and an ids filter — neither may widen visibility past
+    submitted + not-hidden."""
+
+    def test_omitting_portal_id_spans_portals(self, client, form_config):
+        a = _submit(client).json()["id"]
+        b = _submit(client, fields={"title": "other"}, portal_id=OTHER_PORTAL).json()[
+            "id"
+        ]
+        listed = {s["id"] for s in client.get("/api/submissions").json()}
+        assert {a, b} <= listed
+
+    def test_ids_filter_narrows(self, client, form_config):
+        a = _submit(client).json()["id"]
+        _submit(client, fields={"title": "other"}, portal_id=OTHER_PORTAL)
+        listed = client.get(f"/api/submissions?ids={a}").json()
+        assert [s["id"] for s in listed] == [a]
+
+    def test_ids_cannot_fish_out_hidden_rows(self, client, form_config, session):
+        submission_id = _submit(client).json()["id"]
+        _set_auth(TEAM_A_PAYLOAD)
+        response = client.post(
+            f"/api/submissions/admin/{submission_id}/hidden", json={"hidden": True}
+        )
+        assert response.status_code == 200
+        assert client.get(f"/api/submissions?ids={submission_id}").json() == []
+
+    def test_ids_cannot_fish_out_drafts(
+        self, client, form_config, ks_demo_view_census_blocks_districtrmap, session
+    ):
+        response = client.post(
+            "/api/create_document",
+            json={
+                "districtr_map_slug": "ks_demo_view_census_blocks",
+                "portal_id": PORTAL,
+            },
+        )
+        assert response.status_code == 201
+        draft_pk = session.exec(
+            select(Submission.id).where(col(Submission.portal_id) == PORTAL)
+        ).one()
+        assert client.get(f"/api/submissions?ids={draft_pk}").json() == []

cms/content/api.py

@@ -59,6 +59,12 @@ def _inject_portal_tag(body_data, portal_slug):
             tags = list(block.get("value", {}).get("mandatoryTags") or [])
             if portal_slug not in tags:
                 block["value"]["mandatoryTags"] = [portal_slug, *tags]
+        elif block.get("type") == "comment_gallery":
+            # A portal page's gallery lists ITS portal's submissions —
+            # without this, an empty editor `tags` field would list every
+            # portal's submissions, and user-added tag filters (OR
+            # semantics) would widen back across portals.
+            block["value"]["portalId"] = portal_slug
     return body_data