wip

Author: MohammedBasioni

addons/t9n/models/message.py

@@ -1,4 +1,4 @@
-from odoo import api, fields, models
+from odoo import fields, models
 
 
 class Message(models.Model):
@@ -41,25 +41,3 @@ class Message(models.Model):
             "The combination of a text to translate and its context must be unique within the same resource!",
         ),
     ]
-
-    @api.model
-    def get_message(self, message_id, target_lang_id):
-        message_records = self.browse([message_id])
-        message_records.ensure_one()
-        message_record = next(iter(message_records))
-        return {
-            "id": message_record.id,
-            "body": message_record.body,
-            "context": message_record.context,
-            "translator_comments": message_record.translator_comments,
-            "extracted_comments": message_record.extracted_comments,
-            "references": message_record.references,
-            "translations": [
-                {
-                    "id": record.id,
-                    "body": record.body,
-                }
-                for record in message_record.translation_ids
-                if record.lang_id.id == target_lang_id
-            ],
-        }

addons/t9n/models/project.py

@@ -35,44 +35,22 @@ def _check_source_and_target_languages(self):
 
     @api.model
     def get_projects(self):
-        projects_records = self.search([])
+        return self.search([])._format()
+
+    def _format(self):
         return [
             {
                 "id": record.id,
                 "name": record.name,
-                "src_lang_id": {
-                    "id": record.src_lang_id.id,
-                    "name": record.src_lang_id.name if record.src_lang_id.name else "",
-                },
+                "src_lang_id": record.src_lang_id._format()[0],
                 "resource_ids": [
                     {
                         "id": resource.id,
                         "file_name": resource.file_name,
                     }
                     for resource in record.resource_ids
                 ],
-                "target_lang_ids": [
-                    {
-                        "id": lang.id,
-                        "name": lang.name,
-                    }
-                    for lang in record.target_lang_ids
-                ],
-            }
-            for record in projects_records
-        ]
-
-    @api.model
-    def get_target_langs(self, id):
-        project_records = self.browse([id])
-        project_records.ensure_one()
-        project_record = next(iter(project_records))
-        return [
-            {
-                "id": lang.id,
-                "name": lang.name,
-                "code": lang.code,
-                "native_name": lang.native_name,
+                "target_lang_ids": record.target_lang_ids._format(),
             }
-            for lang in project_record.target_lang_ids
+            for record in self
         ]

addons/t9n/models/resource.py

@@ -106,40 +106,20 @@ def _format(self):
                     {
                         "id": msg.id,
                         "body": msg.body,
-                    } for msg in resource.message_ids
+                        "translation_ids": [
+                            {
+                                "id": translation.id,
+                                "body": translation.body,
+                                "lang_id": translation.lang_id.id,
+                            }
+                            for translation in msg.translation_ids
+                        ],
+                    }
+                    for msg in resource.message_ids
                 ],
                 "project_id": {
                     "id": resource.project_id.id,
                 },
-            } for resource in self
+            }
+            for resource in self
         ]
-
-    @api.model
-    def get_resource(self, id, target_lang_id):
-        resource_records = self.browse([id])
-        resource_records.ensure_one()
-        resource_record = next(iter(resource_records))
-        return {
-            "id": resource_record.id,
-            "file_name": resource_record.file_name,
-            "project_id": resource_record.project_id.id,
-            "messages": [
-                {
-                    "id": message.id,
-                    "body": message.body,
-                    "context": message.context,
-                    "translator_comments": message.translator_comments,
-                    "extracted_comments": message.extracted_comments,
-                    "references": message.references,
-                    "translations": [
-                        {
-                            "id": lang.id,
-                            "body": lang.body,
-                        }
-                        for lang in message.translation_ids
-                        if lang.lang_id.id == target_lang_id
-                    ],
-                }
-                for message in resource_record.message_ids
-            ],
-        }

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

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

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

@@ -1,9 +1,7 @@
-import { Component, useState, useRef } from "@odoo/owl";
-
-import { CopyPopover } from "@t9n/core/copy_button_popover";
+import { Component, useState } from "@odoo/owl";
 
+import { _t } from "@web/core/l10n/translation";
 import { useService } from "@web/core/utils/hooks";
-import { usePopover } from "@web/core/popover/popover_hook";
 
 export class MessageForm extends Component {
     static props = {};
@@ -15,13 +13,7 @@ export class MessageForm extends Component {
         });
         this.store = useState(useService("mail.store"));
         this.orm = useService("orm");
