fix(app-headless-cms-common): push id in the list if no other field e…

…xists (#4370)
webiny · Nov 11, 2024 · 6ba635c · 6ba635c
1 parent 9bd4fa2
commit 6ba635c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 40 deletions.
diff --git a/packages/app-headless-cms-common/src/createFieldsList.ts b/packages/app-headless-cms-common/src/createFieldsList.ts
@@ -1,4 +1,4 @@
-import { CmsModelField, CmsModelFieldTypePlugin, CmsModel } from "~/types";
+import { CmsModel, CmsModelField, CmsModelFieldTypePlugin } from "~/types";
 import { plugins } from "@webiny/plugins";
 
 interface CreateFieldsListParams {
@@ -9,7 +9,7 @@ interface CreateFieldsListParams {
 
 export function createFieldsList({
     model,
-    fields,
+    fields: inputFields,
     graphQLTypePrefix
 }: CreateFieldsListParams): string {
     const fieldPlugins: Record<string, CmsModelFieldTypePlugin["field"]> = plugins
@@ -18,7 +18,7 @@ export function createFieldsList({
 
     const typePrefix = graphQLTypePrefix ?? model.singularApiName;
 
-    const allFields = fields
+    const fields = inputFields
         .map(field => {
             if (!fieldPlugins[field.type]) {
                 console.log(`Unknown field plugin for field type "${field.type}".`);
@@ -46,14 +46,11 @@ export function createFieldsList({
             return field.fieldId;
         })
         .filter(Boolean);
-
     /**
-     * If there are no fields for a given type, we add a dummy `_empty` field, which will also be present in the schema
-     * on the API side, to protect the schema from invalid types.
+     * If there are no fields, let's always load the `id` field.
      */
-    if (!allFields.length) {
-        allFields.push("_empty");
+    if (fields.length === 0) {
+        fields.push("id");
     }
-
-    return allFields.join("\n");
+    return fields.join("\n");
 }
diff --git a/packages/app-headless-cms-common/src/entries.graphql.ts b/packages/app-headless-cms-common/src/entries.graphql.ts
@@ -112,36 +112,6 @@ const createEntrySystemFields = (model: CmsModel) => {
             type
             displayName
         }
-        revisionCreatedOn
-        revisionSavedOn
-        revisionModifiedOn
-        revisionFirstPublishedOn
-        revisionLastPublishedOn
-        revisionCreatedBy {
-            id
-            type
-            displayName
-        }
-        revisionSavedBy {
-            id
-            type
-            displayName
-        }
-        revisionModifiedBy {
-            id
-            type
-            displayName
-        }
-        revisionFirstPublishedBy {
-            id
-            type
-            displayName
-        }
-        revisionLastPublishedBy {
-            id
-            type
-            displayName
-        }
         ${optionalFields}
     `;
 };