From 7322d2172129d0ac31490fd4e61c4df65b368dba Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Tue, 7 Jan 2025 05:12:48 +0100 Subject: [PATCH 1/4] fix: resolve pagination-querypipe null checks issues --- api/src/utils/pagination/pagination-query.pipe.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/src/utils/pagination/pagination-query.pipe.ts b/api/src/utils/pagination/pagination-query.pipe.ts index c69076a1..82716f8c 100644 --- a/api/src/utils/pagination/pagination-query.pipe.ts +++ b/api/src/utils/pagination/pagination-query.pipe.ts @@ -23,9 +23,10 @@ export class PageQueryPipe let skip: number | undefined = undefined; let limit: number | undefined = undefined; if ('limit' in value) { - skip = parseInt(value.skip) > -1 ? parseInt(value.skip) : 0; + skip = + value?.skip && parseInt(value.skip) > -1 ? parseInt(value.skip) : 0; limit = - parseInt(value.limit) > 0 + value?.limit && parseInt(value.limit) > 0 ? parseInt(value.limit) : config.pagination.limit; } From ec2ef242df57d05466e3d4a576f08dc6e73c7658 Mon Sep 17 00:00:00 2001 From: Mohamed Marrouchi Date: Tue, 7 Jan 2025 16:39:48 +0100 Subject: [PATCH 2/4] fix: default lang --- api/src/i18n/services/i18n.service.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/api/src/i18n/services/i18n.service.ts b/api/src/i18n/services/i18n.service.ts index 39fd0fd0..60ded192 100644 --- a/api/src/i18n/services/i18n.service.ts +++ b/api/src/i18n/services/i18n.service.ts @@ -1,12 +1,12 @@ /* - * Copyright © 2024 Hexastack. All rights reserved. + * Copyright © 2025 Hexastack. All rights reserved. * * Licensed under the GNU Affero General Public License v3.0 (AGPLv3) with the following additional terms: * 1. The name "Hexabot" is a trademark of Hexastack. You may not use this name in derivative works without express written permission. * 2. All derivative works must include clear attribution to the original creator and software, Hexastack and Hexabot, in a prominent location (e.g., in the software's "About" section, documentation, and README file). */ -import { Injectable, InternalServerErrorException } from '@nestjs/common'; +import { Injectable } from '@nestjs/common'; import { I18nService as NativeI18nService, Path, @@ -29,16 +29,12 @@ export class I18nService< options?: TranslateOptions, ): IfAnyOrNever { options = { - lang: this.i18nOptions.fallbackLanguage, - defaultValue: key, ...options, + lang: options.lang || this.i18nOptions.fallbackLanguage, + defaultValue: options.defaultValue || key, }; let { lang } = options; - if (!lang) { - throw new InternalServerErrorException('I18nService: lang is undefined'); - } - lang = this.resolveLanguage(lang); // Translate block message, button text, ... From 718cec85ae0a7dbbce2e934273e64d175ffc52de Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Tue, 7 Jan 2025 16:41:28 +0100 Subject: [PATCH 3/4] fix: apply feedbacks --- api/src/utils/pagination/pagination-query.pipe.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/utils/pagination/pagination-query.pipe.ts b/api/src/utils/pagination/pagination-query.pipe.ts index 82716f8c..ee729670 100644 --- a/api/src/utils/pagination/pagination-query.pipe.ts +++ b/api/src/utils/pagination/pagination-query.pipe.ts @@ -22,7 +22,7 @@ export class PageQueryPipe transform(value: PageQueryParams) { let skip: number | undefined = undefined; let limit: number | undefined = undefined; - if ('limit' in value) { + if (value && 'limit' in value) { skip = value?.skip && parseInt(value.skip) > -1 ? parseInt(value.skip) : 0; limit = From 7e227d03dea8857b44249ab7be49710f16695e49 Mon Sep 17 00:00:00 2001 From: yassinedorbozgithub Date: Tue, 7 Jan 2025 16:49:56 +0100 Subject: [PATCH 4/4] fix: apply feedbacks --- api/src/utils/pagination/pagination-query.pipe.ts | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/api/src/utils/pagination/pagination-query.pipe.ts b/api/src/utils/pagination/pagination-query.pipe.ts index ee729670..076bf492 100644 --- a/api/src/utils/pagination/pagination-query.pipe.ts +++ b/api/src/utils/pagination/pagination-query.pipe.ts @@ -23,10 +23,9 @@ export class PageQueryPipe let skip: number | undefined = undefined; let limit: number | undefined = undefined; if (value && 'limit' in value) { - skip = - value?.skip && parseInt(value.skip) > -1 ? parseInt(value.skip) : 0; + skip = value.skip && parseInt(value.skip) > -1 ? parseInt(value.skip) : 0; limit = - value?.limit && parseInt(value.limit) > 0 + value.limit && parseInt(value.limit) > 0 ? parseInt(value.limit) : config.pagination.limit; }