Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug/CXINT-2438: Update Sort Keys in Spartacus PDF Invoices Component #18488

Merged
merged 7 commits into from
Apr 4, 2024
Merged

Bug/CXINT-2438: Update Sort Keys in Spartacus PDF Invoices Component #18488

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3cbc4b4
Update invoices-list.component.ts
anjana-bl Feb 13, 2024
04d3d73
code changes
anjana-bl Mar 4, 2024
a086ca2
Merge branch 'develop' into bug/CXINT-2438
anjana-bl Mar 4, 2024
9185ab6
Merge branch 'develop' into bug/CXINT-2438
anjana-bl Apr 4, 2024
ded2e3e
code changes
anjana-bl Apr 4, 2024
da4665c
changing the feature flag name
anjana-bl Apr 4, 2024
b6f63b4
lint changes
anjana-bl Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions feature-libs/pdf-invoices/components/invoices-list/invoices-list.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@ import {
Component,
OnDestroy,
OnInit,
inject,
} from '@angular/core';
import {
ErrorModel,
FeatureConfigService,
GlobalMessageService,
GlobalMessageType,
HttpErrorModel,
Expand Down Expand Up @@ -44,15 +46,20 @@ import { catchError, skip, switchMap, take, tap } from 'rxjs/operators';
export class InvoicesListComponent implements OnInit, OnDestroy {
/* For Enum use in HTML */
ICON_TYPE = ICON_TYPE;
private featureConfig = inject(FeatureConfigService);

protected PAGE_SIZE = 5; //Default page size

sortOptions: SortModel[];
sort = 'byInvoiceIdAsc';

protected sortMapping: { [key: string]: string } = {
byCreatedAtAsc: 'invoiceDate:asc', //TODO: (CXINT-2438) update the sort code after the API is changed
byCreatedAtDesc: 'invoiceDate:desc', //TODO: (CXINT-2438) update the sort code after the API is changed
byCreatedAtAsc: this.featureConfig.isEnabled('useUpdatedSortMappingForInvoices')
? 'createdAt:asc'
: 'invoiceDate:asc',
byCreatedAtDesc: this.featureConfig.isEnabled('useUpdatedSortMappingForInvoices')
? 'createdAt:desc'
: 'invoiceDate:desc',
byInvoiceIdAsc: 'invoiceId:asc',
byInvoiceIdDesc: 'invoiceId:desc',
byNetAmountAsc: 'netAmount:asc',
Expand Down
3 changes: 3 additions & 0 deletions feature-libs/pdf-invoices/components/pdf-invoices-components.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ import { InvoicesListComponent } from './invoices-list/invoices-list.component';
guards: [AuthGuard],
},
},
features: {
useUpdatedSortMappingForInvoices: false,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I recommend starting with the name of the library, e.g. pdfInvoices and if possible describe semantically the change: e.g. sortByInvoiceDate.
What do you think about: pdfInvoicesSortByInvoiceDate?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is better. have changed the name

},
}),
],
})
Expand Down
1 change: 1 addition & 0 deletions projects/storefrontlib/feature-toggles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export interface FeatureToggles {
*/
storeFrontLibCardParagraphTruncated?: boolean;
showPromotionsInPDP?: boolean;
useUpdatedSortMappingForInvoices?: boolean;
recentSearches?: boolean;
};
}
Loading