Deprecate Old publishedOn and ownedBy GraphQL Fields (Instead of Removing Them) and Make New Meta GraphQL Fields Nullable

packages/api-headless-cms/__tests__/contentAPI/snapshots/category.manage.ts

@@ -6,27 +6,34 @@ export default /* GraphQL */ `
         id: ID!
         entryId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         meta: CategoryApiNameWhichIsABitDifferentThanModelIdMeta
         title: String
         slug: String

packages/api-headless-cms/__tests__/contentAPI/snapshots/category.read.ts

@@ -7,27 +7,34 @@ export default /* GraphQL */ `
         entryId: String!
         modelId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         title: String
         slug: String
     }

packages/api-headless-cms/__tests__/contentAPI/snapshots/page.manage.ts

@@ -6,27 +6,34 @@ export default /* GraphQL */ `
         id: ID!
         entryId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         meta: PageModelApiNameMeta
         content: [PageModelApiName_Content!]
         header: PageModelApiName_Header

packages/api-headless-cms/__tests__/contentAPI/snapshots/page.read.ts

@@ -7,27 +7,34 @@ export default /* GraphQL */ `
         entryId: String!
         modelId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         content: [PageModelApiName_Content!]
         header: PageModelApiName_Header
         objective: PageModelApiName_Objective

packages/api-headless-cms/__tests__/contentAPI/snapshots/product.manage.ts

@@ -6,27 +6,34 @@ export default /* GraphQL */ `
         id: ID!
         entryId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         meta: ProductApiSingularMeta
         title: String
         category: RefField

packages/api-headless-cms/__tests__/contentAPI/snapshots/product.read.ts

@@ -7,27 +7,34 @@ export default /* GraphQL */ `
         entryId: String!
         modelId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         title: String
         category(populate: Boolean = true): CategoryApiNameWhichIsABitDifferentThanModelId
         price: Number

packages/api-headless-cms/__tests__/contentAPI/snapshots/review.manage.ts

@@ -6,27 +6,34 @@ export default /* GraphQL */ `
         id: ID!
         entryId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         meta: ReviewApiModelMeta
         text: String
         product: RefField

packages/api-headless-cms/__tests__/contentAPI/snapshots/review.read.ts

@@ -7,27 +7,34 @@ export default /* GraphQL */ `
         entryId: String!
         modelId: String!
 
-        createdOn: DateTime!
+        createdOn: DateTime
         modifiedOn: DateTime
-        savedOn: DateTime!
+        savedOn: DateTime
         firstPublishedOn: DateTime
         lastPublishedOn: DateTime
-        createdBy: CmsIdentity!
+        createdBy: CmsIdentity
         modifiedBy: CmsIdentity
-        savedBy: CmsIdentity!
+        savedBy: CmsIdentity
         firstPublishedBy: CmsIdentity
         lastPublishedBy: CmsIdentity
-        revisionCreatedOn: DateTime!
+        revisionCreatedOn: DateTime
         revisionModifiedOn: DateTime
-        revisionSavedOn: DateTime!
+        revisionSavedOn: DateTime
         revisionFirstPublishedOn: DateTime
         revisionLastPublishedOn: DateTime
-        revisionCreatedBy: CmsIdentity!
+        revisionCreatedBy: CmsIdentity
         revisionModifiedBy: CmsIdentity
-        revisionSavedBy: CmsIdentity!
+        revisionSavedBy: CmsIdentity
         revisionFirstPublishedBy: CmsIdentity
         revisionLastPublishedBy: CmsIdentity
 
+        publishedOn: DateTime
+            @deprecated(
+                reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field."
+            )
+        ownedBy: CmsIdentity
+            @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
         text: String
         product(populate: Boolean = true): ProductApiSingular
         rating: Number

packages/api-headless-cms/src/graphql/schema/contentEntries.ts

@@ -8,7 +8,7 @@ import { getEntryDescription } from "~/utils/getEntryDescription";
 import { getEntryImage } from "~/utils/getEntryImage";
 import { entryFieldFromStorageTransform } from "~/utils/entryStorage";
 import { Resolvers } from "@webiny/handler-graphql/types";
-import { ENTRY_META_FIELDS, isNullableEntryMetaField, isDateTimeEntryMetaField } from "~/constants";
+import { ENTRY_META_FIELDS, isDateTimeEntryMetaField } from "~/constants";
 
 interface EntriesByModel {
     [key: string]: string[];
@@ -321,10 +321,9 @@ export const createContentEntriesSchema = ({
     }
 
     const onByMetaFields = ENTRY_META_FIELDS.map(field => {
-        const isNullable = isNullableEntryMetaField(field) ? "" : "!";
         const fieldType = isDateTimeEntryMetaField(field) ? "DateTime" : "CmsIdentity";
 
-        return `${field}: ${fieldType}${isNullable}`;
+        return `${field}: ${fieldType}`;
     }).join("\n");
 
     const plugin = new CmsGraphQLSchemaPlugin({

packages/api-headless-cms/src/graphql/schema/createManageSDL.ts

@@ -5,7 +5,7 @@ import { renderGetFilterFields } from "~/utils/renderGetFilterFields";
 import { renderInputFields } from "~/utils/renderInputFields";
 import { renderFields } from "~/utils/renderFields";
 import { CmsGraphQLSchemaSorterPlugin } from "~/plugins";
-import { ENTRY_META_FIELDS, isDateTimeEntryMetaField, isNullableEntryMetaField } from "~/constants";
+import { ENTRY_META_FIELDS, isDateTimeEntryMetaField } from "~/constants";
 
 interface CreateManageSDLParams {
     models: CmsModel[];
@@ -70,10 +70,9 @@ export const createManageSDL: CreateManageSDL = ({
     }).join("\n");
 
     const onByMetaGqlFields = ENTRY_META_FIELDS.map(field => {
-        const isNullable = isNullableEntryMetaField(field) ? "" : "!";
         const fieldType = isDateTimeEntryMetaField(field) ? "DateTime" : "CmsIdentity";
 
-        return `${field}: ${fieldType}${isNullable}`;
+        return `${field}: ${fieldType}`;
     }).join("\n");
 
     // Had to remove /* GraphQL */ because prettier would not format the code correctly.
@@ -85,6 +84,9 @@ export const createManageSDL: CreateManageSDL = ({
 
             ${onByMetaGqlFields}
 
+            publishedOn: DateTime @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'firstPublishedOn' or 'lastPublishedOn' field.")
+            ownedBy: CmsIdentity @deprecated(reason: "Field was removed with the 5.39.0 release. Use 'createdBy' field.")
+
             meta: ${singularName}Meta
             ${fields.map(f => f.fields).join("\n")}
             # Advanced Content Organization - make required in 5.38.0