Merge release/1.0.0-beta-4.1 into master

vuestorefront · May 7, 2021 · 71521a7 · 71521a7
2 parents 0143ff4 + 5be2a7d
commit 71521a7
Show file tree

Hide file tree

Showing 10 changed files with 648 additions and 31 deletions.
diff --git a/packages/api-client/package.json b/packages/api-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/magento-api",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.4.1",
   "sideEffects": false,
   "license": "MIT",
   "server": "server/index.js",

diff --git a/packages/api-client/src/api/relatedProduct/relatedProductQuery.graphql b/packages/api-client/src/api/relatedProduct/relatedProductQuery.graphql
@@ -1,10 +1,60 @@
-#import "../../fragments/productFragment.graphql"
-
-query relatedProduct($search: String = "", $filter: ProductAttributeFilterInput, $pageSize: Int = 20, $currentPage: Int = 1, $sort: ProductAttributeSortInput) {
-  products(search: $search, filter: $filter, sort: $sort, pageSize: $pageSize, currentPage: $currentPage) {
+query relatedProduct(
+  $search: String = ""
+  $filter: ProductAttributeFilterInput
+  $pageSize: Int = 20
+  $currentPage: Int = 1
+  $sort: ProductAttributeSortInput
+) {
+  products(
+    search: $search
+    filter: $filter
+    sort: $sort
+    pageSize: $pageSize
+    currentPage: $currentPage
+  ) {
     items {
       related_products {
-        ...ProductData
+        uid
+        __typename
+        sku
+        name
+        new
+        stock_status
+        only_x_left_in_stock
+        rating_summary
+        sale
+        thumbnail {
+          url
+          position
+          disabled
+          label
+        }
+        price_range {
+          minimum_price {
+            final_price {
+              currency
+              value
+            }
+            regular_price {
+              currency
+              value
+            }
+          }
+        }
+        url_key
+        url_rewrites {
+          url
+        }
+        categories {
+          uid
+          name
+          url_suffix
+          url_path
+          breadcrumbs {
+            category_name
+            category_url_path
+          }
+        }
       }
       uid
     }

diff --git a/packages/api-client/src/api/upsellProduct/upsellProductsQuery.graphql b/packages/api-client/src/api/upsellProduct/upsellProductsQuery.graphql
@@ -1,10 +1,60 @@
-#import "../../fragments/productFragment.graphql"
-
-query upsellProducts($search: String = "", $filter: ProductAttributeFilterInput, $pageSize: Int = 20, $currentPage: Int = 1, $sort: ProductAttributeSortInput) {
-  products(search: $search, filter: $filter, sort: $sort, pageSize: $pageSize, currentPage: $currentPage) {
+query upsellProducts(
+  $search: String = ""
+  $filter: ProductAttributeFilterInput
+  $pageSize: Int = 20
+  $currentPage: Int = 1
+  $sort: ProductAttributeSortInput
+) {
+  products(
+    search: $search
+    filter: $filter
+    sort: $sort
+    pageSize: $pageSize
+    currentPage: $currentPage
+  ){
     items {
       upsell_products {
-        ...ProductData
+        uid
+        __typename
+        sku
+        name
+        new
+        stock_status
+        only_x_left_in_stock
+        rating_summary
+        sale
+        thumbnail {
+          url
+          position
+          disabled
+          label
+        }
+        price_range {
+          minimum_price {
+            final_price {
+              currency
+              value
+            }
+            regular_price {
+              currency
+              value
+            }
+          }
+        }
+        url_key
+        url_rewrites {
+          url
+        }
+        categories {
+          uid
+          name
+          url_suffix
+          url_path
+          breadcrumbs {
+            category_name
+            category_url_path
+          }
+        }
       }
       uid
     }

diff --git a/packages/api-client/src/types/GraphQL.ts b/packages/api-client/src/types/GraphQL.ts
diff --git a/packages/composables/package.json b/packages/composables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/magento",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.4.1",
   "license": "MIT",
   "sideEffects": false,
   "main": "lib/index.cjs.js",
@@ -24,7 +24,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@vue-storefront/magento-api": "^1.0.0-beta.4",
+    "@vue-storefront/magento-api": "^1.0.0-beta.4.1",
     "@vue-storefront/core": "^2.3.1",
     "vue": "^2.6.x"
   },

diff --git a/packages/composables/src/composables/getters/categoryGetters.ts b/packages/composables/src/composables/getters/categoryGetters.ts
@@ -1,8 +1,9 @@
 import { CategoryGetters, AgnosticCategoryTree, AgnosticBreadcrumb } from '@vue-storefront/core';
 import { Category } from '@vue-storefront/magento-api';
+import { htmlDecode } from '../../helpers/htmlDecoder';
 
 const buildTree = (rootCategory: Category, currentCategory: string, withProducts = false): AgnosticCategoryTree => ({
-  label: rootCategory.name,
+  label: htmlDecode(rootCategory.name),
   slug: `/${rootCategory.url_path}${rootCategory.url_suffix || ''}`,
   items: Array.isArray(rootCategory.children) && rootCategory.children.length ? rootCategory
     .children

diff --git a/packages/composables/src/composables/getters/productGetters.ts b/packages/composables/src/composables/getters/productGetters.ts
@@ -11,6 +11,7 @@ import {
 } from '@vue-storefront/magento-api';
 
 import categoryGetters from './categoryGetters';
+import { htmlDecode } from '../../helpers/htmlDecoder';
 
 type ProductVariantFilters = any;
 
@@ -19,7 +20,7 @@ export const getProductName = (product: Product): string => {
     return '';
   }
 
-  return product.name;
+  return htmlDecode(product.name);
 };
 
 export const getProductSlug = (product: Product, category?: Category): string => {

diff --git a/packages/composables/src/helpers/htmlDecoder.ts b/packages/composables/src/helpers/htmlDecoder.ts
@@ -0,0 +1,9 @@
+export function htmlDecode(input) {
+  try {
+    const domParser = new DOMParser();
+    const doc = domParser.parseFromString(input, 'text/html');
+    return doc.documentElement.textContent;
+  } catch {
+    return input;
+  }
+}
diff --git a/packages/theme/components/MyAccount/ProfileUpdateForm.vue b/packages/theme/components/MyAccount/ProfileUpdateForm.vue
@@ -54,6 +54,7 @@
         :title="$t('Attention!')"
         cross
         persistent
+        @close="requirePassword = false"
       >
         {{ $t('Please type your current password to change your email address.') }}
         <SfInput
@@ -63,6 +64,7 @@
           label="Current Password"
           required
           class="form__element"
+          style="margin-top: 10px"
           @keypress.enter="handleSubmit(submitForm(reset))"
         />
         <SfButton

diff --git a/packages/theme/package.json b/packages/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/magento-theme",
-  "version": "1.0.0-beta.4",
+  "version": "1.0.0-beta.4.1",
   "private": true,
   "license": "MIT",
   "scripts": {
@@ -24,7 +24,7 @@
     "@nuxtjs/style-resources": "^1.0.0",
     "@storefront-ui/vue": "^0.10.5",
     "@vue-storefront/core": "^2.3.1",
-    "@vue-storefront/magento": "^1.0.0-beta.4",
+    "@vue-storefront/magento": "^1.0.0-beta.4.1",
     "@vue-storefront/middleware": "^2.3.1",
     "@vue-storefront/nuxt": "^2.3.1",
     "@vue-storefront/nuxt-theme": "^2.3.1",