Skip to content

Commit

Permalink
fix article format & invalid blogs url format (#2151)
Browse files Browse the repository at this point in the history
  • Loading branch information
@michenly
michenly committed May 27, 2024
1 parent edc1892 commit c31c655
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 10 deletions.
4 changes: 3 additions & 1 deletion examples/b2b/storefrontapi.generated.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,7 @@ export type PredictiveArticleFragment = {__typename: 'Article'} & Pick<
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -413,6 +414,7 @@ export type PredictiveSearchQuery = {
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -1248,7 +1250,7 @@ interface GeneratedQueryTypes {
return: RecommendedProductsQuery;
variables: RecommendedProductsQueryVariables;
};
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n blog {\n handle\n }\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
return: PredictiveSearchQuery;
variables: PredictiveSearchQueryVariables;
};
Expand Down
4 changes: 3 additions & 1 deletion examples/custom-cart-method/storefrontapi.generated.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ export type PredictiveArticleFragment = {__typename: 'Article'} & Pick<
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -411,6 +412,7 @@ export type PredictiveSearchQuery = {
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -1171,7 +1173,7 @@ interface GeneratedQueryTypes {
return: RecommendedProductsQuery;
variables: RecommendedProductsQueryVariables;
};
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n blog {\n handle\n }\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
return: PredictiveSearchQuery;
variables: PredictiveSearchQueryVariables;
};
Expand Down
4 changes: 3 additions & 1 deletion examples/legacy-customer-account-flow/storefrontapi.generated.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1050,6 +1050,7 @@ export type PredictiveArticleFragment = {__typename: 'Article'} & Pick<
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -1111,6 +1112,7 @@ export type PredictiveSearchQuery = {
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -1879,7 +1881,7 @@ interface GeneratedQueryTypes {
return: CustomerQuery;
variables: CustomerQueryVariables;
};
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n blog {\n handle\n }\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
return: PredictiveSearchQuery;
variables: PredictiveSearchQueryVariables;
};
Expand Down
4 changes: 3 additions & 1 deletion examples/metaobjects/storefrontapi.generated.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,7 @@ export type PredictiveArticleFragment = {__typename: 'Article'} & Pick<
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -320,6 +321,7 @@ export type PredictiveSearchQuery = {
StorefrontAPI.Article,
'id' | 'title' | 'handle' | 'trackingParameters'
> & {
blog: Pick<StorefrontAPI.Blog, 'handle'>;
image?: StorefrontAPI.Maybe<
Pick<StorefrontAPI.Image, 'url' | 'altText' | 'width' | 'height'>
>;
Expand Down Expand Up @@ -1696,7 +1698,7 @@ interface GeneratedQueryTypes {
return: SitemapQuery;
variables: SitemapQueryVariables;
};
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
'#graphql\n fragment PredictiveArticle on Article {\n __typename\n id\n title\n handle\n blog {\n handle\n }\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictiveCollection on Collection {\n __typename\n id\n title\n handle\n image {\n url\n altText\n width\n height\n }\n trackingParameters\n }\n fragment PredictivePage on Page {\n __typename\n id\n title\n handle\n trackingParameters\n }\n fragment PredictiveProduct on Product {\n __typename\n id\n title\n handle\n trackingParameters\n variants(first: 1) {\n nodes {\n id\n image {\n url\n altText\n width\n height\n }\n price {\n amount\n currencyCode\n }\n }\n }\n }\n fragment PredictiveQuery on SearchQuerySuggestion {\n __typename\n text\n styledText\n trackingParameters\n }\n query predictiveSearch(\n $country: CountryCode\n $language: LanguageCode\n $limit: Int!\n $limitScope: PredictiveSearchLimitScope!\n $searchTerm: String!\n $types: [PredictiveSearchType!]\n ) @inContext(country: $country, language: $language) {\n predictiveSearch(\n limit: $limit,\n limitScope: $limitScope,\n query: $searchTerm,\n types: $types,\n ) {\n articles {\n ...PredictiveArticle\n }\n collections {\n ...PredictiveCollection\n }\n pages {\n ...PredictivePage\n }\n products {\n ...PredictiveProduct\n }\n queries {\n ...PredictiveQuery\n }\n }\n }\n': {
return: PredictiveSearchQuery;
variables: PredictiveSearchQueryVariables;
};
Expand Down
5 changes: 4 additions & 1 deletion examples/multipass/app/routes/api.predictive-search.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ export function normalizePredictiveSearchResults(
id: article.id,
image: article.image,
title: article.title,
url: `${localePrefix}/blog/${article.handle}${trackingParams}`,
url: `${localePrefix}/blogs/${article.blog.handle}/${article.handle}/${trackingParams}`,
};
},
),
Expand All @@ -250,6 +250,9 @@ const PREDICTIVE_SEARCH_QUERY = `#graphql
id
title
handle
blog {
handle
}
image {
url
altText
Expand Down
Loading

0 comments on commit c31c655

Please sign in to comment.