Merge branch 'main' into feat/forms-1240-external-api

usingtechnology · May 28, 2024 · 4ab192e · 4ab192e
2 parents 00efb56 + cc49b3e
commit 4ab192e
Show file tree

Hide file tree

Showing 51 changed files with 3,191 additions and 2,733 deletions.
diff --git a/app/frontend/src/internationalization/trans/chefs/ar/ar.json b/app/frontend/src/internationalization/trans/chefs/ar/ar.json
@@ -77,7 +77,7 @@
     "upload": "تحميل",
     "delete": "حذف",
     "download": "تنزيل",
-    "invalidFileMessage": "يجب أن يستخدم القالب أحد الامتدادات التالية: .txt، .docx، .html، .odt، .pptx، .xlsx، .pdf",
+    "invalidFileMessage": "يجب أن يستخدم القالب أحد الامتدادات التالية: .txt، .docx، .html، .odt، .pptx، .xlsx",
     "uploadSuccess": "تم تحميل القالب بنجاح.",
     "uploadError": "حدث خطأ أثناء تحميل القالب.",
     "deleteSuccess": "تم حذف القالب بنجاح.",

diff --git a/app/frontend/src/internationalization/trans/chefs/de/de.json b/app/frontend/src/internationalization/trans/chefs/de/de.json
@@ -77,7 +77,7 @@
     "upload": "Hochladen",
     "delete": "Löschen",
     "download": "Herunterladen",
-    "invalidFileMessage": "Die Vorlage muss eine der folgenden Erweiterungen verwenden: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "Die Vorlage muss eine der folgenden Erweiterungen verwenden: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Vorlage erfolgreich hochgeladen.",
     "uploadError": "Beim Hochladen der Vorlage ist ein Fehler aufgetreten.",
     "deleteSuccess": "Vorlage erfolgreich gelöscht.",

diff --git a/app/frontend/src/internationalization/trans/chefs/en/en.json b/app/frontend/src/internationalization/trans/chefs/en/en.json
@@ -73,7 +73,7 @@
     "upload": "Upload",
     "delete": "Delete",
     "download": "Download",
-    "invalidFileMessage": "The template must use one of the following extentions: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "The template must use one of the following extentions: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Template uploaded successfully.",
     "uploadError": "An error occurred while uploading the template.",
     "deleteSuccess": "Template deleted successfully.",

diff --git a/app/frontend/src/internationalization/trans/chefs/es/es.json b/app/frontend/src/internationalization/trans/chefs/es/es.json
@@ -77,7 +77,7 @@
     "upload": "Subir",
     "delete": "Eliminar",
     "download": "Descargar",
-    "invalidFileMessage": "La plantilla debe usar una de las siguientes extensiones: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "La plantilla debe usar una de las siguientes extensiones: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Plantilla subida exitosamente.",
     "uploadError": "Ocurrió un error al subir la plantilla.",
     "deleteSuccess": "Plantilla eliminada exitosamente.",

diff --git a/app/frontend/src/internationalization/trans/chefs/fa/fa.json b/app/frontend/src/internationalization/trans/chefs/fa/fa.json
@@ -77,7 +77,7 @@
     "upload": "بارگذاری",
     "delete": "حذف",
     "download": "دانلود",
-    "invalidFileMessage": "قالب باید یکی از پسوندهای زیر را استفاده کند: .txt، .docx، .html، .odt، .pptx، .xlsx، .pdf",
+    "invalidFileMessage": "قالب باید یکی از پسوندهای زیر را استفاده کند: .txt، .docx، .html، .odt، .pptx، .xlsx",
     "uploadSuccess": "قالب با موفقیت بارگذاری شد.",
     "uploadError": "خطایی در هنگام بارگذاری قالب رخ داد.",
     "deleteSuccess": "قالب با موفقیت حذف شد.",

diff --git a/app/frontend/src/internationalization/trans/chefs/fr/fr.json b/app/frontend/src/internationalization/trans/chefs/fr/fr.json
@@ -77,7 +77,7 @@
     "upload": "Télécharger",
     "delete": "Supprimer",
     "download": "Télécharger",
-    "invalidFileMessage": "Le modèle doit utiliser l'une des extensions suivantes : .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "Le modèle doit utiliser l'une des extensions suivantes : .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Modèle téléchargé avec succès.",
     "uploadError": "Une erreur s'est produite lors du téléchargement du modèle.",
     "deleteSuccess": "Modèle supprimé avec succès.",

diff --git a/app/frontend/src/internationalization/trans/chefs/hi/hi.json b/app/frontend/src/internationalization/trans/chefs/hi/hi.json
@@ -77,7 +77,7 @@
     "upload": "अपलोड करें",
     "delete": "हटाएं",
     "download": "डाउनलोड करें",
