From 628d0f5819f60d52260d30f63d4a57b719a7a2e1 Mon Sep 17 00:00:00 2001
From: abdou6666 <sfayhi.abderrahmen@esprit.tn>
Date: Fri, 22 Nov 2024 11:51:54 +0100
Subject: [PATCH] fix: address review comments

---
 api/src/i18n/services/translation.service.spec.ts |  6 +++---
 api/src/plugins/types.ts                          |  4 +---
 api/src/utils/test/fixtures/setting.ts            | 10 ----------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/api/src/i18n/services/translation.service.spec.ts b/api/src/i18n/services/translation.service.spec.ts
index fda9087..dfa2601 100644
--- a/api/src/i18n/services/translation.service.spec.ts
+++ b/api/src/i18n/services/translation.service.spec.ts
@@ -72,9 +72,9 @@ describe('TranslationService', () => {
               .mockResolvedValue(['Global fallback message']),
             find: jest.fn().mockResolvedValue([
               {
-                translatable: true,
-                key: 'global_fallback',
-                value: 'Global fallback message',
+                translatable: false,
+                global_fallback: 'global_fallback',
+                fallback_message: ['Global fallback message'],
               },
             ]),
           },
diff --git a/api/src/plugins/types.ts b/api/src/plugins/types.ts
index d0b6a27..2dfae9d 100644
--- a/api/src/plugins/types.ts
+++ b/api/src/plugins/types.ts
@@ -24,9 +24,7 @@ export interface CustomBlocks {}
 
 type BlockAttrs = Partial<BlockCreateDto> & { name: string };
 
-export type PluginSetting = Omit<SettingCreateDto, 'weight'> & {
-  translatable?: boolean;
-};
+export type PluginSetting = Omit<SettingCreateDto, 'weight'>;
 
 export type PluginBlockTemplate = Omit<
   BlockAttrs,
diff --git a/api/src/utils/test/fixtures/setting.ts b/api/src/utils/test/fixtures/setting.ts
index f1bea92..4d6355f 100644
--- a/api/src/utils/test/fixtures/setting.ts
+++ b/api/src/utils/test/fixtures/setting.ts
@@ -19,7 +19,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: 'admin@example.com',
     type: SettingType.text,
     weight: 1,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -35,7 +34,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: 'Your company name',
     type: SettingType.text,
     weight: 2,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -43,7 +41,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: '(+999) 9999 9999 999',
     type: SettingType.text,
     weight: 3,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -51,7 +48,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: 'contact[at]mycompany.com',
     type: SettingType.text,
     weight: 4,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -59,7 +55,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: '71 Pilgrim Avenue',
     type: SettingType.text,
     weight: 5,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -67,7 +62,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: '',
     type: SettingType.text,
     weight: 6,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -75,7 +69,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: 'Chevy Chase',
     type: SettingType.text,
     weight: 7,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -83,7 +76,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: '85705',
     type: SettingType.text,
     weight: 8,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -91,7 +83,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: 'Orlando',
     type: SettingType.text,
     weight: 9,
-    translatable: false,
   },
   {
     group: 'contact',
@@ -99,7 +90,6 @@ export const settingFixtures: SettingCreateDto[] = [
     value: 'US',
     type: SettingType.text,
     weight: 10,
-    translatable: false,
   },
 ];