diff --git a/.npmignore b/.npmignore index 3ba6feeee01..b7599e66bb7 100644 --- a/.npmignore +++ b/.npmignore @@ -2,3 +2,4 @@ sonar-project.properties sub-folder/ .pipeline/ +tmp/** diff --git a/.prettierrc b/.prettierrc index 544138be456..c1a6f667131 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,3 +1,4 @@ { - "singleQuote": true + "singleQuote": true, + "trailingComma": "es5" } diff --git a/ci-scripts/publish-sample-data.sh b/ci-scripts/publish-sample-data.sh index 45a9c403557..d2e418599bf 100755 --- a/ci-scripts/publish-sample-data.sh +++ b/ci-scripts/publish-sample-data.sh @@ -4,8 +4,12 @@ TAG_NAME="sampledata" SAMPLE_DATA_ASSETS_FOLDER="sample-data-assets" STOREFRONT_FILE_NAME="spartacussampledata" -SAMPLE_DATA_UNRELEASED_BRANCH="release/6.x" -UNRELEASED_SPARTACUS_VERSION_NAME="$STOREFRONT_FILE_NAME-version-6-x" + +SAMPLE_DATA_UNRELEASED_BRANCH="release/2211.x" +UNRELEASED_SPARTACUS_VERSION_NAME="$STOREFRONT_FILE_NAME-version-2211-x" + +SAMPLE_DATA_UNRELEASED_BRANCH6="release/6.x" +UNRELEASED_SPARTACUS_VERSION_NAME6="$STOREFRONT_FILE_NAME-version-6-x" SAMPLE_DATA_CURRENT_BRANCH="release/5.x" CURRENT_SPARTACUS_VERSION_NAME="$STOREFRONT_FILE_NAME-version-5-x" @@ -23,12 +27,17 @@ function download_sample_data_from_spartacussample_repo { } echo "-----" -echo "Downloading UNRELEASED sample data for 6.x" +echo "Downloading PREVIOUS sample data for 6.x" download_sample_data_from_spartacussample_repo $SAMPLE_DATA_UNRELEASED_BRANCH $UNRELEASED_SPARTACUS_VERSION_NAME echo "-----" -echo "Downloading CURRENT sample data for 5.x" +echo "Downloading PREVIOUS sample data for 6.x" + +download_sample_data_from_spartacussample_repo $SAMPLE_DATA_UNRELEASED_BRANCH6 $UNRELEASED_SPARTACUS_VERSION_NAME6 + +echo "-----" +echo "Downloading PREVIOUS sample data for 5.x" download_sample_data_from_spartacussample_repo $SAMPLE_DATA_CURRENT_BRANCH $CURRENT_SPARTACUS_VERSION_NAME @@ -55,7 +64,8 @@ echo "-----" echo "Create a release with created tag" gh release create $TAG_NAME ./$SAMPLE_DATA_ASSETS_FOLDER/** --repo "https://$GH_TOKEN@github.com/SAP-samples/cloud-commerce-sample-setup.git" --title "Spartacus Sample Data" --notes "Spartacus sample data releases: -6-x: unreleased -5-x: current release +2211-x: current release +6-x: previous release +5-x: previous release 4-x: previous release -3-x: old release" +3-x: old release" \ No newline at end of file diff --git a/ci-scripts/release-packer.sh b/ci-scripts/release-packer.sh index 690df6b02f4..17583a51e24 100755 --- a/ci-scripts/release-packer.sh +++ b/ci-scripts/release-packer.sh @@ -5,12 +5,15 @@ set -e shopt -s extglob dotglob +# Build all the libraries and generate the dist folders to use when releasing +function build_libs { + npm ci && npm run build:libs +} + # Configure the project to move everything into a sub-folder to keep root clean for publishing function configure_project { mkdir sub-folder mv !(sub-folder) sub-folder - cd sub-folder - npm ci && npm run build:libs } # Clear root containing the old package so the next package can be published @@ -49,6 +52,8 @@ function pack { if [[ $1 == 'configure' ]]; then configure_project +elif [[ $1 == 'build' ]]; then + build_libs else clear_root pack "$1" diff --git a/core-libs/setup/package.json b/core-libs/setup/package.json index 25b4c84b539..23d96af4548 100644 --- a/core-libs/setup/package.json +++ b/core-libs/setup/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/setup", - "version": "2211.24.0", + "version": "2211.25.1", "description": "Includes features that makes Spartacus and it's setup easier and streamlined.", "keywords": [ "spartacus", @@ -21,10 +21,10 @@ "peerDependencies": { "@angular/core": "^17.0.5", "@angular/ssr": "^17.0.5", - "@spartacus/cart": "2211.24.0", - "@spartacus/core": "2211.24.0", - "@spartacus/order": "2211.24.0", - "@spartacus/user": "2211.24.0" + "@spartacus/cart": "2211.25.1", + "@spartacus/core": "2211.25.1", + "@spartacus/order": "2211.25.1", + "@spartacus/user": "2211.25.1" }, "optionalDependencies": { "@angular/platform-server": "^17.0.5", diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts index 763e56cb506..561aeba796a 100644 --- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts +++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.spec.ts @@ -137,6 +137,7 @@ describe('OptimizedSsrEngine', () => { }); }); }); + describe('logOptions', () => { let dateSpy: jest.SpyInstance; @@ -151,6 +152,10 @@ describe('OptimizedSsrEngine', () => { dateSpy.mockReset(); }); + afterAll(() => { + dateSpy.mockRestore(); + }); + it('should log the provided options', () => { new TestEngineRunner({ timeout: 50, @@ -181,6 +186,30 @@ describe('OptimizedSsrEngine', () => { }); }); + describe('rendering cache', () => { + it('should be initialized with default optimization options none of the custom options are provided', () => { + const engineRunner = new TestEngineRunner({}); + expect( + engineRunner.optimizedSsrEngine['renderingCache']['options'] + ).toEqual(defaultSsrOptimizationOptions); + }); + + it('should be initialized with the provided custom options', () => { + const engineRunner = new TestEngineRunner({ + cacheSize: 100, + ttl: 200, + }); + expect(engineRunner.optimizedSsrEngine['renderingCache']).toBeDefined(); + expect( + engineRunner.optimizedSsrEngine['renderingCache']['options'] + ).toEqual({ + ...defaultSsrOptimizationOptions, + cacheSize: 100, + ttl: 200, + }); + }); + }); + describe('timeout option', () => { it('should fallback to CSR if rendering exceeds timeout', fakeAsync(() => { const engineRunner = new TestEngineRunner({ timeout: 50 }).request('a'); @@ -376,6 +405,27 @@ describe('OptimizedSsrEngine', () => { tick(200); expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-1']); })); + + it('should not invalidate renders if ttl is not defined', fakeAsync(() => { + let currentDate = 100; + jest.spyOn(Date, 'now').mockImplementation(() => currentDate); + + const engineRunner = new TestEngineRunner({ + cache: true, + timeout: 200, + }).request('a'); + + tick(200); + currentDate += 200; + engineRunner.request('a'); + + tick(200); + currentDate += 200; + engineRunner.request('a'); + + tick(200); + expect(engineRunner.renders).toEqual(['a-0', 'a-0', 'a-0']); + })); }); describe('renderKeyResolver option', () => { @@ -1206,8 +1256,8 @@ describe('OptimizedSsrEngine', () => { .mockImplementationOnce(() => mockDate); }); - afterEach(() => { - dateSpy.mockReset(); + afterAll(() => { + dateSpy.mockRestore(); }); it('should use the default server logger, if custom logger is not specified', () => { diff --git a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts index 0d5b22b53aa..6d3ec10595d 100644 --- a/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts +++ b/core-libs/setup/ssr/optimized-engine/optimized-ssr-engine.ts @@ -45,7 +45,7 @@ export type SsrCallbackFn = ( */ export class OptimizedSsrEngine { protected currentConcurrency = 0; - protected renderingCache = new RenderingCache(this.ssrOptions); + protected renderingCache: RenderingCache; private logger: ExpressServerLogger; private templateCache = new Map(); @@ -81,6 +81,7 @@ export class OptimizedSsrEngine { throw new Error('`SsrOptimizationOptions.logger` is not defined'); } this.logger = this.ssrOptions?.logger; + this.renderingCache = new RenderingCache(this.ssrOptions); this.logOptions(); } diff --git a/core-libs/setup/tsconfig.spec.json b/core-libs/setup/tsconfig.spec.json index a63f9b6c460..290c6e0060a 100644 --- a/core-libs/setup/tsconfig.spec.json +++ b/core-libs/setup/tsconfig.spec.json @@ -549,6 +549,7 @@ "../../integration-libs/cdp/customer-ticketing/public_api" ], "@spartacus/cdp": ["../../integration-libs/cdp/public_api"], + "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"], "@spartacus/cds": ["../../integration-libs/cds/public_api"], "@spartacus/digital-payments/assets": [ "../../integration-libs/digital-payments/assets/public_api" diff --git a/feature-libs/asm/assets/translations/en/asm.json b/feature-libs/asm/assets/translations/en/asm.json index b9fe1ccfd6c..e32e231cd99 100644 --- a/feature-libs/asm/assets/translations/en/asm.json +++ b/feature-libs/asm/assets/translations/en/asm.json @@ -27,11 +27,21 @@ "searchTerm": { "label": "Customer Name/Email Address" }, + "searchCustomer": { + "label": "Search by name or email address" + }, + "searchOrder": { + "label": "Search by full order ID" + }, "submit": "Start Session", "startEmulation": "Start Emulation", "noMatch": "No customer found.", "noMatchResult": "This account cannot be found.", - "createCustomer": "Create New Customer" + "noCustomerMatchResult": "No matching customer found.", + "noOrderMatchResult": "Search by full order ID.", + "createCustomer": "Create New Customer", + "customer": "Customer", + "orderID": "Order ID" }, "createCustomerForm": { "title": "Create New Customer", @@ -74,8 +84,11 @@ "order": "Order", "view": "360 View", "activeCart": "Active Cart", + "viewActiveCart": "View Active Cart", "orders": "Orders", - "customer360": "Customer 360°" + "viewOrders": "View Orders", + "customer360": "Customer 360°", + "viewCustomer360": "View Customer 360°" }, "tableSort": { "sortBy": "Sort by", diff --git a/feature-libs/asm/components/asm-components.module.ts b/feature-libs/asm/components/asm-components.module.ts index 21548afbf9a..4860f252938 100644 --- a/feature-libs/asm/components/asm-components.module.ts +++ b/feature-libs/asm/components/asm-components.module.ts @@ -8,7 +8,11 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { NgSelectModule } from '@ng-select/ng-select'; -import { I18nModule, provideDefaultConfig } from '@spartacus/core'; +import { + FeaturesConfigModule, + I18nModule, + provideDefaultConfig, +} from '@spartacus/core'; import { FormErrorsModule, IconModule, @@ -58,6 +62,7 @@ import { DotSpinnerComponent } from './dot-spinner/dot-spinner.component'; SortingModule, PaginationModule, MessageComponentModule, + FeaturesConfigModule, ], declarations: [ AsmBindCartDialogComponent, diff --git a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html index 38e9cde6b90..c407d368005 100644 --- a/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html +++ b/feature-libs/asm/components/asm-create-customer-form/asm-create-customer-form.component.html @@ -102,19 +102,13 @@

+
+ + +
+ +
- - + {{ + 'asm.customerSearch.orderID' | cxTranslate + }} -
- + -
+ + +
+
+ + +
+ +
+ + + +
-
- +
+ +
diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts b/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts index 550177725ce..9b133783a14 100644 --- a/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts +++ b/feature-libs/asm/components/customer-selection/customer-selection.component.spec.ts @@ -11,6 +11,7 @@ import { By } from '@angular/platform-browser'; import { AsmService } from '@spartacus/asm/core'; import { AsmConfig, CustomerSearchPage } from '@spartacus/asm/root'; import { + FeatureConfigService, FeaturesConfig, GlobalMessageService, I18nTestingModule, @@ -23,6 +24,7 @@ import { LAUNCH_CALLER, LaunchDialogService, } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { BehaviorSubject, EMPTY, Observable, Subject } from 'rxjs'; import { DotSpinnerComponent } from '../dot-spinner/dot-spinner.component'; import { CustomerSelectionComponent } from './customer-selection.component'; @@ -106,42 +108,49 @@ describe('CustomerSelectionComponent', () => { let el: DebugElement; let searchResultItems: Array> = []; let launchDialogService: LaunchDialogService; + let featureConfig: FeatureConfigService; const validSearchTerm = 'cUstoMer@test.com'; + const validSearchOrderID = 'valid_order_id'; - beforeEach( - waitForAsync(() => { - customerSearchResults = new BehaviorSubject({ - entries: [], - }); - customerSearchResultsLoading = new BehaviorSubject(false); - - TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule], - declarations: [CustomerSelectionComponent, DotSpinnerComponent], - providers: [ - { provide: AsmService, useClass: MockAsmService }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { provide: AsmConfig, useValue: MockAsmConfig }, - { - provide: DirectionService, - useClass: MockDirectionService, - }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '*' }, - }, + beforeEach(waitForAsync(() => { + customerSearchResults = new BehaviorSubject({ + entries: [], + }); + customerSearchResultsLoading = new BehaviorSubject(false); + + TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule], + declarations: [ + CustomerSelectionComponent, + DotSpinnerComponent, + MockFeatureDirective, + ], + providers: [ + { provide: AsmService, useClass: MockAsmService }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { provide: AsmConfig, useValue: MockAsmConfig }, + { + provide: DirectionService, + useClass: MockDirectionService, + }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '*' }, }, - ], - }).compileComponents(); + }, + ], + }).compileComponents(); - launchDialogService = TestBed.inject(LaunchDialogService); - }) - ); + launchDialogService = TestBed.inject(LaunchDialogService); + })); beforeEach(() => { + featureConfig = TestBed.inject(FeatureConfigService); + spyOn(featureConfig, 'isEnabled').and.callFake(() => true); + fixture = TestBed.createComponent(CustomerSelectionComponent); component = fixture.componentInstance; @@ -154,7 +163,7 @@ describe('CustomerSelectionComponent', () => { expect(component).toBeTruthy(); }); - it('should emit selection event when submitted', () => { + it('should emit selection event when submitted (CXSPA-7026)', () => { spyOn(component, 'onSubmit').and.callThrough(); spyOn(component.submitEvent, 'emit').and.stub(); @@ -170,11 +179,33 @@ describe('CustomerSelectionComponent', () => { expect(component.onSubmit).toHaveBeenCalled(); expect(component.submitEvent.emit).toHaveBeenCalledWith({ customerId: mockCustomer.customerId, + parameters: { + orderId: '', + }, }); }); - it('should display spinner when customer search is running', () => { + it('should emit selection event when submitted with showSearchingCustomerByOrderInASM disabled (CXSPA-7026)', () => { + component.isShowSearchingCustomerByOrderInASM = false; + spyOn(component, 'onSubmit').and.callThrough(); + spyOn(component.customerSelectionForm, 'markAllAsTouched').and.stub(); + + component.customerSelectionForm.controls.searchTerm.setValue('testTerm'); + component.selectedCustomer = mockCustomer; + fixture.detectChanges(); + + const submitBtn = fixture.debugElement.query( + By.css('button[type="submit"]') + ); + submitBtn.nativeElement.dispatchEvent(new MouseEvent('click')); + + expect(component.onSubmit).toHaveBeenCalled(); + expect(component.customerSelectionForm.markAllAsTouched).toHaveBeenCalled(); + }); + + it('should display spinner when customer search is running (CXSPA-7026)', () => { customerSearchResultsLoading.next(true); + component.searchByCustomer = true; fixture.detectChanges(); expect(el.query(By.css('cx-dot-spinner'))).toBeTruthy(); @@ -189,6 +220,22 @@ describe('CustomerSelectionComponent', () => { }); it('should trigger search for valid search term', fakeAsync(() => { + spyOn(asmService, 'customerSearch').and.callThrough(); + component.customerSelectionForm.controls.searchTerm.setValue( + validSearchTerm + ); + component.selectedCustomer = mockCustomer; + + fixture.detectChanges(); + tick(1000); + expect(asmService.customerSearch).toHaveBeenCalledWith({ + query: validSearchTerm, + pageSize: 20, + }); + })); + + it('should trigger search for valid search term when showSearchingCustomerByOrderInASM disabled', fakeAsync(() => { + component.isShowSearchingCustomerByOrderInASM = false; spyOn(asmService, 'customerSearch').and.callThrough(); component.customerSelectionForm.controls.searchTerm.setValue( validSearchTerm @@ -214,20 +261,47 @@ describe('CustomerSelectionComponent', () => { ); })); + it('should display 1 search results for valid search order (CXSPA-7026)', fakeAsync(() => { + spyOn(asmService, 'customerSearch').and.callFake(() => { + customerSearchResults.next({ entries: [mockCustomer] }); + customerSearchResultsLoading.next(false); + }); + component.customerSelectionForm.controls.searchOrder.setValue( + validSearchOrderID + ); + component.selectedCustomer = mockCustomer; + + tick(300); + + fixture.detectChanges(); + expect(el.queryAll(By.css('div.asm-results button')).length).toEqual(1); + })); + it('should close the result list when we click out of the result list area', () => { spyOn(asmService, 'customerSearchReset').and.stub(); component.customerSelectionForm.controls.searchTerm.setValue( validSearchTerm ); + el.nativeElement.ownerDocument.dispatchEvent(new MouseEvent('click')); fixture.detectChanges(); - expect(el.query(By.css('div.asm-results'))).toBeTruthy(); + expect(asmService.customerSearchReset).toHaveBeenCalled(); + }); + + it('should close the order search result list when we click out of the result list area (CXSPA-7026)', () => { + spyOn(asmService, 'customerSearchReset').and.stub(); + + component.customerSelectionForm.controls.searchOrder.setValue( + validSearchOrderID + ); el.nativeElement.ownerDocument.dispatchEvent(new MouseEvent('click')); fixture.detectChanges(); expect(asmService.customerSearchReset).toHaveBeenCalled(); }); - it('should display customer registration message if no result was found', () => { + it('should display customer registration message if no customer was found (CXSPA-7026)', () => { + component.searchByCustomer = true; + spyOn(asmService, 'customerSearch').and.callFake(() => { customerSearchResults.next({ entries: [] }); customerSearchResultsLoading.next(false); @@ -237,15 +311,33 @@ describe('CustomerSelectionComponent', () => { validSearchTerm ); fixture.detectChanges(); - expect(el.queryAll(By.css('div.asm-results button')).length).toEqual(1); - const createAccountButton = el.query(By.css('div.asm-results button')); + expect(el.queryAll(By.css('div.cx-message-content div')).length).toEqual(1); + const createAccountButton = el.query(By.css('span.linkStyleLabel')); expect(createAccountButton.nativeElement.innerText).toEqual( - 'asm.customerSearch.noMatchResultasm.customerSearch.createCustomer' + 'asm.customerSearch.createCustomer' ); createAccountButton.nativeElement.dispatchEvent(new MouseEvent('click')); expect(asmService.customerSearchReset).toHaveBeenCalled(); }); + it('should display search exact order message if no customer was found by order ID (CXSPA-7026)', () => { + component.searchByOrder = true; + + spyOn(asmService, 'customerSearch').and.callFake(() => { + customerSearchResults.next({ entries: [] }); + customerSearchResultsLoading.next(false); + }); + component.customerSelectionForm.controls.searchOrder.setValue( + validSearchOrderID + ); + fixture.detectChanges(); + expect(el.queryAll(By.css('div.cx-message-content div')).length).toEqual(1); + const createAccountButton = el.query(By.css('span.cx-message-text')); + expect(createAccountButton.nativeElement.innerText).toEqual( + 'asm.customerSearch.noOrderMatchResult' + ); + }); + it('should be able to select a customer from the result list.', fakeAsync(() => { spyOn(asmService, 'customerSearchReset').and.stub(); @@ -416,4 +508,185 @@ describe('CustomerSelectionComponent', () => { ); }); }); + + describe('Search result navigation for order search', () => { + beforeEach(fakeAsync(() => { + component.customerSelectionForm.controls.searchOrder.setValue( + validSearchOrderID + ); + + tick(300); + + fixture.detectChanges(); + searchResultItems = component.searchResultItems.toArray(); + component.searchOrder.nativeElement.focus(); + })); + it('should navigate between result items for order search', () => { + spyOn(searchResultItems[0].nativeElement, 'focus'); + + expect(component.activeFocusedButtonIndex).toEqual(-1); + + component.focusFirstItem(new UIEvent('keydown.arrowdown')); + fixture.detectChanges(); + expect(component.activeFocusedButtonIndex).toEqual(0); + expect(searchResultItems[0].nativeElement.tabIndex).toEqual(0); + expect(searchResultItems[0].nativeElement.focus).toHaveBeenCalled(); + + component.focusNextChild(new UIEvent('keydown.arrowdown')); + fixture.detectChanges(); + expect(component.activeFocusedButtonIndex).toEqual(1); + expect(searchResultItems[0].nativeElement.tabIndex).toEqual(-1); + expect(searchResultItems[1].nativeElement.tabIndex).toEqual(0); + + component.focusPreviousChild(new UIEvent('keydown.arrowup')); + fixture.detectChanges(); + expect(component.activeFocusedButtonIndex).toEqual(0); + expect(searchResultItems[0].nativeElement.tabIndex).toEqual(0); + expect(searchResultItems[1].nativeElement.tabIndex).toEqual(-1); + }); + + it('should focus search text and set cursor one right to original select position', () => { + const event = { + code: 'ArrowRight', + ctrlKey: false, + stopPropagation: () => {}, + preventDefault: () => {}, + }; + spyOn(component.searchOrder.nativeElement, 'focus'); + + component.searchOrder.nativeElement.selectionStart = + validSearchOrderID.length - 5; + component.searchOrder.nativeElement.selectionEnd = + validSearchOrderID.length - 5; + + component.focusFirstItem(new UIEvent('keydown.arrowdown')); + component.focusOrderSearchInputText(event as KeyboardEvent); + + expect(component.searchOrder.nativeElement.focus).toHaveBeenCalled(); + expect(component.searchOrder.nativeElement.selectionStart).toEqual( + validSearchOrderID.length - 4 + ); + expect(component.searchOrder.nativeElement.selectionEnd).toEqual( + validSearchOrderID.length - 4 + ); + }); + it('should focus search text and set cursor -1 from original position', () => { + const event = { + code: 'ArrowLeft', + ctrlKey: false, + stopPropagation: () => {}, + preventDefault: () => {}, + }; + spyOn(component.searchOrder.nativeElement, 'focus'); + + component.searchOrder.nativeElement.selectionStart = + validSearchOrderID.length - 5; + component.searchOrder.nativeElement.selectionEnd = + validSearchOrderID.length - 5; + + component.focusFirstItem(new UIEvent('keydown.arrowdown')); + component.focusOrderSearchInputText(event as KeyboardEvent); + + expect(component.searchOrder.nativeElement.focus).toHaveBeenCalled(); + expect(component.searchOrder.nativeElement.selectionStart).toEqual( + validSearchOrderID.length - 6 + ); + expect(component.searchOrder.nativeElement.selectionEnd).toEqual( + validSearchOrderID.length - 6 + ); + }); + + it('should focus search text and set cursor at the begining of text', () => { + const event = { + code: 'Home', + ctrlKey: false, + stopPropagation: () => {}, + preventDefault: () => {}, + }; + spyOn(component.searchOrder.nativeElement, 'focus'); + + component.searchOrder.nativeElement.selectionStart = + validSearchOrderID.length - 5; + component.searchOrder.nativeElement.selectionEnd = + validSearchOrderID.length - 5; + + component.focusFirstItem(new UIEvent('keydown.arrowdown')); + component.focusOrderSearchInputText(event as KeyboardEvent); + + expect(component.searchOrder.nativeElement.focus).toHaveBeenCalled(); + expect(component.searchOrder.nativeElement.selectionStart).toEqual(0); + expect(component.searchOrder.nativeElement.selectionEnd).toEqual(0); + }); + + it('should close the order search result list when keydown escape', () => { + const event = { + code: 'Escape', + ctrlKey: false, + stopPropagation: () => {}, + preventDefault: () => {}, + }; + spyOn(component.searchOrder.nativeElement, 'focus'); + spyOn(asmService, 'customerSearchReset').and.stub(); + + component.focusFirstItem(new UIEvent('keydown.arrowdown')); + component.closeOrderSearchResults(event as KeyboardEvent); + + expect(component.searchOrder.nativeElement.focus).toHaveBeenCalled(); + + expect(asmService.customerSearchReset).toHaveBeenCalled(); + }); + + it('should close the result list when keydown escape', () => { + const event = { + code: 'Escape', + ctrlKey: false, + stopPropagation: () => {}, + preventDefault: () => {}, + }; + spyOn(component.searchTerm.nativeElement, 'focus'); + spyOn(asmService, 'customerSearchReset').and.stub(); + + component.focusFirstItem(new UIEvent('keydown.arrowdown')); + component.closeResults(event as KeyboardEvent); + + expect(component.searchTerm.nativeElement.focus).toHaveBeenCalled(); + + expect(asmService.customerSearchReset).toHaveBeenCalled(); + }); + + it('should focus search text and set cursor at the end of text', () => { + const event = { + code: 'End', + ctrlKey: false, + stopPropagation: () => {}, + preventDefault: () => {}, + }; + spyOn(component.searchOrder.nativeElement, 'focus'); + + component.searchOrder.nativeElement.selectionStart = + validSearchOrderID.length - 5; + component.searchOrder.nativeElement.selectionEnd = + validSearchOrderID.length - 5; + + component.focusFirstItem(new UIEvent('keydown.arrowdown')); + component.focusOrderSearchInputText(event as KeyboardEvent); + + expect(component.searchOrder.nativeElement.focus).toHaveBeenCalled(); + expect(component.searchOrder.nativeElement.selectionStart).toEqual( + validSearchOrderID.length + ); + expect(component.searchOrder.nativeElement.selectionEnd).toEqual( + validSearchOrderID.length + ); + }); + + it('should be able to open dialog', () => { + spyOn(launchDialogService, 'openDialogAndSubscribe'); + component.createCustomer(); + expect(launchDialogService.openDialogAndSubscribe).toHaveBeenCalledWith( + LAUNCH_CALLER.ASM_CREATE_CUSTOMER_FORM, + component.createCustomerLink + ); + }); + }); }); diff --git a/feature-libs/asm/components/customer-selection/customer-selection.component.ts b/feature-libs/asm/components/customer-selection/customer-selection.component.ts index 3855bae7391..96f2f5b656c 100644 --- a/feature-libs/asm/components/customer-selection/customer-selection.component.ts +++ b/feature-libs/asm/components/customer-selection/customer-selection.component.ts @@ -14,6 +14,7 @@ import { QueryList, ViewChild, ViewChildren, + inject, } from '@angular/core'; import { UntypedFormBuilder, @@ -21,9 +22,13 @@ import { Validators, } from '@angular/forms'; import { AsmService } from '@spartacus/asm/core'; -import { AsmConfig, CustomerSearchPage } from '@spartacus/asm/root'; +import { + AsmConfig, + AsmDeepLinkParameters, + CustomerSearchPage, +} from '@spartacus/asm/root'; -import { User } from '@spartacus/core'; +import { FeatureConfigService, User, useFeatureStyles } from '@spartacus/core'; import { DirectionMode, DirectionService, @@ -46,32 +51,64 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy { searchResultsLoading$: Observable; searchResults: Observable; selectedCustomer: User | undefined; + searchByCustomer: boolean = false; + searchByOrder: boolean = false; + isLoading: boolean = false; + + activeFocusedButtonIndex = -1; + + protected featureConfig = inject(FeatureConfigService); + isShowSearchingCustomerByOrderInASM = this.featureConfig.isEnabled( + 'showSearchingCustomerByOrderInASM' + ); @Output() - submitEvent = new EventEmitter<{ customerId?: string }>(); + submitEvent = new EventEmitter<{ + customerId?: string; + parameters?: AsmDeepLinkParameters; + }>(); @ViewChild('resultList') resultList: ElementRef; @ViewChild('searchTerm') searchTerm: ElementRef; + @ViewChild('searchOrder') searchOrder: ElementRef; @ViewChild('createCustomerLink') createCustomerLink: ElementRef; @ViewChildren('searchResultItem') searchResultItems: QueryList< ElementRef >; - activeFocusedButtonIndex = -1; - constructor( protected fb: UntypedFormBuilder, protected asmService: AsmService, protected config: AsmConfig, protected directionService: DirectionService, protected launchDialogService: LaunchDialogService - ) {} + ) { + useFeatureStyles('showSearchingCustomerByOrderInASM'); + } ngOnInit(): void { - this.customerSelectionForm = this.fb.group({ - searchTerm: ['', Validators.required], - }); + if (this.isShowSearchingCustomerByOrderInASM) { + this.customerSelectionForm = this.fb.group({ + searchTerm: '', + searchOrder: '', + }); + + this.subscription.add( + this.customerSelectionForm.controls.searchOrder.valueChanges + .pipe(debounceTime(300)) + .subscribe((searchTermValue) => { + this.searchByCustomer = false; + this.searchByOrder = true; + this.handleSearchByOrder(searchTermValue); + }) + ); + } else { + this.customerSelectionForm = this.fb.group({ + searchTerm: ['', Validators.required], + }); + } + this.asmService.customerSearchReset(); this.searchResultsLoading$ = this.asmService.getCustomerSearchResultsLoading(); @@ -81,9 +118,21 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy { this.customerSelectionForm.controls.searchTerm.valueChanges .pipe(debounceTime(300)) .subscribe((searchTermValue) => { - this.handleSearchTerm(searchTermValue); + if (this.isShowSearchingCustomerByOrderInASM) { + this.searchByCustomer = true; + this.searchByOrder = false; + this.handleSearchByCustomer(searchTermValue); + } else { + this.handleSearchTerm(searchTermValue); + } }) ); + + this.subscription.add( + this.searchResultsLoading$.subscribe((loading) => { + this.isLoading = loading; + }) + ); } protected handleSearchTerm(searchTermValue: string) { @@ -106,22 +155,100 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy { } } + protected handleSearchByCustomer(searchTermValue: string) { + if (!!this.selectedCustomer) { + this.selectedCustomer = undefined; + } + if (!!this.customerSelectionForm.controls.searchOrder.value) { + this.customerSelectionForm.controls.searchOrder.setValue(undefined, { + emitEvent: false, + }); + } + + this.asmService.customerSearchReset(); + this.activeFocusedButtonIndex = -1; + if (searchTermValue.trim().length >= 3) { + this.asmService.customerSearch({ + query: searchTermValue, + pageSize: this.config.asm?.customerSearch?.maxResults, + }); + } + } + + protected handleSearchByOrder(searchOrderValue: string) { + if (!!this.selectedCustomer) { + this.selectedCustomer = undefined; + } + if (!!this.customerSelectionForm.controls.searchTerm.value) { + this.customerSelectionForm.controls.searchTerm.setValue(undefined, { + emitEvent: false, + }); + } + + this.asmService.customerSearchReset(); + this.activeFocusedButtonIndex = -1; + if (searchOrderValue.trim().length >= 3) { + this.asmService.customerSearch({ + orderId: searchOrderValue, + pageSize: this.config.asm?.customerSearch?.maxResults, + }); + } + } + + isNoResultMessageInfoVisible( + results: any, + searchFlag: boolean, + searchElement: HTMLInputElement + ): boolean { + const searchTermValid = searchElement.value.length >= 3; + const hasEntries = !!results.entries && results.entries.length > 0; + return !this.isLoading && searchTermValid && searchFlag && !hasEntries; + } + + isSearchResultsVisible(results: any, searchFlag: boolean): boolean { + return !!results.entries && searchFlag && results.entries.length > 0; + } + selectCustomerFromList(event: UIEvent, customer: User) { this.selectedCustomer = customer; - this.customerSelectionForm.controls.searchTerm.setValue( - this.selectedCustomer.name - ); + if (this.isShowSearchingCustomerByOrderInASM) { + this.customerSelectionForm.controls.searchTerm.setValue( + this.selectedCustomer.name, + { + emitEvent: false, + } + ); + } else { + this.customerSelectionForm.controls.searchTerm.setValue( + this.selectedCustomer.name + ); + } this.asmService.customerSearchReset(); - this.searchTerm.nativeElement.focus(); + if (!this.isShowSearchingCustomerByOrderInASM) { + this.searchTerm.nativeElement.focus(); + } event.preventDefault(); event.stopPropagation(); } onSubmit(): void { - if (this.customerSelectionForm.valid && !!this.selectedCustomer) { - this.submitEvent.emit({ customerId: this.selectedCustomer.customerId }); + if (this.isShowSearchingCustomerByOrderInASM) { + if (!!this.selectedCustomer) { + this.submitEvent.emit({ + customerId: this.selectedCustomer.customerId, + parameters: { + orderId: this.customerSelectionForm.controls.searchOrder.value, + }, + }); + } else { + this.customerSelectionForm.markAllAsTouched(); + } } else { - this.customerSelectionForm.markAllAsTouched(); + if (this.customerSelectionForm.valid && !!this.selectedCustomer) { + this.submitEvent.emit({ customerId: this.selectedCustomer.customerId }); + } else { + this.customerSelectionForm.markAllAsTouched(); + } } } @@ -145,6 +272,13 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy { event.stopPropagation(); } + closeOrderSearchResults(event: UIEvent) { + this.asmService.customerSearchReset(); + this.searchOrder.nativeElement.focus(); + event.preventDefault(); + event.stopPropagation(); + } + ngOnDestroy(): void { this.subscription.unsubscribe(); this.asmService.customerSearchReset(); @@ -171,6 +305,19 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy { this.searchTerm.nativeElement.selectionEnd = selectionStart; } } + + /** + * set mouse cursor to the end of search order text + * @param event keyboard event + */ + setOrderSearchSelectionEnd(event: UIEvent): void { + event.preventDefault(); + if (this.searchOrder.nativeElement.value?.length) { + const selectionStart = this.searchOrder.nativeElement.value.length; + this.searchOrder.nativeElement.selectionStart = selectionStart; + this.searchOrder.nativeElement.selectionEnd = selectionStart; + } + } /** * set focus on previous searh result item. If no previous item then go to end of item. * @param event keyboard event @@ -223,6 +370,35 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy { this.searchTerm.nativeElement.selectionEnd = selectionPos; } } + + /** + * set focus to order search input search text + * @param event keyboard event + */ + focusOrderSearchInputText(event: KeyboardEvent): void { + event.preventDefault(); + this.activeFocusedButtonIndex = -1; + this.searchOrder.nativeElement.focus(); + if (this.searchOrder.nativeElement.value?.length) { + let selectionPos = this.searchOrder.nativeElement.selectionEnd; + const searchTermLength = this.searchOrder.nativeElement.value.length; + + if (this.isBackNavigation(event)) { + selectionPos = selectionPos <= 0 ? 0 : selectionPos - 1; + } else if (this.isForwardsNavigation(event)) { + selectionPos = + selectionPos >= searchTermLength + ? searchTermLength + : selectionPos + 1; + } else if (event.code === 'Home') { + selectionPos = 0; + } else if (event.code === 'End') { + selectionPos = searchTermLength; + } + this.searchOrder.nativeElement.selectionStart = selectionPos; + this.searchOrder.nativeElement.selectionEnd = selectionPos; + } + } /** * set focus to selected item * @param {number} selectedIndex - current selected item index @@ -237,6 +413,12 @@ export class CustomerSelectionComponent implements OnInit, OnDestroy { LAUNCH_CALLER.ASM_CREATE_CUSTOMER_FORM, this.createCustomerLink ); + + if (this.isShowSearchingCustomerByOrderInASM) { + setTimeout(() => { + this.searchTerm.nativeElement.blur(); + }); + } } /** * Verifies whether the user navigates into a subgroup of the main group menu. diff --git a/feature-libs/asm/core/store/effects/customer.effect.ts b/feature-libs/asm/core/store/effects/customer.effect.ts index 6e974ebe90b..4595c500e63 100644 --- a/feature-libs/asm/core/store/effects/customer.effect.ts +++ b/feature-libs/asm/core/store/effects/customer.effect.ts @@ -26,13 +26,19 @@ export class CustomerEffects { map((customerSearchResults: CustomerSearchPage) => { return new AsmActions.CustomerSearchSuccess(customerSearchResults); }), - catchError((error) => - of( + catchError((error) => { + if ( + error.status === 400 && + error.details?.[0]?.message?.indexOf('Wrong orderId') > -1 + ) { + return of(new AsmActions.CustomerSearchSuccess({ entries: [] })); + } + return of( new AsmActions.CustomerSearchFail( normalizeHttpError(error, this.logger) ) - ) - ) + ); + }) ) ) ) @@ -62,5 +68,8 @@ export class CustomerEffects { ) ); - constructor(private actions$: Actions, private asmConnector: AsmConnector) {} + constructor( + private actions$: Actions, + private asmConnector: AsmConnector + ) {} } diff --git a/feature-libs/asm/customer-360/components/asm-customer-360-table/asm-customer-360-table.component.html b/feature-libs/asm/customer-360/components/asm-customer-360-table/asm-customer-360-table.component.html index 9c20b939bcf..b1bbdd00f17 100644 --- a/feature-libs/asm/customer-360/components/asm-customer-360-table/asm-customer-360-table.component.html +++ b/feature-libs/asm/customer-360/components/asm-customer-360-table/asm-customer-360-table.component.html @@ -49,7 +49,8 @@

[class.asc]="listSortOrder === SortOrder.ASC" [class.desc]="listSortOrder !== SortOrder.ASC" [attr.aria-sort]=" - sortDirection | cxArgs: column.property:sortProperty:listSortOrder + sortDirection + | cxArgs: column.property : sortProperty : listSortOrder " [ngClass]="{ 'text-start': diff --git a/feature-libs/asm/customer-360/components/sections/asm-customer-360-section-context-source.model.ts b/feature-libs/asm/customer-360/components/sections/asm-customer-360-section-context-source.model.ts index 5514f72119d..fb4c4bba5cc 100644 --- a/feature-libs/asm/customer-360/components/sections/asm-customer-360-section-context-source.model.ts +++ b/feature-libs/asm/customer-360/components/sections/asm-customer-360-section-context-source.model.ts @@ -15,7 +15,7 @@ import { AsmCustomer360SectionContext } from './asm-customer-360-section-context @Injectable() export class AsmCustomer360SectionContextSource< - Data + Data, > extends AsmCustomer360SectionContext { readonly customer$ = new ReplaySubject(1); diff --git a/feature-libs/asm/customer-360/styles/components/_asm-customer-360-promotion-listing.component.scss b/feature-libs/asm/customer-360/styles/components/_asm-customer-360-promotion-listing.component.scss index 76ecaa0d6a6..4c73378053f 100644 --- a/feature-libs/asm/customer-360/styles/components/_asm-customer-360-promotion-listing.component.scss +++ b/feature-libs/asm/customer-360/styles/components/_asm-customer-360-promotion-listing.component.scss @@ -88,7 +88,8 @@ position: relative; &-input { border: none; - box-shadow: 0 0 0 1px rgba(85, 107, 130, 0.0625), + box-shadow: + 0 0 0 1px rgba(85, 107, 130, 0.0625), 0 1px 0 rgba(85, 107, 129, 1); height: 48px; width: 100%; @@ -100,7 +101,8 @@ color: #6c7079; } &:hover { - box-shadow: 0 0 0 1px rgba(104, 174, 255, 0.25), + box-shadow: + 0 0 0 1px rgba(104, 174, 255, 0.25), 0 1px 0 rgba(0, 100, 217, 1); & ~ .cx-asm-customer-360-promotion-listing-search-icon-reset { display: inline; diff --git a/feature-libs/asm/customer-360/styles/components/_asm-customer-360-table.component.scss b/feature-libs/asm/customer-360/styles/components/_asm-customer-360-table.component.scss index d1b6183e94b..9f0e2bd36a3 100644 --- a/feature-libs/asm/customer-360/styles/components/_asm-customer-360-table.component.scss +++ b/feature-libs/asm/customer-360/styles/components/_asm-customer-360-table.component.scss @@ -98,12 +98,17 @@ cursor: pointer; user-select: none; + button { + text-align: start; + } + &:hover, &.active { color: $asmLinkColor; } &.active { + display: inline-block; &.desc::after, &.asc::after { content: ''; diff --git a/feature-libs/asm/occ/adapters/occ-asm.adapter.ts b/feature-libs/asm/occ/adapters/occ-asm.adapter.ts index ac10ab41bb9..28ddb5f1c7e 100644 --- a/feature-libs/asm/occ/adapters/occ-asm.adapter.ts +++ b/feature-libs/asm/occ/adapters/occ-asm.adapter.ts @@ -102,6 +102,9 @@ export class OccAsmAdapter implements AsmAdapter { if (options.query !== undefined) { params = params.set('query', options.query); } + if (options.orderId !== undefined) { + params = params.set('orderId', options.orderId); + } if (options.pageSize !== undefined) { params = params.set('pageSize', options.pageSize.toString()); diff --git a/feature-libs/asm/package.json b/feature-libs/asm/package.json index 00bd1c5c75e..07aba084cbd 100644 --- a/feature-libs/asm/package.json +++ b/feature-libs/asm/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/asm", - "version": "2211.24.0", + "version": "2211.25.1", "description": "ASM feature library for Spartacus", "keywords": [ "spartacus", @@ -32,14 +32,14 @@ "@ng-select/ng-select": "^12.0.4", "@ngrx/effects": "^17.0.1", "@ngrx/store": "^17.0.1", - "@spartacus/cart": "2211.24.0", - "@spartacus/core": "2211.24.0", - "@spartacus/order": "2211.24.0", - "@spartacus/schematics": "2211.24.0", - "@spartacus/storefinder": "2211.24.0", - "@spartacus/storefront": "2211.24.0", - "@spartacus/styles": "2211.24.0", - "@spartacus/user": "2211.24.0", + "@spartacus/cart": "2211.25.1", + "@spartacus/core": "2211.25.1", + "@spartacus/order": "2211.25.1", + "@spartacus/schematics": "2211.25.1", + "@spartacus/storefinder": "2211.25.1", + "@spartacus/storefront": "2211.25.1", + "@spartacus/styles": "2211.25.1", + "@spartacus/user": "2211.25.1", "rxjs": "^7.8.0" }, "publishConfig": { diff --git a/feature-libs/asm/root/config/default-asm-config.ts b/feature-libs/asm/root/config/default-asm-config.ts index 298c3fccf14..3d729b58a67 100644 --- a/feature-libs/asm/root/config/default-asm-config.ts +++ b/feature-libs/asm/root/config/default-asm-config.ts @@ -49,7 +49,8 @@ export const defaultAsmConfig: AsmConfig = { headerLocalizationKey: 'asm.customerList.tableHeader.activeCart', icon: { symbol: ICON_TYPE.CART, - captionLocalizationKey: 'asm.customerList.tableHeader.activeCart', + captionLocalizationKey: + 'asm.customerList.tableHeader.viewActiveCart', }, actionType: CustomerListColumnActionType.ACTIVE_CART, }, @@ -57,7 +58,7 @@ export const defaultAsmConfig: AsmConfig = { headerLocalizationKey: 'asm.customerList.tableHeader.orders', icon: { symbol: ICON_TYPE.C360_INVOICE, - captionLocalizationKey: 'asm.customerList.tableHeader.orders', + captionLocalizationKey: 'asm.customerList.tableHeader.viewOrders', }, actionType: CustomerListColumnActionType.ORDER_HISTORY, }, @@ -65,7 +66,8 @@ export const defaultAsmConfig: AsmConfig = { headerLocalizationKey: 'asm.customerList.tableHeader.customer360', icon: { symbol: ICON_TYPE.C360_CIRCLE_USER, - captionLocalizationKey: 'asm.customerList.tableHeader.customer360', + captionLocalizationKey: + 'asm.customerList.tableHeader.viewCustomer360', }, actionType: CustomerListColumnActionType.CUSTOMER_360, }, diff --git a/feature-libs/asm/root/model/asm.models.ts b/feature-libs/asm/root/model/asm.models.ts index 242684b02ff..e6173a675ce 100644 --- a/feature-libs/asm/root/model/asm.models.ts +++ b/feature-libs/asm/root/model/asm.models.ts @@ -14,6 +14,7 @@ export interface CustomerSearchPage { export interface CustomerSearchOptions { query?: string; + orderId?: string; pageSize?: number; customerListId?: string; currentPage?: number; diff --git a/feature-libs/asm/schematics/add-asm/__snapshots__/index_spec.ts.snap b/feature-libs/asm/schematics/add-asm/__snapshots__/index_spec.ts.snap index e75366fb2ca..f4183a03407 100644 --- a/feature-libs/asm/schematics/add-asm/__snapshots__/index_spec.ts.snap +++ b/feature-libs/asm/schematics/add-asm/__snapshots__/index_spec.ts.snap @@ -27,7 +27,7 @@ export class AsmFeatureModule { } exports[`Spartacus Asm schematics: ng-add Asm feature general setup should add the feature using the lazy loading syntax 1`] = ` "import { NgModule } from '@angular/core'; import { asmTranslationChunksConfig, asmTranslations } from "@spartacus/asm/assets"; -import { AsmRootModule, ASM_FEATURE } from "@spartacus/asm/root"; +import { ASM_FEATURE, AsmRootModule } from "@spartacus/asm/root"; import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core"; @NgModule({ diff --git a/feature-libs/asm/styles/components/_asm-bind-cart-dialog.component.scss b/feature-libs/asm/styles/components/_asm-bind-cart-dialog.component.scss index 64a33b3442a..174275cfd4c 100644 --- a/feature-libs/asm/styles/components/_asm-bind-cart-dialog.component.scss +++ b/feature-libs/asm/styles/components/_asm-bind-cart-dialog.component.scss @@ -38,7 +38,9 @@ $sapFiori_Button_Emphasized_Active_BorderColor: #0070f2; border-width: 0; display: flex; - box-shadow: 0px 0px 4px rgba(85, 107, 130, 0.16), inset 0px -1px 0px #d9d9d9; + box-shadow: + 0px 0px 4px rgba(85, 107, 130, 0.16), + inset 0px -1px 0px #d9d9d9; .title { font-size: 1rem; diff --git a/feature-libs/asm/styles/components/_asm-main-ui.component.scss b/feature-libs/asm/styles/components/_asm-main-ui.component.scss index 435745d70d6..bd841770cfa 100644 --- a/feature-libs/asm/styles/components/_asm-main-ui.component.scss +++ b/feature-libs/asm/styles/components/_asm-main-ui.component.scss @@ -136,7 +136,8 @@ color: inherit; background-color: #ffffff; - box-shadow: 2px 2px rgba(85, 107, 130, 0.1), + box-shadow: + 2px 2px rgba(85, 107, 130, 0.1), inset 0px -1px 0px rgba(85, 107, 130, 0.2); } diff --git a/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss b/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss index 9dfa1e2ab98..e05205e3fe4 100644 --- a/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss +++ b/feature-libs/asm/styles/components/_asm-save-cart-dialog.component.scss @@ -101,7 +101,9 @@ $sapFiori_Button_Emphasized_Active_BorderColor: #0070f2; border-width: 0; display: flex; - box-shadow: 0px 0px 4px rgba(85, 107, 130, 0.16), inset 0px -1px 0px #d9d9d9; + box-shadow: + 0px 0px 4px rgba(85, 107, 130, 0.16), + inset 0px -1px 0px #d9d9d9; .title { font-size: 1rem; diff --git a/feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss b/feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss index 843a0d58552..4d5d4e969dd 100644 --- a/feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss +++ b/feature-libs/asm/styles/components/_asm-switch-customer-dialog.component.scss @@ -38,7 +38,9 @@ $sapFiori_Button_Emphasized_Active_BorderColor: #0070f2; border-width: 0; display: flex; - box-shadow: 0px 0px 4px rgba(85, 107, 130, 0.16), inset 0px -1px 0px #d9d9d9; + box-shadow: + 0px 0px 4px rgba(85, 107, 130, 0.16), + inset 0px -1px 0px #d9d9d9; .title { font-family: '72'; diff --git a/feature-libs/asm/styles/components/_customer-list.component.scss b/feature-libs/asm/styles/components/_customer-list.component.scss index 7ac91c6954b..2529a27be00 100644 --- a/feature-libs/asm/styles/components/_customer-list.component.scss +++ b/feature-libs/asm/styles/components/_customer-list.component.scss @@ -220,6 +220,9 @@ $sapFioriContent_LabelColor: #6a6d70; .cx-cart { padding-inline-end: 18px; } + .cx-action-disable { + color: var(--cx-color-dark); + } } .cx-action-color { diff --git a/feature-libs/asm/styles/components/_customer-selection.component.scss b/feature-libs/asm/styles/components/_customer-selection.component.scss index 9fec3fb278f..32c3a4ce8fc 100644 --- a/feature-libs/asm/styles/components/_customer-selection.component.scss +++ b/feature-libs/asm/styles/components/_customer-selection.component.scss @@ -1,6 +1,5 @@ %cx-customer-selection { position: relative; - form { display: flex; width: 100%; @@ -79,19 +78,20 @@ } .asm-results { - border: solid 1px #89919a; position: absolute; + border: solid 1px #89919a; line-height: 1.5rem; - left: 2rem; z-index: 11; - box-shadow: 0 5px 20px 0 #d9d9d9, 0 2px 8px 0 #ededed; + box-shadow: + 0 5px 20px 0 #d9d9d9, + 0 2px 8px 0 #ededed; background-color: #fff; border-radius: 4px; max-width: 50vw; max-height: 70vh; overflow-y: auto; top: 3.3rem; - width: 33%; + width: 25rem; @media (max-width: 1200px) { max-width: calc(100% - 4rem); @@ -159,4 +159,147 @@ } } } + + @include forFeature('showSearchingCustomerByOrderInASM') { + form { + display: flex; + width: 100%; + + @media (max-width: 41rem) { + flex-direction: column; + } + .searchLabel { + margin-top: 0.5rem; + margin-inline-end: 1rem; + } + + label { + margin-inline-end: 2rem; + min-width: auto; + + .selection-message-info { + z-index: 11; + width: 25rem; + position: absolute; + } + + @media (min-width: 41rem) { + margin-bottom: 0; + min-width: 25rem; + } + + .linkStyleLabel { + @include type('7'); + font-weight: var(--cx-font-weight-bold); + margin-inline-start: 0.2rem; + color: var(--cx-color-primary); + } + + .asm-results { + position: absolute; + top: auto; + border: solid 0.0714rem #89919a; + line-height: 1.5rem; + z-index: 11; + box-shadow: + 0 5px 20px 0 #d9d9d9, + 0 2px 8px 0 #ededed; + background-color: #fff; + border-radius: 0.25rem; + max-width: 50vw; + max-height: 70vh; + overflow-y: auto; + width: 25rem; + + @media (max-width: 1200px) { + max-width: calc(100% - 4rem); + } + + cx-dot-spinner { + height: 3rem; + color: #0a6ed1; + } + + button { + margin: 0; + appearance: none; + outline: 0; + border: 0; + text-decoration: none; + cursor: pointer; + user-select: none; + vertical-align: middle; + white-space: nowrap; + background-color: transparent; + color: #51555a; + display: flex; + flex-direction: column; + padding: 0.5rem; + width: 100%; + align-items: flex-start; + justify-content: flex-start; + + &.active { + color: #32363a; + background-color: #d3d6db; + } + + &:hover { + color: #32363a; + background-color: #d3d6db; + } + + .result-id { + width: 100%; + display: flex; + justify-content: space-between; + } + + span { + margin-inline-end: 1rem; + margin-top: 0; + margin-bottom: 0; + margin-inline-start: 0; + word-break: break-all; + white-space: normal; + text-align: start; + + @media (min-width: 41rem) { + &:last-of-type { + margin: 0; + } + } + } + } + } + + input { + width: 100%; + &:focus { + outline: none; + } + &.ng-invalid { + &.ng-dirty, + &.ng-touched { + border-color: initial; + } + } + } + } + + button[type='submit'] { + background-color: var(--cx-color-success-accent); + opacity: 0.4; + border: 0.0714rem solid var(--cx-color-success-accent); + border-radius: 0.5rem; + color: var(--cx-color-success); + font-weight: var(--cx-font-weight-bold); + transition: opacity 0.3s; + + &.active { + opacity: 1; + } + } + } + } } diff --git a/feature-libs/asm/tsconfig.schematics.json b/feature-libs/asm/tsconfig.schematics.json index f430d173f73..498b79fe02b 100644 --- a/feature-libs/asm/tsconfig.schematics.json +++ b/feature-libs/asm/tsconfig.schematics.json @@ -546,6 +546,7 @@ "../../integration-libs/cdp/customer-ticketing/public_api" ], "@spartacus/cdp": ["../../integration-libs/cdp/public_api"], + "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"], "@spartacus/cds": ["../../integration-libs/cds/public_api"], "@spartacus/digital-payments/assets": [ "../../integration-libs/digital-payments/assets/public_api" diff --git a/feature-libs/cart/base/components/abstract-order-context/abstract-order-context.directive.spec.ts b/feature-libs/cart/base/components/abstract-order-context/abstract-order-context.directive.spec.ts index da823eb346f..a06d5161d24 100644 --- a/feature-libs/cart/base/components/abstract-order-context/abstract-order-context.directive.spec.ts +++ b/feature-libs/cart/base/components/abstract-order-context/abstract-order-context.directive.spec.ts @@ -12,9 +12,9 @@ let emissionCounterKey = 0; @Component({ selector: 'cx-test-cmp', - template: ` - -`, + template: ` + `, }) class TestComponent { abstractOrderKey: AbstractOrderKeyInput = { @@ -43,19 +43,17 @@ describe('AbstractOrderContextDirective', () => { let fixture: ComponentFixture; let testOuterComponent: TestComponent; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [TestComponent, TestInnerComponent], - imports: [AbstractOrderContextModule], - providers: [], - }).compileComponents(); - emissionCounterKey = 0; - fixture = TestBed.createComponent(TestComponent); - testOuterComponent = fixture.componentInstance; - fixture.detectChanges(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [TestComponent, TestInnerComponent], + imports: [AbstractOrderContextModule], + providers: [], + }).compileComponents(); + emissionCounterKey = 0; + fixture = TestBed.createComponent(TestComponent); + testOuterComponent = fixture.componentInstance; + fixture.detectChanges(); + })); it('should propagate abstract order ID to inner component', () => { expect(fixture.nativeElement.innerHTML).toContain(abstractOrderId); diff --git a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html index d97b00668e6..b6eb0f10828 100644 --- a/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html +++ b/feature-libs/cart/base/components/added-to-cart-dialog/added-to-cart-dialog.component.html @@ -46,11 +46,7 @@

{ 'removeVoucher', ]); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - AppliedCouponsComponent, - MockCxIconComponent, - MockedCartCouponComponent, - ], - providers: [ - { provide: CartVoucherFacade, useValue: mockCartVoucherService }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '5.1' }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + AppliedCouponsComponent, + MockCxIconComponent, + MockedCartCouponComponent, + ], + providers: [ + { provide: CartVoucherFacade, useValue: mockCartVoucherService }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '5.1' }, }, - ], - }).compileComponents(); - }) - ); + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(MockedCartCouponComponent); diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html index 01573b6ed35..26d78748b42 100644 --- a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html +++ b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.html @@ -1,40 +1,96 @@
-

- {{ 'formLegend.required' | cxTranslate }} -

+ +

+ {{ 'formLegend.required' | cxTranslate }} +

+ +
- - + + + - {{ 'voucher.apply' | cxTranslate }} - - + + + + + + + +
diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts index 80d9f3cab6a..d8030b4275b 100644 --- a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts +++ b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.spec.ts @@ -15,6 +15,7 @@ import { } from '@spartacus/core'; import { FormErrorsModule } from '@spartacus/storefront'; import { cold, getTestScheduler, hot } from 'jasmine-marbles'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { EMPTY, of } from 'rxjs'; import { CartCouponComponent } from './cart-coupon.component'; @@ -69,22 +70,24 @@ describe('CartCouponComponent', () => { const appliedVouchers: Voucher[] = [{ code: 'CustomerCoupon1' }]; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, ReactiveFormsModule, FormErrorsModule], - declarations: [CartCouponComponent, MockAppliedCouponsComponent], - providers: [ - { provide: ActiveCartFacade, useValue: mockActiveCartService }, - { provide: CartVoucherFacade, useValue: mockCartVoucherService }, - { - provide: CustomerCouponService, - useValue: mockCustomerCouponService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, ReactiveFormsModule, FormErrorsModule], + declarations: [ + CartCouponComponent, + MockAppliedCouponsComponent, + MockFeatureDirective, + ], + providers: [ + { provide: ActiveCartFacade, useValue: mockActiveCartService }, + { provide: CartVoucherFacade, useValue: mockCartVoucherService }, + { + provide: CustomerCouponService, + useValue: mockCustomerCouponService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartCouponComponent); diff --git a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts index bcddf60004b..7090a6550f8 100644 --- a/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts +++ b/feature-libs/cart/base/components/cart-coupon/cart-coupon.component.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { Component, OnDestroy, OnInit, Optional, inject } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, @@ -19,8 +19,9 @@ import { CustomerCoupon, CustomerCouponSearchResult, CustomerCouponService, + FeatureConfigService, } from '@spartacus/core'; -import { combineLatest, Observable, Subscription } from 'rxjs'; +import { Observable, Subscription, combineLatest } from 'rxjs'; import { map, tap } from 'rxjs/operators'; @Component({ @@ -41,6 +42,10 @@ export class CartCouponComponent implements OnInit, OnDestroy { couponBoxIsActive = false; + @Optional() protected featureConfigService = inject(FeatureConfigService, { + optional: true, + }); + constructor( protected cartVoucherService: CartVoucherFacade, protected formBuilder: UntypedFormBuilder, @@ -66,7 +71,7 @@ export class CartCouponComponent implements OnInit, OnDestroy { ([cart, activeCardId, customerCoupons]: [ Cart, string, - CustomerCouponSearchResult + CustomerCouponSearchResult, ]) => { this.cartId = activeCardId; this.getApplicableCustomerCoupons( @@ -84,8 +89,16 @@ export class CartCouponComponent implements OnInit, OnDestroy { this.cartVoucherService.resetAddVoucherProcessingState(); + // TODO: (CXSPA-7479) Remove feature flags next major + const shouldHaveRequiredValidator = !this.featureConfigService?.isEnabled( + 'a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields' + ); + this.couponForm = this.formBuilder.group({ - couponCode: ['', [Validators.required]], + couponCode: [ + '', + shouldHaveRequiredValidator ? [Validators.required] : [], + ], }); // TODO(#7241): Replace process subscriptions with event listeners and drop process for ADD_VOUCHER diff --git a/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts b/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts index 6a333f52337..e836e2abe5f 100644 --- a/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts +++ b/feature-libs/cart/base/components/cart-details/cart-details.component.spec.ts @@ -94,35 +94,33 @@ describe('CartDetailsComponent', () => { const mockRoutingService = jasmine.createSpyObj('RoutingService', ['go']); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, PromotionsModule, I18nTestingModule], - declarations: [ - CartDetailsComponent, - MockCartItemListComponent, - MockCartCouponComponent, - MockCartValidationWarningsComponent, - ], - providers: [ - { provide: SelectiveCartFacade, useValue: mockSelectiveCartFacade }, - { provide: AuthService, useValue: mockAuthService }, - { provide: RoutingService, useValue: mockRoutingService }, - { - provide: ActiveCartFacade, - useClass: MockActiveCartService, - }, - { - provide: CartConfigService, - useValue: mockCartConfig, - }, - ], - }).compileComponents(); - - mockCartConfig.isSelectiveCartEnabled.and.returnValue(true); - mockSelectiveCartFacade.isStable.and.returnValue(of(true)); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, PromotionsModule, I18nTestingModule], + declarations: [ + CartDetailsComponent, + MockCartItemListComponent, + MockCartCouponComponent, + MockCartValidationWarningsComponent, + ], + providers: [ + { provide: SelectiveCartFacade, useValue: mockSelectiveCartFacade }, + { provide: AuthService, useValue: mockAuthService }, + { provide: RoutingService, useValue: mockRoutingService }, + { + provide: ActiveCartFacade, + useClass: MockActiveCartService, + }, + { + provide: CartConfigService, + useValue: mockCartConfig, + }, + ], + }).compileComponents(); + + mockCartConfig.isSelectiveCartEnabled.and.returnValue(true); + mockSelectiveCartFacade.isStable.and.returnValue(of(true)); + })); beforeEach(() => { fixture = TestBed.createComponent(CartDetailsComponent); diff --git a/feature-libs/cart/base/components/cart-page-layout-handler.ts b/feature-libs/cart/base/components/cart-page-layout-handler.ts index def400e4e8e..ac8befe7125 100644 --- a/feature-libs/cart/base/components/cart-page-layout-handler.ts +++ b/feature-libs/cart/base/components/cart-page-layout-handler.ts @@ -47,13 +47,13 @@ export class CartPageLayoutHandler implements PageLayoutHandler { 'EmptyCartMiddleContent', ]) : cart.totalItems - ? exclude(slots, ['EmptyCartMiddleContent']) - : selectiveCart?.totalItems - ? exclude(slots, [ - 'EmptyCartMiddleContent', - 'CenterRightContentSlot', - ]) - : exclude(slots, ['TopContent', 'CenterRightContentSlot']); + ? exclude(slots, ['EmptyCartMiddleContent']) + : selectiveCart?.totalItems + ? exclude(slots, [ + 'EmptyCartMiddleContent', + 'CenterRightContentSlot', + ]) + : exclude(slots, ['TopContent', 'CenterRightContentSlot']); }) ); } diff --git a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts index e0b724c6aed..1e05a36093e 100644 --- a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts +++ b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.spec.ts @@ -25,24 +25,22 @@ describe('CartProceedToCheckoutComponent', () => { let component: CartProceedToCheckoutComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, ProgressButtonModule], - declarations: [CartProceedToCheckoutComponent, MockUrlPipe], - providers: [ - { - provide: Router, - useClass: MockRouter, - }, - { - provide: ChangeDetectorRef, - useValue: { markForCheck: createSpy('markForCheck') }, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, ProgressButtonModule], + declarations: [CartProceedToCheckoutComponent, MockUrlPipe], + providers: [ + { + provide: Router, + useClass: MockRouter, + }, + { + provide: ChangeDetectorRef, + useValue: { markForCheck: createSpy('markForCheck') }, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartProceedToCheckoutComponent); diff --git a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts index e11f834296b..c43c4c5dc3c 100644 --- a/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts +++ b/feature-libs/cart/base/components/cart-proceed-to-checkout/cart-proceed-to-checkout.component.ts @@ -38,7 +38,10 @@ export class CartProceedToCheckoutComponent implements OnInit, OnDestroy { * @deprecated since 5.2 */ constructor(router: Router); - constructor(protected router: Router, protected cd?: ChangeDetectorRef) {} + constructor( + protected router: Router, + protected cd?: ChangeDetectorRef + ) {} ngOnInit(): void { this.subscription.add( diff --git a/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html b/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html index c0fcf92caeb..00a01a6a5f8 100644 --- a/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html +++ b/feature-libs/cart/base/components/cart-shared/cart-item-list-row/cart-item-list-row.component.html @@ -51,7 +51,7 @@
diff --git a/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.spec.ts b/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.spec.ts index 109604de842..1c262f61f0a 100644 --- a/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.spec.ts +++ b/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.spec.ts @@ -11,9 +11,13 @@ import { PromotionLocation, SelectiveCartFacade, } from '@spartacus/cart/base/root'; -import { I18nTestingModule, UserIdService } from '@spartacus/core'; +import { + FeatureConfigService, + I18nTestingModule, + UserIdService, +} from '@spartacus/core'; import { OutletContextData, PromotionsModule } from '@spartacus/storefront'; -import { Observable, of } from 'rxjs'; +import { Observable, Subject, of } from 'rxjs'; import { CartItemListComponent } from './cart-item-list.component'; class MockActiveCartService { @@ -107,6 +111,12 @@ const mockContext = { }; const context$ = of(mockContext); +class MockFeatureConfigService { + isEnabled() { + return true; + } +} + describe('CartItemListComponent', () => { let component: CartItemListComponent; let fixture: ComponentFixture; @@ -132,6 +142,7 @@ describe('CartItemListComponent', () => { { provide: SelectiveCartFacade, useValue: mockSelectiveCartService }, { provide: MultiCartFacade, useClass: MockMultiCartService }, { provide: UserIdService, useClass: MockUserIdService }, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, ], }); } @@ -397,6 +408,9 @@ describe('CartItemListComponent', () => { describe('Use outlet with outlet context data', () => { it('should be able to get inputs from outlet context data', () => { + const newContext = structuredClone(mockContext); + newContext.items = [mockItem0]; + const context$ = new Subject(); configureTestingModule().overrideProvider(OutletContextData, { useValue: { context$ }, }); @@ -406,18 +420,16 @@ describe('CartItemListComponent', () => { spyOn(component, '_setItems').and.callThrough(); const setLoading = spyOnProperty(component, 'setLoading', 'set'); component.ngOnInit(); - - expect(component.cartId).toEqual(mockContext.cartId); - expect(component.hasHeader).toEqual(mockContext.hasHeader); - expect(component['_setItems']).toHaveBeenCalledWith(mockContext.items, { - forceRerender: false, + context$.next(newContext); + expect(component.cartId).toEqual(newContext.cartId); + expect(component.hasHeader).toEqual(newContext.hasHeader); + expect(component['_setItems']).toHaveBeenCalledWith(newContext.items, { + forceRerender: true, }); - expect(component.options).toEqual(mockContext.options); - expect(component.promotionLocation).toEqual( - mockContext.promotionLocation - ); - expect(component.readonly).toEqual(mockContext.readonly); - expect(setLoading).toHaveBeenCalledWith(mockContext.cartIsLoading); + expect(component.options).toEqual(newContext.options); + expect(component.promotionLocation).toEqual(newContext.promotionLocation); + expect(component.readonly).toEqual(newContext.readonly); + expect(setLoading).toHaveBeenCalledWith(newContext.cartIsLoading); }); it('should mark view for check and force re-creation of item controls when outlet context emits with changed read-only flag', () => { @@ -443,5 +455,19 @@ describe('CartItemListComponent', () => { component.form.get(mockItem1.entryNumber.toString()) ); }); + + it('should not call _setItems when neither contextRequiresRerender nor isItemsChanged are true', () => { + configureTestingModule().overrideProvider(OutletContextData, { + useValue: { context$ }, + }); + TestBed.compileComponents(); + stubSeviceAndCreateComponent(); + + spyOn(component, '_setItems').and.callThrough(); + component.ngOnInit(); + + // context$ emits mockContext which has the same items that were set in stubSeviceAndCreateComponent + expect(component['_setItems']).not.toHaveBeenCalled(); + }); }); }); diff --git a/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.ts b/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.ts index cfde3524481..521daea91fb 100644 --- a/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.ts +++ b/feature-libs/cart/base/components/cart-shared/cart-item-list/cart-item-list.component.ts @@ -12,6 +12,7 @@ import { OnDestroy, OnInit, Optional, + inject, } from '@angular/core'; import { UntypedFormControl, UntypedFormGroup } from '@angular/forms'; import { @@ -24,7 +25,7 @@ import { SelectiveCartFacade, CartOutlets, } from '@spartacus/cart/base/root'; -import { UserIdService } from '@spartacus/core'; +import { FeatureConfigService, UserIdService } from '@spartacus/core'; import { OutletContextData } from '@spartacus/storefront'; import { Observable, Subscription } from 'rxjs'; import { map, startWith, tap } from 'rxjs/operators'; @@ -84,6 +85,7 @@ export class CartItemListComponent implements OnInit, OnDestroy { } } readonly CartOutlets = CartOutlets; + private featureConfigService = inject(FeatureConfigService); constructor( protected activeCartService: ActiveCartFacade, protected selectiveCartService: SelectiveCartFacade, @@ -133,15 +135,35 @@ export class CartItemListComponent implements OnInit, OnDestroy { if (context.cartIsLoading !== undefined) { this.setLoading = context.cartIsLoading; } - if (context.items !== undefined) { - this.cd.markForCheck(); - this._setItems(context.items, { - forceRerender: contextRequiresRerender, - }); - } + this.updateItemsOnContextChange(context, contextRequiresRerender); }); } + protected updateItemsOnContextChange( + context: ItemListContext, + contextRequiresRerender: boolean + ) { + const preventRedundantRecreationEnabled = + this.featureConfigService.isEnabled( + 'a11yPreventCartItemsFormRedundantRecreation' + ); + if ( + context.items !== undefined && + (!preventRedundantRecreationEnabled || + contextRequiresRerender || + this.isItemsChanged(context.items)) + ) { + this.cd.markForCheck(); + this._setItems(context.items, { + forceRerender: contextRequiresRerender, + }); + } + } + + protected isItemsChanged(newItems: OrderEntry[]): boolean { + return JSON.stringify(this.items) !== JSON.stringify(newItems); + } + /** * Resolves items passed to component input and updates 'items' field */ diff --git a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts index 6f19a22cc8f..0112b975547 100644 --- a/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts +++ b/feature-libs/cart/base/components/cart-shared/cart-item/cart-item.component.spec.ts @@ -113,34 +113,32 @@ describe('CartItemComponent', () => { 'isLevel', ]); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - RouterTestingModule, - ReactiveFormsModule, - I18nTestingModule, - OutletModule, - ], - declarations: [ - CartItemComponent, - MockMediaComponent, - MockItemCounterComponent, - MockPromotionsComponent, - MockUrlPipe, - MockFeatureLevelDirective, - MockOutletDirective, - MockCartItemValidationWarningComponent, - MockAtMessageDirective, - ], - providers: [ - { - provide: ControlContainer, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule, + ReactiveFormsModule, + I18nTestingModule, + OutletModule, + ], + declarations: [ + CartItemComponent, + MockMediaComponent, + MockItemCounterComponent, + MockPromotionsComponent, + MockUrlPipe, + MockFeatureLevelDirective, + MockOutletDirective, + MockCartItemValidationWarningComponent, + MockAtMessageDirective, + ], + providers: [ + { + provide: ControlContainer, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartItemComponent); diff --git a/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts b/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts index e079450d2cc..0d62fa2353d 100644 --- a/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts +++ b/feature-libs/cart/base/components/cart-shared/order-summary/order-summary.component.spec.ts @@ -30,21 +30,19 @@ describe('OrderSummary', () => { let component: OrderSummaryComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [CommonModule, PromotionsModule, I18nTestingModule], - declarations: [OrderSummaryComponent, MockAppliedCouponsComponent], - providers: [ - { provide: CartVoucherFacade, useValue: {} }, - { - provide: OutletContextData, - useValue: { context$ }, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [CommonModule, PromotionsModule, I18nTestingModule], + declarations: [OrderSummaryComponent, MockAppliedCouponsComponent], + providers: [ + { provide: CartVoucherFacade, useValue: {} }, + { + provide: OutletContextData, + useValue: { context$ }, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderSummaryComponent); diff --git a/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts b/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts index 8e51a5f8f28..71bdf9fb237 100644 --- a/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts +++ b/feature-libs/cart/base/components/cart-totals/cart-totals.component.spec.ts @@ -26,19 +26,17 @@ describe('CartTotalsComponent', () => { let component: CartTotalsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [CartTotalsComponent, MockOrderSummaryComponent], - providers: [ - { - provide: ActiveCartFacade, - useClass: MockActiveCartService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CartTotalsComponent, MockOrderSummaryComponent], + providers: [ + { + provide: ActiveCartFacade, + useClass: MockActiveCartService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CartTotalsComponent); diff --git a/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts b/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts index f156b251200..ed15bd77bd0 100644 --- a/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts +++ b/feature-libs/cart/base/components/mini-cart/mini-cart.component.spec.ts @@ -37,20 +37,18 @@ describe('MiniCartComponent', () => { let miniCartComponent: MiniCartComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [MiniCartComponent, MockUrlPipe, MockCxIconComponent], - providers: [ - { - provide: MiniCartComponentService, - useValue: mockMiniCartComponentService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [MiniCartComponent, MockUrlPipe, MockCxIconComponent], + providers: [ + { + provide: MiniCartComponentService, + useValue: mockMiniCartComponentService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(MiniCartComponent); diff --git a/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts b/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts index 0912eaddcf6..dfd43d486e3 100644 --- a/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts +++ b/feature-libs/cart/base/components/save-for-later/save-for-later.component.spec.ts @@ -46,19 +46,17 @@ describe('SaveForLaterComponent', () => { 'getComponentData', ]); - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [SaveForLaterComponent, MockCartItemListComponent], - imports: [I18nTestingModule], - providers: [ - { provide: CmsService, useValue: mockCmsService }, - { provide: ActiveCartFacade, useValue: mockActiveCartService }, - { provide: SelectiveCartFacade, useValue: mockSelectiveCartService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [SaveForLaterComponent, MockCartItemListComponent], + imports: [I18nTestingModule], + providers: [ + { provide: CmsService, useValue: mockCmsService }, + { provide: ActiveCartFacade, useValue: mockActiveCartService }, + { provide: SelectiveCartFacade, useValue: mockSelectiveCartService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(SaveForLaterComponent); diff --git a/feature-libs/cart/base/occ/adapters/default-occ-cart-config.ts b/feature-libs/cart/base/occ/adapters/default-occ-cart-config.ts deleted file mode 100644 index 2f3273b74c4..00000000000 --- a/feature-libs/cart/base/occ/adapters/default-occ-cart-config.ts +++ /dev/null @@ -1,32 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2024 SAP Spartacus team - * - * SPDX-License-Identifier: Apache-2.0 - */ - -import { OccConfig } from '@spartacus/core'; - -export const defaultOccCartConfig: OccConfig = { - backend: { - occ: { - endpoints: { - /* eslint-disable max-len */ - carts: - 'users/${userId}/carts?fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description)', - cart: 'users/${userId}/carts/${cartId}?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description', - createCart: - 'users/${userId}/carts?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user', - addEntries: 'users/${userId}/carts/${cartId}/entries', - updateEntries: 'users/${userId}/carts/${cartId}/entries/${entryNumber}', - removeEntries: 'users/${userId}/carts/${cartId}/entries/${entryNumber}', - addEmail: 'users/${userId}/carts/${cartId}/email', - deleteCart: 'users/${userId}/carts/${cartId}', - cartVoucher: 'users/${userId}/carts/${cartId}/vouchers', - saveCart: - '/users/${userId}/carts/${cartId}/save?saveCartName=${saveCartName}&saveCartDescription=${saveCartDescription}', - validate: 'users/${userId}/carts/${cartId}/validate?fields=DEFAULT', - /* eslint-enable */ - }, - }, - }, -}; diff --git a/feature-libs/cart/base/occ/adapters/occ-cart.adapter.ts b/feature-libs/cart/base/occ/adapters/occ-cart.adapter.ts index 8f81a43015e..39c9a46cf25 100644 --- a/feature-libs/cart/base/occ/adapters/occ-cart.adapter.ts +++ b/feature-libs/cart/base/occ/adapters/occ-cart.adapter.ts @@ -5,19 +5,20 @@ */ import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http'; -import { Injectable } from '@angular/core'; +import { inject, Injectable } from '@angular/core'; import { CartAdapter } from '@spartacus/cart/base/core'; import { - CART_NORMALIZER, Cart, + CART_NORMALIZER, SaveCartResult, } from '@spartacus/cart/base/root'; import { ConverterService, + FeatureConfigService, InterceptorUtil, + Occ, OCC_CART_ID_CURRENT, OCC_USER_ID_ANONYMOUS, - Occ, OccEndpointsService, USE_CLIENT_TOKEN, } from '@spartacus/core'; @@ -26,6 +27,8 @@ import { map } from 'rxjs/operators'; @Injectable() export class OccCartAdapter implements CartAdapter { + private featureConfigService = inject(FeatureConfigService); + constructor( protected http: HttpClient, protected occEndpointsService: OccEndpointsService, @@ -113,7 +116,20 @@ export class OccCartAdapter implements CartAdapter { saveCartDescription, }, }); - return this.http.patch(endpoint, cartId).pipe( + + let httpParams: HttpParams = new HttpParams(); + + if ( + this.featureConfigService?.isEnabled( + 'occCartNameAndDescriptionInHttpRequestBody' + ) + ) { + httpParams = httpParams + .set('saveCartName', saveCartName) + .set('saveCartDescription', saveCartDescription); + } + + return this.http.patch(endpoint, httpParams).pipe( map((cartResponse) => (cartResponse as SaveCartResult).savedCartData), this.converterService.pipeable(CART_NORMALIZER) ); diff --git a/feature-libs/cart/base/occ/cart-base-occ.module.ts b/feature-libs/cart/base/occ/cart-base-occ.module.ts index ed29cfb7746..2bd35931405 100644 --- a/feature-libs/cart/base/occ/cart-base-occ.module.ts +++ b/feature-libs/cart/base/occ/cart-base-occ.module.ts @@ -16,19 +16,19 @@ import { CART_NORMALIZER, ORDER_ENTRY_PROMOTIONS_NORMALIZER, } from '@spartacus/cart/base/root'; -import { provideDefaultConfig } from '@spartacus/core'; +import { provideDefaultConfigFactory } from '@spartacus/core'; import { OccCartNormalizer } from './adapters/converters/occ-cart-normalizer'; import { OrderEntryPromotionsNormalizer } from './adapters/converters/order-entry-promotions-normalizer'; -import { defaultOccCartConfig } from './adapters/default-occ-cart-config'; import { OccCartEntryAdapter } from './adapters/occ-cart-entry.adapter'; import { OccCartValidationAdapter } from './adapters/occ-cart-validation.adapter'; import { OccCartVoucherAdapter } from './adapters/occ-cart-voucher.adapter'; import { OccCartAdapter } from './adapters/occ-cart.adapter'; +import { defaultOccCartConfigFactory } from './config/default-occ-cart-config-factory'; @NgModule({ imports: [CommonModule], providers: [ - provideDefaultConfig(defaultOccCartConfig), + provideDefaultConfigFactory(defaultOccCartConfigFactory), { provide: CartAdapter, useClass: OccCartAdapter, diff --git a/feature-libs/cart/base/occ/config/default-occ-cart-config-factory.ts b/feature-libs/cart/base/occ/config/default-occ-cart-config-factory.ts new file mode 100644 index 00000000000..9843ea64eea --- /dev/null +++ b/feature-libs/cart/base/occ/config/default-occ-cart-config-factory.ts @@ -0,0 +1,40 @@ +/* + * SPDX-FileCopyrightText: 2024 SAP Spartacus team + * + * SPDX-License-Identifier: Apache-2.0 + */ + +import { FeatureToggles, OccConfig } from '@spartacus/core'; +import { inject } from '@angular/core'; + +export function defaultOccCartConfigFactory(): OccConfig { + const featureToggles = inject(FeatureToggles); + + return { + backend: { + occ: { + endpoints: { + /* eslint-disable max-len */ + carts: + 'users/${userId}/carts?fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description)', + cart: 'users/${userId}/carts/${cartId}?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user,saveTime,name,description', + createCart: + 'users/${userId}/carts?fields=DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),user', + addEntries: 'users/${userId}/carts/${cartId}/entries', + updateEntries: + 'users/${userId}/carts/${cartId}/entries/${entryNumber}', + removeEntries: + 'users/${userId}/carts/${cartId}/entries/${entryNumber}', + addEmail: 'users/${userId}/carts/${cartId}/email', + deleteCart: 'users/${userId}/carts/${cartId}', + cartVoucher: 'users/${userId}/carts/${cartId}/vouchers', + saveCart: featureToggles.occCartNameAndDescriptionInHttpRequestBody + ? '/users/${userId}/carts/${cartId}/save' + : '/users/${userId}/carts/${cartId}/save?saveCartName=${saveCartName}&saveCartDescription=${saveCartDescription}', + validate: 'users/${userId}/carts/${cartId}/validate?fields=DEFAULT', + /* eslint-enable */ + }, + }, + }, + }; +} diff --git a/feature-libs/cart/base/styles/components/_item-counter.scss b/feature-libs/cart/base/styles/components/_item-counter.scss index 0c5c3af8c5f..2f5f680dbc6 100644 --- a/feature-libs/cart/base/styles/components/_item-counter.scss +++ b/feature-libs/cart/base/styles/components/_item-counter.scss @@ -85,6 +85,8 @@ font-size: var(--cx-font-size, 2rem); line-height: 0; color: var(--cx-color-text); + padding-inline-start: 0; + padding-inline-end: 0; &:focus { box-shadow: 0 0 0 0; } diff --git a/feature-libs/cart/package.json b/feature-libs/cart/package.json index fc119e21412..98ad4632713 100644 --- a/feature-libs/cart/package.json +++ b/feature-libs/cart/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/cart", - "version": "2211.24.0", + "version": "2211.25.1", "description": "", "keywords": [ "spartacus", @@ -37,11 +37,11 @@ "@ng-select/ng-select": "^12.0.4", "@ngrx/effects": "^17.0.1", "@ngrx/store": "^17.0.1", - "@spartacus/core": "2211.24.0", - "@spartacus/schematics": "2211.24.0", - "@spartacus/storefront": "2211.24.0", - "@spartacus/styles": "2211.24.0", - "@spartacus/user": "2211.24.0", + "@spartacus/core": "2211.25.1", + "@spartacus/schematics": "2211.25.1", + "@spartacus/storefront": "2211.25.1", + "@spartacus/styles": "2211.25.1", + "@spartacus/user": "2211.25.1", "bootstrap": "^4.6.2", "rxjs": "^7.8.0" }, diff --git a/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.html b/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.html index aace7f2b09e..6020991f360 100644 --- a/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.html +++ b/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.html @@ -8,57 +8,164 @@ - + + + + + + > + + - + + + + + + + + + + - - - + + + + + + + + + + + + + + + + - + + + diff --git a/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.spec.ts b/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.spec.ts index 8dfff8d3cd3..4fcd3559333 100644 --- a/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.spec.ts +++ b/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.spec.ts @@ -16,7 +16,8 @@ import { Translatable, } from '@spartacus/core'; import { FormErrorsModule } from '@spartacus/storefront'; -import { BehaviorSubject, Observable, of, Subject } from 'rxjs'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; +import { BehaviorSubject, Observable, Subject, of } from 'rxjs'; import { CartQuickOrderFormComponent } from './cart-quick-order-form.component'; const mockCart: Cart = { @@ -111,7 +112,7 @@ describe('CartQuickOrderFormComponent', () => { I18nTestingModule, ReactiveFormsModule, ], - declarations: [CartQuickOrderFormComponent], + declarations: [CartQuickOrderFormComponent, MockFeatureDirective], providers: [ { provide: ActiveCartFacade, useClass: MockActiveCartService }, { diff --git a/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.ts b/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.ts index 29a90261db3..c6d3c182b6f 100644 --- a/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.ts +++ b/feature-libs/cart/quick-order/components/cart-quick-order-form/cart-quick-order-form.component.ts @@ -89,11 +89,22 @@ export class CartQuickOrderFormComponent implements OnInit, OnDestroy { } protected buildForm(): void { + // TODO: (CXSPA-7479) Remove feature flags next major + const shouldHaveRequiredValidator = !this.featureConfig.isEnabled( + 'a11yDisabledCouponAndQuickOrderActionButtonsInsteadOfRequiredFields' + ); + this.quickOrderForm = this.formBuilder.group({ - productCode: ['', [Validators.required]], + productCode: [ + '', + shouldHaveRequiredValidator ? [Validators.required] : [], + ], quantity: [ this.minQuantityValue, - { updateOn: 'blur', validators: [Validators.required] }, + { + updateOn: 'blur', + validators: shouldHaveRequiredValidator ? [Validators.required] : [], + }, ], }); } diff --git a/feature-libs/cart/quick-order/root/config/default-quick-order.config.ts b/feature-libs/cart/quick-order/root/config/default-quick-order.config.ts index 843c94ae89d..ad8d8995cae 100644 --- a/feature-libs/cart/quick-order/root/config/default-quick-order.config.ts +++ b/feature-libs/cart/quick-order/root/config/default-quick-order.config.ts @@ -14,7 +14,7 @@ export const defaultQuickOrderConfig: QuickOrderConfig = { minCharactersBeforeRequest: 3, }, list: { - hardDeleteTimeout: 7000, + hardDeleteTimeout: 240_000, }, }, }; diff --git a/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts b/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts index 4eec0ab8c61..9e53306bd0b 100644 --- a/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts +++ b/feature-libs/cart/saved-cart/components/details/saved-cart-details-items/saved-cart-details-items.component.spec.ts @@ -79,46 +79,44 @@ describe('SavedCartDetailsItemsComponent', () => { let globalMessageService: GlobalMessageService; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [StoreModule.forRoot({}), I18nTestingModule, OutletModule], - declarations: [SavedCartDetailsItemsComponent], - providers: [ - { - provide: SavedCartFacade, - useClass: MockSavedCartFacade, - }, - { - provide: EventService, - useClass: MockEventService, - }, - { - provide: SavedCartDetailsService, - useClass: MockSavedCartDetailsService, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - ], - }).compileComponents(); - - fixture = TestBed.createComponent(SavedCartDetailsItemsComponent); - component = fixture.componentInstance; - - savedCartFacade = TestBed.inject(SavedCartFacade); - eventService = TestBed.inject(EventService); - globalMessageService = TestBed.inject(GlobalMessageService); - routingService = TestBed.inject(RoutingService); - - spyOn(routingService, 'go').and.callThrough(); - spyOn(globalMessageService, 'add').and.callThrough(); - spyOn(savedCartFacade, 'deleteSavedCart').and.callThrough(); - - cart$.next(mockSavedCart); - - fixture.detectChanges(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [StoreModule.forRoot({}), I18nTestingModule, OutletModule], + declarations: [SavedCartDetailsItemsComponent], + providers: [ + { + provide: SavedCartFacade, + useClass: MockSavedCartFacade, + }, + { + provide: EventService, + useClass: MockEventService, + }, + { + provide: SavedCartDetailsService, + useClass: MockSavedCartDetailsService, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + ], + }).compileComponents(); + + fixture = TestBed.createComponent(SavedCartDetailsItemsComponent); + component = fixture.componentInstance; + + savedCartFacade = TestBed.inject(SavedCartFacade); + eventService = TestBed.inject(EventService); + globalMessageService = TestBed.inject(GlobalMessageService); + routingService = TestBed.inject(RoutingService); + + spyOn(routingService, 'go').and.callThrough(); + spyOn(globalMessageService, 'add').and.callThrough(); + spyOn(savedCartFacade, 'deleteSavedCart').and.callThrough(); + + cart$.next(mockSavedCart); + + fixture.detectChanges(); + })); it('should create', () => { expect(component).toBeTruthy(); diff --git a/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.html b/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.html index de7cae77a94..bc0c3785716 100644 --- a/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.html +++ b/feature-libs/cart/saved-cart/components/list/saved-cart-list.component.html @@ -10,25 +10,34 @@

- - -
+ + + - - - + + - - diff --git a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html index b037665b801..091df1bffd7 100644 --- a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html +++ b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.html @@ -202,7 +202,20 @@ required type="text" /> - + + + + + @@ -221,7 +234,18 @@ formControlName="description" rows="5" > + + + + diff --git a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.spec.ts b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.spec.ts index 07182ff82ed..eff093d837b 100644 --- a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.spec.ts +++ b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.component.spec.ts @@ -21,6 +21,7 @@ import { KeyboardFocusTestingModule, LaunchDialogService, } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { BehaviorSubject, EMPTY, Observable, of } from 'rxjs'; import { SavedCartFormDialogComponent, @@ -132,7 +133,7 @@ describe('SavedCartFormDialogComponent', () => { KeyboardFocusTestingModule, IconTestingModule, ], - declarations: [SavedCartFormDialogComponent], + declarations: [SavedCartFormDialogComponent, MockFeatureDirective], providers: [ { provide: LaunchDialogService, useClass: MockLaunchDialogService }, { provide: SavedCartFacade, useClass: MockSavedCartFacade }, diff --git a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.module.ts b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.module.ts index 3fd2db2025c..704ab88e3e7 100644 --- a/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.module.ts +++ b/feature-libs/cart/saved-cart/components/saved-cart-form-dialog/saved-cart-form-dialog.module.ts @@ -7,7 +7,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { I18nModule } from '@spartacus/core'; +import { FeaturesConfigModule, I18nModule } from '@spartacus/core'; import { FormErrorsModule, IconModule, @@ -24,6 +24,7 @@ import { SavedCartFormDialogComponent } from './saved-cart-form-dialog.component I18nModule, IconModule, KeyboardFocusModule, + FeaturesConfigModule, ], declarations: [SavedCartFormDialogComponent], exports: [SavedCartFormDialogComponent], diff --git a/feature-libs/cart/saved-cart/occ/adapters/occ-saved-cart.adapter.ts b/feature-libs/cart/saved-cart/occ/adapters/occ-saved-cart.adapter.ts index f5cf26eedae..d4af800a922 100644 --- a/feature-libs/cart/saved-cart/occ/adapters/occ-saved-cart.adapter.ts +++ b/feature-libs/cart/saved-cart/occ/adapters/occ-saved-cart.adapter.ts @@ -4,20 +4,27 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { HttpClient } from '@angular/common/http'; -import { Injectable } from '@angular/core'; +import { HttpClient, HttpParams } from '@angular/common/http'; +import { inject, Injectable } from '@angular/core'; import { Cart, CART_NORMALIZER, SaveCartResult, } from '@spartacus/cart/base/root'; import { SavedCartAdapter } from '@spartacus/cart/saved-cart/core'; -import { ConverterService, Occ, OccEndpointsService } from '@spartacus/core'; +import { + ConverterService, + FeatureConfigService, + Occ, + OccEndpointsService, +} from '@spartacus/core'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; @Injectable() export class OccSavedCartAdapter implements SavedCartAdapter { + private featureConfigService = inject(FeatureConfigService); + constructor( protected http: HttpClient, protected occEndpoints: OccEndpointsService, @@ -56,15 +63,24 @@ export class OccSavedCartAdapter implements SavedCartAdapter { cartId: string, saveCartName: string ): Observable { - return this.http - .post( - this.getCloneSavedCartEndpoint(userId, cartId, saveCartName), - cartId + let httpParams: HttpParams = new HttpParams(); + if ( + this.featureConfigService?.isEnabled( + 'occCartNameAndDescriptionInHttpRequestBody' ) - .pipe( - map((cartResponse) => (cartResponse as SaveCartResult).savedCartData), - this.converter.pipeable(CART_NORMALIZER) - ); + ) { + httpParams = httpParams.set('name', saveCartName); + } + const endpoint = this.getCloneSavedCartEndpoint( + userId, + cartId, + saveCartName + ); + + return this.http.post(endpoint, httpParams).pipe( + map((cartResponse) => (cartResponse as SaveCartResult).savedCartData), + this.converter.pipeable(CART_NORMALIZER) + ); } protected getSavedCartEndpoint(userId: string, cartId: string): string { diff --git a/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config-factory.ts b/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config-factory.ts new file mode 100644 index 00000000000..d25c7c1035a --- /dev/null +++ b/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config-factory.ts @@ -0,0 +1,29 @@ +/* + * SPDX-FileCopyrightText: 2024 SAP Spartacus team + * + * SPDX-License-Identifier: Apache-2.0 + */ + +import { FeatureToggles, OccConfig } from '@spartacus/core'; +import { inject } from '@angular/core'; + +export function defaultOccSavedCartConfigFactory(): OccConfig { + const featureToggles = inject(FeatureToggles); + + return { + backend: { + occ: { + endpoints: { + savedCarts: + '/users/${userId}/carts?savedCartsOnly=true&fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),saveTime,user,name,description)', + savedCart: '/users/${userId}/carts/${cartId}/savedcart', + restoreSavedCart: '/users/${userId}/carts/${cartId}/restoresavedcart', + cloneSavedCart: + featureToggles.occCartNameAndDescriptionInHttpRequestBody + ? '/users/${userId}/carts/${cartId}/clonesavedcart' + : '/users/${userId}/carts/${cartId}/clonesavedcart?name=${saveCartName}', + }, + }, + }, + }; +} diff --git a/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config.ts b/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config.ts deleted file mode 100644 index 0bd8178fc65..00000000000 --- a/feature-libs/cart/saved-cart/occ/config/default-occ-saved-cart-config.ts +++ /dev/null @@ -1,22 +0,0 @@ -/* - * SPDX-FileCopyrightText: 2024 SAP Spartacus team - * - * SPDX-License-Identifier: Apache-2.0 - */ - -import { OccConfig } from '@spartacus/core'; - -export const defaultOccSavedCartConfig: OccConfig = { - backend: { - occ: { - endpoints: { - savedCarts: - '/users/${userId}/carts?savedCartsOnly=true&fields=carts(DEFAULT,potentialProductPromotions,appliedProductPromotions,potentialOrderPromotions,appliedOrderPromotions,entries(totalPrice(formattedValue),product(images(FULL),stock(FULL)),basePrice(formattedValue,value),updateable),totalPrice(formattedValue),totalItems,totalPriceWithTax(formattedValue),totalDiscounts(value,formattedValue),subTotal(formattedValue),totalUnitCount,deliveryItemsQuantity,deliveryCost(formattedValue),totalTax(formattedValue, value),pickupItemsQuantity,net,appliedVouchers,productDiscounts(formattedValue),saveTime,user,name,description)', - savedCart: '/users/${userId}/carts/${cartId}/savedcart', - restoreSavedCart: '/users/${userId}/carts/${cartId}/restoresavedcart', - cloneSavedCart: - '/users/${userId}/carts/${cartId}/clonesavedcart?name=${saveCartName}', - }, - }, - }, -}; diff --git a/feature-libs/cart/saved-cart/occ/saved-cart-occ.module.ts b/feature-libs/cart/saved-cart/occ/saved-cart-occ.module.ts index 38b12acdff7..b50d453a198 100644 --- a/feature-libs/cart/saved-cart/occ/saved-cart-occ.module.ts +++ b/feature-libs/cart/saved-cart/occ/saved-cart-occ.module.ts @@ -7,14 +7,14 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { SavedCartAdapter } from '@spartacus/cart/saved-cart/core'; -import { provideDefaultConfig } from '@spartacus/core'; +import { provideDefaultConfigFactory } from '@spartacus/core'; import { OccSavedCartAdapter } from './adapters/occ-saved-cart.adapter'; -import { defaultOccSavedCartConfig } from './config/default-occ-saved-cart-config'; +import { defaultOccSavedCartConfigFactory } from './config/default-occ-saved-cart-config-factory'; @NgModule({ imports: [CommonModule], providers: [ - provideDefaultConfig(defaultOccSavedCartConfig), + provideDefaultConfigFactory(defaultOccSavedCartConfigFactory), { provide: SavedCartAdapter, useClass: OccSavedCartAdapter, diff --git a/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss b/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss index 85c0741abfd..5b8ee12c84d 100644 --- a/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss +++ b/feature-libs/cart/saved-cart/styles/_add-to-saved-cart.scss @@ -11,6 +11,10 @@ cx-add-to-saved-cart { margin-inline-end: 0; &:before { content: '|'; + @include forFeature('a11yExpandedFocusIndicator') { + content: '|' / ''; + } + color: var(--cx-color-light); display: inline-block; text-decoration: none; diff --git a/feature-libs/cart/schematics/add-cart/__snapshots__/index_spec.ts.snap b/feature-libs/cart/schematics/add-cart/__snapshots__/index_spec.ts.snap index a7f8614df3b..4adcfeea53a 100644 --- a/feature-libs/cart/schematics/add-cart/__snapshots__/index_spec.ts.snap +++ b/feature-libs/cart/schematics/add-cart/__snapshots__/index_spec.ts.snap @@ -31,7 +31,7 @@ export class CartBaseFeatureModule { } exports[`Spartacus Cart schematics: ng-add Cart Base feature general setup should add the feature using the lazy loading syntax 1`] = ` "import { NgModule } from '@angular/core'; import { cartBaseTranslationChunksConfig, cartBaseTranslations } from "@spartacus/cart/base/assets"; -import { ADD_TO_CART_FEATURE, CartBaseRootModule, CART_BASE_FEATURE, MINI_CART_FEATURE } from "@spartacus/cart/base/root"; +import { ADD_TO_CART_FEATURE, CART_BASE_FEATURE, CartBaseRootModule, MINI_CART_FEATURE } from "@spartacus/cart/base/root"; import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core"; @NgModule({ diff --git a/feature-libs/cart/tsconfig.schematics.json b/feature-libs/cart/tsconfig.schematics.json index f430d173f73..498b79fe02b 100644 --- a/feature-libs/cart/tsconfig.schematics.json +++ b/feature-libs/cart/tsconfig.schematics.json @@ -546,6 +546,7 @@ "../../integration-libs/cdp/customer-ticketing/public_api" ], "@spartacus/cdp": ["../../integration-libs/cdp/public_api"], + "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"], "@spartacus/cds": ["../../integration-libs/cds/public_api"], "@spartacus/digital-payments/assets": [ "../../integration-libs/digital-payments/assets/public_api" diff --git a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html index fcc2ad604de..603fdb8353f 100644 --- a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html +++ b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.html @@ -2,34 +2,73 @@ -
- -
- - + + + + + +
- - {{ - 'addToWishList.add' | cxTranslate - }} - - + +
+ + + + diff --git a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts index 95bc2c5bbc6..236ffcd977d 100644 --- a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts +++ b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.component.spec.ts @@ -14,6 +14,7 @@ import { Cart, OrderEntry } from '@spartacus/cart/base/root'; import { WishListFacade } from '@spartacus/cart/wish-list/root'; import { AuthService, I18nTestingModule, Product } from '@spartacus/core'; import { CurrentProductService } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { BehaviorSubject, Observable, of } from 'rxjs'; import { AddToWishListComponent } from './add-to-wish-list.component'; import createSpy = jasmine.createSpy; @@ -105,31 +106,30 @@ describe('AddToWishListComponent', () => { let wishListFacade: WishListFacade; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - AddToWishListComponent, - MockIconComponent, - MockUrlPipe, - MockAtMessageDirective, - ], - providers: [ - { provide: AuthService, useClass: MockAuthService }, - { provide: WishListFacade, useClass: MockWishListService }, - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - }) - .overrideComponent(AddToWishListComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + AddToWishListComponent, + MockIconComponent, + MockUrlPipe, + MockAtMessageDirective, + MockFeatureDirective, + ], + providers: [ + { provide: AuthService, useClass: MockAuthService }, + { provide: WishListFacade, useClass: MockWishListService }, + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], }) - ); + .overrideComponent(AddToWishListComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(AddToWishListComponent); diff --git a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts index 3dbefc18af4..98757588831 100644 --- a/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts +++ b/feature-libs/cart/wish-list/components/add-to-wishlist/add-to-wish-list.module.ts @@ -9,11 +9,12 @@ import { NgModule } from '@angular/core'; import { RouterModule } from '@angular/router'; import { CmsConfig, + FeaturesConfigModule, I18nModule, provideDefaultConfig, UrlModule, } from '@spartacus/core'; -import { IconModule, AtMessageModule } from '@spartacus/storefront'; +import { AtMessageModule, IconModule } from '@spartacus/storefront'; import { AddToWishListComponent } from './add-to-wish-list.component'; @NgModule({ @@ -24,6 +25,7 @@ import { AddToWishListComponent } from './add-to-wish-list.component'; RouterModule, UrlModule, AtMessageModule, + FeaturesConfigModule, ], providers: [ provideDefaultConfig({ diff --git a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts index 7605061f96e..fb1ae76973e 100644 --- a/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts +++ b/feature-libs/cart/wish-list/components/wish-list-item/wish-list-item.component.spec.ts @@ -85,24 +85,22 @@ describe('WishListItemComponent', () => { let el: DebugElement; let componentInjector: Injector; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - WishListItemComponent, - MockPictureComponent, - MockAddToCartComponent, - MockUrlPipe, - MockAtMessageDirective, - ], - }) - .overrideComponent(WishListItemComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + WishListItemComponent, + MockPictureComponent, + MockAddToCartComponent, + MockUrlPipe, + MockAtMessageDirective, + ], }) - ); + .overrideComponent(WishListItemComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(WishListItemComponent); diff --git a/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts b/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts index 2cf18a9dbeb..b1ba5793722 100644 --- a/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts +++ b/feature-libs/cart/wish-list/components/wish-list/wish-list.component.spec.ts @@ -36,20 +36,18 @@ describe('WishListComponent', () => { let wishListService: WishListFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [WishListComponent, MockWishListItemComponent], - providers: [ - { - provide: WishListFacade, - useClass: MockWishListService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [WishListComponent, MockWishListItemComponent], + providers: [ + { + provide: WishListFacade, + useClass: MockWishListService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(WishListComponent); diff --git a/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts index 3ab1a9adca9..af3cd4d7e5f 100644 --- a/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts +++ b/feature-libs/checkout/b2b/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts @@ -158,62 +158,60 @@ describe('B2BCheckoutDeliveryAddressComponent', () => { let globalMessageService: GlobalMessageService; let checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - B2BCheckoutDeliveryAddressComponent, - MockAddressFormComponent, - MockCardComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: UserAddressService, useClass: MockUserAddressService }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressFacade, - }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { - provide: CheckoutPaymentTypeFacade, - useClass: MockPaymentTypeService, - }, - { - provide: UserCostCenterService, - useClass: MockUserCostCenterService, - }, - { - provide: CheckoutCostCenterFacade, - useClass: MockCheckoutCostCenterService, - }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesFacade, - }, - ], + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + B2BCheckoutDeliveryAddressComponent, + MockAddressFormComponent, + MockCardComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: UserAddressService, useClass: MockUserAddressService }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressFacade, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { + provide: CheckoutPaymentTypeFacade, + useClass: MockPaymentTypeService, + }, + { + provide: UserCostCenterService, + useClass: MockUserCostCenterService, + }, + { + provide: CheckoutCostCenterFacade, + useClass: MockCheckoutCostCenterService, + }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesFacade, + }, + ], + }) + .overrideComponent(B2BCheckoutDeliveryAddressComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, }) - .overrideComponent(B2BCheckoutDeliveryAddressComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + .compileComponents(); - checkoutDeliveryAddressFacade = TestBed.inject( - CheckoutDeliveryAddressFacade - ); - activeCartFacade = TestBed.inject(ActiveCartFacade); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - userAddressService = TestBed.inject(UserAddressService); - userCostCenterService = TestBed.inject(UserCostCenterService); - globalMessageService = TestBed.inject(GlobalMessageService); - checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); - }) - ); + checkoutDeliveryAddressFacade = TestBed.inject( + CheckoutDeliveryAddressFacade + ); + activeCartFacade = TestBed.inject(ActiveCartFacade); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + userAddressService = TestBed.inject(UserAddressService); + userCostCenterService = TestBed.inject(UserCostCenterService); + globalMessageService = TestBed.inject(GlobalMessageService); + checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); + })); beforeEach(() => { fixture = TestBed.createComponent(B2BCheckoutDeliveryAddressComponent); diff --git a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts index 432275a3cc0..3e8b8ca5e89 100644 --- a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts +++ b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.spec.ts @@ -84,33 +84,31 @@ describe('CheckoutOnePaymentTypeComponent', () => { let checkoutStepService: CheckoutStepService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], - providers: [ - { - provide: CheckoutPaymentTypeFacade, - useClass: MockCheckoutOnePaymentTypeService, - }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { - provide: GlobalMessageService, - useClass: MockGlobalMessageService, - }, - ], - }).compileComponents(); - - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], + providers: [ + { + provide: CheckoutPaymentTypeFacade, + useClass: MockCheckoutOnePaymentTypeService, + }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { + provide: GlobalMessageService, + useClass: MockGlobalMessageService, + }, + ], + }).compileComponents(); + + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentTypeComponent); @@ -141,36 +139,34 @@ describe('CheckoutPaymentTypeComponent', () => { let checkoutStepService: CheckoutStepService; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], - providers: [ - { - provide: CheckoutPaymentTypeFacade, - useClass: MockCheckoutPaymentTypeService, - }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { - provide: GlobalMessageService, - useClass: MockGlobalMessageService, - }, - ], - }).compileComponents(); - - checkoutPaymentTypeFacade = TestBed.inject( - CheckoutPaymentTypeFacade as Type - ); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [CheckoutPaymentTypeComponent, MockSpinnerComponent], + providers: [ + { + provide: CheckoutPaymentTypeFacade, + useClass: MockCheckoutPaymentTypeService, + }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { + provide: GlobalMessageService, + useClass: MockGlobalMessageService, + }, + ], + }).compileComponents(); + + checkoutPaymentTypeFacade = TestBed.inject( + CheckoutPaymentTypeFacade as Type + ); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentTypeComponent); diff --git a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts index e4f0482761d..76147cf49ea 100644 --- a/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts +++ b/feature-libs/checkout/b2b/components/checkout-payment-type/checkout-payment-type.component.ts @@ -87,7 +87,7 @@ export class CheckoutPaymentTypeComponent { map( ([selectedPaymentType, availablePaymentTypes]: [ PaymentType | undefined, - PaymentType[] + PaymentType[], ]) => { if ( selectedPaymentType && diff --git a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts index b4eb2a3a17f..5e67bfa0042 100644 --- a/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts +++ b/feature-libs/checkout/b2b/components/checkout-review-submit/checkout-review-submit.component.spec.ts @@ -213,55 +213,53 @@ describe('B2BCheckoutReviewSubmitComponent', () => { let component: B2BCheckoutReviewSubmitComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - I18nTestingModule, - PromotionsModule, - RouterTestingModule, - IconTestingModule, - OutletModule, - ], - declarations: [ - B2BCheckoutReviewSubmitComponent, - MockCardComponent, - MockUrlPipe, - ], - providers: [ - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressService, - }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesService, - }, - { - provide: CheckoutPaymentFacade, - useClass: MockCheckoutPaymentService, - }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - { - provide: CheckoutPaymentTypeFacade, - useClass: MockCheckoutPaymentTypeFacade, - }, - { - provide: CheckoutCostCenterFacade, - useClass: MockCheckoutCostCenterService, - }, - { - provide: UserCostCenterService, - useClass: MockUserCostCenterService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + I18nTestingModule, + PromotionsModule, + RouterTestingModule, + IconTestingModule, + OutletModule, + ], + declarations: [ + B2BCheckoutReviewSubmitComponent, + MockCardComponent, + MockUrlPipe, + ], + providers: [ + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressService, + }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesService, + }, + { + provide: CheckoutPaymentFacade, + useClass: MockCheckoutPaymentService, + }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + { + provide: CheckoutPaymentTypeFacade, + useClass: MockCheckoutPaymentTypeFacade, + }, + { + provide: CheckoutCostCenterFacade, + useClass: MockCheckoutCostCenterService, + }, + { + provide: UserCostCenterService, + useClass: MockUserCostCenterService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(B2BCheckoutReviewSubmitComponent); diff --git a/feature-libs/checkout/base/assets/translations/en/checkout.json b/feature-libs/checkout/base/assets/translations/en/checkout.json index d0025d88684..56b5b946cd5 100644 --- a/feature-libs/checkout/base/assets/translations/en/checkout.json +++ b/feature-libs/checkout/base/assets/translations/en/checkout.json @@ -7,7 +7,12 @@ "deliveryAddress": "Shipping Address", "deliveryMode": "Delivery Mode", "paymentDetails": "Payment", - "reviewOrder": "Review" + "reviewOrder": "Review", + "state": { + "completed": "{{step}}, Completed", + "selected": "{{step}}, Selected", + "disabled": "{{step}}, Disabled" + } }, "checkoutAddress": { "shippingAddress": "Shipping Address", diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.html b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.html new file mode 100644 index 00000000000..a84704fe2f0 --- /dev/null +++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.html @@ -0,0 +1,211 @@ + +
+
+ {{ 'paymentForm.billingAddress' | cxTranslate }} +
+ + + +
+
+ +
+
+ + + + + + + + + +
+
+ +
+ +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+
+ +
+
+ +
+ + +
+ +
+ + +
+
+ +
diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.spec.ts b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.spec.ts new file mode 100644 index 00000000000..d9e510c69fa --- /dev/null +++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.spec.ts @@ -0,0 +1,236 @@ +import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { ReactiveFormsModule } from '@angular/forms'; +import { NgSelectModule } from '@ng-select/ng-select'; +import { CheckoutDeliveryAddressFacade } from '@spartacus/checkout/base/root'; +import { + Address, + AddressValidation, + Country, + GlobalMessageService, + I18nTestingModule, + UserAddressService, + UserPaymentService, +} from '@spartacus/core'; +import { + FormErrorsModule, + LaunchDialogService, + NgSelectA11yModule, +} from '@spartacus/storefront'; +import { EMPTY, of } from 'rxjs'; +import createSpy = jasmine.createSpy; +import { CheckoutBillingAddressFormComponent } from './checkout-billing-address-form.component'; +import { CheckoutBillingAddressFormService } from './checkout-billing-address-form.service'; + +const mockBillingCountries: Country[] = [ + { + isocode: 'CA', + name: 'Canada', + }, +]; + +const mockBillingCountriesEmpty: Country[] = []; + +const mockAddress: Address = { + firstName: 'John', + lastName: 'Doe', + titleCode: 'mr', + line1: 'Toyosaki 2 create on cart', + line2: 'line2', + town: 'town', + region: { isocode: 'JP-27' }, + postalCode: 'zip', + country: { isocode: 'JP' }, +}; + +@Component({ + selector: 'cx-card', + template: '', +}) +class MockCardComponent { + @Input() + content: any; +} + +class MockCheckoutDeliveryService + implements Partial +{ + getDeliveryAddressState = createSpy().and.returnValue( + of({ loading: false, error: false, data: undefined }) + ); + getAddressVerificationResults = createSpy().and.returnValue(EMPTY); + verifyAddress = createSpy(); + clearAddressVerificationResults = createSpy(); +} + +class MockUserPaymentService implements Partial { + loadBillingCountries = createSpy(); + getAllBillingCountries = createSpy().and.returnValue( + of(mockBillingCountries) + ); +} + +class MockGlobalMessageService implements Partial { + add = createSpy(); +} + +class MockLaunchDialogService implements Partial { + openDialogAndSubscribe() { + return EMPTY; + } +} +class MockUserAddressService implements Partial { + getRegions = createSpy().and.returnValue(of([])); + verifyAddress = createSpy().and.returnValue(of({})); +} + +describe('CheckoutBillingAddressFormComponent', () => { + let component: CheckoutBillingAddressFormComponent; + let fixture: ComponentFixture; + let mockCheckoutDeliveryService: MockCheckoutDeliveryService; + let mockUserPaymentService: MockUserPaymentService; + let mockGlobalMessageService: MockGlobalMessageService; + let userAddressService: UserAddressService; + + beforeEach(waitForAsync(() => { + mockCheckoutDeliveryService = new MockCheckoutDeliveryService(); + mockUserPaymentService = new MockUserPaymentService(); + mockGlobalMessageService = new MockGlobalMessageService(); + + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + NgSelectModule, + NgSelectA11yModule, + I18nTestingModule, + FormErrorsModule, + ], + declarations: [CheckoutBillingAddressFormComponent, MockCardComponent], + providers: [ + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: CheckoutDeliveryAddressFacade, + useValue: mockCheckoutDeliveryService, + }, + { provide: UserPaymentService, useValue: mockUserPaymentService }, + { provide: GlobalMessageService, useValue: mockGlobalMessageService }, + { provide: UserAddressService, useClass: MockUserAddressService }, + CheckoutBillingAddressFormService, + ], + }) + .overrideComponent(CheckoutBillingAddressFormComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); + + beforeEach(() => { + userAddressService = TestBed.inject(UserAddressService); + fixture = TestBed.createComponent(CheckoutBillingAddressFormComponent); + component = fixture.componentInstance; + }); + + it('should be created', () => { + expect(component).toBeTruthy(); + }); + + describe('ngOnInit()', () => { + it('should call ngOnInit to get billing countries', (done) => { + mockUserPaymentService.getAllBillingCountries = + createSpy().and.returnValue(of(mockBillingCountries)); + component.ngOnInit(); + component.countries$.subscribe((countries: Country[]) => { + expect(countries).toBe(mockBillingCountries); + done(); + }); + }); + it('should call ngOnInit to get delivery address set in cart', (done) => { + mockCheckoutDeliveryService.getDeliveryAddressState = + createSpy().and.returnValue( + of({ loading: false, error: false, data: mockAddress }) + ); + component.ngOnInit(); + component.deliveryAddress$.subscribe((address) => { + expect(address).toBe(mockAddress); + done(); + }); + }); + it('should call ngOnInit to load billing countries', (done) => { + mockUserPaymentService.getAllBillingCountries = + createSpy().and.returnValue(of(mockBillingCountriesEmpty)); + + component.ngOnInit(); + component.countries$.subscribe((countries: Country[]) => { + expect(countries).toBe(mockBillingCountriesEmpty); + expect(mockUserPaymentService.loadBillingCountries).toHaveBeenCalled(); + done(); + }); + }); + it('should add address with address verification result "accept"', () => { + const mockAddressVerificationResult = { decision: 'ACCEPT' }; + component.ngOnInit(); + component['handleAddressVerificationResults']( + mockAddressVerificationResult + ); + }); + it('should display error message with address verification result "reject"', () => { + const mockAddressVerificationResult: AddressValidation = { + decision: 'REJECT', + }; + component.ngOnInit(); + component['handleAddressVerificationResults']( + mockAddressVerificationResult + ); + expect(mockGlobalMessageService.add).toHaveBeenCalled(); + }); + it('should open suggested address with address verification result "review"', () => { + const mockAddressVerificationResult: AddressValidation = { + decision: 'REVIEW', + }; + spyOn(component, 'openSuggestedAddress'); + component.ngOnInit(); + component['handleAddressVerificationResults']( + mockAddressVerificationResult + ); + expect(component.openSuggestedAddress).toHaveBeenCalled(); + }); + }); + + it('should call toggleSameAsDeliveryAddress()', () => { + spyOn(component, 'toggleSameAsDeliveryAddress').and.callThrough(); + component.sameAsDeliveryAddress = true; + + component.toggleSameAsDeliveryAddress(); + + expect(component.toggleSameAsDeliveryAddress).toHaveBeenCalled(); + expect(component.sameAsDeliveryAddress).toBeFalsy(); + }); + + it('should call getAddressCardContent(address)', (done) => { + component.getAddressCardContent(mockAddress).subscribe((card) => { + expect(card?.textBold).toEqual('John Doe'); + expect(card?.text).toEqual([ + 'Toyosaki 2 create on cart', + 'line2', + 'town, JP-27, JP', + 'zip', + undefined, + ]); + done(); + }); + }); + + it('should call verifyAddress() when billing address not same as shipping', () => { + userAddressService.verifyAddress = createSpy().and.returnValue( + of({ + decision: 'ACCEPT', + }) + ); + component.sameAsDeliveryAddress = true; + component.verifyAddress(); + expect(userAddressService.verifyAddress).not.toHaveBeenCalled(); + component.sameAsDeliveryAddress = false; + component.verifyAddress(); + expect(userAddressService.verifyAddress).toHaveBeenCalled(); + }); +}); diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.ts b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.ts new file mode 100644 index 00000000000..bee455549d8 --- /dev/null +++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.component.ts @@ -0,0 +1,200 @@ +/* + * SPDX-FileCopyrightText: 2024 SAP Spartacus team + * + * SPDX-License-Identifier: Apache-2.0 + */ + +import { Component, OnInit, inject } from '@angular/core'; +import { UntypedFormGroup } from '@angular/forms'; +import { CheckoutDeliveryAddressFacade } from '@spartacus/checkout/base/root'; +import { + Address, + AddressValidation, + Country, + GlobalMessageService, + GlobalMessageType, + Region, + TranslationService, + UserAddressService, + UserPaymentService, +} from '@spartacus/core'; +import { + Card, + LAUNCH_CALLER, + LaunchDialogService, + getAddressNumbers, +} from '@spartacus/storefront'; +import { + BehaviorSubject, + EMPTY, + Observable, + combineLatest, + filter, + map, + switchMap, + tap, +} from 'rxjs'; +import { CheckoutBillingAddressFormService } from './checkout-billing-address-form.service'; + +@Component({ + selector: 'cx-checkout-billing-address-form', + templateUrl: './checkout-billing-address-form.component.html', +}) +export class CheckoutBillingAddressFormComponent implements OnInit { + showSameAsDeliveryAddressCheckbox$: Observable; + sameAsDeliveryAddress = true; + deliveryAddress$: Observable
; + countries$: Observable; + regions$: Observable; + selectedCountry$: BehaviorSubject = new BehaviorSubject(''); + protected checkoutDeliveryAddressFacade = inject( + CheckoutDeliveryAddressFacade + ); + protected userPaymentService = inject(UserPaymentService); + protected globalMessageService = inject(GlobalMessageService); + protected userAddressService = inject(UserAddressService); + protected launchDialogService = inject(LaunchDialogService); + protected translationService = inject(TranslationService); + protected billingAddressFormService = inject( + CheckoutBillingAddressFormService + ); + ngOnInit(): void { + this.countries$ = this.userPaymentService.getAllBillingCountries().pipe( + tap((countries) => { + // If the store is empty fetch countries. This is also used when changing language. + if (Object.keys(countries).length === 0) { + this.userPaymentService.loadBillingCountries(); + } + }) + ); + this.deliveryAddress$ = this.checkoutDeliveryAddressFacade + .getDeliveryAddressState() + .pipe( + filter((state) => !state.loading), + map((state) => { + this.billingAddressFormService.setDeliveryAddressAsBillingAddress( + state.data + ); + return state.data; + }) + ); + this.showSameAsDeliveryAddressCheckbox$ = combineLatest([ + this.countries$, + this.deliveryAddress$, + ]).pipe( + map(([countries, address]) => { + return ( + (address?.country && + !!countries.filter( + (country: Country): boolean => + country.isocode === address.country?.isocode + ).length) ?? + false + ); + }), + tap((shouldShowCheckbox) => { + this.sameAsDeliveryAddress = shouldShowCheckbox; + }) + ); + this.regions$ = this.selectedCountry$.pipe( + switchMap((country) => this.userAddressService.getRegions(country)), + tap((regions) => { + const regionControl = this.billingAddressForm.get( + 'region.isocodeShort' + ); + if (regions.length > 0) { + regionControl?.enable(); + } else { + regionControl?.disable(); + } + }) + ); + } + billingAddressForm: UntypedFormGroup = + this.billingAddressFormService.getBillingAddressForm(); + + toggleSameAsDeliveryAddress(): void { + this.sameAsDeliveryAddress = !this.sameAsDeliveryAddress; + if (this.sameAsDeliveryAddress) { + this.deliveryAddress$.subscribe((address) => { + this.billingAddressFormService.setDeliveryAddressAsBillingAddress( + address + ); + }); + } else { + this.billingAddressFormService.setDeliveryAddressAsBillingAddress( + undefined + ); + } + } + /** + *TODO: This method is not used, but should be. It triggers suggested addresses modal under the hood. + * + * See ticket CXSPA-1276 + */ + verifyAddress(): void { + if (!this.sameAsDeliveryAddress) { + this.userAddressService + .verifyAddress(this.billingAddressForm.value) + .subscribe((result) => { + this.handleAddressVerificationResults(result); + }); + } + } + protected handleAddressVerificationResults(results: AddressValidation) { + if (results.decision === 'ACCEPT') { + //continue + } else if (results.decision === 'REJECT') { + this.globalMessageService.add( + { key: 'addressForm.invalidAddress' }, + GlobalMessageType.MSG_TYPE_ERROR + ); + } else if (results.decision === 'REVIEW') { + this.openSuggestedAddress(results); + } + } + + countrySelected(country: Country): void { + this.billingAddressForm.get('country.isocode')?.setValue(country.isocode); + this.selectedCountry$.next(country.isocode as string); + } + //TODO: Add elementRef to trigger button when verifyAddress is used. + openSuggestedAddress(results: AddressValidation): void { + this.launchDialogService.openDialogAndSubscribe( + LAUNCH_CALLER.SUGGESTED_ADDRESSES, + undefined, + { + enteredAddress: this.billingAddressForm.value, + suggestedAddresses: results.suggestedAddresses, + } + ); + //TODO: Add logic that handle dialog's actions. Scope of CXSPA-1276 + } + getAddressCardContent(address: Address): Observable { + return this.translationService + ? combineLatest([ + this.translationService.translate('addressCard.phoneNumber'), + this.translationService.translate('addressCard.mobileNumber'), + ]).pipe( + map(([textPhone, textMobile]) => { + let region = ''; + if (address.region && address.region.isocode) { + region = address.region.isocode + ', '; + } + const numbers = getAddressNumbers(address, textPhone, textMobile); + + return { + textBold: address.firstName + ' ' + address.lastName, + text: [ + address.line1, + address.line2, + address.town + ', ' + region + address.country?.isocode, + address.postalCode, + numbers, + ], + } as Card; + }) + ) + : EMPTY; + } +} diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.module.ts b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.module.ts new file mode 100644 index 00000000000..1a501533190 --- /dev/null +++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.module.ts @@ -0,0 +1,38 @@ +/* + * SPDX-FileCopyrightText: 2024 SAP Spartacus team + * + * SPDX-License-Identifier: Apache-2.0 + */ + +import { CommonModule } from '@angular/common'; +import { NgModule } from '@angular/core'; +import { ReactiveFormsModule } from '@angular/forms'; +import { NgSelectModule } from '@ng-select/ng-select'; +import { FeaturesConfigModule, I18nModule } from '@spartacus/core'; +import { + CardModule, + FormErrorsModule, + IconModule, + NgSelectA11yModule, + SpinnerModule, +} from '@spartacus/storefront'; +import { CheckoutBillingAddressFormService } from './checkout-billing-address-form.service'; +import { CheckoutBillingAddressFormComponent } from './checkout-billing-address-form.component'; +@NgModule({ + imports: [ + NgSelectA11yModule, + CommonModule, + ReactiveFormsModule, + NgSelectModule, + CardModule, + I18nModule, + IconModule, + SpinnerModule, + FormErrorsModule, + FeaturesConfigModule, + ], + providers: [CheckoutBillingAddressFormService], + declarations: [CheckoutBillingAddressFormComponent], + exports: [CheckoutBillingAddressFormComponent], +}) +export class CheckoutBillingAddressFormModule {} diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.service.spec.ts b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.service.spec.ts new file mode 100644 index 00000000000..817d218e185 --- /dev/null +++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.service.spec.ts @@ -0,0 +1,99 @@ +import { TestBed } from '@angular/core/testing'; +import { Address } from '@spartacus/core'; +import { CheckoutBillingAddressFormService } from './checkout-billing-address-form.service'; +const mockAddress: Address = { + firstName: 'John', + lastName: 'Doe', + line1: '123 Main St', + town: 'Anytown', + region: { isocodeShort: 'CA' }, + country: { isocode: 'US' }, + postalCode: '12345', +}; +describe('CheckoutBillingAddressFormComponentService', () => { + let service: CheckoutBillingAddressFormService; + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [CheckoutBillingAddressFormService], + }); + service = TestBed.inject(CheckoutBillingAddressFormService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + describe('getBillingAddressForm', () => { + it('should create and return a form group with default values', () => { + const form = service.getBillingAddressForm(); + expect(form).toBeTruthy(); + expect(form.get('firstName')).toBeTruthy(); + expect(form.get('lastName')).toBeTruthy(); + expect(form.get('line1')).toBeTruthy(); + expect(form.get('line2')).toBeTruthy(); + expect(form.get('town')).toBeTruthy(); + expect(form.get('region.isocodeShort')).toBeTruthy(); + expect(form.get('country.isocode')).toBeTruthy(); + expect(form.get('postalCode')).toBeTruthy(); + }); + it('should return the same form group instance if called multiple times', () => { + const form1 = service.getBillingAddressForm(); + const form2 = service.getBillingAddressForm(); + expect(form1).toBe(form2); + }); + }); + describe('setDeliveryAddressAsBillingAddress', () => { + it('should set the billing address', () => { + service.setDeliveryAddressAsBillingAddress(mockAddress); + expect(service['billingAddress']).toEqual(mockAddress); + }); + it('should set billing address to undefined', () => { + service.setDeliveryAddressAsBillingAddress(undefined); + expect(service['billingAddress']).toBeUndefined(); + }); + }); + describe('isBillingAddressSameAsDeliveryAddress', () => { + it('should return false if billing address is undefined', () => { + service.setDeliveryAddressAsBillingAddress(undefined); + expect(service.isBillingAddressSameAsDeliveryAddress()).toEqual(false); + }); + + it('should return true if billing address is defined', () => { + service.setDeliveryAddressAsBillingAddress(mockAddress); + expect(service.isBillingAddressSameAsDeliveryAddress()).toEqual(true); + }); + }); + describe('isBillingAddressFormValid', () => { + it('should return false if form is invalid', () => { + const form = service.getBillingAddressForm(); + form.patchValue({ firstName: '', lastName: '' }); + expect(service.isBillingAddressFormValid()).toEqual(false); + }); + + it('should return true if form is valid', () => { + const form = service.getBillingAddressForm(); + form.patchValue(mockAddress); + expect(service.isBillingAddressFormValid()).toEqual(true); + }); + }); + describe('markAllAsTouched', () => { + it('should mark all form controls as touched', () => { + const form = service.getBillingAddressForm(); + spyOn(form, 'markAllAsTouched'); + service.markAllAsTouched(); + expect(form.markAllAsTouched).toHaveBeenCalled(); + }); + }); + describe('getBillingAddress', () => { + it('should return the billing address if it is defined', () => { + service.setDeliveryAddressAsBillingAddress(mockAddress); + expect(service.getBillingAddress()).toEqual(mockAddress); + }); + + it('should return the form value if billing address is undefined', () => { + service.setDeliveryAddressAsBillingAddress(undefined); + const form = service.getBillingAddressForm(); + form.patchValue(mockAddress); + expect(service.getBillingAddress()).toEqual(form.value); + }); + }); +}); diff --git a/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.service.ts b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.service.ts new file mode 100644 index 00000000000..0fbc1482353 --- /dev/null +++ b/feature-libs/checkout/base/components/checkout-billing-address/checkout-billing-address-form.service.ts @@ -0,0 +1,68 @@ +/* + * SPDX-FileCopyrightText: 2024 SAP Spartacus team + * + * SPDX-License-Identifier: Apache-2.0 + */ + +import { Injectable, inject } from '@angular/core'; +import { + UntypedFormBuilder, + UntypedFormGroup, + Validators, +} from '@angular/forms'; +import { Address } from '@spartacus/core'; + +@Injectable() +export class CheckoutBillingAddressFormService { + protected fb: UntypedFormBuilder = inject(UntypedFormBuilder); + protected billingAddress: Address | undefined = undefined; + private form: UntypedFormGroup; + getBillingAddressForm(): UntypedFormGroup { + if (!this.form) { + this.form = this.fb.group({ + firstName: ['', Validators.required], + lastName: ['', Validators.required], + line1: ['', Validators.required], + line2: [''], + town: ['', Validators.required], + region: this.fb.group({ + isocodeShort: [null, Validators.required], + }), + country: this.fb.group({ + isocode: [null, Validators.required], + }), + postalCode: ['', Validators.required], + }); + } + return this.form; + } + + setDeliveryAddressAsBillingAddress(address: Address | undefined) { + this.billingAddress = address; + } + + isBillingAddressSameAsDeliveryAddress(): boolean { + if (this.billingAddress === undefined) { + return false; + } + return true; + } + + isBillingAddressFormValid(): boolean { + return this.getBillingAddressForm().valid; + } + + markAllAsTouched() { + this.getBillingAddressForm().markAllAsTouched(); + } + + getBillingAddress(): Address { + if (this.billingAddress) { + // billing address same as delivery address + return this.billingAddress; + } else { + // billing address and delivery address are different + return this.getBillingAddressForm().value; + } + } +} diff --git a/feature-libs/checkout/base/components/checkout-billing-address/index.ts b/feature-libs/checkout/base/components/checkout-billing-address/index.ts new file mode 100644 index 00000000000..1791a324f1b --- /dev/null +++ b/feature-libs/checkout/base/components/checkout-billing-address/index.ts @@ -0,0 +1,9 @@ +/* + * SPDX-FileCopyrightText: 2024 SAP Spartacus team + * + * SPDX-License-Identifier: Apache-2.0 + */ + +export * from './checkout-billing-address-form.module'; +export * from './checkout-billing-address-form.service'; +export * from './checkout-billing-address-form.component'; diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts index 5f80f9cfb9c..4ffc059ad42 100644 --- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.spec.ts @@ -139,60 +139,58 @@ describe('CheckoutDeliveryAddressComponent', () => { let globalMessageService: GlobalMessageService; let featureConfig: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - CheckoutDeliveryAddressComponent, - MockAddressFormComponent, - MockCardComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: UserAddressService, useClass: MockUserAddressService }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressFacade, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + CheckoutDeliveryAddressComponent, + MockAddressFormComponent, + MockCardComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: UserAddressService, useClass: MockUserAddressService }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressFacade, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesFacade, + }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '6.3' }, }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesFacade, - }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '6.3' }, - }, - }, - { - provide: FeatureConfigService, - useClass: MockFeatureConfigService, - }, - ], + }, + { + provide: FeatureConfigService, + useClass: MockFeatureConfigService, + }, + ], + }) + .overrideComponent(CheckoutDeliveryAddressComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, }) - .overrideComponent(CheckoutDeliveryAddressComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + .compileComponents(); - checkoutDeliveryAddressFacade = TestBed.inject( - CheckoutDeliveryAddressFacade - ); - activeCartFacade = TestBed.inject(ActiveCartFacade); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - userAddressService = TestBed.inject(UserAddressService); - checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); - globalMessageService = TestBed.inject(GlobalMessageService); - featureConfig = TestBed.inject(FeatureConfigService); - }) - ); + checkoutDeliveryAddressFacade = TestBed.inject( + CheckoutDeliveryAddressFacade + ); + activeCartFacade = TestBed.inject(ActiveCartFacade); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + userAddressService = TestBed.inject(UserAddressService); + checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); + globalMessageService = TestBed.inject(GlobalMessageService); + featureConfig = TestBed.inject(FeatureConfigService); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutDeliveryAddressComponent); diff --git a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts index 99df5f44fca..871e1de5806 100644 --- a/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-delivery-mode/checkout-delivery-mode.component.spec.ts @@ -128,36 +128,34 @@ describe('CheckoutDeliveryModeComponent', () => { let checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade; let globalMessageService: GlobalMessageService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, I18nTestingModule, OutletModule], - declarations: [CheckoutDeliveryModeComponent, MockSpinnerComponent], - providers: [ - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModeService, - }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { - provide: CheckoutConfigService, - useClass: MockCheckoutConfigService, - }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: ActiveCartFacade, useClass: MockCartService }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { provide: FeatureConfigService, useClass: MockFeatureConfigService }, - ], - }).compileComponents(); - - checkoutConfigService = TestBed.inject(CheckoutConfigService); - checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); - globalMessageService = TestBed.inject(GlobalMessageService); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, I18nTestingModule, OutletModule], + declarations: [CheckoutDeliveryModeComponent, MockSpinnerComponent], + providers: [ + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModeService, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { + provide: CheckoutConfigService, + useClass: MockCheckoutConfigService, + }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: ActiveCartFacade, useClass: MockCartService }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, + ], + }).compileComponents(); + + checkoutConfigService = TestBed.inject(CheckoutConfigService); + checkoutDeliveryModesFacade = TestBed.inject(CheckoutDeliveryModesFacade); + globalMessageService = TestBed.inject(GlobalMessageService); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutDeliveryModeComponent); diff --git a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html index 4f4aa085d12..6d25ddbf090 100644 --- a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html +++ b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.html @@ -14,7 +14,18 @@ 'checkoutLogin.emailAddress.placeholder' | cxTranslate }}" /> + + + + @@ -35,7 +46,18 @@ 'checkoutLogin.confirmEmail.placeholder' | cxTranslate }}" /> + + + + diff --git a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts index 4ccdfa10643..00bd4685493 100644 --- a/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-login/checkout-login.component.spec.ts @@ -3,6 +3,7 @@ import { AbstractControl, ReactiveFormsModule } from '@angular/forms'; import { ActiveCartFacade } from '@spartacus/cart/base/root'; import { AuthRedirectService, I18nTestingModule, User } from '@spartacus/core'; import { FormErrorsModule } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { EMPTY, of } from 'rxjs'; import { CheckoutLoginComponent } from './checkout-login.component'; import createSpy = jasmine.createSpy; @@ -27,21 +28,19 @@ describe('CheckoutLoginComponent', () => { let email: AbstractControl; let emailConfirmation: AbstractControl; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule], - declarations: [CheckoutLoginComponent], - providers: [ - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: AuthRedirectService, - useClass: MockRedirectAfterAuthService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, I18nTestingModule, FormErrorsModule], + declarations: [CheckoutLoginComponent, MockFeatureDirective], + providers: [ + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: AuthRedirectService, + useClass: MockRedirectAfterAuthService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutLoginComponent); diff --git a/feature-libs/checkout/base/components/checkout-login/checkout-login.module.ts b/feature-libs/checkout/base/components/checkout-login/checkout-login.module.ts index f9f84bac710..faeb54b976b 100644 --- a/feature-libs/checkout/base/components/checkout-login/checkout-login.module.ts +++ b/feature-libs/checkout/base/components/checkout-login/checkout-login.module.ts @@ -7,7 +7,12 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core'; +import { + CmsConfig, + FeaturesConfigModule, + I18nModule, + provideDefaultConfig, +} from '@spartacus/core'; import { FormErrorsModule } from '@spartacus/storefront'; import { NotCheckoutAuthGuard } from '../guards/not-checkout-auth.guard'; import { CheckoutLoginComponent } from './checkout-login.component'; @@ -18,9 +23,8 @@ import { CheckoutLoginComponent } from './checkout-login.component'; I18nModule, FormsModule, ReactiveFormsModule, - FormsModule, - ReactiveFormsModule, FormErrorsModule, + FeaturesConfigModule, ], providers: [ provideDefaultConfig({ diff --git a/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts b/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts index b4451c950e7..aab19f1dd8c 100644 --- a/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-orchestrator/checkout-orchestrator.component.spec.ts @@ -5,13 +5,11 @@ describe('MultiStepCheckoutOrchestratorComponent', () => { let component: CheckoutOrchestratorComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [CheckoutOrchestratorComponent], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [CheckoutOrchestratorComponent], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutOrchestratorComponent); diff --git a/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts b/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts index f80dc740809..34411378be1 100644 --- a/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-order-summary/checkout-order-summary.component.spec.ts @@ -24,23 +24,21 @@ describe('CheckoutOrderSummaryComponent', () => { let component: CheckoutOrderSummaryComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - CheckoutOrderSummaryComponent, - OrderSummaryComponent, - PromotionsComponent, - AppliedCouponsComponent, - MockFeatureLevelDirective, - ], - providers: [ - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + CheckoutOrderSummaryComponent, + OrderSummaryComponent, + PromotionsComponent, + AppliedCouponsComponent, + MockFeatureLevelDirective, + ], + providers: [ + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutOrderSummaryComponent); diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html index b8b39ccdb9a..c091a19a355 100644 --- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html +++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.html @@ -33,7 +33,18 @@ }" > + + + + @@ -56,7 +67,18 @@ }}" formControlName="accountHolderName" /> + + + + @@ -74,7 +96,18 @@ class="form-control" formControlName="cardNumber" /> + + + + @@ -106,7 +139,18 @@ }" > + + + + @@ -127,7 +171,18 @@ formControlName="expiryYear" > + + + + @@ -159,7 +214,18 @@ id="cVVNumber" formControlName="cvn" /> + + + + @@ -182,7 +248,13 @@ -
+
{{ 'paymentForm.billingAddress' | cxTranslate }}
@@ -250,7 +322,18 @@ }" > + + + + @@ -271,7 +354,18 @@ }}" formControlName="firstName" /> + + + + @@ -290,7 +384,18 @@ }}" formControlName="lastName" /> + + + + @@ -309,7 +414,18 @@ }}" formControlName="line1" /> + + + + @@ -342,7 +458,18 @@ }}" formControlName="town" /> + + + + @@ -361,7 +488,18 @@ }}" formControlName="postalCode" /> + + + + @@ -398,7 +536,20 @@ }" > + + + + + + + + diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts index edb01765347..77f54afb976 100644 --- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.spec.ts @@ -12,6 +12,7 @@ import { AddressValidation, CardType, Country, + FeatureConfigService, GlobalMessageService, I18nTestingModule, PaymentDetails, @@ -24,7 +25,9 @@ import { LaunchDialogService, NgSelectA11yModule, } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { EMPTY, Observable, of } from 'rxjs'; +import { CheckoutBillingAddressFormService } from '../../checkout-billing-address'; import { CheckoutPaymentFormComponent } from './checkout-payment-form.component'; import createSpy = jasmine.createSpy; @@ -156,6 +159,24 @@ class MockUserAddressService implements Partial { getRegions = createSpy().and.returnValue(of([])); verifyAddress = createSpy().and.returnValue(of({})); } +class MockFeatureConfigService implements Partial { + isEnabled(_feature: string): boolean { + return false; + } +} +class MockCheckoutBillingAddressFormService + implements Partial +{ + getBillingAddress(): Address { + return mockBillingAddress; + } + isBillingAddressSameAsDeliveryAddress(): boolean { + return true; + } + isBillingAddressFormValid(): boolean { + return true; + } +} describe('CheckoutPaymentFormComponent', () => { let component: CheckoutPaymentFormComponent; @@ -171,49 +192,53 @@ describe('CheckoutPaymentFormComponent', () => { billingAddress: UntypedFormGroup['controls']; }; - beforeEach( - waitForAsync(() => { - mockCheckoutDeliveryService = new MockCheckoutDeliveryService(); - mockCheckoutPaymentService = new MockCheckoutPaymentService(); - mockUserPaymentService = new MockUserPaymentService(); - mockGlobalMessageService = new MockGlobalMessageService(); - - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - NgSelectModule, - NgSelectA11yModule, - I18nTestingModule, - FormErrorsModule, - ], - declarations: [ - CheckoutPaymentFormComponent, - MockCardComponent, - MockBillingAddressFormComponent, - MockCxIconComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: CheckoutPaymentFacade, - useValue: mockCheckoutPaymentService, - }, - { - provide: CheckoutDeliveryAddressFacade, - useValue: mockCheckoutDeliveryService, - }, - { provide: UserPaymentService, useValue: mockUserPaymentService }, - { provide: GlobalMessageService, useValue: mockGlobalMessageService }, - { provide: UserAddressService, useClass: MockUserAddressService }, - ], - }) - .overrideComponent(CheckoutPaymentFormComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + mockCheckoutDeliveryService = new MockCheckoutDeliveryService(); + mockCheckoutPaymentService = new MockCheckoutPaymentService(); + mockUserPaymentService = new MockUserPaymentService(); + mockGlobalMessageService = new MockGlobalMessageService(); + + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + NgSelectModule, + NgSelectA11yModule, + I18nTestingModule, + FormErrorsModule, + ], + declarations: [ + CheckoutPaymentFormComponent, + MockCardComponent, + MockBillingAddressFormComponent, + MockCxIconComponent, + MockSpinnerComponent, + MockFeatureDirective, + ], + providers: [ + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: CheckoutPaymentFacade, + useValue: mockCheckoutPaymentService, + }, + { + provide: CheckoutDeliveryAddressFacade, + useValue: mockCheckoutDeliveryService, + }, + { provide: UserPaymentService, useValue: mockUserPaymentService }, + { provide: GlobalMessageService, useValue: mockGlobalMessageService }, + { provide: UserAddressService, useClass: MockUserAddressService }, + { + provide: CheckoutBillingAddressFormService, + useClass: MockCheckoutBillingAddressFormService, + }, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, + ], }) - ); + .overrideComponent(CheckoutPaymentFormComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentFormComponent); @@ -506,6 +531,12 @@ describe('CheckoutPaymentFormComponent', () => { fixture.debugElement.queryAll(By.css('.form-check-input')).length ).toEqual(1); }); + + it('should show assitive message when form is submitted with errors', () => { + component.paymentForm.setErrors({ required: true }); + component.next(); + expect(mockGlobalMessageService.add).toHaveBeenCalled(); + }); }); describe('UI close/back button', () => { diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.ts index eda7a413052..8a58a57fbc0 100644 --- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.ts +++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.component.ts @@ -11,6 +11,7 @@ import { Input, OnInit, Output, + inject, } from '@angular/core'; import { UntypedFormBuilder, @@ -26,6 +27,7 @@ import { AddressValidation, CardType, Country, + FeatureConfigService, GlobalMessageService, GlobalMessageType, PaymentDetails, @@ -36,13 +38,14 @@ import { } from '@spartacus/core'; import { Card, - getAddressNumbers, ICON_TYPE, - LaunchDialogService, LAUNCH_CALLER, + LaunchDialogService, + getAddressNumbers, } from '@spartacus/storefront'; -import { BehaviorSubject, combineLatest, EMPTY, Observable } from 'rxjs'; +import { BehaviorSubject, EMPTY, Observable, combineLatest } from 'rxjs'; import { filter, map, switchMap, tap } from 'rxjs/operators'; +import { CheckoutBillingAddressFormService } from '../../checkout-billing-address'; @Component({ selector: 'cx-payment-form', @@ -57,10 +60,30 @@ export class CheckoutPaymentFormComponent implements OnInit { cardTypes$: Observable; deliveryAddress$: Observable
; + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ countries$: Observable; + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ sameAsDeliveryAddress = true; + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ regions$: Observable; + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ selectedCountry$: BehaviorSubject = new BehaviorSubject(''); + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ showSameAsDeliveryAddressCheckbox$: Observable; @Input() @@ -95,7 +118,10 @@ export class CheckoutPaymentFormComponent implements OnInit { cvn: ['', Validators.required], defaultPayment: [false], }); - + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ billingAddressForm: UntypedFormGroup = this.fb.group({ firstName: ['', Validators.required], lastName: ['', Validators.required], @@ -111,6 +137,8 @@ export class CheckoutPaymentFormComponent implements OnInit { postalCode: ['', Validators.required], }); + protected featureConfig = inject(FeatureConfigService); + protected billingAddressService = inject(CheckoutBillingAddressFormService); constructor( protected checkoutPaymentFacade: CheckoutPaymentFacade, protected checkoutDeliveryAddressFacade: CheckoutDeliveryAddressFacade, @@ -121,6 +149,9 @@ export class CheckoutPaymentFormComponent implements OnInit { protected launchDialogService: LaunchDialogService, protected translationService: TranslationService ) {} + useExtractedBillingAddressComponent: boolean = this.featureConfig.isEnabled( + 'useExtractedBillingAddressComponent' + ); ngOnInit(): void { if (this.paymentDetails) { @@ -200,10 +231,17 @@ export class CheckoutPaymentFormComponent implements OnInit { this.paymentForm.value.defaultPayment = !this.paymentForm.value.defaultPayment; } - + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ toggleSameAsDeliveryAddress(): void { this.sameAsDeliveryAddress = !this.sameAsDeliveryAddress; } + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ getAddressCardContent(address: Address): Observable { return this.translationService ? combineLatest([ @@ -231,7 +269,10 @@ export class CheckoutPaymentFormComponent implements OnInit { ) : EMPTY; } - + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ //TODO: Add elementRef to trigger button when verifyAddress is used. openSuggestedAddress(results: AddressValidation): void { this.launchDialogService.openDialogAndSubscribe( @@ -257,6 +298,10 @@ export class CheckoutPaymentFormComponent implements OnInit { * * See ticket CXSPA-1276 */ + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ verifyAddress(): void { if (this.sameAsDeliveryAddress) { this.next(); @@ -268,7 +313,10 @@ export class CheckoutPaymentFormComponent implements OnInit { }); } } - + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ protected handleAddressVerificationResults(results: AddressValidation) { if (results.decision === 'ACCEPT') { this.next(); @@ -282,33 +330,55 @@ export class CheckoutPaymentFormComponent implements OnInit { } } + /** + * @deprecated since 2211.25 + * Use CheckoutBillingAddressFormComponent instead + */ countrySelected(country: Country): void { this.billingAddressForm.get('country.isocode')?.setValue(country.isocode); this.selectedCountry$.next(country.isocode as string); } next(): void { + const sameAsDeliveryAddress = this.useExtractedBillingAddressComponent + ? this.billingAddressService.isBillingAddressSameAsDeliveryAddress() + : this.sameAsDeliveryAddress; + const isBillingAddressFormValid = this.useExtractedBillingAddressComponent + ? this.billingAddressService.isBillingAddressFormValid() + : this.billingAddressForm.valid; + const billingAddressFormvalue = this.useExtractedBillingAddressComponent + ? this.billingAddressService.getBillingAddress() + : this.billingAddressForm.value; + if (this.paymentForm.valid) { - if (this.sameAsDeliveryAddress) { + if (sameAsDeliveryAddress) { this.setPaymentDetails.emit({ paymentDetails: this.paymentForm.value, billingAddress: null, }); } else { - if (this.billingAddressForm.valid) { + if (isBillingAddressFormValid) { this.setPaymentDetails.emit({ paymentDetails: this.paymentForm.value, - billingAddress: this.billingAddressForm.value, + billingAddress: billingAddressFormvalue, }); } else { - this.billingAddressForm.markAllAsTouched(); + this.useExtractedBillingAddressComponent + ? this.billingAddressService.markAllAsTouched() + : this.billingAddressForm.markAllAsTouched(); } } } else { this.paymentForm.markAllAsTouched(); + this.globalMessageService.add( + { key: 'formErrors.globalMessage' }, + GlobalMessageType.MSG_TYPE_ASSISTIVE + ); - if (!this.sameAsDeliveryAddress) { - this.billingAddressForm.markAllAsTouched(); + if (!sameAsDeliveryAddress) { + this.useExtractedBillingAddressComponent + ? this.billingAddressService.markAllAsTouched() + : this.billingAddressForm.markAllAsTouched(); } } } diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.module.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.module.ts index 3c3ad4e1b4a..7d1c097a0f6 100644 --- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.module.ts +++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-form/checkout-payment-form.module.ts @@ -17,7 +17,7 @@ import { SpinnerModule, } from '@spartacus/storefront'; import { CheckoutPaymentFormComponent } from './checkout-payment-form.component'; - +import { CheckoutBillingAddressFormModule } from '../../checkout-billing-address'; @NgModule({ imports: [ NgSelectA11yModule, @@ -30,6 +30,7 @@ import { CheckoutPaymentFormComponent } from './checkout-payment-form.component' SpinnerModule, FormErrorsModule, FeaturesConfigModule, + CheckoutBillingAddressFormModule, ], declarations: [CheckoutPaymentFormComponent], exports: [CheckoutPaymentFormComponent], diff --git a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts index bcfaf516a4c..098302e7439 100644 --- a/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-payment-method/checkout-payment-method.component.spec.ts @@ -179,57 +179,55 @@ describe('CheckoutPaymentMethodComponent', () => { let globalMessageService: GlobalMessageService; let featureConfig: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - CheckoutPaymentMethodComponent, - MockPaymentFormComponent, - CardComponent, - MockSpinnerComponent, - MockCxIconComponent, - ], - providers: [ - { provide: UserPaymentService, useClass: MockUserPaymentService }, - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryFacade, - }, - { - provide: ActiveCartFacade, - useClass: MockActiveCartService, - }, - { - provide: CheckoutPaymentFacade, - useClass: MockCheckoutPaymentService, - }, - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActivatedRoute, useValue: mockActivatedRoute }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '6.3' }, - }, - }, - { - provide: FeatureConfigService, - useClass: MockFeatureConfigService, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + CheckoutPaymentMethodComponent, + MockPaymentFormComponent, + CardComponent, + MockSpinnerComponent, + MockCxIconComponent, + ], + providers: [ + { provide: UserPaymentService, useClass: MockUserPaymentService }, + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryFacade, + }, + { + provide: ActiveCartFacade, + useClass: MockActiveCartService, + }, + { + provide: CheckoutPaymentFacade, + useClass: MockCheckoutPaymentService, + }, + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActivatedRoute, useValue: mockActivatedRoute }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '6.3' }, }, - ], - }).compileComponents(); - - mockUserPaymentService = TestBed.inject(UserPaymentService); - mockCheckoutPaymentService = TestBed.inject(CheckoutPaymentFacade); - mockActiveCartService = TestBed.inject(ActiveCartFacade); - checkoutStepService = TestBed.inject( - CheckoutStepService as Type - ); - globalMessageService = TestBed.inject(GlobalMessageService); - featureConfig = TestBed.inject(FeatureConfigService); - }) - ); + }, + { + provide: FeatureConfigService, + useClass: MockFeatureConfigService, + }, + ], + }).compileComponents(); + + mockUserPaymentService = TestBed.inject(UserPaymentService); + mockCheckoutPaymentService = TestBed.inject(CheckoutPaymentFacade); + mockActiveCartService = TestBed.inject(ActiveCartFacade); + checkoutStepService = TestBed.inject( + CheckoutStepService as Type + ); + globalMessageService = TestBed.inject(GlobalMessageService); + featureConfig = TestBed.inject(FeatureConfigService); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPaymentMethodComponent); diff --git a/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts b/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts index 7a333cdc55a..28c97833690 100644 --- a/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-place-order/checkout-place-order.component.spec.ts @@ -47,25 +47,23 @@ describe('CheckoutPlaceOrderComponent', () => { let routingService: RoutingService; let launchDialogService: LaunchDialogService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - RouterTestingModule, - I18nTestingModule, - AtMessageModule, - ], - declarations: [MockUrlPipe, CheckoutPlaceOrderComponent], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { provide: GlobalMessageService, useValue: {} }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + RouterTestingModule, + I18nTestingModule, + AtMessageModule, + ], + declarations: [MockUrlPipe, CheckoutPlaceOrderComponent], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { provide: GlobalMessageService, useValue: {} }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutPlaceOrderComponent); diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts index 63d91a9a4dd..71410d81036 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-bottom/checkout-progress-mobile-bottom.component.spec.ts @@ -47,20 +47,18 @@ describe('CheckoutProgressMobileBottomComponent', () => { let component: CheckoutProgressMobileBottomComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CheckoutProgressMobileBottomComponent, - MockTranslateUrlPipe, - ], - providers: [ - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + CheckoutProgressMobileBottomComponent, + MockTranslateUrlPipe, + ], + providers: [ + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutProgressMobileBottomComponent); diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts index be9b2761c12..5d71fcdfe38 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress-mobile-top/checkout-progress-mobile-top.component.spec.ts @@ -60,21 +60,16 @@ describe('CheckoutProgressMobileTopComponent', () => { let component: CheckoutProgressMobileTopComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CheckoutProgressMobileTopComponent, - MockTranslateUrlPipe, - ], - providers: [ - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [CheckoutProgressMobileTopComponent, MockTranslateUrlPipe], + providers: [ + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutProgressMobileTopComponent); diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.html b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.html index 94b5da93679..89dd654c723 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.html +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.html @@ -13,6 +13,8 @@ diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts index e9bdfe3f0c4..91c69f9a037 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.spec.ts @@ -56,21 +56,19 @@ describe('CheckoutProgressComponent', () => { let component: CheckoutProgressComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CheckoutProgressComponent, - MockTranslateUrlPipe, - MockMultiLinePipe, - ], - providers: [ - { provide: CheckoutStepService, useClass: MockCheckoutStepService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + CheckoutProgressComponent, + MockTranslateUrlPipe, + MockMultiLinePipe, + ], + providers: [ + { provide: CheckoutStepService, useClass: MockCheckoutStepService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutProgressComponent); @@ -149,4 +147,22 @@ describe('CheckoutProgressComponent', () => { expect(component.getTabIndex(2)).toBe(-1); }); }); + + describe('getStepState()', () => { + beforeEach(() => { + component.activeStepIndex = 1; + }); + + it('should return first step as completed', () => { + expect(component.getStepState(0)).toBe('completed'); + }); + + it('should return second step as selected', () => { + expect(component.getStepState(1)).toBe('selected'); + }); + + it('should return third step as disabled', () => { + expect(component.getStepState(2)).toBe('disabled'); + }); + }); }); diff --git a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.ts b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.ts index cec3cbb9ae7..8e730fd83bd 100644 --- a/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.ts +++ b/feature-libs/checkout/base/components/checkout-progress/checkout-progress.component.ts @@ -5,7 +5,7 @@ */ import { ChangeDetectionStrategy, Component } from '@angular/core'; -import { CheckoutStep } from '@spartacus/checkout/base/root'; +import { CheckoutStep, CheckoutStepState } from '@spartacus/checkout/base/root'; import { BehaviorSubject, Observable } from 'rxjs'; import { tap } from 'rxjs/operators'; import { CheckoutStepService } from '../services/checkout-step.service'; @@ -42,4 +42,14 @@ export class CheckoutProgressComponent { isDisabled(index: number): boolean { return index > this.activeStepIndex; } + + getStepState(index: number): CheckoutStepState { + if (this.isDisabled(index)) { + return CheckoutStepState.DISABLED; + } + if (this.isActive(index)) { + return CheckoutStepState.SELECTED; + } + return CheckoutStepState.COMPLETED; + } } diff --git a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts index a3675c20346..933dcd4b11d 100644 --- a/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts +++ b/feature-libs/checkout/base/components/checkout-review-submit/checkout-review-submit.component.spec.ts @@ -145,43 +145,41 @@ describe('CheckoutReviewSubmitComponent', () => { let component: CheckoutReviewSubmitComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - I18nTestingModule, - PromotionsModule, - RouterTestingModule, - IconTestingModule, - OutletModule, - ], - declarations: [ - CheckoutReviewSubmitComponent, - MockCardComponent, - MockUrlPipe, - ], - providers: [ - { - provide: CheckoutDeliveryAddressFacade, - useClass: MockCheckoutDeliveryAddressService, - }, - { - provide: CheckoutDeliveryModesFacade, - useClass: MockCheckoutDeliveryModesService, - }, - { - provide: CheckoutPaymentFacade, - useClass: MockCheckoutPaymentService, - }, - { provide: ActiveCartFacade, useClass: MockActiveCartService }, - { - provide: CheckoutStepService, - useClass: MockCheckoutStepService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + I18nTestingModule, + PromotionsModule, + RouterTestingModule, + IconTestingModule, + OutletModule, + ], + declarations: [ + CheckoutReviewSubmitComponent, + MockCardComponent, + MockUrlPipe, + ], + providers: [ + { + provide: CheckoutDeliveryAddressFacade, + useClass: MockCheckoutDeliveryAddressService, + }, + { + provide: CheckoutDeliveryModesFacade, + useClass: MockCheckoutDeliveryModesService, + }, + { + provide: CheckoutPaymentFacade, + useClass: MockCheckoutPaymentService, + }, + { provide: ActiveCartFacade, useClass: MockActiveCartService }, + { + provide: CheckoutStepService, + useClass: MockCheckoutStepService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CheckoutReviewSubmitComponent); diff --git a/feature-libs/checkout/base/components/public_api.ts b/feature-libs/checkout/base/components/public_api.ts index 8de65fbd49f..6619d4e8da3 100644 --- a/feature-libs/checkout/base/components/public_api.ts +++ b/feature-libs/checkout/base/components/public_api.ts @@ -31,3 +31,4 @@ export * from './checkout-review-submit/checkout-review-submit.component'; export * from './checkout-review-submit/checkout-review-submit.module'; export * from './guards/index'; export * from './services/index'; +export * from './checkout-billing-address/index'; diff --git a/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts b/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts index b4ebfd366a9..2c097ce76fe 100644 --- a/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts +++ b/feature-libs/checkout/base/occ/adapters/occ-checkout-payment.adapter.ts @@ -319,7 +319,6 @@ export class OccCheckoutPaymentAdapter implements CheckoutPaymentAdapter { const key = item.key; result[key] = item.value; return result; - }, - {}); + }, {}); } } diff --git a/feature-libs/checkout/base/root/model/checkout-step.model.ts b/feature-libs/checkout/base/root/model/checkout-step.model.ts index 07d3bfe2ee7..42a07aa5140 100644 --- a/feature-libs/checkout/base/root/model/checkout-step.model.ts +++ b/feature-libs/checkout/base/root/model/checkout-step.model.ts @@ -11,6 +11,12 @@ export const enum CheckoutStepType { REVIEW_ORDER = 'reviewOrder', } +export const enum CheckoutStepState { + COMPLETED = 'completed', + SELECTED = 'selected', + DISABLED = 'disabled', +} + export interface CheckoutStep { id: string; name: string; diff --git a/feature-libs/checkout/base/styles/components/steps/_index.scss b/feature-libs/checkout/base/styles/components/steps/_index.scss index af96f5c27b9..2b59f413661 100644 --- a/feature-libs/checkout/base/styles/components/steps/_index.scss +++ b/feature-libs/checkout/base/styles/components/steps/_index.scss @@ -10,7 +10,8 @@ $checkout-components-allowlist: cx-payment-method, cx-payment-methods, cx-address-form, cx-billing-address-form, cx-payment-form, cx-review-submit, cx-guest-register-form, cx-suggested-addresses-dialog, cx-checkout-review-shipping, cx-checkout-review-payment, - cx-checkout-review-overview, cx-order-confirmation-shipping !default; + cx-checkout-review-overview, cx-order-confirmation-shipping, + cx-checkout-billing-address-form !default; $skipComponentStyles: () !default; diff --git a/feature-libs/checkout/base/styles/components/steps/payment/_checkout-billing-address.scss b/feature-libs/checkout/base/styles/components/steps/payment/_checkout-billing-address.scss new file mode 100644 index 00000000000..6122ca08369 --- /dev/null +++ b/feature-libs/checkout/base/styles/components/steps/payment/_checkout-billing-address.scss @@ -0,0 +1,6 @@ +%cx-checkout-billing-address-form { + .cx-payment-form-billing-address { + @include type('4'); + padding: 0.875rem 0 1.25rem 0; + } +} diff --git a/feature-libs/checkout/base/styles/components/steps/payment/_index.scss b/feature-libs/checkout/base/styles/components/steps/payment/_index.scss index a98dada5a95..d464923653e 100644 --- a/feature-libs/checkout/base/styles/components/steps/payment/_index.scss +++ b/feature-libs/checkout/base/styles/components/steps/payment/_index.scss @@ -1,3 +1,4 @@ @import './billing-address-form'; @import './payment-method'; @import './payment-form'; +@import './checkout-billing-address'; diff --git a/feature-libs/checkout/package.json b/feature-libs/checkout/package.json index bb899b9a6f9..ec6be36d5e0 100644 --- a/feature-libs/checkout/package.json +++ b/feature-libs/checkout/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/checkout", - "version": "2211.24.0", + "version": "2211.25.1", "description": "Checkout feature library for Spartacus", "keywords": [ "spartacus", @@ -32,13 +32,13 @@ "@angular/router": "^17.0.5", "@ng-select/ng-select": "^12.0.4", "@ngrx/store": "^17.0.1", - "@spartacus/cart": "2211.24.0", - "@spartacus/core": "2211.24.0", - "@spartacus/order": "2211.24.0", - "@spartacus/schematics": "2211.24.0", - "@spartacus/storefront": "2211.24.0", - "@spartacus/styles": "2211.24.0", - "@spartacus/user": "2211.24.0", + "@spartacus/cart": "2211.25.1", + "@spartacus/core": "2211.25.1", + "@spartacus/order": "2211.25.1", + "@spartacus/schematics": "2211.25.1", + "@spartacus/storefront": "2211.25.1", + "@spartacus/styles": "2211.25.1", + "@spartacus/user": "2211.25.1", "bootstrap": "^4.6.2", "rxjs": "^7.8.0" }, diff --git a/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts b/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts index 8d5ba5f6d19..109df779470 100644 --- a/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts +++ b/feature-libs/checkout/scheduled-replenishment/components/checkout-place-order/checkout-place-order.component.spec.ts @@ -90,39 +90,37 @@ describe('CheckoutScheduledReplenishmentPlaceOrderComponent', () => { let launchDialogService: LaunchDialogService; let scheduledReplenishmentOrderFacade: ScheduledReplenishmentOrderFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - RouterTestingModule, - I18nTestingModule, - AtMessageModule, - ], - declarations: [ - MockUrlPipe, - CheckoutScheduledReplenishmentPlaceOrderComponent, - ], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { - provide: CheckoutReplenishmentFormService, - useClass: MockCheckoutReplenishmentFormService, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: ScheduledReplenishmentOrderFacade, - useClass: MockScheduledReplenishmentOrderFacade, - }, - { - provide: GlobalMessageService, - useValue: {}, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + RouterTestingModule, + I18nTestingModule, + AtMessageModule, + ], + declarations: [ + MockUrlPipe, + CheckoutScheduledReplenishmentPlaceOrderComponent, + ], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { + provide: CheckoutReplenishmentFormService, + useClass: MockCheckoutReplenishmentFormService, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: ScheduledReplenishmentOrderFacade, + useClass: MockScheduledReplenishmentOrderFacade, + }, + { + provide: GlobalMessageService, + useValue: {}, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts b/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts index 7e09a3b98d1..17dbe1c93a9 100644 --- a/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts +++ b/feature-libs/checkout/scheduled-replenishment/components/checkout-schedule-replenishment-order/checkout-schedule-replenishment-order.component.spec.ts @@ -37,20 +37,18 @@ describe('CheckoutScheduleReplenishmentOrderComponent', () => { let checkoutReplenishmentFormService: CheckoutReplenishmentFormService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, IconTestingModule], - declarations: [CheckoutScheduleReplenishmentOrderComponent], - providers: [ - { - provide: CheckoutReplenishmentFormService, - useClass: MockCheckoutReplenishmentFormService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, IconTestingModule], + declarations: [CheckoutScheduleReplenishmentOrderComponent], + providers: [ + { + provide: CheckoutReplenishmentFormService, + useClass: MockCheckoutReplenishmentFormService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts b/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts index 10845fb3803..6049dea36eb 100644 --- a/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts +++ b/feature-libs/checkout/scheduled-replenishment/components/services/checkout-replenishment-form.service.spec.ts @@ -11,13 +11,11 @@ const newReplenishmentFormData: ScheduleReplenishmentForm = { describe('Checkout Replenishment Form Service', () => { let service: CheckoutReplenishmentFormService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [CheckoutReplenishmentFormService], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [CheckoutReplenishmentFormService], + }); + })); beforeEach(() => { service = TestBed.inject(CheckoutReplenishmentFormService); diff --git a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap index 57de34f62f4..5df7b75fec1 100644 --- a/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap +++ b/feature-libs/checkout/schematics/add-checkout/__snapshots__/index_spec.ts.snap @@ -63,7 +63,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu }, }), provideConfig({ features: { - level: '2211.24' + level: '2211.25' } }), provideConfig(defaultB2bOccConfig)] }) @@ -76,7 +76,7 @@ exports[`Spartacus Checkout schematics: ng-add Checkout feature b2b general setu import { checkoutB2BTranslationChunksConfig, checkoutB2BTranslations } from "@spartacus/checkout/b2b/assets"; import { CheckoutB2BRootModule } from "@spartacus/checkout/b2b/root"; import { checkoutTranslationChunksConfig, checkoutTranslations } from "@spartacus/checkout/base/assets"; -import { CheckoutRootModule, CHECKOUT_FEATURE } from "@spartacus/checkout/base/root"; +import { CHECKOUT_FEATURE, CheckoutRootModule } from "@spartacus/checkout/base/root"; import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core"; @NgModule({ @@ -283,7 +283,7 @@ export class CheckoutFeatureModule { } exports[`Spartacus Checkout schematics: ng-add Checkout feature base general setup should add the feature using the lazy loading syntax 1`] = ` "import { NgModule } from '@angular/core'; import { checkoutTranslationChunksConfig, checkoutTranslations } from "@spartacus/checkout/base/assets"; -import { CheckoutRootModule, CHECKOUT_FEATURE } from "@spartacus/checkout/base/root"; +import { CHECKOUT_FEATURE, CheckoutRootModule } from "@spartacus/checkout/base/root"; import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core"; @NgModule({ @@ -514,7 +514,7 @@ import { defaultCmsContentProviders, layoutConfig, mediaConfig } from "@spartacu }, }), provideConfig({ features: { - level: '2211.24' + level: '2211.25' } }), provideConfig(defaultB2bOccConfig)] }) @@ -527,7 +527,7 @@ exports[`Spartacus Checkout schematics: ng-add Checkout feature scheduled replen import { checkoutB2BTranslationChunksConfig, checkoutB2BTranslations } from "@spartacus/checkout/b2b/assets"; import { CheckoutB2BRootModule } from "@spartacus/checkout/b2b/root"; import { checkoutTranslationChunksConfig, checkoutTranslations } from "@spartacus/checkout/base/assets"; -import { CheckoutRootModule, CHECKOUT_FEATURE } from "@spartacus/checkout/base/root"; +import { CHECKOUT_FEATURE, CheckoutRootModule } from "@spartacus/checkout/base/root"; import { checkoutScheduledReplenishmentTranslationChunksConfig, checkoutScheduledReplenishmentTranslations } from "@spartacus/checkout/scheduled-replenishment/assets"; import { CheckoutScheduledReplenishmentRootModule } from "@spartacus/checkout/scheduled-replenishment/root"; import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core"; diff --git a/feature-libs/checkout/tsconfig.schematics.json b/feature-libs/checkout/tsconfig.schematics.json index f430d173f73..498b79fe02b 100644 --- a/feature-libs/checkout/tsconfig.schematics.json +++ b/feature-libs/checkout/tsconfig.schematics.json @@ -546,6 +546,7 @@ "../../integration-libs/cdp/customer-ticketing/public_api" ], "@spartacus/cdp": ["../../integration-libs/cdp/public_api"], + "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"], "@spartacus/cds": ["../../integration-libs/cds/public_api"], "@spartacus/digital-payments/assets": [ "../../integration-libs/digital-payments/assets/public_api" diff --git a/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.spec.ts b/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.spec.ts index cc177e0487c..e08c1f1bcb4 100644 --- a/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.spec.ts +++ b/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.spec.ts @@ -1,6 +1,6 @@ import { Component, Directive, Input } from '@angular/core'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { ReactiveFormsModule } from '@angular/forms'; +import { ReactiveFormsModule, Validators } from '@angular/forms'; import { GlobalMessageEntities, GlobalMessageService, @@ -79,7 +79,9 @@ class MockGlobalMessageService implements Partial { get(): Observable { return of({}); } + add(_: string | Translatable, __: GlobalMessageType, ___?: number): void {} + remove(_: GlobalMessageType, __?: number): void {} } @@ -261,4 +263,17 @@ describe('CustomerTicketingCreateDialogComponent', () => { ); }); }); + + it('should add Validators.required to ticketCategory if categories are present', () => { + const ticketCategoryControl = component.form.get('ticketCategory'); + expect(ticketCategoryControl?.hasValidator(Validators.required)).toBe(true); + }); + + it('should remove Validators.required from ticketCategory if no categories are present', () => { + component['manageCategoryValidation']([]); + const ticketCategoryControl = component.form.get('ticketCategory'); + expect(ticketCategoryControl?.hasValidator(Validators.required)).toBe( + false + ); + }); }); diff --git a/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.ts b/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.ts index 93f1fae10f7..dbe20cb0cc0 100644 --- a/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.ts +++ b/feature-libs/customer-ticketing/components/list/customer-ticketing-create/customer-ticketing-create-dialog/customer-ticketing-create-dialog.component.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Component, Input, OnDestroy, OnInit, inject } from '@angular/core'; +import { Component, inject, Input, OnDestroy, OnInit } from '@angular/core'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { AssociatedObject, @@ -14,7 +14,7 @@ import { TicketStarter, } from '@spartacus/customer-ticketing/root'; import { FormUtils } from '@spartacus/storefront'; -import { Observable, Subscription, of } from 'rxjs'; +import { Observable, of, Subscription } from 'rxjs'; import { CustomerTicketingDialogComponent } from '../../../shared/customer-ticketing-dialog/customer-ticketing-dialog.component'; import { GlobalMessageService, @@ -22,7 +22,8 @@ import { HttpErrorModel, TranslationService, } from '@spartacus/core'; -import { catchError, first } from 'rxjs/operators'; +import { catchError, first, tap } from 'rxjs/operators'; + @Component({ selector: 'cx-customer-ticketing-create-dialog', templateUrl: './customer-ticketing-create-dialog.component.html', @@ -31,8 +32,12 @@ export class CustomerTicketingCreateDialogComponent extends CustomerTicketingDialogComponent implements OnInit, OnDestroy { - ticketCategories$: Observable = - this.customerTicketingFacade.getTicketCategories(); + ticketCategories$: Observable = + this.customerTicketingFacade.getTicketCategories().pipe( + tap((categories: Category[] | undefined) => { + this.manageCategoryValidation(categories); + }) + ); ticketAssociatedObjects$: Observable = this.customerTicketingFacade.getTicketAssociatedObjects().pipe( catchError((error: any) => { @@ -155,6 +160,20 @@ export class CustomerTicketingCreateDialogComponent this.onError(); } + protected manageCategoryValidation(categories: Category[] | undefined): void { + const categoryControl = this.form.get('ticketCategory'); + if (!categoryControl) { + return; + } + if (categories?.length) { + categoryControl.setValidators(Validators.required); + categoryControl.updateValueAndValidity(); + } else { + categoryControl.clearValidators(); + categoryControl.updateValueAndValidity(); + } + } + protected onComplete(): void { this.close('Ticket created successfully'); } diff --git a/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts b/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts index c164000e4bd..c4392d81851 100644 --- a/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts +++ b/feature-libs/customer-ticketing/components/list/customer-ticketing-list/customer-ticketing-list.component.spec.ts @@ -206,47 +206,45 @@ describe('CustomerTicketingListComponent', () => { let routingService: RoutingService; let customerTicketingFacade: CustomerTicketingFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - CustomerTicketingListComponent, - MockPaginationComponent, - MockSortingComponent, - MockUrlPipe, - MockCustomerTicketingCreateComponent, - ], - providers: [ - { - provide: CustomerTicketingFacade, - useClass: MockCustomerTicketingFacade, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + CustomerTicketingListComponent, + MockPaginationComponent, + MockSortingComponent, + MockUrlPipe, + MockCustomerTicketingCreateComponent, + ], + providers: [ + { + provide: CustomerTicketingFacade, + useClass: MockCustomerTicketingFacade, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); - const translationService = TestBed.inject(TranslationService); - spyOn(translationService, 'translate').and.callFake((input) => { - switch (input) { - case 'customerTicketing.ticketId': - return of('ticket-id'); - case 'customerTicketing.changedOn': - return of(new Date(0).toISOString()); - default: - return EMPTY; - } - }); + const translationService = TestBed.inject(TranslationService); + spyOn(translationService, 'translate').and.callFake((input) => { + switch (input) { + case 'customerTicketing.ticketId': + return of('ticket-id'); + case 'customerTicketing.changedOn': + return of(new Date(0).toISOString()); + default: + return EMPTY; + } + }); - customerTicketingFacade = TestBed.inject(CustomerTicketingFacade); + customerTicketingFacade = TestBed.inject(CustomerTicketingFacade); - fixture = TestBed.createComponent(CustomerTicketingListComponent); - component = fixture.componentInstance; - routingService = TestBed.inject(RoutingService); - fixture.detectChanges(); - }) - ); + fixture = TestBed.createComponent(CustomerTicketingListComponent); + component = fixture.componentInstance; + routingService = TestBed.inject(RoutingService); + fixture.detectChanges(); + })); it('should be created', () => { expect(component).toBeTruthy(); diff --git a/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts b/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts index 17d6b181743..e75ab1e18ba 100644 --- a/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts +++ b/feature-libs/customer-ticketing/components/my-account-v2/my-account-v2-customer-ticketing.component.spec.ts @@ -67,31 +67,29 @@ describe('MyAccountV2CustomerTicketingComponent', () => { let component: MyAccountV2CustomerTicketingComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - MyAccountV2CustomerTicketingComponent, - MockTranslatePipe, - MockUrlPipe, - ], - providers: [ - { - provide: 'CustomerTicketingFacade', - useClass: MockcustomerTicketingFacade, - }, - { provide: RoutingService, useClass: MockRoutingService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + MyAccountV2CustomerTicketingComponent, + MockTranslatePipe, + MockUrlPipe, + ], + providers: [ + { + provide: 'CustomerTicketingFacade', + useClass: MockcustomerTicketingFacade, + }, + { provide: RoutingService, useClass: MockRoutingService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); - fixture = TestBed.createComponent(MyAccountV2CustomerTicketingComponent); - component = fixture.componentInstance; - component.tickets$ = of(mockTicketList); - fixture.detectChanges(); - }) - ); + fixture = TestBed.createComponent(MyAccountV2CustomerTicketingComponent); + component = fixture.componentInstance; + component.tickets$ = of(mockTicketList); + fixture.detectChanges(); + })); it('should be created', () => { expect(component).toBeTruthy(); diff --git a/feature-libs/customer-ticketing/package.json b/feature-libs/customer-ticketing/package.json index 35abb1624e4..15372c0dbbd 100644 --- a/feature-libs/customer-ticketing/package.json +++ b/feature-libs/customer-ticketing/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/customer-ticketing", - "version": "2211.24.0", + "version": "2211.25.1", "description": "Customer-Ticketing library for Spartacus", "keywords": [ "spartacus", @@ -30,11 +30,11 @@ "@angular/core": "^17.0.5", "@angular/forms": "^17.0.5", "@angular/router": "^17.0.5", - "@spartacus/cart": "2211.24.0", - "@spartacus/core": "2211.24.0", - "@spartacus/schematics": "2211.24.0", - "@spartacus/storefront": "2211.24.0", - "@spartacus/styles": "2211.24.0", + "@spartacus/cart": "2211.25.1", + "@spartacus/core": "2211.25.1", + "@spartacus/schematics": "2211.25.1", + "@spartacus/storefront": "2211.25.1", + "@spartacus/styles": "2211.25.1", "rxjs": "^7.8.0" }, "publishConfig": { diff --git a/feature-libs/customer-ticketing/schematics/add-customer-ticketing/__snapshots__/index_spec.ts.snap b/feature-libs/customer-ticketing/schematics/add-customer-ticketing/__snapshots__/index_spec.ts.snap index a27d225da5e..b1358fc96ec 100644 --- a/feature-libs/customer-ticketing/schematics/add-customer-ticketing/__snapshots__/index_spec.ts.snap +++ b/feature-libs/customer-ticketing/schematics/add-customer-ticketing/__snapshots__/index_spec.ts.snap @@ -28,7 +28,7 @@ exports[`Spartacus Customer Ticketing schematics: ng-add Customer Ticketing feat "import { NgModule } from '@angular/core'; import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core"; import { customerTicketingTranslationChunksConfig, customerTicketingTranslations } from "@spartacus/customer-ticketing/assets"; -import { CustomerTicketingRootModule, CUSTOMER_TICKETING_FEATURE } from "@spartacus/customer-ticketing/root"; +import { CUSTOMER_TICKETING_FEATURE, CustomerTicketingRootModule } from "@spartacus/customer-ticketing/root"; @NgModule({ declarations: [], diff --git a/feature-libs/customer-ticketing/tsconfig.schematics.json b/feature-libs/customer-ticketing/tsconfig.schematics.json index d5ebe270b77..e89d86d474e 100644 --- a/feature-libs/customer-ticketing/tsconfig.schematics.json +++ b/feature-libs/customer-ticketing/tsconfig.schematics.json @@ -559,6 +559,7 @@ "../../integration-libs/cdp/customer-ticketing/public_api" ], "@spartacus/cdp": ["../../integration-libs/cdp/public_api"], + "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"], "@spartacus/cds": ["../../integration-libs/cds/public_api"], "@spartacus/digital-payments/assets": [ "../../integration-libs/digital-payments/assets/public_api" diff --git a/feature-libs/estimated-delivery-date/package.json b/feature-libs/estimated-delivery-date/package.json index 5e7086d6bd9..ab5439a48c4 100644 --- a/feature-libs/estimated-delivery-date/package.json +++ b/feature-libs/estimated-delivery-date/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/estimated-delivery-date", - "version": "2211.24.0", + "version": "2211.25.1", "description": "Estimated Delivery Date library for Spartacus", "keywords": [ "spartacus", @@ -28,12 +28,12 @@ "@angular-devkit/schematics": "^17.0.5", "@angular/common": "^17.0.5", "@angular/core": "^17.0.5", - "@spartacus/cart": "2211.24.0", - "@spartacus/core": "2211.24.0", - "@spartacus/order": "2211.24.0", - "@spartacus/schematics": "2211.24.0", - "@spartacus/storefront": "2211.24.0", - "@spartacus/styles": "2211.24.0", + "@spartacus/cart": "2211.25.1", + "@spartacus/core": "2211.25.1", + "@spartacus/order": "2211.25.1", + "@spartacus/schematics": "2211.25.1", + "@spartacus/storefront": "2211.25.1", + "@spartacus/styles": "2211.25.1", "rxjs": "^7.8.0" }, "publishConfig": { diff --git a/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts b/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts index e2003da8e9a..4eb407d7082 100644 --- a/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts +++ b/feature-libs/estimated-delivery-date/show-estimated-delivery-date/components/estimated-delivery-date.component.spec.ts @@ -53,26 +53,24 @@ describe('EstimatedDeliveryDateCartEntryComponent', () => { let mockCartItemContext: MockCartItemContext; let mockOrderHistoryFacade: MockOrderHistoryFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, ReactiveFormsModule, I18nTestingModule], - declarations: [ - EstimatedDeliveryDateComponent, - MockConfigureEstimatedDeliveryDateComponent, - ], - providers: [ - { provide: CartItemContext, useClass: MockCartItemContext }, - { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, - { - provide: TranslationService, - useClass: MockTranslationService, - }, - { provide: LanguageService, useClass: MockLanguageService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, ReactiveFormsModule, I18nTestingModule], + declarations: [ + EstimatedDeliveryDateComponent, + MockConfigureEstimatedDeliveryDateComponent, + ], + providers: [ + { provide: CartItemContext, useClass: MockCartItemContext }, + { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, + { + provide: TranslationService, + useClass: MockTranslationService, + }, + { provide: LanguageService, useClass: MockLanguageService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(EstimatedDeliveryDateComponent); diff --git a/feature-libs/estimated-delivery-date/tsconfig.schematics.json b/feature-libs/estimated-delivery-date/tsconfig.schematics.json index d5ebe270b77..e89d86d474e 100644 --- a/feature-libs/estimated-delivery-date/tsconfig.schematics.json +++ b/feature-libs/estimated-delivery-date/tsconfig.schematics.json @@ -559,6 +559,7 @@ "../../integration-libs/cdp/customer-ticketing/public_api" ], "@spartacus/cdp": ["../../integration-libs/cdp/public_api"], + "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"], "@spartacus/cds": ["../../integration-libs/cds/public_api"], "@spartacus/digital-payments/assets": [ "../../integration-libs/digital-payments/assets/public_api" diff --git a/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts b/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts index c727e224fd0..429d0a8a75b 100644 --- a/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts +++ b/feature-libs/order/components/amend-order/amend-order-actions/amend-order-actions.component.spec.ts @@ -30,27 +30,25 @@ describe('AmendOrderActionsComponent', () => { let fixture: ComponentFixture; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - RouterTestingModule, - I18nTestingModule, - StoreModule.forRoot({}), - ], - declarations: [MockUrlPipe, AmendOrderActionsComponent], - providers: [ - { - provide: RoutingConfigService, - useClass: MockRoutingConfigService, - }, - { provide: RoutingService, useClass: MockRoutingService }, - ], - }).compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + RouterTestingModule, + I18nTestingModule, + StoreModule.forRoot({}), + ], + declarations: [MockUrlPipe, AmendOrderActionsComponent], + providers: [ + { + provide: RoutingConfigService, + useClass: MockRoutingConfigService, + }, + { provide: RoutingService, useClass: MockRoutingService }, + ], + }).compileComponents(); - routingService = TestBed.inject(RoutingService); - }) - ); + routingService = TestBed.inject(RoutingService); + })); beforeEach(() => { fixture = TestBed.createComponent(AmendOrderActionsComponent); diff --git a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts index 1f5e60d0c9a..680d894c1c5 100644 --- a/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts +++ b/feature-libs/order/components/amend-order/amend-order-items/amend-order-items.component.spec.ts @@ -65,25 +65,23 @@ describe('CancelOrReturnItemsComponent', () => { let fixture: ComponentFixture; let orderAmendService: OrderAmendService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ReactiveFormsModule, I18nTestingModule], - providers: [ - { - provide: OrderAmendService, - useClass: MockOrderAmendService, - }, - ], - declarations: [ - CancelOrReturnItemsComponent, - MockMediaComponent, - MockItemCounterComponent, - MockFeatureLevelDirective, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ReactiveFormsModule, I18nTestingModule], + providers: [ + { + provide: OrderAmendService, + useClass: MockOrderAmendService, + }, + ], + declarations: [ + CancelOrReturnItemsComponent, + MockMediaComponent, + MockItemCounterComponent, + MockFeatureLevelDirective, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CancelOrReturnItemsComponent); diff --git a/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts b/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts index a6b3317340b..4b0ea1543b2 100644 --- a/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts +++ b/feature-libs/order/components/amend-order/cancellations/cancel-order-confirmation/cancel-order-confirmation.component.spec.ts @@ -66,26 +66,24 @@ describe('CancelOrderConfirmationComponent', () => { let fixture: ComponentFixture; let service: OrderAmendService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - CommonModule, - RouterTestingModule, - I18nTestingModule, - ReactiveFormsModule, - ], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - CancelOrderConfirmationComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + CommonModule, + RouterTestingModule, + I18nTestingModule, + ReactiveFormsModule, + ], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + CancelOrderConfirmationComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CancelOrderConfirmationComponent); diff --git a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts index 05d9e31ba9d..33a5f22eac6 100644 --- a/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts +++ b/feature-libs/order/components/amend-order/cancellations/cancel-order/cancel-order.component.spec.ts @@ -44,21 +44,19 @@ describe('CancelOrderComponent', () => { let component: CancelOrderComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, FormErrorsModule], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - CancelOrderComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, FormErrorsModule], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + CancelOrderComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(CancelOrderComponent); diff --git a/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts b/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts index 42096806ef6..d7500a891d7 100644 --- a/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts +++ b/feature-libs/order/components/amend-order/cancellations/order-cancellation.service.ts @@ -63,7 +63,7 @@ export class OrderCancellationService extends OrderAmendService { ({ orderEntryNumber: Number(entryNumber), quantity: entries[entryNumber], - } as CancelOrReturnRequestEntryInput) + }) as CancelOrReturnRequestEntryInput ); this.form.reset(); diff --git a/feature-libs/order/components/amend-order/returns/order-return.service.ts b/feature-libs/order/components/amend-order/returns/order-return.service.ts index f72d2e35d75..25f43ab3ff0 100644 --- a/feature-libs/order/components/amend-order/returns/order-return.service.ts +++ b/feature-libs/order/components/amend-order/returns/order-return.service.ts @@ -61,7 +61,7 @@ export class OrderReturnService extends OrderAmendService { ({ orderEntryNumber: Number(entryNumber), quantity: entries[entryNumber], - } as CancelOrReturnRequestEntryInput) + }) as CancelOrReturnRequestEntryInput ); this.form.reset(); diff --git a/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts b/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts index eedfb0faf83..8fff0241b33 100644 --- a/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts +++ b/feature-libs/order/components/amend-order/returns/return-order-confirmation/return-order-confirmation.component.spec.ts @@ -65,21 +65,19 @@ describe('ReturnOrderConfirmationComponent', () => { let fixture: ComponentFixture; let service: OrderAmendService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, ReactiveFormsModule], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - ReturnOrderConfirmationComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, ReactiveFormsModule], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + ReturnOrderConfirmationComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReturnOrderConfirmationComponent); diff --git a/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts b/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts index 0689abf1cef..4213e3a9a38 100644 --- a/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts +++ b/feature-libs/order/components/amend-order/returns/return-order/return-order.component.spec.ts @@ -44,21 +44,19 @@ describe('ReturnOrderComponent', () => { let component: ReturnOrderComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, FormErrorsModule], - providers: [ - { provide: OrderAmendService, useClass: MockOrderAmendService }, - ], - declarations: [ - ReturnOrderComponent, - MockAmendOrderActionComponent, - MockCancelOrReturnItemsComponent, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, FormErrorsModule], + providers: [ + { provide: OrderAmendService, useClass: MockOrderAmendService }, + ], + declarations: [ + ReturnOrderComponent, + MockAmendOrderActionComponent, + MockCancelOrReturnItemsComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReturnOrderComponent); diff --git a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts index 98ea72ef55d..230f6bb6474 100644 --- a/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts +++ b/feature-libs/order/components/my-account-v2/my-account-v2-orders.component.spec.ts @@ -94,25 +94,23 @@ describe(' MyAccountV2OrdersComponent', () => { let fixture: ComponentFixture; let service: MyAccountV2OrderHistoryService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - MyAccountV2OrdersComponent, - MockUrlPipe, - MockMediaComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: RoutingService, useClass: MockRoutingService }, - { provide: MyAccountV2OrderHistoryService, useClass: MockService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); - service = TestBed.inject(MyAccountV2OrderHistoryService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + MyAccountV2OrdersComponent, + MockUrlPipe, + MockMediaComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: RoutingService, useClass: MockRoutingService }, + { provide: MyAccountV2OrderHistoryService, useClass: MockService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); + service = TestBed.inject(MyAccountV2OrderHistoryService); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2OrdersComponent); diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts b/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts index 93b7e6ad15c..aac1325187a 100644 --- a/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-confirmation-items/order-confirmation-items.component.spec.ts @@ -24,23 +24,21 @@ describe('OrderConfirmationItemsComponent', () => { let component: OrderConfirmationItemsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, PromotionsModule], - declarations: [OrderConfirmationItemsComponent], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '1.3' }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, PromotionsModule], + declarations: [OrderConfirmationItemsComponent], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '1.3' }, }, - ], - }).compileComponents(); - }) - ); + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderConfirmationItemsComponent); diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts index 9ef075bbb04..4008f63f948 100644 --- a/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-confirmation-thank-you-message/order-confirmation-thank-you-message.component.spec.ts @@ -50,24 +50,22 @@ describe('OrderConfirmationThankYouMessageComponent', () => { let orderFacade: OrderFacade; let globalMessageService: GlobalMessageService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - OrderConfirmationThankYouMessageComponent, - MockAddtoHomeScreenBannerComponent, - MockGuestRegisterFormComponent, - MockFeatureLevelDirective, - ], - providers: [ - { provide: OrderFacade, useClass: MockOrderFacade }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + OrderConfirmationThankYouMessageComponent, + MockAddtoHomeScreenBannerComponent, + MockGuestRegisterFormComponent, + MockFeatureLevelDirective, + ], + providers: [ + { provide: OrderFacade, useClass: MockOrderFacade }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts b/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts index e95f4b9a071..795c4eeba14 100644 --- a/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-confirmation-totals/order-confirmation-totals.component.spec.ts @@ -18,15 +18,13 @@ describe('OrderConfirmationTotalsComponent', () => { let component: OrderConfirmationTotalsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [OrderConfirmationTotalsComponent], - providers: [{ provide: OrderFacade, useClass: MockOrderFacade }], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [OrderConfirmationTotalsComponent], + providers: [{ provide: OrderFacade, useClass: MockOrderFacade }], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderConfirmationTotalsComponent); diff --git a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html index c9cd1600457..1647c1a536a 100644 --- a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html +++ b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.html @@ -24,7 +24,18 @@

{{ 'checkoutOrderConfirmation.createAccount' | cxTranslate }}

[attr.aria-label]="'register.password.placeholder' | cxTranslate" cxPasswordVisibilitySwitch /> + + + + @@ -49,7 +60,18 @@

{{ 'checkoutOrderConfirmation.createAccount' | cxTranslate }}

" cxPasswordVisibilitySwitch /> + + + + diff --git a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts index ebdacd80226..5de9de87a5e 100644 --- a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts +++ b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.spec.ts @@ -10,6 +10,7 @@ import { PasswordVisibilityToggleModule, } from '@spartacus/storefront'; import { UserRegisterFacade } from '@spartacus/user/profile/root'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { of } from 'rxjs'; import { OrderGuestRegisterFormComponent } from './order-guest-register-form.component'; import createSpy = jasmine.createSpy; @@ -33,24 +34,22 @@ describe('OrderGuestRegisterFormComponent', () => { let userRegisterFacade: UserRegisterFacade; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - I18nTestingModule, - ReactiveFormsModule, - FormErrorsModule, - PasswordVisibilityToggleModule, - ], - declarations: [OrderGuestRegisterFormComponent], - providers: [ - { provide: AuthService, useClass: MockAuthService }, - { provide: UserRegisterFacade, useClass: MockUserRegisterFacade }, - { provide: RoutingService, useClass: MockRoutingService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + I18nTestingModule, + ReactiveFormsModule, + FormErrorsModule, + PasswordVisibilityToggleModule, + ], + declarations: [OrderGuestRegisterFormComponent, MockFeatureDirective], + providers: [ + { provide: AuthService, useClass: MockAuthService }, + { provide: UserRegisterFacade, useClass: MockUserRegisterFacade }, + { provide: RoutingService, useClass: MockRoutingService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderGuestRegisterFormComponent); diff --git a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts index fbfb23044e6..6d2ca45ec9f 100644 --- a/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts +++ b/feature-libs/order/components/order-confirmation/order-guest-register-form/order-guest-register-form.component.ts @@ -4,13 +4,17 @@ * SPDX-License-Identifier: Apache-2.0 */ -import { Component, Input, OnDestroy } from '@angular/core'; +import { Component, Input, OnDestroy, inject } from '@angular/core'; import { UntypedFormBuilder, UntypedFormGroup, Validators, } from '@angular/forms'; -import { AuthService, RoutingService } from '@spartacus/core'; +import { + AuthService, + FeatureConfigService, + RoutingService, +} from '@spartacus/core'; import { CustomFormValidators } from '@spartacus/storefront'; import { UserRegisterFacade } from '@spartacus/user/profile/root'; import { Subscription } from 'rxjs'; @@ -20,16 +24,22 @@ import { Subscription } from 'rxjs'; templateUrl: './order-guest-register-form.component.html', }) export class OrderGuestRegisterFormComponent implements OnDestroy { + // TODO: (CXSPA-7315) Remove feature toggle in the next major + private featureConfigService = inject(FeatureConfigService); + + protected passwordValidators = this.featureConfigService?.isEnabled( + 'formErrorsDescriptiveMessages' + ) + ? [CustomFormValidators.passwordValidator] + : CustomFormValidators.passwordValidators; + @Input() guid: string; @Input() email: string; subscription: Subscription; guestRegisterForm: UntypedFormGroup = this.fb.group( { - password: [ - '', - [Validators.required, CustomFormValidators.passwordValidator], - ], + password: ['', [Validators.required, ...this.passwordValidators]], passwordconf: ['', Validators.required], }, { diff --git a/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts b/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts index 449724f5554..c405a315155 100644 --- a/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts +++ b/feature-libs/order/components/order-details/my-account-v2-order-consignments.service.ts @@ -50,12 +50,15 @@ export class MyAccountV2OrderConsignmentsService { protected groupConsignments( consignments: Consignment[] | undefined ): Consignment[] | undefined { - const grouped = consignments?.reduce((result, current) => { - const key = this.getStatusGroupKey(current.status || ''); - result[key] = result[key] || []; - result[key].push(current); - return result; - }, {} as { [key: string]: Consignment[] }); + const grouped = consignments?.reduce( + (result, current) => { + const key = this.getStatusGroupKey(current.status || ''); + result[key] = result[key] || []; + result[key].push(current); + return result; + }, + {} as { [key: string]: Consignment[] } + ); return grouped ? [...(grouped[1] || []), ...(grouped[0] || []), ...(grouped[-1] || [])] diff --git a/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts b/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts index ade2db6d5e8..04f8b3d1201 100644 --- a/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts +++ b/feature-libs/order/components/order-details/my-account-v2/order-details-actions/my-account-v2-order-details-actions.component.spec.ts @@ -51,24 +51,22 @@ describe('MyAccountV2OrderDetailsActionsComponent', () => { let el: DebugElement; let event: EventService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nModule, RouterTestingModule], - providers: [ - { provide: TranslationService, useClass: MockTranslationService }, - { provide: OrderDetailsService, useClass: MockOrderDetailsService }, - { provide: RoutingService, useClass: MockRoutingService }, - ], - declarations: [ - MyAccountV2OrderDetailsActionsComponent, - MockUrlPipe, - MockOrderDetailActionsComponent, - ], - }).compileComponents(); - event = TestBed.inject(EventService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nModule, RouterTestingModule], + providers: [ + { provide: TranslationService, useClass: MockTranslationService }, + { provide: OrderDetailsService, useClass: MockOrderDetailsService }, + { provide: RoutingService, useClass: MockRoutingService }, + ], + declarations: [ + MyAccountV2OrderDetailsActionsComponent, + MockUrlPipe, + MockOrderDetailActionsComponent, + ], + }).compileComponents(); + event = TestBed.inject(EventService); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2OrderDetailsActionsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts b/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts index cd6dac39a32..aacac0f8f6e 100644 --- a/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-actions/order-detail-actions.component.spec.ts @@ -28,29 +28,27 @@ describe('OrderDetailActionsComponent', () => { let mockOrderDetailsService: OrderDetailsService; let el: DebugElement; - beforeEach( - waitForAsync(() => { - mockOrderDetailsService = { - getOrderDetails() { - return of(mockOrder); - }, - }; + beforeEach(waitForAsync(() => { + mockOrderDetailsService = { + getOrderDetails() { + return of(mockOrder); + }, + }; - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - providers: [ - { provide: OrderDetailsService, useValue: mockOrderDetailsService }, - { - provide: FeaturesConfig, - useValue: { - features: { cancellationAndReturn: true }, - }, + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + providers: [ + { provide: OrderDetailsService, useValue: mockOrderDetailsService }, + { + provide: FeaturesConfig, + useValue: { + features: { cancellationAndReturn: true }, }, - ], - declarations: [OrderDetailActionsComponent, MockUrlPipe], - }).compileComponents(); - }) - ); + }, + ], + declarations: [OrderDetailActionsComponent, MockUrlPipe], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailActionsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts b/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts index b4244ceab1f..53683eec569 100644 --- a/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-billing/order-detail-billing.component.spec.ts @@ -42,20 +42,18 @@ describe('OrderDetailBillingComponent', () => { let component: OrderDetailBillingComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [OrderDetailBillingComponent], - providers: [ - { - provide: OrderDetailsService, - useClass: MockOrderDetailsService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [OrderDetailBillingComponent], + providers: [ + { + provide: OrderDetailsService, + useClass: MockOrderDetailsService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailBillingComponent); diff --git a/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts b/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts index 33348e41007..de9b97bd9c9 100644 --- a/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-items/consignment-tracking/tracking-events/tracking-events.component.spec.ts @@ -37,25 +37,23 @@ describe('TrackingEventsComponent', () => { ]); let launchDialogService: LaunchDialogService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - SpinnerModule, - I18nTestingModule, - KeyboardFocusTestingModule, - IconTestingModule, - ], - declarations: [TrackingEventsComponent, MockTranslateUrlPipe], - providers: [ - { provide: OrderHistoryFacade, useValue: userOrderService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - ], - }).compileComponents(); - - launchDialogService = TestBed.inject(LaunchDialogService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + SpinnerModule, + I18nTestingModule, + KeyboardFocusTestingModule, + IconTestingModule, + ], + declarations: [TrackingEventsComponent, MockTranslateUrlPipe], + providers: [ + { provide: OrderHistoryFacade, useValue: userOrderService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + ], + }).compileComponents(); + + launchDialogService = TestBed.inject(LaunchDialogService); + })); beforeEach(() => { fixture = TestBed.createComponent(TrackingEventsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts b/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts index 12ce44a8bad..bdb42020820 100644 --- a/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-items/order-consigned-entries/order-consigned-entries.component.spec.ts @@ -81,30 +81,28 @@ describe('OrderConsignedEntriesComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - CardModule, - I18nTestingModule, - RouterTestingModule, - OutletModule, - ], - providers: [ - { - provide: FeaturesConfig, - useValue: { - features: { level: '1.4', consignmentTracking: true }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + CardModule, + I18nTestingModule, + RouterTestingModule, + OutletModule, + ], + providers: [ + { + provide: FeaturesConfig, + useValue: { + features: { level: '1.4', consignmentTracking: true }, }, - ], - declarations: [ - OrderConsignedEntriesComponent, - MockConsignmentTrackingComponent, - ], - }).compileComponents(); - }) - ); + }, + ], + declarations: [ + OrderConsignedEntriesComponent, + MockConsignmentTrackingComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderConsignedEntriesComponent); diff --git a/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts b/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts index ac42a4668bc..cac01adc1e1 100644 --- a/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-items/order-detail-items.component.spec.ts @@ -149,37 +149,35 @@ describe('OrderDetailItemsComponent', () => { let mockOrderDetailsService: OrderDetailsService; let el: DebugElement; - beforeEach( - waitForAsync(() => { - mockOrderDetailsService = { - isOrderDetailsLoading(): Observable { - return of(false); - }, - getOrderDetails() { - return of(mockOrder); - }, - }; + beforeEach(waitForAsync(() => { + mockOrderDetailsService = { + isOrderDetailsLoading(): Observable { + return of(false); + }, + getOrderDetails() { + return of(mockOrder); + }, + }; - TestBed.configureTestingModule({ - imports: [ - CardModule, - I18nTestingModule, - PromotionsModule, - RouterTestingModule, - OutletModule, - ], - providers: [ - { provide: OrderDetailsService, useValue: mockOrderDetailsService }, - { provide: CmsComponentData, useValue: MockCmsComponentData }, - ], - declarations: [ - OrderDetailItemsComponent, - MockConsignmentTrackingComponent, - OrderConsignedEntriesComponent, - ], - }).compileComponents(); - }) - ); + TestBed.configureTestingModule({ + imports: [ + CardModule, + I18nTestingModule, + PromotionsModule, + RouterTestingModule, + OutletModule, + ], + providers: [ + { provide: OrderDetailsService, useValue: mockOrderDetailsService }, + { provide: CmsComponentData, useValue: MockCmsComponentData }, + ], + declarations: [ + OrderDetailItemsComponent, + MockConsignmentTrackingComponent, + OrderConsignedEntriesComponent, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailItemsComponent); diff --git a/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts b/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts index ffe01a61ddc..be1cb068167 100644 --- a/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-reorder/order-detail-reorder.component.spec.ts @@ -35,25 +35,23 @@ describe('Order detail reorder component', () => { let fixture: ComponentFixture; let launchDialogService: LaunchDialogService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [OrderDetailReorderComponent], - providers: [ - RouterTestingModule, - { - provide: LaunchDialogService, - useClass: MockLaunchDialogService, - }, - { - provide: OrderDetailsService, - useClass: MockOrderDetailsService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [OrderDetailReorderComponent], + providers: [ + RouterTestingModule, + { + provide: LaunchDialogService, + useClass: MockLaunchDialogService, + }, + { + provide: OrderDetailsService, + useClass: MockOrderDetailsService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailReorderComponent); diff --git a/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts b/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts index 605519b8c96..ad3af64a6f3 100644 --- a/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-reorder/reorder-dialog/reorder-dialog.component.spec.ts @@ -119,41 +119,39 @@ describe('ReorderDialogComponent', () => { let el: DebugElement; let reorderOrderFacade: ReorderOrderFacade; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - RouterTestingModule, - SpinnerModule, - I18nTestingModule, - PromotionsModule, - ], - declarations: [ - ReorderDialogComponent, - MockCxIconComponent, - MockSpinnerComponent, - MockFocusDirective, - ], - providers: [ - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - { - provide: ReorderOrderFacade, - useClass: MockReorderOrderFacade, - }, - { - provide: MultiCartFacade, - useClass: MockMultiCartService, - }, - { - provide: FeatureConfigService, - useClass: MockFeatureConfigService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + FormsModule, + ReactiveFormsModule, + RouterTestingModule, + SpinnerModule, + I18nTestingModule, + PromotionsModule, + ], + declarations: [ + ReorderDialogComponent, + MockCxIconComponent, + MockSpinnerComponent, + MockFocusDirective, + ], + providers: [ + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + { + provide: ReorderOrderFacade, + useClass: MockReorderOrderFacade, + }, + { + provide: MultiCartFacade, + useClass: MockMultiCartService, + }, + { + provide: FeatureConfigService, + useClass: MockFeatureConfigService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReorderDialogComponent); diff --git a/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts b/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts index a3da55ca186..76973dd0f2b 100644 --- a/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts +++ b/feature-libs/order/components/order-details/order-detail-totals/order-detail-totals.component.spec.ts @@ -53,23 +53,21 @@ describe('OrderDetailTotalsComponent', () => { let fixture: ComponentFixture; let mockOrderDetailsService: OrderDetailsService; - beforeEach( - waitForAsync(() => { - mockOrderDetailsService = { - getOrderDetails() { - return of(mockOrder); - }, - }; + beforeEach(waitForAsync(() => { + mockOrderDetailsService = { + getOrderDetails() { + return of(mockOrder); + }, + }; - TestBed.configureTestingModule({ - imports: [OutletModule], - providers: [ - { provide: OrderDetailsService, useValue: mockOrderDetailsService }, - ], - declarations: [OrderDetailTotalsComponent], - }).compileComponents(); - }) - ); + TestBed.configureTestingModule({ + imports: [OutletModule], + providers: [ + { provide: OrderDetailsService, useValue: mockOrderDetailsService }, + ], + declarations: [OrderDetailTotalsComponent], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderDetailTotalsComponent); diff --git a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts index f05b90e8228..0d015aaf09d 100644 --- a/feature-libs/order/components/order-details/order-overview/order-overview.component.ts +++ b/feature-libs/order/components/order-details/order-overview/order-overview.component.ts @@ -205,7 +205,7 @@ export class OrderOverviewComponent { ? deliveryMode.deliveryCost?.formattedValue : '', ], - } as Card) + }) as Card ) ); } @@ -243,7 +243,7 @@ export class OrderOverviewComponent { billingAddress.formattedAddress, billingAddress.country?.name, ], - } as Card) + }) as Card ) ); } diff --git a/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts b/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts index fbeca85d0aa..1c18ce9b129 100644 --- a/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts +++ b/feature-libs/order/components/order-history/my-account-v2/consignment-entries/my-account-v2-consignment-entries.component.spec.ts @@ -66,22 +66,20 @@ describe('MyAccountV2ConsignmentEntriesComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nModule], - providers: [ - { provide: TranslationService, useClass: MockTranslationService }, - { provide: LanguageService, useClass: MockLanguageService }, - ], - declarations: [ - MyAccountV2ConsignmentEntriesComponent, - MockUrlPipe, - MockDatePipe, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nModule], + providers: [ + { provide: TranslationService, useClass: MockTranslationService }, + { provide: LanguageService, useClass: MockLanguageService }, + ], + declarations: [ + MyAccountV2ConsignmentEntriesComponent, + MockUrlPipe, + MockDatePipe, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2ConsignmentEntriesComponent); diff --git a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts index 15d1e0cc490..5305afb289c 100644 --- a/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts +++ b/feature-libs/order/components/order-history/my-account-v2/consolidated-information/my-account-v2-order-consolidated-information.component.spec.ts @@ -66,26 +66,24 @@ describe('MyAccountV2OrderConsolidatedInformationComponent', () => { let fixture: ComponentFixture; let service: MyAccountV2OrderConsignmentsService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - MyAccountV2OrderConsolidatedInformationComponent, - MockUrlPipe, - MockMediaComponent, - ], - providers: [ - { - provide: MyAccountV2OrderConsignmentsService, - useClass: MockMyAccountV2OrderConsignmentsService, - }, - { provide: TranslationService, useClass: MockTranslationService }, - ], - }).compileComponents(); - service = TestBed.inject(MyAccountV2OrderConsignmentsService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + MyAccountV2OrderConsolidatedInformationComponent, + MockUrlPipe, + MockMediaComponent, + ], + providers: [ + { + provide: MyAccountV2OrderConsignmentsService, + useClass: MockMyAccountV2OrderConsignmentsService, + }, + { provide: TranslationService, useClass: MockTranslationService }, + ], + }).compileComponents(); + service = TestBed.inject(MyAccountV2OrderConsignmentsService); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts b/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts index a356d3397b6..e408ffbd20f 100644 --- a/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts +++ b/feature-libs/order/components/order-history/my-account-v2/my-account-v2-order-history.component.spec.ts @@ -107,33 +107,31 @@ describe('MyAccountV2OrderHistoryComponent', () => { let fixture: ComponentFixture; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - MyAccountV2OrderHistoryComponent, - MockUrlPipe, - MockPaginationComponent, - MockMyAccountV2OrderConsolidatedInformationComponent, - MockSpinnerComponent, - ], - providers: [ - { provide: RoutingService, useClass: MockRoutingService }, - { - provide: MyAccountV2OrderHistoryService, - useClass: MockMyAccountV2OrderHistoryService, - }, - { provide: TranslationService, useClass: MockTranslationService }, - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - ], - }).compileComponents(); - routingService = TestBed.inject(RoutingService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + MyAccountV2OrderHistoryComponent, + MockUrlPipe, + MockPaginationComponent, + MockMyAccountV2OrderConsolidatedInformationComponent, + MockSpinnerComponent, + ], + providers: [ + { provide: RoutingService, useClass: MockRoutingService }, + { + provide: MyAccountV2OrderHistoryService, + useClass: MockMyAccountV2OrderHistoryService, + }, + { provide: TranslationService, useClass: MockTranslationService }, + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + ], + }).compileComponents(); + routingService = TestBed.inject(RoutingService); + })); beforeEach(() => { fixture = TestBed.createComponent(MyAccountV2OrderHistoryComponent); diff --git a/feature-libs/order/components/order-history/order-history.component.spec.ts b/feature-libs/order/components/order-history/order-history.component.spec.ts index f80b4db8db8..84d5f9cd39e 100644 --- a/feature-libs/order/components/order-history/order-history.component.spec.ts +++ b/feature-libs/order/components/order-history/order-history.component.spec.ts @@ -151,31 +151,29 @@ describe('OrderHistoryComponent', () => { let orderHistoryFacade: OrderHistoryFacade; let routingService: RoutingService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - OrderHistoryComponent, - MockUrlPipe, - MockPaginationComponent, - MockSortingComponent, - ], - providers: [ - { provide: RoutingService, useClass: MockRoutingService }, - { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, - { provide: TranslationService, useClass: MockTranslationService }, - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - ], - }).compileComponents(); - - orderHistoryFacade = TestBed.inject(OrderHistoryFacade); - routingService = TestBed.inject(RoutingService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + OrderHistoryComponent, + MockUrlPipe, + MockPaginationComponent, + MockSortingComponent, + ], + providers: [ + { provide: RoutingService, useClass: MockRoutingService }, + { provide: OrderHistoryFacade, useClass: MockOrderHistoryFacade }, + { provide: TranslationService, useClass: MockTranslationService }, + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + ], + }).compileComponents(); + + orderHistoryFacade = TestBed.inject(OrderHistoryFacade); + routingService = TestBed.inject(RoutingService); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderHistoryComponent); diff --git a/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts b/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts index 8c5084dc46a..5ae344e48da 100644 --- a/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts +++ b/feature-libs/order/components/replenishment-order-cancellation-dialog/replenishment-order-cancellation-dialog.component.spec.ts @@ -72,26 +72,24 @@ describe('ReplenishmentOrderCancellationDialogComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, KeyboardFocusTestingModule], - declarations: [ - ReplenishmentOrderCancellationDialogComponent, - MockCxIconComponent, - MockFeatureLevelDirective, - ], - providers: [ - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - { provide: GlobalMessageService, useClass: MockGlobalMessageService }, - { provide: LaunchDialogService, useClass: MockLaunchDialogService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, KeyboardFocusTestingModule], + declarations: [ + ReplenishmentOrderCancellationDialogComponent, + MockCxIconComponent, + MockFeatureLevelDirective, + ], + providers: [ + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + { provide: GlobalMessageService, useClass: MockGlobalMessageService }, + { provide: LaunchDialogService, useClass: MockLaunchDialogService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent( diff --git a/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts b/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts index 0c716464cdf..d94e8dc9bab 100644 --- a/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts +++ b/feature-libs/order/components/replenishment-order-details/replenishment-order-cancellation/replenishment-order-cancellation.component.spec.ts @@ -61,24 +61,22 @@ describe('ReplenishmentOrderCancellationComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ReplenishmentOrderCancellationComponent, MockUrlPipe], - providers: [ - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - { - provide: LaunchDialogService, - useClass: MockLaunchDialogService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ReplenishmentOrderCancellationComponent, MockUrlPipe], + providers: [ + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + { + provide: LaunchDialogService, + useClass: MockLaunchDialogService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReplenishmentOrderCancellationComponent); diff --git a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html index a8ad09af473..718175a2ef2 100644 --- a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html +++ b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.html @@ -15,11 +15,7 @@

{{ 'savedCartList.cartName' | cxTranslate }} {{ 'savedCartList.cartId' | cxTranslate }}{{ 'savedCartList.dateSaved' | cxTranslate }} + + {{ 'savedCartList.cartId' | cxTranslate }} + + {{ 'savedCartList.dateSaved' | cxTranslate }} + {{ 'savedCartList.quantity' | cxTranslate }} + {{ 'savedCartList.total' | cxTranslate }} + {{ 'savedCartList.actions' | cxTranslate }}
@@ -179,9 +172,7 @@

params: order } | cxUrl " - class=" - cx-replenishment-order-history-value cx-next-order-date - " + class="cx-replenishment-order-history-value cx-next-order-date" > {{ order?.active diff --git a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.spec.ts b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.spec.ts index 93ce5cde082..ed615087629 100644 --- a/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.spec.ts +++ b/feature-libs/order/components/replenishment-order-history/replenishment-order-history.component.spec.ts @@ -122,36 +122,34 @@ describe('ReplenishmentOrderHistoryComponent', () => { let launchDialogService: LaunchDialogService; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule], - declarations: [ - ReplenishmentOrderHistoryComponent, - MockUrlPipe, - MockPaginationComponent, - MockSortingComponent, - ], - providers: [ - { provide: RoutingService, useClass: MockRoutingService }, - { - provide: ReplenishmentOrderHistoryFacade, - useClass: MockReplenishmentOrderHistoryFacade, - }, - { - provide: LaunchDialogService, - useClass: MockLaunchDialogService, - }, - ], - }).compileComponents(); - - replenishmentOrderHistoryFacade = TestBed.inject( - ReplenishmentOrderHistoryFacade - ); - routingService = TestBed.inject(RoutingService); - launchDialogService = TestBed.inject(LaunchDialogService); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule], + declarations: [ + ReplenishmentOrderHistoryComponent, + MockUrlPipe, + MockPaginationComponent, + MockSortingComponent, + ], + providers: [ + { provide: RoutingService, useClass: MockRoutingService }, + { + provide: ReplenishmentOrderHistoryFacade, + useClass: MockReplenishmentOrderHistoryFacade, + }, + { + provide: LaunchDialogService, + useClass: MockLaunchDialogService, + }, + ], + }).compileComponents(); + + replenishmentOrderHistoryFacade = TestBed.inject( + ReplenishmentOrderHistoryFacade + ); + routingService = TestBed.inject(RoutingService); + launchDialogService = TestBed.inject(LaunchDialogService); + })); beforeEach(() => { fixture = TestBed.createComponent(ReplenishmentOrderHistoryComponent); diff --git a/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts b/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts index 3cc511ceeab..f7731462c4a 100644 --- a/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts +++ b/feature-libs/order/components/return-request-detail/return-request-items/return-request-items.component.spec.ts @@ -30,21 +30,19 @@ describe('ReturnRequestItemsComponent', () => { let component: ReturnRequestItemsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - ReturnRequestItemsComponent, - MockMediaComponent, - MockFeatureLevelDirective, - ], - providers: [ - { provide: ReturnRequestService, useClass: MockCheckoutService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + ReturnRequestItemsComponent, + MockMediaComponent, + MockFeatureLevelDirective, + ], + providers: [ + { provide: ReturnRequestService, useClass: MockCheckoutService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReturnRequestItemsComponent); diff --git a/feature-libs/order/components/return-request-detail/return-request-overview/return-request-overview.component.spec.ts b/feature-libs/order/components/return-request-detail/return-request-overview/return-request-overview.component.spec.ts index 9e93588c550..bbd38c9268c 100644 --- a/feature-libs/order/components/return-request-detail/return-request-overview/return-request-overview.component.spec.ts +++ b/feature-libs/order/components/return-request-detail/return-request-overview/return-request-overview.component.spec.ts @@ -27,17 +27,15 @@ describe('ReturnRequestOverviewComponent', () => { let fixture: ComponentFixture; let returnRequestService: ReturnRequestService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ReturnRequestOverviewComponent], - providers: [ - { provide: ReturnRequestService, useClass: MockReturnRequestService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ReturnRequestOverviewComponent], + providers: [ + { provide: ReturnRequestService, useClass: MockReturnRequestService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReturnRequestOverviewComponent); diff --git a/feature-libs/order/components/return-request-detail/return-request-totals/return-request-totals.component.spec.ts b/feature-libs/order/components/return-request-detail/return-request-totals/return-request-totals.component.spec.ts index c9b1dbef074..cc7a7ab6172 100644 --- a/feature-libs/order/components/return-request-detail/return-request-totals/return-request-totals.component.spec.ts +++ b/feature-libs/order/components/return-request-detail/return-request-totals/return-request-totals.component.spec.ts @@ -21,17 +21,15 @@ describe('ReturnRequestTotalsComponent', () => { let component: ReturnRequestTotalsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ReturnRequestTotalsComponent], - providers: [ - { provide: ReturnRequestService, useClass: MockReturnRequestService }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ReturnRequestTotalsComponent], + providers: [ + { provide: ReturnRequestService, useClass: MockReturnRequestService }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ReturnRequestTotalsComponent); diff --git a/feature-libs/order/components/return-request-list/order-return-request-list.component.spec.ts b/feature-libs/order/components/return-request-list/order-return-request-list.component.spec.ts index 8a9afa5e332..e311a7b9df8 100644 --- a/feature-libs/order/components/return-request-list/order-return-request-list.component.spec.ts +++ b/feature-libs/order/components/return-request-list/order-return-request-list.component.spec.ts @@ -61,26 +61,24 @@ describe('OrderReturnRequestListComponent', () => { let fixture: ComponentFixture; let returnService: OrderReturnRequestFacade; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, ListNavigationModule, I18nTestingModule], - declarations: [OrderReturnRequestListComponent, MockUrlPipe], - providers: [ - { - provide: OrderReturnRequestFacade, - useClass: MockOrderReturnRequestService, - }, - { - provide: TranslationService, - useClass: MockTranslationService, - }, - ], - }).compileComponents(); - - returnService = TestBed.inject(OrderReturnRequestFacade); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, ListNavigationModule, I18nTestingModule], + declarations: [OrderReturnRequestListComponent, MockUrlPipe], + providers: [ + { + provide: OrderReturnRequestFacade, + useClass: MockOrderReturnRequestService, + }, + { + provide: TranslationService, + useClass: MockTranslationService, + }, + ], + }).compileComponents(); + + returnService = TestBed.inject(OrderReturnRequestFacade); + })); beforeEach(() => { fixture = TestBed.createComponent(OrderReturnRequestListComponent); diff --git a/feature-libs/order/core/connectors/reorder-order.connector.spec.ts b/feature-libs/order/core/connectors/reorder-order.connector.spec.ts index 5de179f3349..148a3591990 100644 --- a/feature-libs/order/core/connectors/reorder-order.connector.spec.ts +++ b/feature-libs/order/core/connectors/reorder-order.connector.spec.ts @@ -21,19 +21,17 @@ describe('ReorderOrderConnector', () => { let adapter: ReorderOrderAdapter; let connector: ReorderOrderConnector; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [ - ReorderOrderConnector, - { - provide: ReorderOrderAdapter, - useClass: MockReorderOrderAdapter, - }, - ], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [ + ReorderOrderConnector, + { + provide: ReorderOrderAdapter, + useClass: MockReorderOrderAdapter, + }, + ], + }); + })); beforeEach(() => { adapter = TestBed.inject(ReorderOrderAdapter); diff --git a/feature-libs/order/core/connectors/scheduled-replenishment-order.connector.spec.ts b/feature-libs/order/core/connectors/scheduled-replenishment-order.connector.spec.ts index 2b4db43c3c4..a4b5b81e889 100644 --- a/feature-libs/order/core/connectors/scheduled-replenishment-order.connector.spec.ts +++ b/feature-libs/order/core/connectors/scheduled-replenishment-order.connector.spec.ts @@ -30,19 +30,17 @@ describe('Scheduled Replenishment Order Connector', () => { let adapter: ScheduledReplenishmentOrderAdapter; let connector: ScheduledReplenishmentOrderConnector; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [ - ScheduledReplenishmentOrderConnector, - { - provide: ScheduledReplenishmentOrderAdapter, - useClass: MockScheduledReplenishmentOrderAdapter, - }, - ], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [ + ScheduledReplenishmentOrderConnector, + { + provide: ScheduledReplenishmentOrderAdapter, + useClass: MockScheduledReplenishmentOrderAdapter, + }, + ], + }); + })); beforeEach(() => { adapter = TestBed.inject(ScheduledReplenishmentOrderAdapter); diff --git a/feature-libs/order/core/facade/my-account-v2-order-history.service.ts b/feature-libs/order/core/facade/my-account-v2-order-history.service.ts index 9e71b9e7b09..fc782bd4f0b 100644 --- a/feature-libs/order/core/facade/my-account-v2-order-history.service.ts +++ b/feature-libs/order/core/facade/my-account-v2-order-history.service.ts @@ -147,7 +147,7 @@ export class MyAccountV2OrderHistoryService { ( responses: [ OrderHistoryListView | undefined, - ReturnRequestList | undefined + ReturnRequestList | undefined, ] ) => { const returnRequests = responses?.[1]?.returnRequests; diff --git a/feature-libs/order/occ/adapters/converters/occ-reorder-order-normalizer.spec.ts b/feature-libs/order/occ/adapters/converters/occ-reorder-order-normalizer.spec.ts index 33e429567a5..6a240ab98f2 100644 --- a/feature-libs/order/occ/adapters/converters/occ-reorder-order-normalizer.spec.ts +++ b/feature-libs/order/occ/adapters/converters/occ-reorder-order-normalizer.spec.ts @@ -15,19 +15,17 @@ describe('OccReorderOrderNormalizer', () => { let normalizer: OccReorderOrderNormalizer; let converter: ConverterService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [ - OccReorderOrderNormalizer, - { - provide: ConverterService, - useClass: MockConverterService, - }, - ], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [ + OccReorderOrderNormalizer, + { + provide: ConverterService, + useClass: MockConverterService, + }, + ], + }); + })); beforeEach(() => { normalizer = TestBed.inject(OccReorderOrderNormalizer); diff --git a/feature-libs/order/occ/adapters/converters/occ-replenishment-order-normalizer.spec.ts b/feature-libs/order/occ/adapters/converters/occ-replenishment-order-normalizer.spec.ts index 6495b62ec30..322651a09c6 100644 --- a/feature-libs/order/occ/adapters/converters/occ-replenishment-order-normalizer.spec.ts +++ b/feature-libs/order/occ/adapters/converters/occ-replenishment-order-normalizer.spec.ts @@ -22,19 +22,17 @@ describe('OccReplenishmentOrderNormalizer', () => { let normalizer: OccReplenishmentOrderNormalizer; let converter: ConverterService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [ - OccReplenishmentOrderNormalizer, - { - provide: ConverterService, - useClass: MockConverterService, - }, - ], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [ + OccReplenishmentOrderNormalizer, + { + provide: ConverterService, + useClass: MockConverterService, + }, + ], + }); + })); beforeEach(() => { normalizer = TestBed.inject(OccReplenishmentOrderNormalizer); diff --git a/feature-libs/order/occ/adapters/converters/occ-return-request-normalizer.spec.ts b/feature-libs/order/occ/adapters/converters/occ-return-request-normalizer.spec.ts index b8c59dfacbd..42b71128f35 100644 --- a/feature-libs/order/occ/adapters/converters/occ-return-request-normalizer.spec.ts +++ b/feature-libs/order/occ/adapters/converters/occ-return-request-normalizer.spec.ts @@ -17,7 +17,7 @@ describe('OccReturnRequestNormalizer', () => { ({ ...product, code: (product as Product).code + 'converted', - } as any) + }) as any ); }); diff --git a/feature-libs/order/occ/adapters/converters/occ-scheduled-replenishment-order-form-serializer.spec.ts b/feature-libs/order/occ/adapters/converters/occ-scheduled-replenishment-order-form-serializer.spec.ts index 07265245480..8b401561735 100644 --- a/feature-libs/order/occ/adapters/converters/occ-scheduled-replenishment-order-form-serializer.spec.ts +++ b/feature-libs/order/occ/adapters/converters/occ-scheduled-replenishment-order-form-serializer.spec.ts @@ -8,13 +8,11 @@ const mockDate = '2021-06-01'; describe('OccScheduledReplenishmentOrderFormSerializer', () => { let serializer: OccScheduledReplenishmentOrderFormSerializer; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - providers: [OccScheduledReplenishmentOrderFormSerializer], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + providers: [OccScheduledReplenishmentOrderFormSerializer], + }); + })); beforeEach(() => { serializer = TestBed.inject(OccScheduledReplenishmentOrderFormSerializer); diff --git a/feature-libs/order/occ/adapters/occ-order-history.adapter.spec.ts b/feature-libs/order/occ/adapters/occ-order-history.adapter.spec.ts index 848b4a68c5c..70e0cf1b9fa 100644 --- a/feature-libs/order/occ/adapters/occ-order-history.adapter.spec.ts +++ b/feature-libs/order/occ/adapters/occ-order-history.adapter.spec.ts @@ -72,50 +72,38 @@ describe('OccOrderHistoryAdapter', () => { }); describe('getUserOrders', () => { - it( - 'should fetch user Orders with default options', - waitForAsync(() => { - const PAGE_SIZE = 5; - occOrderHistoryAdapter.loadHistory(userId, PAGE_SIZE).subscribe(); - httpMock.expectOne((req: HttpRequest) => { - return req.method === 'GET'; - }, `GET method and url`); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'orderHistory', - { - urlParams: { userId }, - queryParams: { pageSize: PAGE_SIZE.toString() }, - } - ); - }) - ); + it('should fetch user Orders with default options', waitForAsync(() => { + const PAGE_SIZE = 5; + occOrderHistoryAdapter.loadHistory(userId, PAGE_SIZE).subscribe(); + httpMock.expectOne((req: HttpRequest) => { + return req.method === 'GET'; + }, `GET method and url`); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('orderHistory', { + urlParams: { userId }, + queryParams: { pageSize: PAGE_SIZE.toString() }, + }); + })); - it( - 'should fetch user Orders with defined options', - waitForAsync(() => { - const PAGE_SIZE = 5; - const currentPage = 1; - const sort = 'byDate'; + it('should fetch user Orders with defined options', waitForAsync(() => { + const PAGE_SIZE = 5; + const currentPage = 1; + const sort = 'byDate'; - occOrderHistoryAdapter - .loadHistory(userId, PAGE_SIZE, currentPage, sort) - .subscribe(); - httpMock.expectOne((req: HttpRequest) => { - return req.method === 'GET'; - }, `GET method`); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'orderHistory', - { - urlParams: { userId }, - queryParams: { - pageSize: PAGE_SIZE.toString(), - currentPage: currentPage.toString(), - sort, - }, - } - ); - }) - ); + occOrderHistoryAdapter + .loadHistory(userId, PAGE_SIZE, currentPage, sort) + .subscribe(); + httpMock.expectOne((req: HttpRequest) => { + return req.method === 'GET'; + }, `GET method`); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('orderHistory', { + urlParams: { userId }, + queryParams: { + pageSize: PAGE_SIZE.toString(), + currentPage: currentPage.toString(), + sort, + }, + }); + })); it('should use converter', () => { occOrderHistoryAdapter.loadHistory(userId).subscribe(); @@ -129,21 +117,15 @@ describe('OccOrderHistoryAdapter', () => { }); describe('getOrder', () => { - it( - 'should fetch a single order', - waitForAsync(() => { - occOrderHistoryAdapter.load(userId, orderData.code).subscribe(); - httpMock.expectOne((req: HttpRequest) => { - return req.method === 'GET'; - }, `GET a single order`); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'orderDetail', - { - urlParams: { userId, orderId: orderData.code }, - } - ); - }) - ); + it('should fetch a single order', waitForAsync(() => { + occOrderHistoryAdapter.load(userId, orderData.code).subscribe(); + httpMock.expectOne((req: HttpRequest) => { + return req.method === 'GET'; + }, `GET a single order`); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('orderDetail', { + urlParams: { userId, orderId: orderData.code }, + }); + })); it('should use converter', () => { occOrderHistoryAdapter.load(userId, orderData.code).subscribe(); @@ -153,30 +135,27 @@ describe('OccOrderHistoryAdapter', () => { }); describe('getConsignmentTracking', () => { - it( - 'should fetch a consignment tracking', - waitForAsync(() => { - const tracking: ConsignmentTracking = { - trackingID: '1234567890', - trackingEvents: [], - }; - occOrderHistoryAdapter - .getConsignmentTracking(orderData.code, consignmentCode, userId) - .subscribe((result) => expect(result).toEqual(tracking)); - const mockReq = httpMock.expectOne((req) => { - return req.method === 'GET'; - }, `GET a consignment tracking`); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'consignmentTracking', - { - urlParams: { userId, orderCode: orderData.code, consignmentCode }, - } - ); - expect(mockReq.cancelled).toBeFalsy(); - expect(mockReq.request.responseType).toEqual('json'); - mockReq.flush(tracking); - }) - ); + it('should fetch a consignment tracking', waitForAsync(() => { + const tracking: ConsignmentTracking = { + trackingID: '1234567890', + trackingEvents: [], + }; + occOrderHistoryAdapter + .getConsignmentTracking(orderData.code, consignmentCode, userId) + .subscribe((result) => expect(result).toEqual(tracking)); + const mockReq = httpMock.expectOne((req) => { + return req.method === 'GET'; + }, `GET a consignment tracking`); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( + 'consignmentTracking', + { + urlParams: { userId, orderCode: orderData.code, consignmentCode }, + } + ); + expect(mockReq.cancelled).toBeFalsy(); + expect(mockReq.request.responseType).toEqual('json'); + mockReq.flush(tracking); + })); it('should use converter', () => { occOrderHistoryAdapter @@ -194,70 +173,56 @@ describe('OccOrderHistoryAdapter', () => { }); describe('cancel', () => { - it( - 'should be able to cancel an order', - waitForAsync(() => { - const cancelRequestInput: CancellationRequestEntryInputList = { - cancellationRequestEntryInputs: [ - { orderEntryNumber: 0, quantity: 1 }, - ], - }; + it('should be able to cancel an order', waitForAsync(() => { + const cancelRequestInput: CancellationRequestEntryInputList = { + cancellationRequestEntryInputs: [{ orderEntryNumber: 0, quantity: 1 }], + }; - let result; - occOrderHistoryAdapter - .cancel(userId, orderData.code, cancelRequestInput) - .subscribe((res) => (result = res)); + let result; + occOrderHistoryAdapter + .cancel(userId, orderData.code, cancelRequestInput) + .subscribe((res) => (result = res)); - const mockReq = httpMock.expectOne((req) => { - return req.method === 'POST'; - }); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'cancelOrder', - { - urlParams: { userId, orderId: orderData.code }, - } - ); - expect(mockReq.cancelled).toBeFalsy(); - expect(mockReq.request.responseType).toEqual('json'); - mockReq.flush({}); - expect(result).toEqual({}); - }) - ); + const mockReq = httpMock.expectOne((req) => { + return req.method === 'POST'; + }); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('cancelOrder', { + urlParams: { userId, orderId: orderData.code }, + }); + expect(mockReq.cancelled).toBeFalsy(); + expect(mockReq.request.responseType).toEqual('json'); + mockReq.flush({}); + expect(result).toEqual({}); + })); }); describe('createReturnRequest', () => { - it( - 'should be able to create an order return request', - waitForAsync(() => { - const returnRequestInput: ReturnRequestEntryInputList = { - orderCode: orderData.code, - returnRequestEntryInputs: [{ orderEntryNumber: 0, quantity: 1 }], - }; + it('should be able to create an order return request', waitForAsync(() => { + const returnRequestInput: ReturnRequestEntryInputList = { + orderCode: orderData.code, + returnRequestEntryInputs: [{ orderEntryNumber: 0, quantity: 1 }], + }; - let result; - occOrderHistoryAdapter - .createReturnRequest(userId, returnRequestInput) - .subscribe((res) => (result = res)); + let result; + occOrderHistoryAdapter + .createReturnRequest(userId, returnRequestInput) + .subscribe((res) => (result = res)); - const mockReq = httpMock.expectOne((req) => { - return req.method === 'POST'; - }); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'returnOrder', - { - urlParams: { userId }, - } - ); - expect(mockReq.cancelled).toBeFalsy(); - expect(mockReq.request.responseType).toEqual('json'); - mockReq.flush(returnRequest); - expect(result).toEqual(returnRequest); - expect(converter.convert).toHaveBeenCalledWith( - returnRequestInput, - ORDER_RETURN_REQUEST_INPUT_SERIALIZER - ); - }) - ); + const mockReq = httpMock.expectOne((req) => { + return req.method === 'POST'; + }); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('returnOrder', { + urlParams: { userId }, + }); + expect(mockReq.cancelled).toBeFalsy(); + expect(mockReq.request.responseType).toEqual('json'); + mockReq.flush(returnRequest); + expect(result).toEqual(returnRequest); + expect(converter.convert).toHaveBeenCalledWith( + returnRequestInput, + ORDER_RETURN_REQUEST_INPUT_SERIALIZER + ); + })); it('should use converter', () => { const returnRequestInput: ReturnRequestEntryInputList = {}; @@ -276,46 +241,37 @@ describe('OccOrderHistoryAdapter', () => { }); describe('loadReturnRequestList', () => { - it( - 'should fetch order return request list with default options', - waitForAsync(() => { - occOrderHistoryAdapter.loadReturnRequestList(userId).subscribe(); - httpMock.expectOne((req: HttpRequest) => { - return req.method === 'GET'; - }); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'orderReturns', - { urlParams: { userId }, queryParams: {} } - ); - }) - ); + it('should fetch order return request list with default options', waitForAsync(() => { + occOrderHistoryAdapter.loadReturnRequestList(userId).subscribe(); + httpMock.expectOne((req: HttpRequest) => { + return req.method === 'GET'; + }); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('orderReturns', { + urlParams: { userId }, + queryParams: {}, + }); + })); - it( - 'should fetch user order return request list with defined options', - waitForAsync(() => { - const PAGE_SIZE = 5; - const currentPage = 1; - const sort = 'byDate'; + it('should fetch user order return request list with defined options', waitForAsync(() => { + const PAGE_SIZE = 5; + const currentPage = 1; + const sort = 'byDate'; - occOrderHistoryAdapter - .loadReturnRequestList(userId, PAGE_SIZE, currentPage, sort) - .subscribe(); - httpMock.expectOne((req: HttpRequest) => { - return req.method === 'GET'; - }); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'orderReturns', - { - urlParams: { userId }, - queryParams: { - pageSize: PAGE_SIZE.toString(), - currentPage: currentPage.toString(), - sort, - }, - } - ); - }) - ); + occOrderHistoryAdapter + .loadReturnRequestList(userId, PAGE_SIZE, currentPage, sort) + .subscribe(); + httpMock.expectOne((req: HttpRequest) => { + return req.method === 'GET'; + }); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('orderReturns', { + urlParams: { userId }, + queryParams: { + pageSize: PAGE_SIZE.toString(), + currentPage: currentPage.toString(), + sort, + }, + }); + })); it('should use converter', () => { occOrderHistoryAdapter.loadReturnRequestList(userId).subscribe(); @@ -329,28 +285,25 @@ describe('OccOrderHistoryAdapter', () => { }); describe('loadReturnRequestDetail', () => { - it( - 'should be able to load an order return request data', - waitForAsync(() => { - let result; - occOrderHistoryAdapter - .loadReturnRequestDetail(userId, 'test') - .subscribe((res) => (result = res)); + it('should be able to load an order return request data', waitForAsync(() => { + let result; + occOrderHistoryAdapter + .loadReturnRequestDetail(userId, 'test') + .subscribe((res) => (result = res)); - const mockReq = httpMock.expectOne((req) => { - return req.method === 'GET'; - }); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'orderReturnDetail', - { - urlParams: { userId, returnRequestCode: 'test' }, - } - ); - expect(mockReq.cancelled).toBeFalsy(); - mockReq.flush({}); - expect(result).toEqual({}); - }) - ); + const mockReq = httpMock.expectOne((req) => { + return req.method === 'GET'; + }); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( + 'orderReturnDetail', + { + urlParams: { userId, returnRequestCode: 'test' }, + } + ); + expect(mockReq.cancelled).toBeFalsy(); + mockReq.flush({}); + expect(result).toEqual({}); + })); it('should use converter', () => { occOrderHistoryAdapter @@ -368,28 +321,22 @@ describe('OccOrderHistoryAdapter', () => { }); describe('cancelReturnRequest', () => { - it( - 'should be able to cancel one return request', - waitForAsync(() => { - let result; - occOrderHistoryAdapter - .cancelReturnRequest(userId, 'returnCode', { status: 'CANCELLING' }) - .subscribe((res) => (result = res)); + it('should be able to cancel one return request', waitForAsync(() => { + let result; + occOrderHistoryAdapter + .cancelReturnRequest(userId, 'returnCode', { status: 'CANCELLING' }) + .subscribe((res) => (result = res)); - const mockReq = httpMock.expectOne((req) => { - return req.method === 'PATCH'; - }); - expect(occEnpointsService.buildUrl).toHaveBeenCalledWith( - 'cancelReturn', - { - urlParams: { userId, returnRequestCode: 'returnCode' }, - } - ); - expect(mockReq.cancelled).toBeFalsy(); - expect(mockReq.request.responseType).toEqual('json'); - mockReq.flush({}); - expect(result).toEqual({}); - }) - ); + const mockReq = httpMock.expectOne((req) => { + return req.method === 'PATCH'; + }); + expect(occEnpointsService.buildUrl).toHaveBeenCalledWith('cancelReturn', { + urlParams: { userId, returnRequestCode: 'returnCode' }, + }); + expect(mockReq.cancelled).toBeFalsy(); + expect(mockReq.request.responseType).toEqual('json'); + mockReq.flush({}); + expect(result).toEqual({}); + })); }); }); diff --git a/feature-libs/order/occ/adapters/occ-reorder-order.adapter.spec.ts b/feature-libs/order/occ/adapters/occ-reorder-order.adapter.spec.ts index d2e7e88c7ca..4a5612a8582 100644 --- a/feature-libs/order/occ/adapters/occ-reorder-order.adapter.spec.ts +++ b/feature-libs/order/occ/adapters/occ-reorder-order.adapter.spec.ts @@ -26,17 +26,15 @@ describe(`OccReorderOrderAdapter`, () => { let converter: ConverterService; let occEndpointService: OccEndpointsService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [ - OccReorderOrderAdapter, - { provide: OccEndpointsService, useClass: MockOccEndpointsService }, - ], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + OccReorderOrderAdapter, + { provide: OccEndpointsService, useClass: MockOccEndpointsService }, + ], + }); + })); beforeEach(() => { occAdapter = TestBed.inject(OccReorderOrderAdapter); diff --git a/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.spec.ts b/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.spec.ts index 01a45b77fa2..097e9b22cd4 100644 --- a/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.spec.ts +++ b/feature-libs/order/occ/adapters/occ-scheduled-replenishment-order.adapter.spec.ts @@ -82,18 +82,16 @@ describe(`OccScheduledReplenishmentOrderAdapter`, () => { let httpMock: HttpTestingController; let converter: ConverterService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [HttpClientTestingModule], - providers: [ - OccScheduledReplenishmentOrderAdapter, - { provide: OccConfig, useValue: MockOccModuleConfig }, - { provide: LoggerService, useClass: MockLoggerService }, - ], - }); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [HttpClientTestingModule], + providers: [ + OccScheduledReplenishmentOrderAdapter, + { provide: OccConfig, useValue: MockOccModuleConfig }, + { provide: LoggerService, useClass: MockLoggerService }, + ], + }); + })); beforeEach(() => { occAdapter = TestBed.inject(OccScheduledReplenishmentOrderAdapter); diff --git a/feature-libs/order/package.json b/feature-libs/order/package.json index 88fd2e43f52..3bc50593cc2 100644 --- a/feature-libs/order/package.json +++ b/feature-libs/order/package.json @@ -1,6 +1,6 @@ { "name": "@spartacus/order", - "version": "2211.24.0", + "version": "2211.25.1", "description": "Order feature library for Spartacus", "keywords": [ "spartacus", @@ -33,13 +33,13 @@ "@ng-select/ng-select": "^12.0.4", "@ngrx/effects": "^17.0.1", "@ngrx/store": "^17.0.1", - "@spartacus/cart": "2211.24.0", - "@spartacus/core": "2211.24.0", - "@spartacus/pdf-invoices": "2211.24.0", - "@spartacus/schematics": "2211.24.0", - "@spartacus/storefront": "2211.24.0", - "@spartacus/styles": "2211.24.0", - "@spartacus/user": "2211.24.0", + "@spartacus/cart": "2211.25.1", + "@spartacus/core": "2211.25.1", + "@spartacus/pdf-invoices": "2211.25.1", + "@spartacus/schematics": "2211.25.1", + "@spartacus/storefront": "2211.25.1", + "@spartacus/styles": "2211.25.1", + "@spartacus/user": "2211.25.1", "rxjs": "^7.8.0" }, "publishConfig": { diff --git a/feature-libs/order/schematics/add-order/__snapshots__/index_spec.ts.snap b/feature-libs/order/schematics/add-order/__snapshots__/index_spec.ts.snap index 03ffc338503..8826c2e2f40 100644 --- a/feature-libs/order/schematics/add-order/__snapshots__/index_spec.ts.snap +++ b/feature-libs/order/schematics/add-order/__snapshots__/index_spec.ts.snap @@ -28,7 +28,7 @@ exports[`Spartacus Order schematics: ng-add Order feature general setup should a "import { NgModule } from '@angular/core'; import { CmsConfig, I18nConfig, provideConfig } from "@spartacus/core"; import { orderTranslationChunksConfig, orderTranslations } from "@spartacus/order/assets"; -import { OrderRootModule, ORDER_FEATURE } from "@spartacus/order/root"; +import { ORDER_FEATURE, OrderRootModule } from "@spartacus/order/root"; @NgModule({ declarations: [], diff --git a/feature-libs/order/tsconfig.schematics.json b/feature-libs/order/tsconfig.schematics.json index f430d173f73..498b79fe02b 100644 --- a/feature-libs/order/tsconfig.schematics.json +++ b/feature-libs/order/tsconfig.schematics.json @@ -546,6 +546,7 @@ "../../integration-libs/cdp/customer-ticketing/public_api" ], "@spartacus/cdp": ["../../integration-libs/cdp/public_api"], + "@spartacus/cds/assets": ["../../integration-libs/cds/assets/public_api"], "@spartacus/cds": ["../../integration-libs/cds/public_api"], "@spartacus/digital-payments/assets": [ "../../integration-libs/digital-payments/assets/public_api" diff --git a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html index fe40cf2d9ef..cf50c368418 100644 --- a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html +++ b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.html @@ -3,7 +3,17 @@ @@ -105,7 +188,18 @@ class="cx-account-summary-document-filter-form-input" formControlName="documentNumber" /> + + + + diff --git a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.spec.ts b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.spec.ts index a756144023d..8efc17d3438 100644 --- a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.spec.ts +++ b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.component.spec.ts @@ -5,13 +5,14 @@ import { By } from '@angular/platform-browser'; import { NgSelectModule } from '@ng-select/ng-select'; import { I18nTestingModule } from '@spartacus/core'; -import { FormErrorsModule } from '@spartacus/storefront'; import { DocumentQueryParams, DocumentStatus, FilterByOptions, } from '@spartacus/organization/account-summary/root'; +import { FormErrorsModule } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { AccountSummaryDocumentFilterComponent } from './account-summary-document-filter.component'; const mockQueryParams: DocumentQueryParams = { @@ -44,6 +45,7 @@ describe('AccountSummaryDocumentFilterComponent', () => { declarations: [ AccountSummaryDocumentFilterComponent, MockDatePickerComponent, + MockFeatureDirective, ], schemas: [CUSTOM_ELEMENTS_SCHEMA], providers: [], diff --git a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.module.ts b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.module.ts index 5f040fadf67..365ae62fde1 100644 --- a/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.module.ts +++ b/feature-libs/organization/account-summary/components/details/document/filter/account-summary-document-filter.module.ts @@ -6,15 +6,15 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { I18nModule } from '@spartacus/core'; -import { AccountSummaryDocumentFilterComponent } from './account-summary-document-filter.component'; -import { NgSelectModule } from '@ng-select/ng-select'; import { ReactiveFormsModule } from '@angular/forms'; +import { NgSelectModule } from '@ng-select/ng-select'; +import { FeaturesConfigModule, I18nModule } from '@spartacus/core'; import { DatePickerModule, FormErrorsModule, NgSelectA11yModule, } from '@spartacus/storefront'; +import { AccountSummaryDocumentFilterComponent } from './account-summary-document-filter.component'; @NgModule({ declarations: [AccountSummaryDocumentFilterComponent], @@ -26,6 +26,7 @@ import { ReactiveFormsModule, DatePickerModule, FormErrorsModule, + FeaturesConfigModule, ], exports: [AccountSummaryDocumentFilterComponent], }) diff --git a/feature-libs/organization/account-summary/components/details/header/account-summary-header.component.html b/feature-libs/organization/account-summary/components/details/header/account-summary-header.component.html index ccb24e41988..e5d3a02ad65 100644 --- a/feature-libs/organization/account-summary/components/details/header/account-summary-header.component.html +++ b/feature-libs/organization/account-summary/components/details/header/account-summary-header.component.html @@ -1,9 +1,7 @@

{{ 'myInterests.header' | cxTranslate }} {{ variant.name }}
{{ variant.value }}
@@ -198,11 +188,7 @@

{{ 'myInterests.header' | cxTranslate }}

+ + + + + + +
{{ 'productDetails.noReviews' | cxTranslate }} diff --git a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts index a0346b6d4b2..9415326f1c1 100644 --- a/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-intro/product-intro.component.spec.ts @@ -10,6 +10,7 @@ import { ComponentCreateEvent, ComponentDestroyEvent, } from '@spartacus/storefront'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { EMPTY, Observable, of } from 'rxjs'; import { CurrentProductService } from '../current-product.service'; import { ProductIntroComponent } from './product-intro.component'; @@ -47,28 +48,30 @@ describe('ProductIntroComponent in product', () => { let translationService: TranslationService; let eventService: EventService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ProductIntroComponent, MockStarRatingComponent], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - { - provide: TranslationService, - useClass: MockTranslationService, - }, - { - provide: EventService, - useClass: MockEventService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + ProductIntroComponent, + MockStarRatingComponent, + MockFeatureDirective, + ], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + { + provide: TranslationService, + useClass: MockTranslationService, + }, + { + provide: EventService, + useClass: MockEventService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { translationService = TestBed.inject(TranslationService); @@ -213,7 +216,7 @@ describe('ProductIntroComponent in product', () => { productIntroComponent.product$ = of({ averageRating: 5, } as Product); - productIntroComponent['getReviewsComponent'] = () => ({} as HTMLElement); + productIntroComponent['getReviewsComponent'] = () => ({}) as HTMLElement; fixture.detectChanges(); expect(fixture.debugElement.nativeElement.innerText).toContain( @@ -253,7 +256,7 @@ describe('ProductIntroComponent in product', () => { productIntroComponent.product$ = of({ averageRating: 4, } as Product); - productIntroComponent['getReviewsComponent'] = () => ({} as HTMLElement); + productIntroComponent['getReviewsComponent'] = () => ({}) as HTMLElement; fixture.detectChanges(); expect(fixture.debugElement.nativeElement.innerText).not.toContain( diff --git a/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts b/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts index 0c11a2cd209..12baebf8782 100644 --- a/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts +++ b/projects/storefrontlib/cms-components/product/product-intro/product-intro.module.ts @@ -6,12 +6,17 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { CmsConfig, I18nModule, provideDefaultConfig } from '@spartacus/core'; +import { + CmsConfig, + FeaturesConfigModule, + I18nModule, + provideDefaultConfig, +} from '@spartacus/core'; import { StarRatingModule } from '../../../shared/components/star-rating/star-rating.module'; import { ProductIntroComponent } from './product-intro.component'; @NgModule({ - imports: [CommonModule, I18nModule, StarRatingModule], + imports: [CommonModule, I18nModule, StarRatingModule, FeaturesConfigModule], providers: [ provideDefaultConfig({ cmsComponents: { diff --git a/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts index 36669525e1a..fa764292bf0 100644 --- a/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/container/product-list.component.spec.ts @@ -101,52 +101,50 @@ describe('ProductListComponent', () => { let fixture: ComponentFixture; let componentService: ProductListComponentService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ListNavigationModule, - FormsModule, - RouterTestingModule, - I18nTestingModule, - InfiniteScrollModule, - SpinnerModule, - ], - providers: [ - { - provide: PageLayoutService, - useClass: MockPageLayoutService, - }, - { - provide: ProductListComponentService, - useClass: MockProductListComponentService, - }, - { - provide: ViewConfig, - useClass: MockViewConfig, - }, - { - provide: GlobalMessageService, - useClass: MockGlobalMessageService, - }, - ], - declarations: [ - ProductListComponent, - ProductFacetNavigationComponent, - ProductGridItemComponent, - MockStarRatingComponent, - MockAddToCartComponent, - MediaComponent, - ProductViewComponent, - MockProductListItemComponent, - MockUrlPipe, - MockCxIconComponent, - ProductScrollComponent, - MockFeatureLevelDirective, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ListNavigationModule, + FormsModule, + RouterTestingModule, + I18nTestingModule, + InfiniteScrollModule, + SpinnerModule, + ], + providers: [ + { + provide: PageLayoutService, + useClass: MockPageLayoutService, + }, + { + provide: ProductListComponentService, + useClass: MockProductListComponentService, + }, + { + provide: ViewConfig, + useClass: MockViewConfig, + }, + { + provide: GlobalMessageService, + useClass: MockGlobalMessageService, + }, + ], + declarations: [ + ProductListComponent, + ProductFacetNavigationComponent, + ProductGridItemComponent, + MockStarRatingComponent, + MockAddToCartComponent, + MediaComponent, + ProductViewComponent, + MockProductListItemComponent, + MockUrlPipe, + MockCxIconComponent, + ProductScrollComponent, + MockFeatureLevelDirective, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductListComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts index 1e4e33634d0..c71bfcdae5c 100644 --- a/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/container/product-scroll/product-scroll.component.spec.ts @@ -159,35 +159,33 @@ describe('ProductScrollComponent', () => { let fixture: ComponentFixture; let el: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ - ProductScrollComponent, - ProductGridItemComponent, - MockProductListItemComponent, - MockUrlPipe, - MediaComponent, - MockStarRatingComponent, - MockAddToCartComponent, - MockStyleIconsComponent, - MockFeatureLevelDirective, - ], - imports: [ - InfiniteScrollModule, - I18nTestingModule, - SpinnerModule, - RouterTestingModule, - ], - providers: [ - { - provide: ProductListComponentService, - useClass: MockProductListComponentService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ + ProductScrollComponent, + ProductGridItemComponent, + MockProductListItemComponent, + MockUrlPipe, + MediaComponent, + MockStarRatingComponent, + MockAddToCartComponent, + MockStyleIconsComponent, + MockFeatureLevelDirective, + ], + imports: [ + InfiniteScrollModule, + I18nTestingModule, + SpinnerModule, + RouterTestingModule, + ], + providers: [ + { + provide: ProductListComponentService, + useClass: MockProductListComponentService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductScrollComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts index 4ad1d611b9a..44b559d18cc 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/active-facets/active-facets.component.spec.ts @@ -36,19 +36,17 @@ describe('ActiveFacetsComponent', () => { let fixture: ComponentFixture; let element: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule, KeyboardFocusModule], - declarations: [ActiveFacetsComponent, MockCxIconComponent], - providers: [{ provide: FacetService, useClass: MockFacetService }], - }) - .overrideComponent(ActiveFacetsComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule, KeyboardFocusModule], + declarations: [ActiveFacetsComponent, MockCxIconComponent], + providers: [{ provide: FacetService, useClass: MockFacetService }], }) - ); + .overrideComponent(ActiveFacetsComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ActiveFacetsComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts index 340738b531a..ac18db865dd 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet-list/facet-list.component.spec.ts @@ -72,33 +72,31 @@ describe('FacetListComponent', () => { let focusService: KeyboardFocusService; let featureConfigService: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - FacetListComponent, - MockIconComponent, - MockFacetComponent, - MockKeyboadFocusDirective, - MockFeatureDirective, - ], - providers: [ - { provide: FacetService, useClass: MockFacetService }, - { - provide: FeaturesConfig, - useValue: { - features: { level: '5.1' }, - }, + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + FacetListComponent, + MockIconComponent, + MockFacetComponent, + MockKeyboadFocusDirective, + MockFeatureDirective, + ], + providers: [ + { provide: FacetService, useClass: MockFacetService }, + { + provide: FeaturesConfig, + useValue: { + features: { level: '5.1' }, }, - ], - }) - .overrideComponent(FacetListComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + }, + ], }) - ); + .overrideComponent(FacetListComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(FacetListComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html index 2fdaa8dd28c..a5ed01f9a8f 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/facet/facet.component.html @@ -18,7 +18,7 @@
{ let element: DebugElement; let facetService: FacetService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule, RouterTestingModule], - declarations: [ - FacetComponent, - MockCxIconComponent, - MockKeyboadFocusDirective, - ], - providers: [ - { provide: FacetService, useClass: MockFacetService }, - { provide: FeatureConfigService, useClass: MockFeatureConfigService }, - ], - }) - .overrideComponent(FacetComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule, RouterTestingModule], + declarations: [ + FacetComponent, + MockCxIconComponent, + MockKeyboadFocusDirective, + ], + providers: [ + { provide: FacetService, useClass: MockFacetService }, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, + ], }) - ); + .overrideComponent(FacetComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(FacetComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts index 5ecae26839f..0ddafcee408 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/product-facet-navigation.component.spec.ts @@ -47,25 +47,23 @@ describe('ProductFacetNavigationComponent', () => { let fixture: ComponentFixture; let element: DebugElement; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ - ProductFacetNavigationComponent, - MockActiveFacetsComponent, - MockFacetListComponent, - MockCxIconComponent, - ], - providers: [ - { - provide: BreakpointService, - useClass: MockBreakpointService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ + ProductFacetNavigationComponent, + MockActiveFacetsComponent, + MockFacetListComponent, + MockCxIconComponent, + ], + providers: [ + { + provide: BreakpointService, + useClass: MockBreakpointService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductFacetNavigationComponent); @@ -78,16 +76,13 @@ describe('ProductFacetNavigationComponent', () => { }); describe('mobile', () => { - it( - 'should not have facet list when trigger button is visible', - waitForAsync(async () => { - await fixture.whenStable(); - fixture.detectChanges(); + it('should not have facet list when trigger button is visible', waitForAsync(async () => { + await fixture.whenStable(); + fixture.detectChanges(); - const facetList = element.query(By.css('cx-facet-list')); - expect(facetList).toBeNull(); - }) - ); + const facetList = element.query(By.css('cx-facet-list')); + expect(facetList).toBeNull(); + })); it('should invoke launch when trigger button is clicked', () => { spyOn(component, 'launch'); @@ -97,61 +92,46 @@ describe('ProductFacetNavigationComponent', () => { expect(component.launch).toHaveBeenCalled(); }); - it( - 'should have facet list after trigger button is clicked', - waitForAsync(async () => { - fixture.detectChanges(); - const button: HTMLElement = element.query( - By.css('button') - ).nativeElement; - button.click(); - - await fixture.whenStable(); - fixture.detectChanges(); - - const facetList = element.query(By.css('cx-facet-list')).nativeElement; - expect(facetList).toBeTruthy(); - }) - ); - - it( - 'should invoke close when closeList is emitted', - waitForAsync(async () => { - spyOn(component, 'close'); - fixture.detectChanges(); - const button: HTMLElement = element.query( - By.css('button') - ).nativeElement; - button.click(); - - await fixture.whenStable(); - fixture.detectChanges(); - - const facetList = element.query(By.css('cx-facet-list')).nativeElement; - facetList.dispatchEvent(new Event('closeList')); - - expect(component.close).toHaveBeenCalled(); - }) - ); + it('should have facet list after trigger button is clicked', waitForAsync(async () => { + fixture.detectChanges(); + const button: HTMLElement = element.query(By.css('button')).nativeElement; + button.click(); + + await fixture.whenStable(); + fixture.detectChanges(); + + const facetList = element.query(By.css('cx-facet-list')).nativeElement; + expect(facetList).toBeTruthy(); + })); + + it('should invoke close when closeList is emitted', waitForAsync(async () => { + spyOn(component, 'close'); + fixture.detectChanges(); + const button: HTMLElement = element.query(By.css('button')).nativeElement; + button.click(); + + await fixture.whenStable(); + fixture.detectChanges(); + + const facetList = element.query(By.css('cx-facet-list')).nativeElement; + facetList.dispatchEvent(new Event('closeList')); + + expect(component.close).toHaveBeenCalled(); + })); }); describe('desktop', () => { - it( - 'should have facet list when trigger button is hidden', - waitForAsync(async () => { - fixture.detectChanges(); - - const button: HTMLElement = element.query( - By.css('button') - ).nativeElement; - button.style.display = 'none'; - - await fixture.whenStable(); - fixture.detectChanges(); - - const facetList = element.query(By.css('cx-facet-list')).nativeElement; - expect(facetList).toBeTruthy(); - }) - ); + it('should have facet list when trigger button is hidden', waitForAsync(async () => { + fixture.detectChanges(); + + const button: HTMLElement = element.query(By.css('button')).nativeElement; + button.style.display = 'none'; + + await fixture.whenStable(); + fixture.detectChanges(); + + const facetList = element.query(By.css('cx-facet-list')).nativeElement; + expect(facetList).toBeTruthy(); + })); }); }); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts index 8b4800c510f..946d5759876 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-facet-navigation/services/product-facet.service.ts @@ -63,7 +63,7 @@ export class ProductFacetService { ({ facets: result.facets, activeFacets: result.breadcrumbs, - } as FacetList) + }) as FacetList ) ); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html index 12b09425506..cbfce92adfd 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html +++ b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.html @@ -37,5 +37,7 @@ - + + + diff --git a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts index f4d05a569d3..31198c4f758 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.spec.ts @@ -94,37 +94,35 @@ describe('ProductGridItemComponent in product-list', () => { }, }; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, OutletModule], - declarations: [ - ProductGridItemComponent, - MockMediaComponent, - MockAddToCartComponent, - MockStarRatingComponent, - MockUrlPipe, - MockCxIconComponent, - MockFeatureLevelDirective, - MockOutletDirective, - ], - providers: [ - { - provide: RoutingService, - useClass: MockRoutingService, - }, - { - provide: ProductService, - useClass: MockProductService, - }, - ], - }) - .overrideComponent(ProductGridItemComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, OutletModule], + declarations: [ + ProductGridItemComponent, + MockMediaComponent, + MockAddToCartComponent, + MockStarRatingComponent, + MockUrlPipe, + MockCxIconComponent, + MockFeatureLevelDirective, + MockOutletDirective, + ], + providers: [ + { + provide: RoutingService, + useClass: MockRoutingService, + }, + { + provide: ProductService, + useClass: MockProductService, + }, + ], }) - ); + .overrideComponent(ProductGridItemComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductGridItemComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.ts b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.ts index 46877aeb271..fa0607ef199 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-grid-item/product-grid-item.component.ts @@ -10,10 +10,12 @@ import { Input, OnChanges, SimpleChanges, + inject, } from '@angular/core'; import { ProductListOutlets } from '../../product-outlets.model'; import { ProductListItemContextSource } from '../model/product-list-item-context-source.model'; import { ProductListItemContext } from '../model/product-list-item-context.model'; +import { ProductListService } from '../product-list.service'; @Component({ selector: 'cx-product-grid-item', @@ -28,6 +30,9 @@ import { ProductListItemContext } from '../model/product-list-item-context.model ], }) export class ProductGridItemComponent implements OnChanges { + protected productListService = inject(ProductListService); + hideAddToCartButton = false; + readonly ProductListOutlets = ProductListOutlets; @Input() product: any; @@ -37,6 +42,8 @@ export class ProductGridItemComponent implements OnChanges { ngOnChanges(changes?: SimpleChanges): void { if (changes?.product) { + this.hideAddToCartButton = + this.productListService.shouldHideAddToCartButton(this.product); this.productListItemContextSource.product$.next(this.product); } } diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html index ab33d434cab..c54dbe95eb2 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html +++ b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.html @@ -62,7 +62,9 @@

- + + +
diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts index 6f262a30e91..f258e010d30 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.spec.ts @@ -94,37 +94,35 @@ describe('ProductListItemComponent in product-list', () => { }, }; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [RouterTestingModule, I18nTestingModule, OutletModule], - declarations: [ - ProductListItemComponent, - MockPictureComponent, - MockAddToCartComponent, - MockStarRatingComponent, - MockUrlPipe, - MockCxIconComponent, - MockFeatureDirective, - MockOutletDirective, - ], - providers: [ - { - provide: RoutingService, - useClass: MockRoutingService, - }, - { - provide: ProductService, - useClass: MockProductService, - }, - ], - }) - .overrideComponent(ProductListItemComponent, { - set: { changeDetection: ChangeDetectionStrategy.Default }, - }) - .compileComponents(); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [RouterTestingModule, I18nTestingModule, OutletModule], + declarations: [ + ProductListItemComponent, + MockPictureComponent, + MockAddToCartComponent, + MockStarRatingComponent, + MockUrlPipe, + MockCxIconComponent, + MockFeatureDirective, + MockOutletDirective, + ], + providers: [ + { + provide: RoutingService, + useClass: MockRoutingService, + }, + { + provide: ProductService, + useClass: MockProductService, + }, + ], }) - ); + .overrideComponent(ProductListItemComponent, { + set: { changeDetection: ChangeDetectionStrategy.Default }, + }) + .compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductListItemComponent); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.ts b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.ts index 46262deaba8..e19b1e9f577 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-list-item/product-list-item.component.ts @@ -10,11 +10,13 @@ import { Input, OnChanges, SimpleChanges, + inject, } from '@angular/core'; import { useFeatureStyles } from '@spartacus/core'; import { ProductListOutlets } from '../../product-outlets.model'; import { ProductListItemContextSource } from '../model/product-list-item-context-source.model'; import { ProductListItemContext } from '../model/product-list-item-context.model'; +import { ProductListService } from '../product-list.service'; @Component({ selector: 'cx-product-list-item', @@ -29,6 +31,9 @@ import { ProductListItemContext } from '../model/product-list-item-context.model ], }) export class ProductListItemComponent implements OnChanges { + protected productListService = inject(ProductListService); + hideAddToCartButton = false; + readonly ProductListOutlets = ProductListOutlets; @Input() product: any; @@ -40,6 +45,8 @@ export class ProductListItemComponent implements OnChanges { ngOnChanges(changes?: SimpleChanges): void { if (changes?.product) { + this.hideAddToCartButton = this.hideAddToCartButton = + this.productListService.shouldHideAddToCartButton(this.product); this.productListItemContextSource.product$.next(this.product); } } diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list.module.ts b/projects/storefrontlib/cms-components/product/product-list/product-list.module.ts index 8151f03a6c1..5ea05a8e5c8 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-list.module.ts +++ b/projects/storefrontlib/cms-components/product/product-list/product-list.module.ts @@ -33,6 +33,7 @@ import { ProductScrollComponent } from './container/product-scroll/product-scrol import { ProductGridItemComponent } from './product-grid-item/product-grid-item.component'; import { ProductListItemComponent } from './product-list-item/product-list-item.component'; import { ProductViewComponent } from './product-view/product-view.component'; +import { ProductListService } from './product-list.service'; @NgModule({ imports: [ @@ -53,6 +54,7 @@ import { ProductViewComponent } from './product-view/product-view.component'; FeaturesConfigModule, ], providers: [ + ProductListService, provideDefaultConfig(defaultViewConfig), provideDefaultConfig({ cmsComponents: { diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list.service.spec.ts b/projects/storefrontlib/cms-components/product/product-list/product-list.service.spec.ts new file mode 100644 index 00000000000..8803df999b3 --- /dev/null +++ b/projects/storefrontlib/cms-components/product/product-list/product-list.service.spec.ts @@ -0,0 +1,53 @@ +import { TestBed } from '@angular/core/testing'; +import { FeatureConfigService } from '@spartacus/core'; +import { ProductListService } from './product-list.service'; + +class MockFeatureConfigService implements Partial { + isEnabled(_feature: string): boolean { + return true; + } +} + +describe('ProductListService', () => { + let service: ProductListService; + let featureConfigService: FeatureConfigService; + + beforeEach(() => { + TestBed.configureTestingModule({ + providers: [ + ProductListService, + { provide: FeatureConfigService, useClass: MockFeatureConfigService }, + ], + }); + service = TestBed.inject(ProductListService); + featureConfigService = TestBed.inject(FeatureConfigService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); + + it('should hide add to cart button when feature is enabled and product is not purchasable', () => { + spyOn(featureConfigService, 'isEnabled').and.returnValue(true); + const product = { price: 100, purchasable: false }; + expect(service.shouldHideAddToCartButton(product)).toBe(true); + }); + + it('should hide add to cart button when feature is enabled and product price is not defined', () => { + spyOn(featureConfigService, 'isEnabled').and.returnValue(true); + const product = { purchasable: true }; + expect(service.shouldHideAddToCartButton(product)).toBe(true); + }); + + it('should not hide add to cart button when feature is enabled and purchasable is not defined', () => { + spyOn(featureConfigService, 'isEnabled').and.returnValue(true); + const product = { price: 100 }; + expect(service.shouldHideAddToCartButton(product)).toBe(false); + }); + + it('should not hide add to cart button when feature is disabled and product is purchasable', () => { + spyOn(featureConfigService, 'isEnabled').and.returnValue(false); + const product = { price: 100, purchasable: true }; + expect(service.shouldHideAddToCartButton(product)).toBe(false); + }); +}); diff --git a/projects/storefrontlib/cms-components/product/product-list/product-list.service.ts b/projects/storefrontlib/cms-components/product/product-list/product-list.service.ts new file mode 100644 index 00000000000..602e7948764 --- /dev/null +++ b/projects/storefrontlib/cms-components/product/product-list/product-list.service.ts @@ -0,0 +1,24 @@ +/* + * SPDX-FileCopyrightText: 2024 SAP Spartacus team + * + * SPDX-License-Identifier: Apache-2.0 + */ + +import { inject, Injectable } from '@angular/core'; +import { FeatureConfigService } from '@spartacus/core'; + +@Injectable({ + providedIn: 'root', +}) +export class ProductListService { + protected featureConfig = inject(FeatureConfigService); + private shouldHideAddToCartForUnpurchasableProducts = + this.featureConfig.isEnabled('shouldHideAddToCartForUnpurchasableProducts'); + + shouldHideAddToCartButton(product: any): boolean { + return ( + this.shouldHideAddToCartForUnpurchasableProducts && + (!product.price || product.purchasable === false) + ); + } +} diff --git a/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html b/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html index df5f131b597..4b9f3ebe867 100644 --- a/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html +++ b/projects/storefrontlib/cms-components/product/product-list/product-view/product-view.component.html @@ -7,8 +7,8 @@ viewMode === iconTypes.GRID ? ('productView.gridView' | cxTranslate) : viewMode === iconTypes.LIST - ? ('productView.listView' | cxTranslate) - : null + ? ('productView.listView' | cxTranslate) + : null }}" > { let component: ProductViewComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [NgSelectModule, FormsModule, I18nTestingModule], - declarations: [ProductViewComponent, MockCxIconComponent], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [NgSelectModule, FormsModule, I18nTestingModule], + declarations: [ProductViewComponent, MockCxIconComponent], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductViewComponent); diff --git a/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts b/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts index 6eac8fce276..8d8f24efc3f 100644 --- a/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-summary/product-summary.component.spec.ts @@ -23,20 +23,18 @@ describe('ProductSummaryComponent in product', () => { let currentProductService: CurrentProductService; let featureConfigService: FeatureConfigService; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ItemCounterModule, I18nTestingModule, RouterTestingModule], - declarations: [ProductSummaryComponent, OutletDirective], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ItemCounterModule, I18nTestingModule, RouterTestingModule], + declarations: [ProductSummaryComponent, OutletDirective], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductSummaryComponent); diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts b/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts index a178ff96350..8dd5665c339 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-attributes/product-attributes.component.spec.ts @@ -57,20 +57,18 @@ describe('ProductAttributesComponent in product', () => { let productAttributesComponent: ProductAttributesComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [I18nTestingModule], - declarations: [ProductAttributesComponent], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [I18nTestingModule], + declarations: [ProductAttributesComponent], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductAttributesComponent); diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts b/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts index f4160a51dd7..33753bc5cc7 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-details-tab/product-details-tab.component.spec.ts @@ -66,27 +66,25 @@ describe('ProductDetailsTabComponent', () => { let productDetailsTabComponent: ProductDetailsTabComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ProductDetailsTabComponent], - providers: [ - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - { - provide: CmsComponentData, - useClass: MockCmsComponentData, - }, - { - provide: CmsService, - useClass: MockCmsService, - }, - ], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ProductDetailsTabComponent], + providers: [ + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + { + provide: CmsComponentData, + useClass: MockCmsComponentData, + }, + { + provide: CmsService, + useClass: MockCmsService, + }, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductDetailsTabComponent); diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html index a703273804f..ae92b426952 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.html @@ -27,7 +27,7 @@

{{ 'productReview.overallRating' | cxTranslate }}

{{ review.headline }}
@@ -76,7 +76,20 @@

{{ 'productReview.overallRating' | cxTranslate }}

class="form-control" formControlName="title" /> - + + + + +
@@ -91,7 +104,18 @@

{{ 'productReview.overallRating' | cxTranslate }}

rows="3" formControlName="comment" > + + + + @@ -114,7 +138,20 @@

{{ 'productReview.overallRating' | cxTranslate }}

(change)="setRating($event)" [disabled]="false" > - + + + + +
diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts index e897c8531b9..7f358a2ea3c 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.spec.ts @@ -6,6 +6,7 @@ import { Product, ProductReviewService, } from '@spartacus/core'; +import { MockFeatureDirective } from 'projects/storefrontlib/shared/test/mock-feature-directive'; import { Observable, of } from 'rxjs'; import { FormErrorsModule, ItemCounterModule } from '../../../../shared/index'; import { CurrentProductService } from '../../current-product.service'; @@ -46,29 +47,31 @@ describe('ProductReviewsComponent in product', () => { let productReviewsComponent: ProductReviewsComponent; let fixture: ComponentFixture; - beforeEach( - waitForAsync(() => { - TestBed.configureTestingModule({ - imports: [ - ReactiveFormsModule, - ItemCounterModule, - I18nTestingModule, - FormErrorsModule, - ], - providers: [ - { - provide: ProductReviewService, - useClass: MockProductReviewService, - }, - { - provide: CurrentProductService, - useClass: MockCurrentProductService, - }, - ], - declarations: [MockStarRatingComponent, ProductReviewsComponent], - }).compileComponents(); - }) - ); + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + imports: [ + ReactiveFormsModule, + ItemCounterModule, + I18nTestingModule, + FormErrorsModule, + ], + providers: [ + { + provide: ProductReviewService, + useClass: MockProductReviewService, + }, + { + provide: CurrentProductService, + useClass: MockCurrentProductService, + }, + ], + declarations: [ + MockStarRatingComponent, + ProductReviewsComponent, + MockFeatureDirective, + ], + }).compileComponents(); + })); beforeEach(() => { fixture = TestBed.createComponent(ProductReviewsComponent); diff --git a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.ts b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.ts index b7224ecf6f0..714306d5728 100644 --- a/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.ts +++ b/projects/storefrontlib/cms-components/product/product-tabs/product-reviews/product-reviews.component.ts @@ -30,7 +30,6 @@ import { switchMap, tap, } from 'rxjs/operators'; -import { CustomFormValidators } from '../../../../shared/index'; import { CurrentProductService } from '../../current-product.service'; @Component({ @@ -131,7 +130,7 @@ export class ProductReviewsComponent { this.reviewForm = this.fb.group({ title: ['', Validators.required], comment: ['', Validators.required], - rating: [null, CustomFormValidators.starRatingEmpty], + rating: [null, Validators.required], reviewerName: '', }); } diff --git a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html index 111b02838bf..85d0d16a581 100644 --- a/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html +++ b/projects/storefrontlib/cms-components/product/stock-notification/stock-notification-dialog/stock-notification-dialog.component.html @@ -89,13 +89,7 @@