@jetshop/template-trend 5.12.1 → 5.12.4

package/.linaria-cache/packages/ui/Modal/ModalProvider.linaria.css

@@ -0,0 +1 @@
+.preventBodyScrollStyle_p1chftlb{overflow:hidden;}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/template-trend",
-  "version": "5.12.1",
+  "version": "5.12.4",
   "license": "MIT",
   "scripts": {
     "build": "react-scripts build",
@@ -45,11 +45,11 @@
     ]
   },
   "dependencies": {
-    "@jetshop/core": "^5.12.1",
+    "@jetshop/core": "^5.12.4",
     "@jetshop/flight-shortcodes": "^2.0.10",
-    "@jetshop/intl": "^5.12.1",
-    "@jetshop/react-scripts": "^5.12.1",
-    "@jetshop/ui": "^5.12.1",
+    "@jetshop/intl": "^5.12.4",
+    "@jetshop/react-scripts": "^5.12.4",
+    "@jetshop/ui": "^5.12.4",
     "@react-google-maps/api": "~1.7.0",
     "prop-types": "^15.6.2",
     "react": "^16.9.0",

package/schema.graphql

@@ -181,6 +181,7 @@ type Category implements Document {
   mainHeader: String
   content: String
   externalId: String
+  externalDiscountId: String
   images: [CategoryImage]
 
   """
@@ -715,6 +716,7 @@ type DeleteCustomerProductListResult {
 }
 
 type Discount {
+  externalId: ID
   name: String
   value: Price
   description: String
@@ -888,6 +890,11 @@ type MultiListFilterList {
   items: [ListFilterItem]!
 }
 
+type MultipleContent {
+  notFoundIds: [ID]!
+  content: [Content]!
+}
+
 type Mutation {
   subscribeToStockNotifications(email: String!, articleNumber: String!): Boolean
 
@@ -1137,6 +1144,7 @@ type Order {
   orderDate: DateTime
   currency: Currency
   attachments: [OrderAttachment]
+  orderPurchaseLocation: String
 }
 
 type OrderAddress {
@@ -1561,6 +1569,7 @@ type Product implements Document {
   """
   configurations: [ProductConfiguration]
   hasConfigurations: Boolean!
+  hasFamilyMembers: Boolean!
 
   """
   Calculates the price of the product based on the configuration choices that's
@@ -1852,6 +1861,11 @@ type Query {
   """Get information on person by Key(personal id number or phone number)"""
   personLookup(key: String!): PersonLookup
 
+  """
+  Returns Content found by list of its IDs. Also not found Content IDs are listed.
+  """
+  content(ids: [String]!): MultipleContent
+
   """get channel by id, null gets default channel"""
   channel(id: String): Channel
 

package/src/components/CategoryPage/Filters/SortOrders.js

@@ -24,12 +24,8 @@ export const SortOrders = ({ sortOrders }) => {
 };
 
 function SortOrderDropdown({ sortOrders }) {
-  const {
-    mappedSortOrder,
-    changeSortOrder,
-    sortOrder,
-    direction
-  } = useSortOrder({ sortOrders });
+  const { mappedSortOrder, changeSortOrder, sortOrder, direction } =
+    useSortOrder({ sortOrders });
 
   const activeItem = mappedSortOrder.find(
     item => item.direction === direction && item.value === sortOrder
@@ -48,7 +44,7 @@ function SortOrderDropdown({ sortOrders }) {
               onSelect={() =>
                 changeSortOrder(sortItem.value, sortItem.direction)
               }
-              key={sortItem.value}
+              key={`${sortItem.value}-${sortItem.direction}`}
             >
               {sortItem.text}
               {activeItem === sortItem && <StyledCheck />}

package/src/components/CategoryPage/ProductGrid.js

@@ -61,6 +61,7 @@ export function ProductGrid({
   category = '',
   loading,
   className,
+  categoryPath,
   ...rest
 }) {
   const track = useTracker();
@@ -86,6 +87,7 @@ export function ProductGrid({
             product={product}
             style={{ opacity: loading ? 0.5 : 1 }}
             list={listName}
+            categoryPath={categoryPath}
             loadImageEagerly={isAboveFold(index)}
             {...rest}
           >

package/src/components/Forms/Success.js

@@ -4,7 +4,7 @@ import React from 'react';
 export function Success({ children, className }) {
   return (
     <div className={cx(success, className)}>
-      <div>{children}</div>
+      <div data-testid="success-message">{children}</div>
     </div>
   );
 }

package/src/components/MyPages/ChangePasswordPage.js

@@ -54,6 +54,7 @@ function ChangePassword() {
                 <PrimaryButton
                   type="submit"
                   disabled={isSubmitting || !isValid}
+                  data-testid="save-password-button"
                 >
                   {t('Save')}
                 </PrimaryButton>

package/src/components/ProductPage/ProductPage.js

@@ -120,7 +120,7 @@ const ProductContainer = styled('div')`
   }
 `;
 
-const Product = ({ result: { data, loading }, product }) => {
+const Product = ({ result: { data, loading }, product, partialProduct }) => {
   const initialVariant = useVariantFromUrl();
   const t = useIntl();
 
@@ -132,13 +132,17 @@ const Product = ({ result: { data, loading }, product }) => {
   const { selectedVariant: selectedVariation, getMissingOptions } =
     variantHandler;
 
+  if (!product) {
+    product = partialProduct;
+  }
   // Return early if there is no product
-  if (!product)
+  if (!product) {
     return (
       <ProductContainer>
         <ProductPageLoadingState />
       </ProductContainer>
     );
+  }
 
   const images = product.images ?? [];
   const parents = getParentOrCanonicalRoute(data?.route?.parents, product);

package/src/shop.config.js

@@ -75,6 +75,7 @@ const config = {
       Category: [LoadableStandardCategoryPage, LoadableWindowedCategoryPage],
       Page: [ContentPage]
     }
-  }
+  },
+  usePrimaryRouteForProducts: false
 };
 export default config;