Merge branch 'minor' into major

CHANGELOG.md

@@ -1,3 +1,22 @@
+## <small>2.0.6 (2023-08-11)</small>
+
+
+#### Fixes
+
+* **admin-ui** Apply max dimensions to relation asset preview ([8169c4e](https://github.com/vendure-ecommerce/vendure/commit/8169c4e)), closes [#2320](https://github.com/vendure-ecommerce/vendure/issues/2320)
+* **admin-ui** Correctly display decimal tax rate in order summary ([1f507fa](https://github.com/vendure-ecommerce/vendure/commit/1f507fa)), closes [#2339](https://github.com/vendure-ecommerce/vendure/issues/2339)
+* **admin-ui** Correctly display widget titles in dropdown ([59a1d5d](https://github.com/vendure-ecommerce/vendure/commit/59a1d5d)), closes [#2334](https://github.com/vendure-ecommerce/vendure/issues/2334)
+* **admin-ui** Fix error when saving multiple new variant options ([e5ad0ee](https://github.com/vendure-ecommerce/vendure/commit/e5ad0ee)), closes [#2326](https://github.com/vendure-ecommerce/vendure/issues/2326)
+* **admin-ui** Fix header overlap on empty data tables ([ada153e](https://github.com/vendure-ecommerce/vendure/commit/ada153e)), closes [#2323](https://github.com/vendure-ecommerce/vendure/issues/2323) [#2325](https://github.com/vendure-ecommerce/vendure/issues/2325)
+* **admin-ui** Fix updating variant tax category ([ff29e9a](https://github.com/vendure-ecommerce/vendure/commit/ff29e9a)), closes [#2336](https://github.com/vendure-ecommerce/vendure/issues/2336)
+* **admin-ui** Fix width of affixed inputs ([75d51ed](https://github.com/vendure-ecommerce/vendure/commit/75d51ed))
+* **admin-ui** Fulfillment button takes existing state into account ([ef357cd](https://github.com/vendure-ecommerce/vendure/commit/ef357cd))
+* **admin-ui** Fulfillment dialog enforces max quantity ([571b157](https://github.com/vendure-ecommerce/vendure/commit/571b157)), closes [#2329](https://github.com/vendure-ecommerce/vendure/issues/2329)
+* **admin-ui** Prevent product creation without variants ([3364559](https://github.com/vendure-ecommerce/vendure/commit/3364559)), closes [#2337](https://github.com/vendure-ecommerce/vendure/issues/2337)
+* **core** Fix entity hydration of nested array entities ([55009a5](https://github.com/vendure-ecommerce/vendure/commit/55009a5)), closes [#2013](https://github.com/vendure-ecommerce/vendure/issues/2013)
+* **core** Fix logic relating to partial fulfillments ([6f48ee2](https://github.com/vendure-ecommerce/vendure/commit/6f48ee2)), closes [#2324](https://github.com/vendure-ecommerce/vendure/issues/2324) [#2191](https://github.com/vendure-ecommerce/vendure/issues/2191)
+* **core** Prevent fulfillments with too great a quantity ([579459a](https://github.com/vendure-ecommerce/vendure/commit/579459a)), closes [#2329](https://github.com/vendure-ecommerce/vendure/issues/2329)
+
 ## <small>2.0.5 (2023-07-27)</small>
 
 
@@ -18,6 +37,7 @@
 * **core** Improved CockroachDB compatibility for DefaultSearchPlugin ([b8d8dec](https://github.com/vendure-ecommerce/vendure/commit/b8d8dec))
 * **core** Publish AccountRegistrationEvent when creating Customer via admin ([e0bd036](https://github.com/vendure-ecommerce/vendure/commit/e0bd036))
 * **core** Use MoneyStrategy in Surcharges (#2294) ([efee8ec](https://github.com/vendure-ecommerce/vendure/commit/efee8ec)), closes [#2294](https://github.com/vendure-ecommerce/vendure/issues/2294)
+* **payments-plugin**: Only find payment methods in the current channel ([bbea69](https://github.com/vendure-ecommerce/vendure/commit/bbea69)), closes [#2308](https://github.com/vendure-ecommerce/vendure/issues/2308)
 
 #### Features
 

CHANGELOG_NEXT.md

@@ -0,0 +1,16 @@
+## 2.1.0-next.0 (2023-08-11)
+
+Includes all changes from v2.0.6, plus:
+
+#### Features
+
+* **admin-ui** Admin UI rtl with Arabic translation improvements (#2322) ([44ea12b](https://github.com/vendure-ecommerce/vendure/commit/44ea12b)), closes [#2322](https://github.com/vendure-ecommerce/vendure/issues/2322)
+* **core** Add `Facet.valueList` resolver for paginated values ([09c7175](https://github.com/vendure-ecommerce/vendure/commit/09c7175)), closes [#1257](https://github.com/vendure-ecommerce/vendure/issues/1257)
+* **core** Add maximum coupon usage (#2331) ([bdd2720](https://github.com/vendure-ecommerce/vendure/commit/bdd2720)), closes [#2331](https://github.com/vendure-ecommerce/vendure/issues/2331) [#2330](https://github.com/vendure-ecommerce/vendure/issues/2330)
+* **email-plugin** Expose template vars to template loader (#2243) ([78ea016](https://github.com/vendure-ecommerce/vendure/commit/78ea016)), closes [#2243](https://github.com/vendure-ecommerce/vendure/issues/2243) [#2242](https://github.com/vendure-ecommerce/vendure/issues/2242)
+
+#### Fixes
+
+* **admin-ui** Improve RTL styles ([056d205](https://github.com/vendure-ecommerce/vendure/commit/056d205))
+* **admin-ui** Limit FacetValues in Facet list component ([b445955](https://github.com/vendure-ecommerce/vendure/commit/b445955)), closes [#1257](https://github.com/vendure-ecommerce/vendure/issues/1257)
+

lerna.json

@@ -1,6 +1,6 @@
 {
     "packages": ["packages/*"],
-    "version": "2.0.5",
+    "version": "2.1.0-next.0",
     "npmClient": "yarn",
     "useWorkspaces": true,
     "command": {

package.json

@@ -26,7 +26,7 @@
     "check-angular-versions": "ts-node scripts/check-angular-versions.ts",
     "generate-changelog": "ts-node scripts/changelogs/generate-changelog.ts",
     "publish-release": "lerna publish -m \"chore: Publish %s\" --no-push --force-publish",
-    "publish-prerelease": "lerna publish -m \"chore: Pre-release %s\" prerelease --exact --no-push --force-publish --preid beta --dist-tag next",
+    "publish-prerelease": "lerna publish -m \"chore: Pre-release %s\" preminor --exact --no-push --force-publish --preid next --dist-tag next",
     "publish-local": "lerna version --no-git-tag-version && cd scripts && ./publish-to-verdaccio.sh"
   },
   "devDependencies": {

packages/admin-ui-plugin/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui-plugin",
-    "version": "2.0.5",
+    "version": "2.1.0-next.0",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
     "files": [
@@ -21,8 +21,8 @@
     "devDependencies": {
         "@types/express": "^4.17.8",
         "@types/fs-extra": "^9.0.1",
-        "@vendure/common": "^2.0.5",
-        "@vendure/core": "^2.0.5",
+        "@vendure/common": "2.1.0-next.0",
+        "@vendure/core": "2.1.0-next.0",
         "express": "^4.17.1",
         "rimraf": "^3.0.2",
         "typescript": "4.9.5"

packages/admin-ui/i18n-coverage.json

@@ -1,76 +1,81 @@
 {
-  "generatedOn": "2023-07-15T10:37:14.708Z",
-  "lastCommit": "77aaf8f4bac72468bdeb28aae858035d2a579ef7",
+  "generatedOn": "2023-08-11T07:58:32.415Z",
+  "lastCommit": "6d726a81a5a9f13af8d6607678da8c72d5cf5e00",
   "translationStatus": {
     "ar": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 740,
       "percentage": 100
     },
     "cs": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 545,
-      "percentage": 74
+      "percentage": 73
     },
     "de": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 739,
-      "percentage": 100
+      "percentage": 99
     },
     "en": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 740,
       "percentage": 100
     },
     "es": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 739,
-      "percentage": 100
+      "percentage": 99
     },
     "fr": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 735,
       "percentage": 99
     },
+    "he": {
+      "tokenCount": 743,
+      "translatedCount": 740,
+      "percentage": 100
+    },
     "it": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 570,
       "percentage": 77
     },
     "pl": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 380,
       "percentage": 51
     },
     "pt_BR": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 739,
-      "percentage": 100
+      "percentage": 99
     },
     "pt_PT": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 579,
       "percentage": 78
     },
     "ru": {
-      "tokenCount": 740,
-      "translatedCount": 569,
-      "percentage": 77
+      "tokenCount": 743,
+      "translatedCount": 740,
+      "percentage": 100
     },
     "uk": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 569,
       "percentage": 77
     },
     "zh_Hans": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 515,
-      "percentage": 70
+      "percentage": 69
     },
     "zh_Hant": {
-      "tokenCount": 740,
+      "tokenCount": 743,
       "translatedCount": 360,
-      "percentage": 49
+      "percentage": 48
     }
   }
 }

packages/admin-ui/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vendure/admin-ui",
-    "version": "2.0.5",
+    "version": "2.1.0-next.0",
     "license": "MIT",
     "scripts": {
         "ng": "ng",
@@ -49,7 +49,7 @@
         "@ng-select/ng-select": "^11.0.0",
         "@ngx-translate/core": "^14.0.0",
         "@ngx-translate/http-loader": "^7.0.0",
-        "@vendure/common": "^2.0.5",
+        "@vendure/common": "2.1.0-next.0",
         "@webcomponents/custom-elements": "^1.5.1",
         "apollo-angular": "^5.0.0",
         "apollo-upload-client": "^17.0.0",

packages/admin-ui/src/lib/catalog/src/components/collection-data-table/collection-data-table.component.html

@@ -5,7 +5,6 @@
     <table
         class=""
         [class.no-select]="disableSelect"
-        [style.table-layout]="!items?.length ? 'fixed' : 'inherit'"
     >
         <thead [class.items-selected]="selectionManager?.selection.length">
             <tr class="heading-row">

packages/admin-ui/src/lib/catalog/src/components/collection-data-table/collection-data-table.component.scss

@@ -1,12 +1,12 @@
 @import 'variables';
 
 .bulk-actions {
-    margin-left: calc(var(--space-unit) * 6);
+    margin-inline-start: calc(var(--space-unit) * 6);
     @media screen and (min-width: $breakpoint-medium) {
-        margin-left: calc(var(--space-unit) * 9.5);
+        margin-inline-start: calc(var(--space-unit) * 9.5);
     }
     @media screen and (min-width: $breakpoint-large) {
-        margin-left: calc(var(--space-unit) * 11.5);
+        margin-inline-start: calc(var(--space-unit) * 11.5);
     }
     background-color: var(--color-surface-bg);
 }

packages/admin-ui/src/lib/catalog/src/components/collection-detail/collection-detail.component.scss

@@ -16,12 +16,12 @@ clr-checkbox-wrapper {
     li {
         font-size: 0.65rem;
         display: inline-block;
-        margin-right: 10px;
+        margin-inline-end: 10px;
     }
     li:not(:last-child)::after {
         content: '›';
         top: 0;
         color: var(--color-grey-400);
-        margin-left: 10px;
+        margin-inline-start: 10px;
     }
 }

packages/admin-ui/src/lib/catalog/src/components/collection-list/collection-list-common.scss

@@ -2,16 +2,16 @@
     --indent-spacing: 18px;
 }
 .indent-1 {
-    padding-left: var(--indent-spacing);
+    padding-inline-start: var(--indent-spacing);
 }
 .indent-2 {
-    padding-left: calc(var(--indent-spacing) * 2);
+    padding-inline-start: calc(var(--indent-spacing) * 2);
 }
 .indent-3 {
-    padding-left: calc(var(--indent-spacing) * 3);
+    padding-inline-start: calc(var(--indent-spacing) * 3);
 }
 .indent-4, .indent-5, .indent-6, .indent-7, .indent-8, .indent-9 {
-    padding-left: calc(var(--indent-spacing) * 4);
+    padding-inline-start: calc(var(--indent-spacing) * 4);
 }
 .child-arrow {
     margin: 1px 6px;

packages/admin-ui/src/lib/catalog/src/components/collection-tree/collection-tree-node.component.scss

@@ -8,7 +8,7 @@
     font-size: 0.65rem;
     transition: transform 250ms cubic-bezier(0, 0, 0.2, 1);
     margin-bottom: 2px;
-    border-left: 2px solid transparent;
+    border-inline-start: 2px solid transparent;
     transition: border-left-color 0.2s;
 
     &.private {
@@ -26,10 +26,10 @@
             background-color: var(--clr-global-selection-color);
         }
 
-        &.depth-1 { padding-left: 12px + 24px; }
-        &.depth-2 { padding-left: 12px + 48px; }
-        &.depth-3 { padding-left: 12px + 72px; }
-        &.depth-4 { padding-left: 12px + 96px; }
+        &.depth-1 { padding-inline-start: 12px + 24px; }
+        &.depth-2 { padding-inline-start: 12px + 48px; }
+        &.depth-3 { padding-inline-start: 12px + 72px; }
+        &.depth-4 { padding-inline-start: 12px + 96px; }
 
         .folder-button-spacer {
             display: inline-block;
@@ -83,7 +83,7 @@
 
     .move-icon {
         flex: none;
-        margin-right: 3px;
+        margin-inline-end: 3px;
     }
     .path {
         line-height: 18px;

packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.html

@@ -16,7 +16,7 @@
                 class="btn btn-primary"
                 *ngIf="isNew$ | async; else updateButton"
                 (click)="create()"
-                [disabled]="detailForm.invalid || detailForm.pristine"
+                [disabled]="detailForm.invalid || detailForm.pristine || createVariantsConfig.variants.length === 0"
             >
                 {{ 'common.create' | translate }}
             </button>

packages/admin-ui/src/lib/catalog/src/components/product-detail/product-detail.component.scss

@@ -30,12 +30,12 @@ vdr-action-bar clr-toggle-wrapper {
         border: 1px solid var(--color-component-border-300);
         background-color: var(--color-component-bg-100);
         border-radius: 0 3px 3px 0;
-        border-left: none;
+        border-inline-start: none;
     }
 }
 
 .group-name {
-    padding-right: 6px;
+    padding-inline-end: 6px;
 }
 
 .view-mode {

packages/admin-ui/src/lib/catalog/src/components/product-list/product-list.component.scss

@@ -50,7 +50,7 @@ td.disabled {
     }
 }
 .edit-button {
-    margin-right: 24px;
+    margin-inline-end: 24px;
 }
 .sku {
     color: var(--color-text-300);

packages/admin-ui/src/lib/catalog/src/components/product-variant-detail/product-variant-detail.component.scss

@@ -6,7 +6,7 @@
 
 vdr-product-variant-quick-jump {
     flex: 1;
-    margin-right: calc(var(--space-unit) * 2);
+    margin-inline-end: calc(var(--space-unit) * 2);
 }
 .stock-levels, .prices {
     margin-top: calc(var(--space-unit) * 2);

packages/admin-ui/src/lib/catalog/src/components/product-variant-detail/product-variant-detail.component.ts

@@ -207,7 +207,6 @@ export class ProductVariantDetailComponent
             .pipe(
                 take(1),
                 mergeMap(([variant, languageCode]) => {
-                    const formValue = this.detailForm.value;
                     const input = pick(
                         this.getUpdatedVariant(
                             variant,
@@ -400,6 +399,7 @@ export class ProductVariantDetailComponent
             assetIds: this.assetChanges.assets?.map(a => a.id),
             featuredAssetId: this.assetChanges.featuredAsset?.id,
             facetValueIds: variantFormGroup.value.facetValueIds,
+            taxCategoryId: variantFormGroup.value.taxCategoryId,
         } as UpdateProductVariantInput | CreateProductVariantInput;
     }
 }

packages/admin-ui/src/lib/catalog/src/components/product-variant-list/product-variant-list.component.scss

@@ -50,7 +50,7 @@ td.disabled {
     }
 }
 .edit-button {
-    margin-right: 24px;
+    margin-inline-end: 24px;
 }
 .sku {
     color: var(--color-text-300);