wip

Author: oomsveta

addons/t9n/__manifest__.py

@@ -3,7 +3,7 @@
     "version": "1.0",
     "category": "TODO: find the appropriate category",
     "description": "TODO: write a description of the module",
-    "depends": ["base", "web"],
+    "depends": ["base", "mail", "web"],
     "application": True,
     "assets": {
         "web.assets_backend": [

addons/t9n/models/language.py

@@ -20,3 +20,12 @@ class Language(models.Model):
     _sql_constraints = [
         ("language_code_unique", "unique(code)", "The language code must be unique.")
     ]
+
+    def _format(self):
+        return [{
+            "id": language.id,
+            "name": language.name,
+            "code": language.code,
+            "native_name": language.native_name,
+            "direction": language.direction,
+        } for language in self]

addons/t9n/models/project.py

@@ -40,17 +40,18 @@ def get_projects(self):
             {
                 "id": record.id,
                 "name": record.name,
-                "src_lang": {
+                "src_lang_id": {
                     "id": record.src_lang_id.id,
                     "name": record.src_lang_id.name if record.src_lang_id.name else "",
                 },
-                "resources": [
+                "resource_ids": [
                     {
                         "id": resource.id,
+                        "file_name": resource.file_name,
                     }
                     for resource in record.resource_ids
                 ],
-                "target_langs": [
+                "target_lang_ids": [
                     {
                         "id": lang.id,
                         "name": lang.name,

addons/t9n/models/resource.py

@@ -94,14 +94,24 @@ def write(self, vals):
         return super().write(vals)
 
     @api.model
-    def get_resources(self, project_id):
-        resources_records = self.search([("project_id.id", "=", project_id)])
+    def get_resources(self, ids):
+        return self.browse(ids)._format()
+
+    def _format(self):
         return [
             {
-                "id": record.id,
-                "file_name": record.file_name,
-            }
-            for record in resources_records
+                "id": resource.id,
+                "file_name": resource.file_name,
+                "message_ids": [
+                    {
+                        "id": msg.id,
+                        "body": msg.body,
+                    } for msg in resource.message_ids
+                ],
+                "project_id": {
+                    "id": resource.project_id.id,
+                },
+            } for resource in self
         ]
 
     @api.model

addons/t9n/models/translation.py

@@ -18,3 +18,17 @@ class Translation(models.Model):
         string="Language",
         help="The language to which the translation translates the original message.",
     )
+
+    @api.model
+    def create_and_format(self, **kwargs):
+        return self.create(kwargs)._format()
+
+    def _format(self):
+        return [{
+            "id": translation.id,
+            "body": translation.body,
+            "source_id": {
+                "id": translation.source_id.id,
+            },
+            "lang_id": translation.lang_id._format()[0],
+        } for translation in self]

addons/t9n/static/src/core/app.js

@@ -1,11 +1,25 @@
-import { Component } from "@odoo/owl";
+import { Component, useState } from "@odoo/owl";
+
 import { ProjectList } from "@t9n/core/project_list";
+import { LanguageList } from "@t9n/core/language_list";
+import { ResourceList } from "@t9n/core/resource_list";
+import { TranslationEditor } from "@t9n/core/translation_editor";
+
+import { useService } from "@web/core/utils/hooks";
 
 /**
  * The "root", the "homepage" of the translation application.
  */
 export class App extends Component {
-    static components = { ProjectList };
+    static components = { LanguageList, ProjectList, ResourceList, TranslationEditor };
     static props = {};
     static template = "t9n.App";
+
+    setup() {
+        this.store = useState(useService("mail.store"));
+    }
+
+    get activeView() {
+        return this.store.t9n.activeView;
+    }
 }

addons/t9n/static/src/core/app.xml

@@ -2,7 +2,10 @@
 <templates>
 
     <t t-name="t9n.App">
-        <ProjectList/>
+        <ProjectList t-if="activeView === 'ProjectList'"/>
+        <LanguageList t-elif="activeView === 'LanguageList'" languages="store.t9n.activeProject.target_lang_ids"/>
+        <ResourceList t-elif="activeView === 'ResourceList'" resources="store.t9n.activeProject.resource_ids"/>
+        <TranslationEditor t-elif="activeView === 'TranslationEditor'"/>
     </t>
 
 </templates>

addons/t9n/static/src/core/language_list.js

@@ -3,7 +3,7 @@ import { Component, useState } from "@odoo/owl";
 import { useService } from "@web/core/utils/hooks";
 
 export class LanguageList extends Component {
-    static props = {};
+    static props = { languages: Array };
     static template = "t9n.LanguageList";
 
     setup() {
@@ -17,22 +17,17 @@ export class LanguageList extends Component {
                 order: "asc",
             },
         });
-        this.store = useState(useService("t9n.store"));
-        this.store.fetchLanguages();
+        this.store = useState(useService("mail.store"));
     }
 
     get languages() {
         const searchTerms = this.state.filters.searchText.trim().toUpperCase();
         const languages = searchTerms
-            ? this.store.languages.filter((l) => l.name.toUpperCase().includes(searchTerms))
-            : [...this.store.languages];
-
-        languages.sort((l1, l2) => {
-            let l1Col = l1[this.state.sorting.column];
-            let l2Col = l2[this.state.sorting.column];
-
-            l1Col = l1Col.toLowerCase();
-            l2Col = l2Col.toLowerCase();
+            ? this.props.languages.filter((l) => l.name.toUpperCase().includes(searchTerms))
+            : [...this.props.languages];
+        return languages.sort((l1, l2) => {
+            const l1Col = l1[this.state.sorting.column];
+            const l2Col = l2[this.state.sorting.column];
 
             if (l1Col < l2Col) {
                 return this.state.sorting.order === "asc" ? -1 : 1;
@@ -42,7 +37,6 @@ export class LanguageList extends Component {
             }
             return 0;
         });
-        return languages;
     }
 
     onClickColumnName(column) {
@@ -54,12 +48,8 @@ export class LanguageList extends Component {
         }
     }
 
-    onClickLanguage(id) {
-        this.store.setTargetLangId(id);
-        this.action.doAction({
-            type: "ir.actions.client",
-            tag: "t9n.open_resource_list",
-            target: "current",
-        });
+    onClickLanguage(language) {
+        this.store.t9n.activeView = "ResourceList";
+        this.store.t9n.activeLanguage = language;
     }
 }

addons/t9n/static/src/core/language_list.xml

@@ -20,7 +20,7 @@
                     <t t-foreach="this.languages" t-as="language" t-key="language.id">
                         <tr>
                             <td>
-                                <button class="btn btn-link " t-on-click="() => this.onClickLanguage(language.id)">
+                                <button class="btn btn-link " t-on-click="() => this.onClickLanguage(language)">
                                     <t t-esc="language.name"/>
                                 </button>
                             </td>

addons/t9n/static/src/core/message_form.js

@@ -1,7 +1,9 @@
 import { Component, useState, useRef } from "@odoo/owl";
+
+import { CopyPopover } from "@t9n/core/copy_button_popover";
+
 import { useService } from "@web/core/utils/hooks";
 import { usePopover } from "@web/core/popover/popover_hook";
-import { CopyPopover } from "@t9n/core/copy_button_popover";
 
 export class MessageForm extends Component {
     static props = {};
@@ -11,7 +13,7 @@ export class MessageForm extends Component {
         this.state = useState({
             suggestedTranslationText: "",
         });
-        this.store = useState(useService("t9n.store"));
+        this.store = useState(useService("mail.store"));
         this.orm = useService("orm");
         this.popoverButtonRef = useRef("popover-button");
         this.copyPopover = usePopover(CopyPopover, {
@@ -23,11 +25,11 @@ export class MessageForm extends Component {
     }
 
     get message() {
-        return this.store.active_message;
+        return this.store.t9n.activeMessage;
     }
 
     get translations() {
-        return this.store.active_message.translations;
+        return this.message.translationsInCurrentLanguage;
     }
 
     onClickClear() {
@@ -47,14 +49,15 @@ export class MessageForm extends Component {
     }
 
     async onClickSuggest() {
-        await this.orm.create("t9n.translation", [
+        const data = await this.orm.call("t9n.translation", "create_and_format", [], 
             {
                 body: this.state.suggestedTranslationText.trim(),
-                source_id: this.store.active_message.id,
-                lang_id: this.store.target_lang_id,
+                source_id: this.store.t9n.activeMessage.id,
+                lang_id: this.store.t9n.activeLanguage.id,
             },
-        ]);
-        this.store.fetchActiveMessage();
-        this.onClickClear();
+        );
+        console.log(data);
+        this.store["t9n.translation"].insert(data);
+        this.state.suggestedTranslationText = "";
     }
 }