Merge pull request #722 from B77Mills/updateNativeXAdvertiserStories

Update to allow for querying by externalId
parameter1 · Jun 16, 2023 · 2e671c0 · 2e671c0
2 parents 87c356e + 8facdbf
commit 2e671c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/packages/marko-web-native-x/components/marko.json b/packages/marko-web-native-x/components/marko.json
@@ -41,6 +41,7 @@
   "<marko-web-native-x-story-advertiser-related-stories>": {
     "template": "./story/advertiser-related-stories.marko",
     "@advertiser-id": "string",
+    "@external-id": "string",
     "@publisher-id": "string",
     "@exclude-story-ids": "array"
   },

diff --git a/packages/marko-web-native-x/components/story/advertiser-related-stories.marko b/packages/marko-web-native-x/components/story/advertiser-related-stories.marko
@@ -3,10 +3,11 @@ import buildQuery from "../../apollo/graphql/queries/related-stories";
 
 $ const { req, nativeX } = out.global;
 
-$ const { advertiserId, publisherId, excludeStoryIds } = input;
+$ const { advertiserId, externalId, publisherId, excludeStoryIds } = input;
 $ const args = {
   config: nativeX,
   advertiserId,
+  externalId,
   ...(publisherId && { publisherId }),
   ...(excludeStoryIds && { excludeStoryIds }),
 };
@@ -19,6 +20,7 @@ $ const args = {
 $ const getStories = async ({
   config,
   advertiserId,
+  externalId,
   publisherId,
   excludeStoryIds,
   pagination,
@@ -27,19 +29,19 @@ $ const getStories = async ({
   const { data } = await config.client.query({
     query: buildQuery(queryFragment),
     variables: {
-      input: { advertiserId, publisherId, excludeStoryIds },
+      input: { advertiserId, externalId, publisherId, excludeStoryIds },
       ...(pagination && { pagination }),
     },
   });
+
   if (!data || !data.advertiserStories) return { nodes: [], pageInfo: {} };
   const { pageInfo } = data.advertiserStories;
   const nodes = data.advertiserStories.edges
     .map(edge => (edge && edge.node ? edge.node : null))
     .filter(c => c);
   return { nodes, pageInfo };
 };
-
-<if(nativeX && advertiserId)>
+<if(nativeX && (externalId|| advertiserId))>
   <marko-web-resolve|{ resolved }| promise=getStories(args)>
     <${input.renderBody} nodes=resolved.nodes pageInfo=resolved.pageInfo />
   </marko-web-resolve>

diff --git a/packages/marko-web-theme-monorail/graphql/fragments/native-x-story.js b/packages/marko-web-theme-monorail/graphql/fragments/native-x-story.js
@@ -18,6 +18,7 @@ module.exports = gql`
     advertiser {
       id
       name
+      externalId
       logo {
         ...NativeXImageFragment
       }
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,6 +18,7 @@ module.exports = gql` @@
         advertiser {
           id
           name
+          externalId
           logo {
             ...NativeXImageFragment
           }
@@ Expand Down @@