Merge pull request #4120 from oat-sa/fix/ADF-1789/small-issues

Fix/ADF-1789/small issues

views/js/form/tpl/translation-languages.tpl

@@ -0,0 +1,4 @@
+<option value="">--- {{__ 'select'}} ---</option>
+{{#each languages}}
+<option value="{{uri}}">{{label}}</option>
+{{/each}}

views/js/form/tpl/translation.tpl

@@ -4,12 +4,7 @@
 {{#if languages}}
         <div class="translations-create">
             <label>{{__ 'Language'}}
-                <select name="language" data-control="select">
-                    <option value="">--- {{__ 'select'}} ---</option>
-                    {{#each languages}}
-                    <option value="{{uri}}">{{label}}</option>
-                    {{/each}}
-                </select>
+                <select name="language" data-control="select"></select>
             </label>
             <button class="btn-info small" data-control="create"><span class="icon-replace"></span> {{__ 'Create
                 translation'}}</button>

views/js/form/translation.js

@@ -23,9 +23,18 @@ define([
     'ui/dialog/confirm',
     'services/translation',
     'tpl!form/tpl/translation',
+    'tpl!form/tpl/translation-languages',
     'ui/datatable'
-], function (__, componentFactory, dialogAlert, dialogConfirm, translationService, translationTpl) {
-    ('use strict');
+], function (
+    __,
+    componentFactory,
+    dialogAlert,
+    dialogConfirm,
+    translationService,
+    translationTpl,
+    translationLanguagesTpl
+) {
+    'use strict';
 
     const defaults = {
         sortBy: 'language',
@@ -174,15 +183,33 @@ define([
              */
             refresh() {
                 return this.getData().then(data => {
-                    this.config.translations = data.translations;
-                    this.updateList();
+                    Object.assign(this.config, data);
+                    this.updateLanguagesList();
+                    this.updateTranslationsList();
                 });
             },
 
+            /**
+             * Updates the list of languages.
+             */
+            updateLanguagesList() {
+                if (!this.is('rendered')) {
+                    return;
+                }
+
+                const { languages = [] } = this.config;
+
+                this.controls.$languageSelect.html(
+                    translationLanguagesTpl({
+                        languages: languages.filter(language => language.uri !== this.config.languageUri)
+                    })
+                );
+            },
+
             /**
              * Updates the list of translations.
              */
-            updateList() {
+            updateTranslationsList() {
                 if (!this.is('rendered')) {
                     return;
                 }
@@ -276,7 +303,8 @@ define([
                     );
                 });
 
-                this.updateList();
+                this.updateLanguagesList();
+                this.updateTranslationsList();
 
                 /**
                  * @event ready
@@ -302,9 +330,11 @@ define([
         translationService
             .getTranslatable(resourceUri)
             .then(response => {
+                const languageUri = translationService.listResourcesLanguages(response.resources);
                 const config = {
                     ready: translationService.isReadyForTranslation(response.resources),
                     renderTo: $container,
+                    languageUri: languageUri && languageUri[0],
                     languages: [],
                     translations: []
                 };