Merge pull request #25 from solocommand/content-related-content-site

parameter1 · Feb 18, 2021 · ae29869 · ae29869
2 parents 6ea0718 + 00ce218
commit ae29869
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/leaders-program/src/graphql/queries/content-for-section.js b/packages/leaders-program/src/graphql/queries/content-for-section.js
@@ -73,6 +73,7 @@ query ContentForLeadersSection(
           teaser(input: { maxLength: 0 })
           website
           promotions: relatedContent(input: {
+            withSite: false,
             queryTypes: [company],
             includeContentTypes: [Promotion],
             pagination: { limit: $promotionLimit },

diff --git a/services/graphql-server/src/graphql/definitions/platform/content/index.js b/services/graphql-server/src/graphql/definitions/platform/content/index.js
@@ -430,6 +430,7 @@ input RelatedPublishedContentQueryInput {
 }
 
 input ContentRelatedContentInput {
+  withSite: Boolean = true
   siteId: ObjectID
   excludeContentTypes: [ContentType!] = []
   includeContentTypes: [ContentType!] = []

diff --git a/services/graphql-server/src/graphql/resolvers/platform/content.js b/services/graphql-server/src/graphql/resolvers/platform/content.js
@@ -498,15 +498,14 @@ module.exports = {
     relatedContent: (doc, { input }, { basedb, site }, info) => {
       const {
         queryTypes,
+        withSite,
       } = input;
       // If no query types were specified (owned, inverse, etc), return an empty response.
       if (!queryTypes.length) return BaseDB.paginateEmpty();
 
-      const siteId = input.siteId || site.id();
-
       // Run perform the related content query.
       return relatedContent.performQuery(doc, {
-        siteId,
+        ...(withSite && { siteId: input.siteId || site.id() }),
         input,
         basedb,
         info,