Skip to content

Commit 63ed33f

Browse files
feat: updated o2s framework and integrations.mocked to the latest versions
1 parent 2db0ab4 commit 63ed33f

File tree

8 files changed

+20
-56
lines changed

8 files changed

+20
-56
lines changed

apps/api-harmonization/package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,8 @@
2525
"@nestjs/config": "^3.3.0",
2626
"@nestjs/core": "^10.0.0",
2727
"@nestjs/platform-express": "^10.0.0",
28-
"@o2s/framework": "^0.10.1",
29-
"@o2s/integrations.mocked": "^0.9.1",
30-
"@o2s/integrations.redis": "*",
31-
"@o2s/integrations.strapi-cms": "*",
28+
"@o2s/framework": "^0.11.0",
29+
"@o2s/integrations.mocked": "^0.10.0",
3230
"@o2s/utils.logger": "^0.9.1",
3331
"compression": "^1.7.5",
3432
"cookie": "^1.0.2",

apps/api-harmonization/src/components/notification-details/notification-details.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ export class NotificationDetailsService {
2626
headers: AppHeaders,
2727
): Observable<NotificationDetailsComponent> {
2828
const cms = this.cmsService.getNotificationDetailsComponent({ ...query, locale: headers['x-locale'] });
29-
const notification = this.notificationService.getNotification(params);
29+
const notification = this.notificationService.getNotification({ ...params, locale: headers['x-locale'] });
3030

3131
return forkJoin([notification, cms]).pipe(
3232
map(([notification, cms]) => {

apps/api-harmonization/src/components/notification-list/notification-list.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export class NotificationListService {
2929
...query,
3030
limit: query.limit || cms.pagination?.limit || 1,
3131
offset: query.offset || 0,
32+
locale: headers['x-locale'],
3233
})
3334
.pipe(map((notifications) => mapNotificationList(notifications, cms, headers['x-locale'])));
3435
}),

apps/api-harmonization/src/components/ticket-details/ticket-details.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class TicketDetailsService {
2222
headers: AppHeaders,
2323
): Observable<TicketDetailsComponent> {
2424
const cms = this.cmsService.getTicketDetailsComponent({ ...query, locale: headers['x-locale'] });
25-
const ticket = this.ticketService.getTicket(params);
25+
const ticket = this.ticketService.getTicket({ ...params, locale: headers['x-locale'] });
2626

2727
return forkJoin([ticket, cms]).pipe(
2828
map(([ticket, cms]) => {

apps/api-harmonization/src/components/ticket-list/ticket-list.service.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class TicketListService {
2626
...query,
2727
limit: query.limit || cms.pagination?.limit || 1,
2828
offset: query.offset || 0,
29+
locale: headers['x-locale'],
2930
})
3031
.pipe(map((tickets) => mapTicketList(tickets, cms, headers['x-locale'])));
3132
}),

apps/frontend/src/containers/UserAccount/UserAccount.client.tsx

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,7 @@ export const UserAccountPure: React.FC<UserAccountPureProps> = (component) => {
3737
{basicInformationDescription}
3838
</Typography>
3939
</div>
40-
<Button
41-
variant="outline"
42-
className="w-full md:w-fit"
43-
onClick={() => {
44-
console.log('edit');
45-
}}
46-
>
40+
<Button variant="outline" className="w-full md:w-fit" onClick={() => {}}>
4741
{labels.edit}
4842
</Button>
4943
</div>

package-lock.json

Lines changed: 10 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ui/src/components/pagination.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,9 @@ const PaginationPrevious = ({
5959
);
6060
PaginationPrevious.displayName = 'PaginationPrevious';
6161

62-
const PaginationNext = ({ className, ...props }: React.ComponentProps<typeof PaginationLink>) => (
63-
<PaginationLink aria-label="Go to next page" size="default" className={cn('gap-1 pr-2.5', className)} {...props}>
64-
<span>Next</span>
62+
const PaginationNext = ({ className, 'aria-label': label, ...props }: React.ComponentProps<typeof PaginationLink>) => (
63+
<PaginationLink aria-label={label} size="default" className={cn('gap-1 pr-2.5', className)} {...props}>
64+
<span>{label}</span>
6565
<ChevronRight className="h-4 w-4" />
6666
</PaginationLink>
6767
);

0 commit comments

Comments
 (0)