Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into release-2211.32.0-1
Browse files Browse the repository at this point in the history
  • Loading branch information
rmch91 committed Nov 29, 2024
2 parents b455f13 + 8297d98 commit d5be534
Show file tree
Hide file tree
Showing 13 changed files with 299 additions and 171 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
<label>
<span class="cx-customer-ticket-label label-content">
{{ 'customerTicketing.message' | cxTranslate }}
<ng-template [ngTemplateOutlet]="requiredAsterisk"></ng-template>
</span>
<textarea
required="true"
[maxLength]="inputCharactersLimit"
class="form-control"
formControlName="message"
Expand Down Expand Up @@ -61,3 +63,12 @@
<cx-spinner *ngIf="isDataLoading$ | async" class="overlay"></cx-spinner>
</form>
</div>
<ng-template #requiredAsterisk>
<abbr
*cxFeature="'a11yRequiredAsterisks'"
class="text-decoration-none"
aria-hidden="true"
title="{{ 'common.required' | cxTranslate }}"
>*</abbr
>
</ng-template>
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
AuthGuard,
CmsConfig,
I18nModule,
FeaturesConfigModule,
provideDefaultConfig,
} from '@spartacus/core';
import { CustomerTicketingCloseComponent } from './customer-ticketing-close.component';
Expand All @@ -34,6 +35,7 @@ import { CustomerTicketingCloseComponentService } from './customer-ticketing-clo
FormErrorsModule,
FileUploadModule,
SpinnerModule,
FeaturesConfigModule,
],
providers: [
CustomerTicketingCloseComponentService,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,16 @@
*/

import { ChangeDetectionStrategy, Component, OnDestroy } from '@angular/core';
import { RoutingService, TranslationService } from '@spartacus/core';
import {
RoutingService,
TranslationService,
useFeatureStyles,
} from '@spartacus/core';
import { Order, OrderHistoryList } from '@spartacus/order/root';
import { OrderHistoryQueryParams } from '@spartacus/organization/unit-order/core';
import { UnitOrderFacade } from '@spartacus/organization/unit-order/root';
import { combineLatest, Observable } from 'rxjs';
import { map, tap } from 'rxjs/operators';
import { UnitOrderFacade } from '@spartacus/organization/unit-order/root';

@Component({
selector: 'cx-unit-level-order-history',
Expand All @@ -32,7 +36,9 @@ export class UnitLevelOrderHistoryComponent implements OnDestroy {
protected routing: RoutingService,
protected unitOrdersFacade: UnitOrderFacade,
protected translation: TranslationService
) {}
) {
useFeatureStyles('a11yTruncatedTextForResponsiveView');
}

orders$: Observable<OrderHistoryList | undefined> = this.unitOrdersFacade
.getOrderHistoryList(this.PAGE_SIZE)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@
padding: 1.25rem;
width: 100%;
}
@include forFeature('a11yTruncatedTextForResponsiveView') {
@include media-breakpoint-down(xs) {
display: block;
}
}
}

.cx-unit-level-order-history-sort {
Expand Down
Loading

0 comments on commit d5be534

Please sign in to comment.