-    "invalidFileMessage": "टेम्पलेट में निम्नलिखित में से एक एक्सटेंशन का उपयोग करना चाहिए: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "टेम्पलेट में निम्नलिखित में से एक एक्सटेंशन का उपयोग करना चाहिए: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "टेम्पलेट सफलतापूर्वक अपलोड हुआ।",
     "uploadError": "टेम्पलेट अपलोड करते समय एक त्रुटि हुई।",
     "deleteSuccess": "टेम्पलेट सफलतापूर्वक हटाया गया।",

diff --git a/app/frontend/src/internationalization/trans/chefs/it/it.json b/app/frontend/src/internationalization/trans/chefs/it/it.json
@@ -77,7 +77,7 @@
     "upload": "Carica",
     "delete": "Elimina",
     "download": "Scarica",
-    "invalidFileMessage": "Il template deve usare una delle seguenti estensioni: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "Il template deve usare una delle seguenti estensioni: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Template caricato con successo.",
     "uploadError": "Si è verificato un errore durante il caricamento del template.",
     "deleteSuccess": "Template eliminato con successo.",

diff --git a/app/frontend/src/internationalization/trans/chefs/ja/ja.json b/app/frontend/src/internationalization/trans/chefs/ja/ja.json
@@ -77,7 +77,7 @@
     "upload": "アップロード",
     "delete": "削除",
     "download": "ダウンロード",
-    "invalidFileMessage": "テンプレートは次のいずれかの拡張子を使用する必要があります: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "テンプレートは次のいずれかの拡張子を使用する必要があります: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "テンプレートが正常にアップロードされました。",
     "uploadError": "テンプレートのアップロード中にエラーが発生しました。",
     "deleteSuccess": "テンプレートが正常に削除されました。",

diff --git a/app/frontend/src/internationalization/trans/chefs/ko/ko.json b/app/frontend/src/internationalization/trans/chefs/ko/ko.json
@@ -77,7 +77,7 @@
     "upload": "업로드",
     "delete": "삭제",
     "download": "다운로드",
-    "invalidFileMessage": "템플릿은 다음 확장자 중 하나를 사용해야 합니다: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "템플릿은 다음 확장자 중 하나를 사용해야 합니다: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "템플릿이 성공적으로 업로드되었습니다.",
     "uploadError": "템플릿 업로드 중 오류가 발생했습니다.",
     "deleteSuccess": "템플릿이 성공적으로 삭제되었습니다.",

diff --git a/app/frontend/src/internationalization/trans/chefs/pa/pa.json b/app/frontend/src/internationalization/trans/chefs/pa/pa.json
@@ -77,7 +77,7 @@
     "upload": "ਅੱਪਲੋਡ ਕਰੋ",
     "delete": "ਮਿਟਾਓ",
     "download": "ਡਾਊਨਲੋਡ ਕਰੋ",
-    "invalidFileMessage": "ਟੈਂਪਲੇਟ ਵਿੱਚ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਇੱਕ ਐਕਸਟੈਂਸ਼ਨ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "ਟੈਂਪਲੇਟ ਵਿੱਚ ਇਹਨਾਂ ਵਿੱਚੋਂ ਕੋਈ ਇੱਕ ਐਕਸਟੈਂਸ਼ਨ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "ਟੈਂਪਲੇਟ ਸਫਲਤਾਪੂਰਵਕ ਅੱਪਲੋਡ ਹੋ ਗਈ।",
     "uploadError": "ਟੈਂਪਲੇਟ ਅੱਪਲੋਡ ਕਰਦੇ ਸਮੇਂ ਇੱਕ ਗਲਤੀ ਆਈ।",
     "deleteSuccess": "ਟੈਂਪਲੇਟ ਸਫਲਤਾਪੂਰਵਕ ਮਿਟਾਈ ਗਈ।",

diff --git a/app/frontend/src/internationalization/trans/chefs/pt/pt.json b/app/frontend/src/internationalization/trans/chefs/pt/pt.json
@@ -77,7 +77,7 @@
     "upload": "Carregar",
     "delete": "Excluir",
     "download": "Baixar",
-    "invalidFileMessage": "O modelo deve usar uma das seguintes extensões: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "O modelo deve usar uma das seguintes extensões: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Modelo carregado com sucesso.",
     "uploadError": "Ocorreu um erro ao carregar o modelo.",
     "deleteSuccess": "Modelo excluído com sucesso.",

diff --git a/app/frontend/src/internationalization/trans/chefs/ru/ru.json b/app/frontend/src/internationalization/trans/chefs/ru/ru.json
@@ -77,7 +77,7 @@
     "upload": "Загрузить",
     "delete": "Удалить",
     "download": "Скачать",
-    "invalidFileMessage": "Шаблон должен использовать одно из следующих расширений: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "Шаблон должен использовать одно из следующих расширений: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Шаблон успешно загружен.",
     "uploadError": "Произошла ошибка при загрузке шаблона.",
     "deleteSuccess": "Шаблон успешно удален.",