-        this.popoverButtonRef = useRef("popover-button");
-        this.copyPopover = usePopover(CopyPopover, {
-            position: "top",
-            animation: true,
-            arrow: true,
-            closeOnClickAway: true,
-        });
+        this.notification = useService("notification");
     }
 
     get message() {
@@ -38,11 +30,11 @@ export class MessageForm extends Component {
 
     async onClickCopy(ev) {
         try {
-            await navigator.clipboard.writeText(this.state.suggestedTranslationText.trim());
-            this.copyPopover.open(this.popoverButtonRef.el, {});
-            setTimeout(() => {
-                this.copyPopover.close();
-            }, 3000);
+            await navigator.clipboard.writeText(this.message.body.trim());
+            this.notification.add(
+                _t("Copied to clipboard!"),
+                { type: "info" }
+            );
         } catch (error) {
             console.error("Error copying text:", error);
         }
@@ -56,7 +48,7 @@ export class MessageForm extends Component {
                 lang_id: this.store.t9n.activeLanguage.id,
             },
         );
-        console.log(data);
+
         this.store["t9n.translation"].insert(data);
         this.state.suggestedTranslationText = "";
     }

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

@@ -50,11 +50,11 @@
                     </p>
                 </div>
                 <div class="form-group">
-                    <textarea class="form-control" rows="3" placeholder="Write your translation" t-model="state.suggestedTranslationText" t-ref="popover-button"></textarea>
+                    <textarea class="form-control" rows="3" placeholder="Write your translation" t-model="state.suggestedTranslationText" ></textarea>
                 </div>
                 <div class="d-flex justify-content-end my-3">
                     <button class="btn btn-outline-primary mx-1" t-on-click="onClickClear">Clear</button>
-                    <button class="btn btn-outline-primary mx-1" data-toggle="popover" t-on-click="onClickCopy">Copy</button>
+                    <button class="btn btn-outline-primary mx-1" t-on-click="onClickCopy">Copy</button>
                     <button class="btn btn-primary mx-1" t-on-click="onClickSuggest">Suggest</button>
                 </div>
             </div>

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

@@ -7,7 +7,7 @@ export class AppModel extends Record {
     activeLanguage = Record.one("t9n.language");
     activeResource = Record.one("t9n.resource");
     activeMessage = Record.one("t9n.message");
-    /** @type {"ProjectList|"LanguageList"|"ResourceList"|"TranslationEditor"} */
+    /** @type {"ProjectList"|"LanguageList"|"ResourceList"|"TranslationEditor"} */
     activeView = "ProjectList";
 }
 

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

@@ -13,7 +13,7 @@ export class ResourceList extends Component {
                 searchText: "",
             },
             sorting: {
-                column: "fileName",
+                column: "file_name",
                 order: "asc",
             },
         });
@@ -24,8 +24,8 @@ export class ResourceList extends Component {
     get resources() {
         const searchTerms = this.state.filters.searchText.trim().toUpperCase();
         const resources = searchTerms
-            ? this.store.resources.filter((r) => r.fileName.toUpperCase().includes(searchTerms))
-            : [...this.store.resources];
+            ? this.props.resources.filter((r) => r.file_name.toUpperCase().includes(searchTerms))
+            : [...this.props.resources];
 
         resources.sort((r1, r2) => {
             let r1Col = r1[this.state.sorting.column];
@@ -49,7 +49,7 @@ export class ResourceList extends Component {
         const resourceData = await this.env.services.orm.call(
             "t9n.resource",
             "get_resources",
-            this.props.resources.map(({ id }) => id)
+            [this.props.resources.map(({ id }) => id)],
         );
         this.store["t9n.resource"].insert(resourceData);
     }

addons/t9n/static/src/core/models/app_model.js

@@ -10,12 +10,12 @@
             <table class="table table-hover">
                 <thead>
                     <tr>
-                        <th t-on-click="() => this.onClickColumnName('fileName')">Resource <i t-attf-class="btn btn-link fa fa-sort-{{this.state.sorting.column === 'name' and this.state.sorting.order === 'asc' ? 'up' : 'down'}}"></i>
+                        <th t-on-click="() => this.onClickColumnName('file_name')">Resource <i t-attf-class="btn btn-link fa fa-sort-{{this.state.sorting.column === 'file_name' and this.state.sorting.order === 'asc' ? 'up' : 'down'}}"></i>
                         </th>
                     </tr>
                 </thead>
                 <tbody>
-                    <t t-foreach="props.resources" t-as="resource" t-key="resource.id">
+                    <t t-foreach="resources" t-as="resource" t-key="resource.id">
                         <tr>
                             <td>
                                 <button class="btn btn-link " t-on-click="() => this.onClickResource(resource)">

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

@@ -1,9 +1,10 @@
-import { Component, xml } from "@odoo/owl";
+import { Component, xml, useState} from "@odoo/owl";
 
 import { App } from "@t9n/core/app";
 
 import { registry } from "@web/core/registry";
 import { standardActionServiceProps } from "@web/webclient/actions/action_service";
+import { useService } from "@web/core/utils/hooks";
 
 /**
  * Wraps the application root, allowing us to open the application as a result
@@ -13,6 +14,14 @@ export class OpenApp extends Component {
     static components = { App };
     static props = { ...standardActionServiceProps };
     static template = xml`<App/>`;
+
+    setup() {
+        this.store = useState(useService("mail.store"));
+        this.store.t9n.activeView = 'ProjectList';
+        this.store.t9n.activeLanguage = null;
+        this.store.t9n.activeResource = null;
+        this.store.t9n.activeMessage = null;
+    }
 }
 
 registry.category("actions").add("t9n.open_app", OpenApp);