Merge pull request #103 from zarathustra323/content-redirect-to

Use `mutations.Website.redirectTo` in `redirectTo` resolver
parameter1 · Jun 10, 2021 · d68cf98 · d68cf98
2 parents f1ad20b + 4c4b1e0
commit d68cf98
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/services/graphql-server/src/graphql/definitions/platform/content/interfaces/content.js b/services/graphql-server/src/graphql/definitions/platform/content/interfaces/content.js
@@ -74,7 +74,7 @@ interface Content @requiresProject(fields: ["type"]) {
   siteContext(input: ContentSiteContextInput = {}): ContentSiteContext! @projection(localField: "_id", needs: ["type", "linkUrl", "mutations.Website.slug", "mutations.Website.primarySection", "mutations.Website.primaryCategory", "mutations.Website.alias", "mutations.Website.canonicalUrl", "mutations.Website.noIndex"])
 
   # Determines if this content item should redirect to another location.
-  redirectTo: String @projection(localField: "type", needs: ["linkUrl"])
+  redirectTo: String @projection(localField: "type", needs: ["linkUrl", "mutations.Website.redirectTo"])
   # Returns related, published content based on input flags
   relatedContent(input: ContentRelatedContentInput = {}): ContentConnection! @projection(localField: "_id", needs: ["relatedTo", "mutations.Website.primarySection"])
   userRegistration: ContentUserRegistration! @projection(localField: "mutations.Website.requiresAccessLevels", needs: ["mutations.Website.requiresRegistration"])

diff --git a/services/graphql-server/src/graphql/resolvers/platform/content.js b/services/graphql-server/src/graphql/resolvers/platform/content.js
@@ -471,6 +471,8 @@ module.exports = {
 
     redirectTo: (content) => {
       const { type, linkUrl } = content;
+      const redirectTo = get(content, 'mutations.Website.redirectTo');
+      if (redirectTo) return redirectTo;
 
       const types = ['Promotion', 'TextAd'];
       if (!types.includes(type)) return null;