Merge pull request #61 from dew326/cleanup-cotf

EZP-29010: Move Content on the Fly common configuration to root namespace od AdminUI config

src/modules/sub-items/components/table-view/table.view.item.component.js

@@ -161,7 +161,7 @@ export default class TableViewItemComponent extends Component {
             href: generateLink(location.id)
         };
         const translations = content.CurrentVersion.Version.VersionInfo.VersionTranslationInfo.Language.map(langauge => {
-            return languages.map[langauge.languageCode].name;
+            return languages.mappings[langauge.languageCode].name;
         });
 
         return (

src/modules/universal-discovery/components/content-meta-preview/content.meta.preview.component.js

@@ -56,12 +56,10 @@ export default class ContentMetaPreviewComponent extends Component {
             return;
         }
 
-        const version = response.View.Result.searchHits.searchHit[0].value.Content.CurrentVersion.Version
+        const version = response.View.Result.searchHits.searchHit[0].value.Content.CurrentVersion.Version;
         const imageField = version.Fields.field.find(field => field.fieldTypeIdentifier === 'ezimage');
-        const translations = version.VersionInfo.VersionTranslationInfo.Language.map(langauge => {
-            // @TODO: pass it in props when COTF is cleaned
-            return window.eZ.adminUiConfig.languages.map[langauge.languageCode].name;
-        });
+        const versionLanguages = version.VersionInfo.VersionTranslationInfo.Language;
+        const translations = versionLanguages.map(langauge => this.props.languages.mappings[langauge.languageCode].name);
         const imageUri = imageField && imageField.fieldValue ? imageField.fieldValue.uri : null;
 
         this.setState(state => Object.assign({}, state, { imageUri, translations }));
@@ -202,5 +200,6 @@ ContentMetaPreviewComponent.propTypes = {
         translations: PropTypes.string.isRequired
     }).isRequired,
     maxHeight: PropTypes.number.isRequired,
-    activeTab: PropTypes.string.isRequired
+    activeTab: PropTypes.string.isRequired,
+    languages: PropTypes.object.isRequired
 };

src/modules/universal-discovery/components/create/create.choose.language.component.js

@@ -11,31 +11,32 @@ export default class ChooseLanguageComponent extends Component {
         this.renderOption = this.renderOption.bind(this);
 
         this.state = {
-            selectedLanguage: props.languages[0]
+            selectedLanguage: props.languages.mappings[props.languages.priority[0]]
         };
     }
 
     updateSelection(event) {
         const languageCode = event.target.value;
-        const selectedLanguage = this.props.languages.find(language => language.languageCode === languageCode);
+        const selectedLanguage = this.props.languages.mappings[languageCode];
 
         this.props.onLanguageSelected(selectedLanguage);
 
         this.setState(state => Object.assign({}, state, { selectedLanguage }));
     }
 
-    renderOption(item, index) {
+    renderOption(languageCode, index) {
+        const language = this.props.languages.mappings[languageCode];
         const attrs = {
             key: index,
-            value: item.languageCode
+            value: language.languageCode
         };
 
-        if (item.languageCode === this.props.forcedLanguage) {
+        if (languageCode === this.props.forcedLanguage) {
             attrs.selected = true;
         }
 
         return (
-            <option {...attrs}>{item.name}</option>
+            <option {...attrs}>{language.name}</option>
         );
     }
 
@@ -54,7 +55,7 @@ export default class ChooseLanguageComponent extends Component {
                 <p className="c-choose-language__title">{this.props.labels.contentOnTheFly.selectLanguage}</p>
                 <div className="c-choose-lagauge__select-wrapper">
                     <select {...selectAttrs}>
-                        {this.props.languages.map(this.renderOption)}
+                        {this.props.languages.priority.map(this.renderOption)}
                     </select>
                 </div>
             </div>
@@ -65,7 +66,7 @@ export default class ChooseLanguageComponent extends Component {
 ChooseLanguageComponent.propTypes = {
     maxHeight: PropTypes.number.isRequired,
     labels: PropTypes.object.isRequired,
-    languages: PropTypes.array.isRequired,
+    languages: PropTypes.object.isRequired,
     onLanguageSelected: PropTypes.func.isRequired,
     forcedLanguage: PropTypes.string.isRequired
 };

src/modules/universal-discovery/components/create/create.component.js

@@ -17,7 +17,7 @@ const CreateComponent = (props) => {
 CreateComponent.propTypes = {
     maxHeight: PropTypes.number.isRequired,
     labels: PropTypes.object.isRequired,
-    languages: PropTypes.array.isRequired,
+    languages: PropTypes.object.isRequired,
     contentTypes: PropTypes.object.isRequired,
     onLanguageSelected: PropTypes.func.isRequired,
     onContentTypeSelected: PropTypes.func.isRequired,

src/modules/universal-discovery/components/tab-content/create.panel.component.js

@@ -44,7 +44,7 @@ CreatePanelComponent.propTypes = {
         siteaccess: PropTypes.string.isRequired
     }).isRequired,
     labels: PropTypes.object.isRequired,
-    languages: PropTypes.array.isRequired,
+    languages: PropTypes.object.isRequired,
     contentTypes: PropTypes.object.isRequired,
     onLanguageSelected: PropTypes.func.isRequired,
     onContentTypeSelected: PropTypes.func.isRequired,

src/modules/universal-discovery/universal.discovery.module.js

@@ -26,14 +26,14 @@ export default class UniversalDiscoveryModule extends Component {
     constructor(props) {
         super(props);
 
-        let selectedLanguage = props.languages[0];
+        let selectedLanguage = props.languages.mappings[props.languages.priority[0]];
 
         this.onLanguageSelected = this.onLanguageSelected.bind(this);
         this.onContentTypeSelected = this.onContentTypeSelected.bind(this);
         this.handlePublish = this.handlePublish.bind(this);
 
         if (props.cotfForcedLanguage) {
-            selectedLanguage = props.languages.find(language => language.languageCode === props.cotfForcedLanguage);
+            selectedLanguage = props.languages.mappings[props.cotfForcedLanguage];
         }
 
         this.state = {
@@ -156,6 +156,7 @@ export default class UniversalDiscoveryModule extends Component {
                     loadContentInfo={this.props.loadContentInfo}
                     restInfo={this.props.restInfo}
                     contentTypesMap={this.state.contentTypesMap}
+                    languages={this.props.languages}
                     labels={this.props.labels.contentMetaPreview}
                     maxHeight={this.state.maxHeight}
                     activeTab={this.state.activeTab}/>
@@ -453,7 +454,7 @@ UniversalDiscoveryModule.propTypes = {
     }),
     maxHeight: PropTypes.number,
     searchResultsPerPage: PropTypes.number,
-    languages: PropTypes.array,
+    languages: PropTypes.object,
     contentTypes: PropTypes.object,
     allowContainersOnly: PropTypes.bool.isRequired,
     onlyContentOnTheFly: PropTypes.bool,
@@ -474,8 +475,8 @@ UniversalDiscoveryModule.defaultProps = {
     startingLocationId: 1,
     maxHeight: 500,
     searchResultsPerPage: 10,
-    languages: window.eZ.adminUiConfig.universalDiscoveryWidget.contentOnTheFly.languages,
-    contentTypes: window.eZ.adminUiConfig.universalDiscoveryWidget.contentOnTheFly.contentTypes,
+    languages: window.eZ.adminUiConfig.languages,
+    contentTypes: window.eZ.adminUiConfig.contentTypes,
     allowContainersOnly: false,
     onlyContentOnTheFly: false,
     cotfForcedLanguage: '',