feat: cleanup and preparation for export support

tolgee · Oct 30, 2024 · 6aa07de · 6aa07de
1 parent 043f2dd
commit 6aa07de
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 15 deletions.
diff --git a/backend/data/src/main/kotlin/io/tolgee/formats/ExportFormat.kt b/backend/data/src/main/kotlin/io/tolgee/formats/ExportFormat.kt
@@ -26,6 +26,11 @@ enum class ExportFormat(
     "application/xml",
     defaultFileStructureTemplate = "values-{androidLanguageTag}/strings.{extension}",
   ),
+  COMPOSE_XML(
+    "xml",
+    "application/xml",
+    defaultFileStructureTemplate = "values-{androidLanguageTag}/strings.{extension}",
+  ),
   FLUTTER_ARB(
     "arb",
     "application/json",

diff --git a/backend/data/src/main/kotlin/io/tolgee/service/export/FileExporterFactory.kt b/backend/data/src/main/kotlin/io/tolgee/service/export/FileExporterFactory.kt
@@ -80,6 +80,8 @@ class FileExporterFactory(
 
       ExportFormat.ANDROID_XML -> AndroidStringsXmlExporter(data, exportParams, projectIcuPlaceholdersSupport)
 
+      ExportFormat.COMPOSE_XML -> AndroidStringsXmlExporter(data, exportParams, projectIcuPlaceholdersSupport) // TODO: Compose XML exporter
+
       ExportFormat.PO ->
         PoFileExporter(
           data,

diff --git a/e2e/cypress/common/export.ts b/e2e/cypress/common/export.ts
@@ -195,6 +195,13 @@ export const testExportFormats = (
     },
   });
 
+  testFormat(interceptFn, submitFn, clearCheckboxesAfter, afterFn, {
+    format: 'Compose Multiplatform .xml',
+    expectedParams: {
+      format: 'COMPOSE_XML',
+    },
+  });
+
   testFormat(interceptFn, submitFn, clearCheckboxesAfter, afterFn, {
     format: 'Flutter .arb',
     expectedParams: {

diff --git a/webapp/src/service/apiSchema.generated.ts b/webapp/src/service/apiSchema.generated.ts
@@ -1865,19 +1865,20 @@ export interface components {
       languages?: string[];
       /** @description Format to export to */
       format:
-        | "CSV"
         | "JSON"
         | "JSON_TOLGEE"
-        | "JSON_I18NEXT"
         | "XLIFF"
         | "PO"
         | "APPLE_STRINGS_STRINGSDICT"
         | "APPLE_XLIFF"
         | "ANDROID_XML"
+        | "COMPOSE_XML"
         | "FLUTTER_ARB"
         | "PROPERTIES"
         | "YAML_RUBY"
-        | "YAML";
+        | "YAML"
+        | "JSON_I18NEXT"
+        | "CSV";
       /**
        * @description Delimiter to structure file content.
        *
@@ -1965,19 +1966,20 @@ export interface components {
       languages?: string[];
       /** @description Format to export to */
       format:
-        | "CSV"
         | "JSON"
         | "JSON_TOLGEE"
-        | "JSON_I18NEXT"
         | "XLIFF"
         | "PO"
         | "APPLE_STRINGS_STRINGSDICT"
         | "APPLE_XLIFF"
         | "ANDROID_XML"
+        | "COMPOSE_XML"
         | "FLUTTER_ARB"
         | "PROPERTIES"
         | "YAML_RUBY"
-        | "YAML";
+        | "YAML"
+        | "JSON_I18NEXT"
+        | "CSV";
       /**
        * @description Delimiter to structure file content.
        *
@@ -3107,19 +3109,20 @@ export interface components {
       languages?: string[];
       /** @description Format to export to */
       format:
-        | "CSV"
         | "JSON"
         | "JSON_TOLGEE"
-        | "JSON_I18NEXT"
         | "XLIFF"
         | "PO"
         | "APPLE_STRINGS_STRINGSDICT"
         | "APPLE_XLIFF"
         | "ANDROID_XML"
+        | "COMPOSE_XML"
         | "FLUTTER_ARB"
         | "PROPERTIES"
         | "YAML_RUBY"
-        | "YAML";
+        | "YAML"
+        | "JSON_I18NEXT"
+        | "CSV";
       /**
        * @description Delimiter to structure file content.
        *
@@ -3640,19 +3643,20 @@ export interface components {
     };
     ExportFormatModel: {
       format:
-        | "CSV"
         | "JSON"
         | "JSON_TOLGEE"
-        | "JSON_I18NEXT"
         | "XLIFF"
         | "PO"
         | "APPLE_STRINGS_STRINGSDICT"
         | "APPLE_XLIFF"
         | "ANDROID_XML"
+        | "COMPOSE_XML"
         | "FLUTTER_ARB"
         | "PROPERTIES"
         | "YAML_RUBY"
-        | "YAML";
+        | "YAML"
+        | "JSON_I18NEXT"
+        | "CSV";
       extension: string;
       mediaType: string;
       defaultFileStructureTemplate: string;
@@ -12267,19 +12271,20 @@ export interface operations {
         languages?: string[];
         /** Format to export to */
         format?:
-          | "CSV"
           | "JSON"
           | "JSON_TOLGEE"
-          | "JSON_I18NEXT"
           | "XLIFF"
           | "PO"
           | "APPLE_STRINGS_STRINGSDICT"
           | "APPLE_XLIFF"
           | "ANDROID_XML"
+          | "COMPOSE_XML"
           | "FLUTTER_ARB"
           | "PROPERTIES"
           | "YAML_RUBY"
-          | "YAML";
+          | "YAML"
+          | "JSON_I18NEXT"
+          | "CSV";
         /**
          * Delimiter to structure file content.
          *

diff --git a/webapp/src/views/projects/export/components/formatGroups.tsx b/webapp/src/views/projects/export/components/formatGroups.tsx
@@ -186,6 +186,17 @@ export const formatGroups: FormatGroup[] = [
       },
     ],
   },
+  {
+    name: "Compose Multiplatform",
+    formats: [
+      {
+        id: 'compose_xml',
+        extension: 'xml',
+        name: <T keyName="export-format-compose-xml" />,
+        format: 'COMPOSE_XML',
+      }
+    ]
+  },
   {
     name: 'Flutter',
     formats: [

diff --git a/webapp/src/views/projects/import/component/ImportSupportedFormats.tsx b/webapp/src/views/projects/import/component/ImportSupportedFormats.tsx
@@ -53,6 +53,7 @@ const FORMATS = [
   { name: 'Apple Stringsdict', logo: <AppleLogo /> },
   { name: 'Apple XLIFF', logo: <AppleLogo /> },
   { name: 'Android XML', logo: <AndroidLogo /> },
+  // TODO: Compose multiplatform logo
   { name: 'Flutter ARB', logo: <FluttrerLogo /> },
   { name: 'Ruby YAML', logo: <RailsLogo /> },
   { name: 'i18next', logo: <I18nextLogo /> },