diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aaaf6e77c..d4b5f27660 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,22 @@ +## 2.0.7 (2023-09-08) + + +#### Fixes + +* **admin-ui** Add custom field support to Customer list ([298e90c](https://github.com/vendure-ecommerce/vendure/commit/298e90c)) +* **admin-ui** Added and improved Italian translations (#2371) ([19292a8](https://github.com/vendure-ecommerce/vendure/commit/19292a8)), closes [#2371](https://github.com/vendure-ecommerce/vendure/issues/2371) +* **admin-ui** Correct handling of ID filters in data tables ([52ddd96](https://github.com/vendure-ecommerce/vendure/commit/52ddd96)) +* **admin-ui** Data table filters react to page navigation ([2471350](https://github.com/vendure-ecommerce/vendure/commit/2471350)) +* **admin-ui** Fix alignment of facet value chip ([7eb43ef](https://github.com/vendure-ecommerce/vendure/commit/7eb43ef)) +* **admin-ui** Fix channel switcher icon style ([6e70794](https://github.com/vendure-ecommerce/vendure/commit/6e70794)) +* **admin-ui** Fix filter shortcut triggering from rich text component ([e6f95b3](https://github.com/vendure-ecommerce/vendure/commit/e6f95b3)), closes [#2384](https://github.com/vendure-ecommerce/vendure/issues/2384) +* **admin-ui** Fix styling of custom field tabs ([ef3d2f9](https://github.com/vendure-ecommerce/vendure/commit/ef3d2f9)) +* **admin-ui** Reinstate multi-deletion of Assets ([a203e50](https://github.com/vendure-ecommerce/vendure/commit/a203e50)), closes [#380](https://github.com/vendure-ecommerce/vendure/issues/380) +* **admin-ui** Use appropriate default values for custom fields ([85a8866](https://github.com/vendure-ecommerce/vendure/commit/85a8866)), closes [#2362](https://github.com/vendure-ecommerce/vendure/issues/2362) +* **admin-ui** Aligns items horizontally in the Chip component ([19d3e51](https://github.com/vendure-ecommerce/vendure/commit/19d3e51)) +* **admin-ui** Add price field on variation dialog modal (#2378) ([5b99bae](https://github.com/vendure-ecommerce/vendure/commit/5b99bae)), closes [#2378](https://github.com/vendure-ecommerce/vendure/issues/2378) +* **core** Fix channel association on promotion update (#2376) ([47e688d](https://github.com/vendure-ecommerce/vendure/commit/47e688d)), closes [#2376](https://github.com/vendure-ecommerce/vendure/issues/2376) + ## 2.0.6 (2023-08-11) diff --git a/lerna.json b/lerna.json index 4325b1b0b4..9611a967b7 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "packages": ["packages/*"], - "version": "2.0.6", + "version": "2.0.7", "npmClient": "yarn", "useWorkspaces": true, "command": { diff --git a/packages/admin-ui-plugin/package.json b/packages/admin-ui-plugin/package.json index f515f640d9..1746ff696a 100644 --- a/packages/admin-ui-plugin/package.json +++ b/packages/admin-ui-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/admin-ui-plugin", - "version": "2.0.6", + "version": "2.0.7", "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.6", - "@vendure/core": "^2.0.6", + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7", "express": "^4.17.1", "rimraf": "^3.0.2", "typescript": "4.9.5" diff --git a/packages/admin-ui/package-lock.json b/packages/admin-ui/package-lock.json index ac9bf3c012..0977a98abe 100644 --- a/packages/admin-ui/package-lock.json +++ b/packages/admin-ui/package-lock.json @@ -1,6 +1,6 @@ { "name": "@vendure/admin-ui", - "version": "2.0.6", + "version": "2.0.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/admin-ui/package.json b/packages/admin-ui/package.json index 38d3152835..4981bc167a 100644 --- a/packages/admin-ui/package.json +++ b/packages/admin-ui/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/admin-ui", - "version": "2.0.6", + "version": "2.0.7", "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.6", + "@vendure/common": "^2.0.7", "@webcomponents/custom-elements": "^1.5.1", "apollo-angular": "^5.0.0", "apollo-upload-client": "^17.0.0", diff --git a/packages/admin-ui/src/lib/catalog/src/components/assets/assets.component.ts b/packages/admin-ui/src/lib/catalog/src/components/assets/assets.component.ts index a966231281..8881830854 100644 --- a/packages/admin-ui/src/lib/catalog/src/components/assets/assets.component.ts +++ b/packages/admin-ui/src/lib/catalog/src/components/assets/assets.component.ts @@ -86,7 +86,7 @@ export class AssetsComponent { .fromComponent(AssetPreviewDialogComponent, { size: 'xl', closable: true, - locals: { asset }, + locals: { asset, assets: this.assets }, }) .subscribe(); } diff --git a/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.html b/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.html index 294045fca5..4e33af8894 100644 --- a/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.html +++ b/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.html @@ -4,21 +4,12 @@
- + - + {{ 'catalog.cannot-create-variants-without-options' | translate }} @@ -31,7 +22,7 @@ {{ 'catalog.product-variant-exists' | translate }}: {{ existingVariant.name }} ({{ - existingVariant.sku + existingVariant.sku }}) @@ -44,16 +35,15 @@ + + +
- - + \ No newline at end of file diff --git a/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.ts b/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.ts index 8e7c3b8613..24767e107a 100644 --- a/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.ts +++ b/packages/admin-ui/src/lib/catalog/src/components/create-product-variant-dialog/create-product-variant-dialog.component.ts @@ -1,7 +1,13 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; -import { FormBuilder, FormControl, FormRecord, Validators } from '@angular/forms'; -import { CreateProductVariantInput, Dialog, GetProductVariantOptionsQuery } from '@vendure/admin-ui/core'; +import { FormBuilder, FormControl, FormGroup, FormRecord, Validators } from '@angular/forms'; +import { + CreateProductVariantInput, + CurrencyCode, + Dialog, + GetProductVariantOptionsQuery, +} from '@vendure/admin-ui/core'; import { notNullOrUndefined } from '@vendure/common/lib/shared-utils'; +import { combineLatest } from 'rxjs'; @Component({ selector: 'vdr-create-product-variant-dialog', @@ -15,13 +21,16 @@ export class CreateProductVariantDialogComponent implements Dialog({}), }); existingVariant: NonNullable['variants'][number] | undefined; + currencyCode: CurrencyCode; constructor(private formBuilder: FormBuilder) {} ngOnInit() { + this.currencyCode = this.product.variants[0].currencyCode; for (const optionGroup of this.product.optionGroups) { (this.form.get('options') as FormRecord).addControl( optionGroup.code, @@ -57,14 +66,16 @@ export class CreateProductVariantDialogComponent implements Dialog { +fdescribe('createUpdatedTranslatable()', () => { let product: any; beforeEach(() => { @@ -182,13 +182,13 @@ describe('createUpdatedTranslatable()', () => { }); }); - it('coerces empty customFields to correct type', () => { + it('coerces empty customFields to correct type (non-nullable)', () => { const customFieldConfig: CustomFieldConfig[] = [ - { name: 'a', type: 'boolean', list: false }, - { name: 'b', type: 'int', list: false }, - { name: 'c', type: 'float', list: false }, - { name: 'd', type: 'datetime', list: false }, - { name: 'e', type: 'string', list: false }, + { name: 'a', type: 'boolean', list: false, nullable: false }, + { name: 'b', type: 'int', list: false, nullable: false }, + { name: 'c', type: 'float', list: false, nullable: false }, + { name: 'd', type: 'datetime', list: false, nullable: false }, + { name: 'e', type: 'string', list: false, nullable: false }, ]; const formValue = { @@ -214,4 +214,37 @@ describe('createUpdatedTranslatable()', () => { expect(result.customFields.d instanceof Date).toBe(true); expect(result.customFields.e).toBe(''); }); + + it('coerces empty customFields to correct type (nullable)', () => { + const customFieldConfig: CustomFieldConfig[] = [ + { name: 'a', type: 'boolean', list: false, nullable: true }, + { name: 'b', type: 'int', list: false, nullable: true }, + { name: 'c', type: 'float', list: false, nullable: true }, + { name: 'd', type: 'datetime', list: false, nullable: true }, + { name: 'e', type: 'string', list: false, nullable: true }, + ]; + + const formValue = { + customFields: { + a: '', + b: '', + c: '', + d: '', + e: '', + }, + }; + + const result = createUpdatedTranslatable({ + translatable: product, + updatedFields: formValue, + customFieldConfig, + languageCode: LanguageCode.en, + }); + + expect(result.customFields.a).toBe(false); + expect(result.customFields.b).toBe(null); + expect(result.customFields.c).toBe(null); + expect(result.customFields.d).toBe(null); + expect(result.customFields.e).toBe(''); + }); }); diff --git a/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts b/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts index 8430bbe310..1711b5b658 100644 --- a/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts +++ b/packages/admin-ui/src/lib/core/src/common/utilities/custom-field-default-value.ts @@ -20,9 +20,9 @@ export function getDefaultValue(type: CustomFieldType, isNullable?: boolean) { case 'string': case 'text': case 'localeText': - return ''; + return isNullable ? null : ''; case 'boolean': - return false; + return isNullable ? null : false; case 'float': case 'int': return isNullable ? null : 0; diff --git a/packages/admin-ui/src/lib/core/src/common/version.ts b/packages/admin-ui/src/lib/core/src/common/version.ts index e9e5a3546c..e4728f4de8 100644 --- a/packages/admin-ui/src/lib/core/src/common/version.ts +++ b/packages/admin-ui/src/lib/core/src/common/version.ts @@ -1,2 +1,2 @@ // Auto-generated by the set-version.js script. -export const ADMIN_UI_VERSION = '2.0.6'; +export const ADMIN_UI_VERSION = '2.0.7'; diff --git a/packages/admin-ui/src/lib/core/src/components/channel-switcher/channel-switcher.component.html b/packages/admin-ui/src/lib/core/src/components/channel-switcher/channel-switcher.component.html index 02f98114c7..691f55dc9e 100644 --- a/packages/admin-ui/src/lib/core/src/components/channel-switcher/channel-switcher.component.html +++ b/packages/admin-ui/src/lib/core/src/components/channel-switcher/channel-switcher.component.html @@ -5,7 +5,7 @@ {{ activeChannelCode$ | async | channelCodeToLabel | translate }} - + diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview-dialog/asset-preview-dialog.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview-dialog/asset-preview-dialog.component.ts index cbc0ca24f9..5b3026397c 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview-dialog/asset-preview-dialog.component.ts +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview-dialog/asset-preview-dialog.component.ts @@ -1,7 +1,7 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core'; import { gql } from 'apollo-angular'; import { Observable, of } from 'rxjs'; -import { mergeMap } from 'rxjs/operators'; +import { map, mergeMap, tap } from 'rxjs/operators'; import { GetAssetQuery, UpdateAssetInput } from '../../../common/generated-types'; import { ASSET_FRAGMENT, TAG_FRAGMENT } from '../../../data/definitions/product-definitions'; @@ -29,11 +29,13 @@ export const ASSET_PREVIEW_QUERY = gql` changeDetection: ChangeDetectionStrategy.OnPush, }) export class AssetPreviewDialogComponent implements Dialog, OnInit { - constructor(private dataService: DataService) {} + constructor(private dataService: DataService) { } asset: AssetLike; + assets?: AssetLike[]; assetChanges?: UpdateAssetInput; resolveWith: (result?: void) => void; assetWithTags$: Observable; + assetsWithTags$: Observable>; ngOnInit() { this.assetWithTags$ = of(this.asset).pipe( @@ -46,6 +48,8 @@ export class AssetPreviewDialogComponent implements Dialog, OnInit { } }), ); + + this.assetsWithTags$ = of(this.assets ?? []); } private hasTags(asset: AssetLike): asset is AssetLike & { tags: string[] } { diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.html b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.html index 7d63bff9e8..71ce78d359 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.html +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.html @@ -106,6 +106,9 @@ +
+
+ +
diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.scss b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.scss index d33992c025..d19ddffba1 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.scss +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.scss @@ -5,7 +5,7 @@ .preview-image { width: 100%; - max-width: 800px; + max-width: 750px; height: 100%; min-height: 60vh; overflow: auto; @@ -89,3 +89,28 @@ } } } + +.carousel-container{ + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + + button{ + cursor: pointer; + width: 30px; + height: 30px; + border: none; + border-radius: 50%; + text-align: center; + background-color: var(--color-grey-300); + &:hover { + background-color: var(--color-grey-400);; + } + } + + .disabled { + pointer-events: none; + opacity: 0.4; + } +} diff --git a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.ts index 2ec71feae3..0f12f57310 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.ts +++ b/packages/admin-ui/src/lib/core/src/shared/components/asset-preview/asset-preview.component.ts @@ -33,6 +33,7 @@ export type PreviewPreset = 'tiny' | 'thumb' | 'small' | 'medium' | 'large' | '' }) export class AssetPreviewComponent implements OnInit, OnDestroy { @Input() asset: AssetLike; + @Input() assets?: AssetLike[]; @Input() editable = false; @Input() customFields: CustomFieldConfig[] = []; @Input() customFieldsForm: UntypedFormGroup | undefined; @@ -50,6 +51,10 @@ export class AssetPreviewComponent implements OnInit, OnDestroy { centered = true; settingFocalPoint = false; lastFocalPoint?: Point; + previewAssetIndex = 0; + disableNextButton = false; + disablePreviousButton = false; + showSlideButtons = false; @ViewChild('imageElement', { static: true }) private imageElementRef: ElementRef; @ViewChild('previewDiv', { static: true }) private previewDivRef: ElementRef; private subscription: Subscription; @@ -61,7 +66,7 @@ export class AssetPreviewComponent implements OnInit, OnDestroy { private notificationService: NotificationService, private changeDetector: ChangeDetectorRef, private modalService: ModalService, - ) {} + ) { } get fpx(): number | null { return this.asset.focalPoint ? this.asset.focalPoint.x : null; @@ -73,6 +78,14 @@ export class AssetPreviewComponent implements OnInit, OnDestroy { ngOnInit() { const { focalPoint } = this.asset; + if (this.assets?.length) { + this.showSlideButtons = true; + this.previewAssetIndex = this.assets.findIndex(asset => asset.id === this.asset.id) || 0; + } else { + this.showSlideButtons = false; + this.updateButtonAccessibility(); + } + this.updateButtonAccessibility(); this.form.get('name')?.setValue(this.asset.name); this.form.get('tags')?.setValue(this.asset.tags?.map(t => t.value)); this.subscription = this.form.valueChanges.subscribe(value => { @@ -206,4 +219,26 @@ export class AssetPreviewComponent implements OnInit, OnDestroy { } }); } + + nextImage() { + this.previewAssetIndex = this.previewAssetIndex + 1; + if (Array.isArray(this.assets)) { + this.asset = this.assets[this.previewAssetIndex]; + this.updateButtonAccessibility(); + } + } + + previousImage() { + this.previewAssetIndex = this.previewAssetIndex - 1; + if (Array.isArray(this.assets)) { + this.asset = this.assets[this.previewAssetIndex]; + this.updateButtonAccessibility(); + } + } + + updateButtonAccessibility() { + this.disableNextButton = this.assets?.[this.previewAssetIndex + 1]?.id ? false : true; + this.disablePreviousButton = this.assets?.[this.previewAssetIndex - 1]?.id ? false : true; + } + } diff --git a/packages/admin-ui/src/lib/core/src/shared/components/chip/chip.component.scss b/packages/admin-ui/src/lib/core/src/shared/components/chip/chip.component.scss index f1abe21d04..ffecd66b73 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/chip/chip.component.scss +++ b/packages/admin-ui/src/lib/core/src/shared/components/chip/chip.component.scss @@ -51,7 +51,7 @@ padding: 5px 8px; white-space: nowrap; display: flex; - align-items: baseline; + align-items: center; gap: 2px; } diff --git a/packages/admin-ui/src/lib/core/src/shared/components/data-table-filters/data-table-filters.component.ts b/packages/admin-ui/src/lib/core/src/shared/components/data-table-filters/data-table-filters.component.ts index c19840d201..5b3bf2f248 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/data-table-filters/data-table-filters.component.ts +++ b/packages/admin-ui/src/lib/core/src/shared/components/data-table-filters/data-table-filters.component.ts @@ -44,7 +44,11 @@ export class DataTableFiltersComponent implements AfterViewInit { @HostListener('window:keydown.f', ['$event']) onFKeyPress(event: KeyboardEvent) { if (event.target instanceof HTMLElement) { - if (event.target.tagName === 'INPUT' || event.target.tagName === 'TEXTAREA') { + if ( + event.target.tagName === 'INPUT' || + event.target.tagName === 'TEXTAREA' || + event.target.classList.contains('vdr-prosemirror') + ) { return; } } diff --git a/packages/admin-ui/src/lib/core/src/shared/components/facet-value-chip/facet-value-chip.component.scss b/packages/admin-ui/src/lib/core/src/shared/components/facet-value-chip/facet-value-chip.component.scss index f899d9b487..6c6d5537cd 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/facet-value-chip/facet-value-chip.component.scss +++ b/packages/admin-ui/src/lib/core/src/shared/components/facet-value-chip/facet-value-chip.component.scss @@ -8,5 +8,4 @@ text-transform: uppercase; font-size: 10px; margin-right: 3px; - height: 11px; } diff --git a/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.scss b/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.scss index 50fc6cdb39..4aa956c179 100644 --- a/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.scss +++ b/packages/admin-ui/src/lib/core/src/shared/components/tabbed-custom-fields/tabbed-custom-fields.component.scss @@ -2,6 +2,6 @@ display: contents; } -//vdr-custom-field-control + vdr-custom-field-control { -// margin-top: calc(var(--space-unit) * 2); -//} +::ng-deep clr-tabs .btn.btn-link { + box-shadow: none; +} diff --git a/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.html b/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.html index 16aeaad416..b19d11899c 100644 --- a/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.html +++ b/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.html @@ -72,4 +72,5 @@ {{ customer.emailAddress }} + diff --git a/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.ts b/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.ts index 9d707f3d79..5a57980236 100644 --- a/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.ts +++ b/packages/admin-ui/src/lib/customer/src/components/customer-list/customer-list.component.ts @@ -37,6 +37,7 @@ export class CustomerListComponent extends TypedBaseListComponent implements OnInit { + readonly customFields = this.getCustomFieldConfig('Customer'); readonly filters = this.createFilterCollection() .addIdFilter() .addDateFilters() @@ -58,6 +59,7 @@ export class CustomerListComponent label: _('customer.email-address'), filterField: 'emailAddress', }) + .addCustomFieldFilters(this.customFields) .connectToRoute(this.route); readonly sorts = this.createSortCollection() @@ -66,6 +68,7 @@ export class CustomerListComponent .addSort({ name: 'updatedAt' }) .addSort({ name: 'lastName' }) .addSort({ name: 'emailAddress' }) + .addCustomFieldSorts(this.customFields) .connectToRoute(this.route); constructor() { diff --git a/packages/admin-ui/src/lib/settings/src/components/tax-category-list/tax-category-list-bulk-actions.ts b/packages/admin-ui/src/lib/settings/src/components/tax-category-list/tax-category-list-bulk-actions.ts index aafa65f0b5..34e5566c4b 100644 --- a/packages/admin-ui/src/lib/settings/src/components/tax-category-list/tax-category-list-bulk-actions.ts +++ b/packages/admin-ui/src/lib/settings/src/components/tax-category-list/tax-category-list-bulk-actions.ts @@ -1,5 +1,4 @@ -import { createBulkDeleteAction, GetSellersQuery, ItemOf, Permission } from '@vendure/admin-ui/core'; -import { GetTaxCategoryListQuery } from '@vendure/core/e2e/graphql/generated-e2e-admin-types'; +import { createBulkDeleteAction, GetTaxCategoryListQuery, ItemOf, Permission } from '@vendure/admin-ui/core'; import { map } from 'rxjs/operators'; export const deleteTaxCategoriesBulkAction = createBulkDeleteAction< diff --git a/packages/asset-server-plugin/package.json b/packages/asset-server-plugin/package.json index b00982f2c9..c6c91fb8fe 100644 --- a/packages/asset-server-plugin/package.json +++ b/packages/asset-server-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/asset-server-plugin", - "version": "2.0.6", + "version": "2.0.7", "main": "lib/index.js", "types": "lib/index.d.ts", "files": [ @@ -27,8 +27,8 @@ "@types/fs-extra": "^9.0.8", "@types/node-fetch": "^2.5.8", "@types/sharp": "^0.30.4", - "@vendure/common": "^2.0.6", - "@vendure/core": "^2.0.6", + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7", "express": "^4.17.1", "node-fetch": "^2.6.7", "rimraf": "^3.0.2", diff --git a/packages/common/package.json b/packages/common/package.json index d66190065b..4f43645dbb 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/common", - "version": "2.0.6", + "version": "2.0.7", "main": "index.js", "license": "MIT", "scripts": { diff --git a/packages/core/package.json b/packages/core/package.json index 144fc391d5..e6e7b89eb6 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/core", - "version": "2.0.6", + "version": "2.0.7", "description": "A modern, headless ecommerce framework", "repository": { "type": "git", @@ -52,7 +52,7 @@ "@nestjs/testing": "9.3.9", "@nestjs/typeorm": "9.0.1", "@types/fs-extra": "^9.0.1", - "@vendure/common": "^2.0.6", + "@vendure/common": "^2.0.7", "apollo-server-express": "3.6.3", "bcrypt": "^5.1.0", "body-parser": "^1.19.0", diff --git a/packages/core/src/service/services/promotion.service.ts b/packages/core/src/service/services/promotion.service.ts index 085af131e2..f945d35b97 100644 --- a/packages/core/src/service/services/promotion.service.ts +++ b/packages/core/src/service/services/promotion.service.ts @@ -184,7 +184,6 @@ export class PromotionService { this.configArgService.parseInput('PromotionAction', a), ); } - await this.channelService.assignToCurrentChannel(p, ctx); }, }); await this.customFieldRelationService.updateRelations(ctx, Promotion, input, updatedPromotion); diff --git a/packages/create/package.json b/packages/create/package.json index 1c1e215c21..f0017dfc05 100644 --- a/packages/create/package.json +++ b/packages/create/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/create", - "version": "2.0.6", + "version": "2.0.7", "license": "MIT", "bin": { "create": "./index.js" @@ -28,14 +28,14 @@ "@types/fs-extra": "^9.0.1", "@types/handlebars": "^4.1.0", "@types/semver": "^6.2.2", - "@vendure/core": "^2.0.6", + "@vendure/core": "^2.0.7", "rimraf": "^3.0.2", "ts-node": "^10.9.1", "typescript": "4.9.5" }, "dependencies": { "@clack/prompts": "^0.6.3", - "@vendure/common": "^2.0.6", + "@vendure/common": "^2.0.7", "commander": "^10.0.0", "cross-spawn": "^7.0.3", "detect-port": "^1.5.1", diff --git a/packages/dev-server/package.json b/packages/dev-server/package.json index 3f961eb1e4..6143644a86 100644 --- a/packages/dev-server/package.json +++ b/packages/dev-server/package.json @@ -1,6 +1,6 @@ { "name": "dev-server", - "version": "2.0.6", + "version": "2.0.7", "main": "index.js", "license": "MIT", "private": true, @@ -14,18 +14,18 @@ "load-test:100k": "node -r ts-node/register load-testing/run-load-test.ts 100000" }, "dependencies": { - "@vendure/admin-ui-plugin": "^2.0.6", - "@vendure/asset-server-plugin": "^2.0.6", - "@vendure/common": "^2.0.6", - "@vendure/core": "^2.0.6", - "@vendure/elasticsearch-plugin": "^2.0.6", - "@vendure/email-plugin": "^2.0.6", + "@vendure/admin-ui-plugin": "^2.0.7", + "@vendure/asset-server-plugin": "^2.0.7", + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7", + "@vendure/elasticsearch-plugin": "^2.0.7", + "@vendure/email-plugin": "^2.0.7", "typescript": "4.9.5" }, "devDependencies": { "@types/csv-stringify": "^3.1.0", - "@vendure/testing": "^2.0.6", - "@vendure/ui-devkit": "^2.0.6", + "@vendure/testing": "^2.0.7", + "@vendure/ui-devkit": "^2.0.7", "commander": "^7.1.0", "concurrently": "^5.0.0", "csv-stringify": "^5.3.3", diff --git a/packages/elasticsearch-plugin/package.json b/packages/elasticsearch-plugin/package.json index 5c70bb9c12..390eab86d3 100644 --- a/packages/elasticsearch-plugin/package.json +++ b/packages/elasticsearch-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/elasticsearch-plugin", - "version": "2.0.6", + "version": "2.0.7", "license": "MIT", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -26,8 +26,8 @@ "fast-deep-equal": "^3.1.3" }, "devDependencies": { - "@vendure/common": "^2.0.6", - "@vendure/core": "^2.0.6", + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7", "rimraf": "^3.0.2", "typescript": "4.9.5" } diff --git a/packages/email-plugin/package.json b/packages/email-plugin/package.json index ec6d9366b5..78a9ca7d60 100644 --- a/packages/email-plugin/package.json +++ b/packages/email-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/email-plugin", - "version": "2.0.6", + "version": "2.0.7", "license": "MIT", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -35,8 +35,8 @@ "@types/fs-extra": "^9.0.1", "@types/handlebars": "^4.1.0", "@types/mjml": "^4.0.4", - "@vendure/common": "^2.0.6", - "@vendure/core": "^2.0.6", + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7", "rimraf": "^3.0.2", "typescript": "4.9.5" } diff --git a/packages/harden-plugin/package.json b/packages/harden-plugin/package.json index 3245aee7bb..b07f7dcc0c 100644 --- a/packages/harden-plugin/package.json +++ b/packages/harden-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/harden-plugin", - "version": "2.0.6", + "version": "2.0.7", "license": "MIT", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -21,7 +21,7 @@ "graphql-query-complexity": "^0.12.0" }, "devDependencies": { - "@vendure/common": "^2.0.6", - "@vendure/core": "^2.0.6" + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7" } } diff --git a/packages/job-queue-plugin/package.json b/packages/job-queue-plugin/package.json index 4344d15b32..3c61a20b05 100644 --- a/packages/job-queue-plugin/package.json +++ b/packages/job-queue-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/job-queue-plugin", - "version": "2.0.6", + "version": "2.0.7", "license": "MIT", "main": "package/index.js", "types": "package/index.d.ts", @@ -23,8 +23,8 @@ }, "devDependencies": { "@google-cloud/pubsub": "^2.8.0", - "@vendure/common": "^2.0.6", - "@vendure/core": "^2.0.6", + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7", "bullmq": "^3.15.5", "ioredis": "^5.3.0", "rimraf": "^3.0.2", diff --git a/packages/payments-plugin/package.json b/packages/payments-plugin/package.json index b6fd058499..9fa97570fb 100644 --- a/packages/payments-plugin/package.json +++ b/packages/payments-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/payments-plugin", - "version": "2.0.6", + "version": "2.0.7", "license": "MIT", "main": "package/index.js", "types": "package/index.d.ts", @@ -46,9 +46,9 @@ "@mollie/api-client": "^3.6.0", "@types/braintree": "^2.22.15", "@types/localtunnel": "2.0.1", - "@vendure/common": "^2.0.6", - "@vendure/core": "^2.0.6", - "@vendure/testing": "^2.0.6", + "@vendure/common": "^2.0.7", + "@vendure/core": "^2.0.7", + "@vendure/testing": "^2.0.7", "braintree": "^3.0.0", "localtunnel": "2.0.1", "nock": "^13.1.4", diff --git a/packages/testing/package.json b/packages/testing/package.json index 6ec831e9c8..7e872f3642 100644 --- a/packages/testing/package.json +++ b/packages/testing/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/testing", - "version": "2.0.6", + "version": "2.0.7", "description": "End-to-end testing tools for Vendure projects", "keywords": [ "vendure", @@ -38,7 +38,7 @@ "dependencies": { "@graphql-typed-document-node/core": "^3.2.0", "@types/node-fetch": "^2.5.4", - "@vendure/common": "^2.0.6", + "@vendure/common": "^2.0.7", "faker": "^4.1.0", "form-data": "^3.0.0", "graphql": "16.6.0", @@ -49,7 +49,7 @@ "devDependencies": { "@types/mysql": "^2.15.15", "@types/pg": "^7.14.5", - "@vendure/core": "^2.0.6", + "@vendure/core": "^2.0.7", "mysql": "^2.18.1", "pg": "^8.4.0", "rimraf": "^3.0.0", diff --git a/packages/ui-devkit/package.json b/packages/ui-devkit/package.json index 89c3911077..cd96ed2f28 100644 --- a/packages/ui-devkit/package.json +++ b/packages/ui-devkit/package.json @@ -1,6 +1,6 @@ { "name": "@vendure/ui-devkit", - "version": "2.0.6", + "version": "2.0.7", "description": "A library for authoring Vendure Admin UI extensions", "keywords": [ "vendure", @@ -40,8 +40,8 @@ "@angular/cli": "^16.0.3", "@angular/compiler": "^16.0.3", "@angular/compiler-cli": "^16.0.3", - "@vendure/admin-ui": "^2.0.6", - "@vendure/common": "^2.0.6", + "@vendure/admin-ui": "^2.0.7", + "@vendure/common": "^2.0.7", "chalk": "^4.1.0", "chokidar": "^3.5.1", "fs-extra": "^10.0.0", @@ -51,7 +51,7 @@ "devDependencies": { "@rollup/plugin-node-resolve": "^15.0.1", "@types/fs-extra": "^11.0.1", - "@vendure/core": "^2.0.6", + "@vendure/core": "^2.0.7", "rimraf": "^3.0.2", "rollup": "^3.18.0", "rollup-plugin-terser": "^7.0.2",