Skip to content

Commit 6ca0ae1

Browse files
committed
[SDK] Repository - Fix language related operations
1 parent 5a6ae7f commit 6ca0ae1

File tree

3 files changed

+6
-6
lines changed
  • components
    • api/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/db
    • template
      • template-application-rest-v2/src/main/resources/META-INF/dirigible/template-application-rest-v2/api
      • template-application-rest/src/main/resources/META-INF/dirigible/template-application-rest/api

3 files changed

+6
-6
lines changed

components/api/api-modules-javascript/src/main/resources/META-INF/dirigible/modules/src/db/repository.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ export abstract class Repository<T extends Record<string, any>> {
116116
public findAll(options: Options = {}): T[] {
117117
// Assume store.list returns T[] but we explicitly cast it to T[]
118118
const list: T[] = store.list(this.getEntityName(), options);
119-
translator.translateList(list, options.language, this.getTableName());
119+
translator.translateList(list, options?.language, this.getTableName());
120120
return list;
121121
}
122122

@@ -126,7 +126,7 @@ export abstract class Repository<T extends Record<string, any>> {
126126
public findById(id: number | string, options: Options = {}): T | undefined {
127127
// Assume store.get returns T or null/undefined
128128
const entity: T | null = store.get(this.getEntityName(), id);
129-
translator.translateEntity(entity, id, options.language, this.getTableName());
129+
translator.translateEntity(entity, id, options?.language, this.getTableName());
130130
return entity ?? undefined;
131131
}
132132

components/template/template-application-rest-v2/src/main/resources/META-INF/dirigible/template-application-rest-v2/api/EntityController.ts.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class ${name}Controller {
4444
const options: Options = {
4545
limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : 20,
4646
offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : 0,
47-
language: request.getLocale().split("_")[0]
47+
language: request.getLocale()?.split("_")[0]
4848
};
4949
#if($layoutType == "MANAGE_DETAILS" || $layoutType == "LIST_DETAILS")
5050

@@ -161,7 +161,7 @@ class ${name}Controller {
161161
#end
162162
#end
163163
const options: Options = {
164-
language: request.getLocale().split("_")[0]
164+
language: request.getLocale()?.split("_")[0]
165165
};
166166
const entity = this.repository.findById(id, options);
167167
if (entity) {

components/template/template-application-rest/src/main/resources/META-INF/dirigible/template-application-rest/api/entity.ts.template

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ${name}Service {
3737
const options: ${name}EntityOptions = {
3838
$limit: ctx.queryParameters["$limit"] ? parseInt(ctx.queryParameters["$limit"]) : undefined,
3939
$offset: ctx.queryParameters["$offset"] ? parseInt(ctx.queryParameters["$offset"]) : undefined,
40-
$language: request.getLocale().split("_")[0]
40+
$language: request.getLocale()?.split("_")[0]
4141
};
4242
#if($layoutType == "MANAGE_DETAILS" || $layoutType == "LIST_DETAILS")
4343

@@ -144,7 +144,7 @@ class ${name}Service {
144144
#end
145145
#end
146146
const options: ${name}EntityOptions = {
147-
$language: request.getLocale().split("_")[0]
147+
$language: request.getLocale()?.split("_")[0]
148148
};
149149
const entity = this.repository.findById(id, options);
150150
if (entity) {

0 commit comments

Comments
 (0)