diff --git a/app/frontend/src/internationalization/trans/chefs/tl/tl.json b/app/frontend/src/internationalization/trans/chefs/tl/tl.json
@@ -77,7 +77,7 @@
     "upload": "I-upload",
     "delete": "Tanggalin",
     "download": "I-download",
-    "invalidFileMessage": "Ang template ay dapat gumamit ng isa sa mga sumusunod na extension: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "Ang template ay dapat gumamit ng isa sa mga sumusunod na extension: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Matagumpay na na-upload ang template.",
     "uploadError": "Nagkaroon ng error habang ina-upload ang template.",
     "deleteSuccess": "Matagumpay na natanggal ang template.",

diff --git a/app/frontend/src/internationalization/trans/chefs/uk/uk.json b/app/frontend/src/internationalization/trans/chefs/uk/uk.json
@@ -77,7 +77,7 @@
     "upload": "Завантажити",
     "delete": "Видалити",
     "download": "Завантажити",
-    "invalidFileMessage": "Шаблон повинен використовувати одне з наступних розширень: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "Шаблон повинен використовувати одне з наступних розширень: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Шаблон успішно завантажено.",
     "uploadError": "Під час завантаження шаблону сталася помилка.",
     "deleteSuccess": "Шаблон успішно видалено.",

diff --git a/app/frontend/src/internationalization/trans/chefs/vi/vi.json b/app/frontend/src/internationalization/trans/chefs/vi/vi.json
@@ -77,7 +77,7 @@
     "upload": "Tải lên",
     "delete": "Xóa",
     "download": "Tải xuống",
-    "invalidFileMessage": "Mẫu phải sử dụng một trong các phần mở rộng sau: .txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "Mẫu phải sử dụng một trong các phần mở rộng sau: .txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "Tải lên mẫu thành công.",
     "uploadError": "Có lỗi xảy ra khi tải lên mẫu.",
     "deleteSuccess": "Xóa mẫu thành công.",

diff --git a/app/frontend/src/internationalization/trans/chefs/zh/zh.json b/app/frontend/src/internationalization/trans/chefs/zh/zh.json
@@ -77,7 +77,7 @@
     "upload": "上传",
     "delete": "删除",
     "download": "下载",
-    "invalidFileMessage": "模板必须使用以下扩展名之一：.txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "模板必须使用以下扩展名之一：.txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "模板上传成功。",
     "uploadError": "上传模板时发生错误。",
     "deleteSuccess": "模板删除成功。",

diff --git a/app/frontend/src/internationalization/trans/chefs/zhTW/zh-TW.json b/app/frontend/src/internationalization/trans/chefs/zhTW/zh-TW.json
@@ -77,7 +77,7 @@
     "upload": "上傳",
     "delete": "刪除",
     "download": "下載",
-    "invalidFileMessage": "範本必須使用以下其中一種擴展名：.txt, .docx, .html, .odt, .pptx, .xlsx, .pdf",
+    "invalidFileMessage": "範本必須使用以下其中一種擴展名：.txt, .docx, .html, .odt, .pptx, .xlsx",
     "uploadSuccess": "範本成功上傳。",
     "uploadError": "上傳範本時發生錯誤。",
     "deleteSuccess": "範本成功刪除。",

diff --git a/app/src/db/dataConnection.js b/app/src/db/dataConnection.js
@@ -79,8 +79,7 @@ class DataConnection {
       const result = data && data.rows && data.rows[0].transaction_read_only === 'off';
       if (result) {
         log.debug('Database connection ok', { function: 'checkConnection' });
-      }
-      else {
+      } else {
         log.warn('Database connection is read-only', { function: 'checkConnection' });
       }
       return result;
@@ -98,10 +97,9 @@ class DataConnection {
   checkSchema() {
     const tables = tableNames(models);
     try {
-      return Promise
-        .all(tables.map(table => this._knex.schema.hasTable(table)))
-        .then(exists => exists.every(x => x))
-        .then(result => {
+      return Promise.all(tables.map((table) => this._knex.schema.hasTable(table)))
+        .then((exists) => exists.every((x) => x))
+        .then((result) => {
           if (result) log.debug('Database schema ok', { function: 'checkSchema' });
           return result;
         });
@@ -129,7 +127,6 @@ class DataConnection {
     }
   }
 
-
   /**
    * @function close
    * Will close the DataConnection

diff --git a/app/src/db/stamps.js b/app/src/db/stamps.js
@@ -1,6 +1,6 @@
 module.exports = (knex, table) => {
   table.string('createdBy').defaultTo('public');
-  table.timestamp('createdAt', {useTz: true}).defaultTo(knex.fn.now());
+  table.timestamp('createdAt', { useTz: true }).defaultTo(knex.fn.now());
   table.string('updatedBy');
-  table.timestamp('updatedAt', {useTz: true}).defaultTo(knex.fn.now());
+  table.timestamp('updatedAt', { useTz: true }).defaultTo(knex.fn.now());
 };