Fix WordPress 7.0 form sync and design token selectors

Author: Smart Cloud Solutions Inc.

blocks/dist/editor.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'ced11c44c28da7562d3b');
+<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-data', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-primitives'), 'version' => 'e7e4dac274f398676ff4');

blocks/dist/editor.css

@@ -2,7 +2,7 @@
   "$schema": "https://schemas.wp.org/trunk/block.json",
   "apiVersion": 3,
   "name": "smartcloud-flow/form",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "title": "Flow Form",
   "category": "smartcloud-flow",
   "icon": "feedback",

blocks/dist/editor.js

@@ -1 +1 @@
-<?php return array('dependencies' => array('jquery', 'react', 'react-dom', 'react-jsx-runtime', 'wp-data', 'wp-i18n'), 'version' => '1354a70c41787ea0aa00');
+<?php return array('dependencies' => array('jquery', 'react', 'react-dom', 'react-jsx-runtime', 'wp-data', 'wp-i18n'), 'version' => '18d3a3c1d901ad56c8f4');

blocks/dist/form/block.json

@@ -1,7 +1,7 @@
 {
   "name": "@smart-cloud/flow-blocks",
   "private": true,
-  "version": "1.1.0",
+  "version": "1.1.1",
   "type": "module",
   "license": "ISC",
   "scripts": {

blocks/dist/view.asset.php

@@ -2,7 +2,7 @@
   "$schema": "https://schemas.wp.org/trunk/block.json",
   "apiVersion": 3,
   "name": "smartcloud-flow/form",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "title": "Flow Form",
   "category": "smartcloud-flow",
   "icon": "feedback",

blocks/dist/view.css

@@ -82,6 +82,38 @@ const EMPTY_FORM_ACTION: EditableFormAction = {
   enabled: true,
 };
 
+type EditorPostRecord = {
+  id?: unknown;
+  wp_id?: unknown;
+  status?: unknown;
+  type?: unknown;
+};
+
+type EditorPostContext = {
+  postId?: number;
+  postType?: string;
+  postStatus?: string;
+};
+
+function resolveNumericEditorEntityId(value: unknown): number | undefined {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value;
+  }
+
+  if (typeof value === "string") {
+    const trimmed = value.trim();
+    if (/^\d+$/.test(trimmed)) {
+      return Number(trimmed);
+    }
+  }
+
+  return undefined;
+}
+
+function resolveEditorString(value: unknown): string | undefined {
+  return typeof value === "string" && value.trim() ? value : undefined;
+}
+
 type FlowBlockInstance = ReturnType<typeof createBlock>;
 
 function normalizeActionKey(value: string): string {
@@ -677,13 +709,31 @@ export default function Edit({
     ...EMPTY_FORM_ACTION,
   });
 
-  // Get current post ID
-  const postId = useSelect((select) => {
+  // Resolve the current edited entity metadata in a way that also works in the
+  // Site Editor, where getCurrentPostId() may be a template slug and the
+  // numeric entity ID lives on currentPost.wp_id.
+  const editorPostContext = useSelect((select) => {
     const editorSelect = select(editorStore) as unknown as {
-      getCurrentPostId: () => string | number;
+      getCurrentPostId: () => string | number | null;
+      getCurrentPost: () => EditorPostRecord | undefined;
+      getCurrentPostType: () => string | undefined;
+      getEditedPostAttribute: (attributeName: string) => unknown;
     };
-    const id = editorSelect.getCurrentPostId();
-    return typeof id === "number" ? id : parseInt(String(id), 10);
+    const currentPost = editorSelect.getCurrentPost?.();
+    const postId =
+      resolveNumericEditorEntityId(editorSelect.getCurrentPostId()) ||
+      resolveNumericEditorEntityId(currentPost?.id) ||
+      resolveNumericEditorEntityId(currentPost?.wp_id);
+
+    return {
+      postId,
+      postType:
+        resolveEditorString(editorSelect.getCurrentPostType?.()) ||
+        resolveEditorString(currentPost?.type),
+      postStatus:
+        resolveEditorString(editorSelect.getEditedPostAttribute?.("status")) ||
+        resolveEditorString(currentPost?.status),
+    } satisfies EditorPostContext;
   }, []);
 
   // Get backend sync settings
@@ -1035,7 +1085,9 @@ export default function Edit({
 
   // Use backend sync hook
   const { syncStatus, performSync } = useFormSync({
-    postId,
+    postId: editorPostContext.postId,
+    postType: editorPostContext.postType,
+    postStatus: editorPostContext.postStatus,
     enabled: backendSyncEnabled,
     formAttributes: attributes,
     fields,
@@ -1392,10 +1444,23 @@ export default function Edit({
               </Notice>
             )}
 
+            {backendSyncEnabled && !editorPostContext.postId && (
+              <Notice status="warning" isDismissible={false}>
+                <p style={{ margin: 0, fontSize: "13px" }}>
+                  {__(
+                    "Backend sync is waiting for the current post or template part to expose a numeric entity ID.",
+                    TEXT_DOMAIN,
+                  )}
+                </p>
+              </Notice>
+            )}
+
             <Button
               variant="secondary"
               onClick={performSync}
-              disabled={syncStatus.status === "syncing"}
+              disabled={
+                syncStatus.status === "syncing" || !editorPostContext.postId
+              }
             >
               {syncStatus.status === "syncing"
                 ? __("Syncing...", TEXT_DOMAIN)

blocks/package.json

@@ -13,11 +13,22 @@ export interface FormSyncMetadata {
   sourceKind: "post" | "pattern" | "reusable_block";
 }
 
+function assertValidPostId(postId: number): number {
+  if (!Number.isFinite(postId)) {
+    throw new Error(
+      "Cannot manage form sync metadata without a numeric post ID.",
+    );
+  }
+
+  return postId;
+}
+
 export async function getFormSyncMeta(
   postId: number,
 ): Promise<FormSyncMetadata> {
+  const resolvedPostId = assertValidPostId(postId);
   const response = await fetch(
-    `/wp-json/smartcloud-flow/v1/forms/${postId}/sync-meta`,
+    `/wp-json/smartcloud-flow/v1/forms/${resolvedPostId}/sync-meta`,
     {
       method: "GET",
       headers: {
@@ -40,8 +51,9 @@ export async function updateFormSyncMeta(
   postId: number,
   updates: Partial<FormSyncMetadata>,
 ): Promise<FormSyncMetadata> {
+  const resolvedPostId = assertValidPostId(postId);
   const response = await fetch(
-    `/wp-json/smartcloud-flow/v1/forms/${postId}/sync-meta`,
+    `/wp-json/smartcloud-flow/v1/forms/${resolvedPostId}/sync-meta`,
     {
       method: "POST",
       headers: {