@tinacms/app 2.5.3 → 2.5.5

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @tinacms/app
 
+## 2.5.5
+
+### Patch Changes
+
+- [#6681](https://github.com/tinacms/tinacms/pull/6681) [`95b7523`](https://github.com/tinacms/tinacms/commit/95b75237cb91ec3dc5dac9ce52359f9786072502) Thanks [@isaaclombardssw](https://github.com/isaaclombardssw)! - Fix click-to-edit for fields in connection query results (e.g. ruleConnection)
+
+- Updated dependencies []:
+  - tinacms@3.9.2
+
+## 2.5.4
+
+### Patch Changes
+
+- Updated dependencies [[`7b539b8`](https://github.com/tinacms/tinacms/commit/7b539b8e7d7d9f4451b5fd36a04d26b734f7d78e)]:
+  - tinacms@3.9.1
+
 ## 2.5.3
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tinacms/app",
-  "version": "2.5.3",
+  "version": "2.5.5",
   "main": "src/main.tsx",
   "license": "Apache-2.0",
   "devDependencies": {
@@ -27,7 +27,7 @@
     "typescript": "^5.7.3",
     "zod": "^3.24.2",
     "@tinacms/mdx": "2.1.6",
-    "tinacms": "3.9.0"
+    "tinacms": "3.9.2"
   },
   "repository": {
     "url": "https://github.com/tinacms/tinacms.git",

package/src/lib/expand-query.ts

@@ -3,14 +3,17 @@ import * as G from 'graphql';
 export const expandQuery = ({
   schema,
   documentNode,
+  includeNodeMetadata,
 }: {
   schema: G.GraphQLSchema;
   documentNode: G.DocumentNode;
+  includeNodeMetadata?: boolean;
 }): G.DocumentNode => {
   const documentNodeWithTypenames = addTypenameToDocument(documentNode);
   return addMetaFieldsToQuery(
     documentNodeWithTypenames,
-    new G.TypeInfo(schema)
+    new G.TypeInfo(schema),
+    includeNodeMetadata
   );
 };
 
@@ -114,7 +117,8 @@ const addMetadataField = (
 
 const addMetaFieldsToQuery = (
   documentNode: G.DocumentNode,
-  typeInfo: G.TypeInfo
+  typeInfo: G.TypeInfo,
+  includeNodeMetadata?: boolean
 ) => {
   const addMetaFields: G.VisitFn<G.ASTNode, G.FieldNode> = (
     node: G.FieldNode
@@ -126,7 +130,11 @@ const addMetaFieldsToQuery = (
           kind: 'SelectionSet',
           selections: [],
         }),
-        selections: [...(node.selectionSet?.selections || []), ...metaFields],
+        selections: [
+          ...(node.selectionSet?.selections || []),
+          ...metaFields,
+          ...(includeNodeMetadata ? nodeMetadataFields : []),
+        ],
       },
     };
   };
@@ -218,6 +226,17 @@ const metaFields: G.SelectionNode[] =
   // @ts-ignore
   node.definitions[0].selectionSet.selections;
 
+const nodeMetadataFragment = G.parse(`
+ query Sample {
+  ...on Document {
+    _tina_metadata
+    _content_source
+  }
+ }`);
+const nodeMetadataFields: G.SelectionNode[] =
+  // @ts-ignore
+  nodeMetadataFragment.definitions[0].selectionSet.selections;
+
 export const isNodeType = (type: G.GraphQLOutputType) => {
   const namedType = G.getNamedType(type);
   if (G.isInterfaceType(namedType)) {

package/src/lib/graphql-reducer.ts

@@ -942,6 +942,7 @@ const expandPayload = async (
   const expandedDocumentNodeForResolver = expandQuery({
     schema: schemaForResolver,
     documentNode,
+    includeNodeMetadata: true,
   });
   const expandedQueryForResolver = G.print(expandedDocumentNodeForResolver);
   return { ...payload, expandedQuery, expandedData, expandedQueryForResolver };

package/src/lib/util.ts

@@ -93,9 +93,10 @@ export const getDeepestMetadata = (state: Object, complexKey: string): any => {
     }
     const value = current[key];
     if (value?._tina_metadata) {
-      // We're at a reference field, we don't want to select the
-      // reference form, just the reference select field
-      if (complexKey === value._tina_metadata?.prefix && metadata) {
+      if (value._tina_metadata.id === null) {
+        // Placeholder metadata from connection/list types — skip it
+      } else if (complexKey === value._tina_metadata?.prefix && metadata) {
+        // Reference field — keep the parent form's metadata
       } else {
         metadata = value._tina_metadata;
       }