@configuratorware/configurator-admingui 1.38.1 → 1.38.3

package/Screens/ReceiveOfferRequests/Components/ConfigurationDataSheet.js

@@ -9,7 +9,7 @@ exports.generateConfigurationDataSheet = exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _lodash = require("lodash");
+var _lodash = _interopRequireWildcard(require("lodash"));
 
 var _i18n = require("../../../App/i18n");
 
@@ -27,6 +27,10 @@ var _OpenInNew = _interopRequireDefault(require("@material-ui/icons/OpenInNew"))
 
 var _ConfigurationDataSheet = require("../../Savedconfigurations/Components/ConfigurationDataSheet");
 
+var _Actions = require("../../Creator/Reducers/Actions");
+
+var _ConfigurationActions = require("../../Creator/Reducers/ConfigurationActions");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -101,7 +105,7 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
 
   _createClass(ConfigurationDataSheet, [{
     key: "renderConfigurationData",
-    value: function renderConfigurationData(data) {
+    value: function renderConfigurationData(data, locale) {
       var configurationCode = (0, _lodash.get)(data, 'code.value', '');
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "configuration-data"
@@ -229,7 +233,7 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
         className: "section-title"
       }, (0, _i18n.T)('productionDataLabel')), /*#__PURE__*/_react["default"].createElement("a", {
         style: styles.link,
-        href: "".concat(_network["default"].frontendBaseURL, "configurations/zip/production/").concat(configurationCode)
+        href: "".concat(_network["default"].frontendBaseURL, "configurations/zip/production/").concat(configurationCode, "?_language=").concat(locale.replace('-', '_'))
       }, (0, _i18n.T)('productionDataDownloadButtonLabel')))));
     }
   }, {
@@ -238,7 +242,8 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
           postData = _this$props.postData,
           hideDetails = _this$props.hideDetails,
-          entityState = _this$props.entityState;
+          entityState = _this$props.entityState,
+          locale = _this$props.locale;
       var data = entityState.data,
           isReady = entityState.isReady;
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -246,7 +251,7 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
           height: '100%',
           width: '100%'
         }
-      }, isReady && this.renderConfigurationData(data), /*#__PURE__*/_react["default"].createElement("div", {
+      }, isReady && this.renderConfigurationData(data, locale), /*#__PURE__*/_react["default"].createElement("div", {
         className: "action-buttons"
       }, postData && /*#__PURE__*/_react["default"].createElement(_RaisedButton["default"], {
         label: (0, _i18n.T)('Save'),

package/Screens/Savedconfigurations/Components/ConfigurationDataSheet.js

@@ -124,7 +124,7 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
 
   _createClass(ConfigurationDataSheet, [{
     key: "renderConfigurationData",
-    value: function renderConfigurationData(data) {
+    value: function renderConfigurationData(data, locale) {
       var configurationCode = (0, _lodash.get)(data, 'code.value', '');
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "configuration-data"
@@ -249,7 +249,7 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
         className: "section-title"
       }, (0, _i18n.T)('productionDataLabel')), /*#__PURE__*/_react["default"].createElement("a", {
         style: styles.link,
-        href: "".concat(_network["default"].frontendBaseURL, "configurations/zip/production/").concat(configurationCode)
+        href: "".concat(_network["default"].frontendBaseURL, "configurations/zip/production/").concat(configurationCode, "?_language=").concat(locale.replace('-', '_'))
       }, (0, _i18n.T)('productionDataDownloadButtonLabel')))));
     }
   }, {
@@ -258,7 +258,8 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
       var _this$props = this.props,
           postData = _this$props.postData,
           hideDetails = _this$props.hideDetails,
-          entityState = _this$props.entityState;
+          entityState = _this$props.entityState,
+          locale = _this$props.locale;
       var data = entityState.data,
           isReady = entityState.isReady;
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -266,7 +267,7 @@ var ConfigurationDataSheet = /*#__PURE__*/function (_Component) {
           height: '100%',
           width: '100%'
         }
-      }, isReady && this.renderConfigurationData(data), /*#__PURE__*/_react["default"].createElement("div", {
+      }, isReady && this.renderConfigurationData(data, locale), /*#__PURE__*/_react["default"].createElement("div", {
         className: "action-buttons"
       }, postData && /*#__PURE__*/_react["default"].createElement(_RaisedButton["default"], {
         label: (0, _i18n.T)('Save'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@configuratorware/configurator-admingui",
-  "version": "1.38.1",
+  "version": "1.38.3",
   "license": "UNLICENSED",
   "private": false,
   "dependencies": {
@@ -29,7 +29,7 @@
     "react-redux-i18n": "^1.9.3",
     "react-router": "^3.2.6",
     "react-sortable-hoc": "^1.11.0",
-    "redhotmagma-visualization": "1.38.1",
+    "redhotmagma-visualization": "1.38.3",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/Screens/ReceiveOfferRequests/Components/ConfigurationDataSheet.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { get } from 'lodash';
+import _, { get } from 'lodash';
 import { T } from '../../../App/i18n';
 
 import RaisedButton from '../../../UIComponents/RaisedButton';
@@ -9,6 +9,8 @@ import networkConfig from '../../../App/Config/network';
 import { Tooltip } from '@material-ui/core';
 import OpenInNew from '@material-ui/icons/OpenInNew';
 import { formatColorIdentifier } from '../../Savedconfigurations/Components/ConfigurationDataSheet';
+import {CREATOR_REDUCER_NAME} from "../../Creator/Reducers/Actions";
+import {CONFIGURATION_REDUCER_NAME} from "../../Creator/Reducers/ConfigurationActions";
 
 const DataRow = ({ label, value, children, identifier, bold }) => (
     <TableRow className="data-row">
@@ -34,7 +36,7 @@ const styles = {
 };
 
 export default class ConfigurationDataSheet extends Component {
-    renderConfigurationData(data) {
+    renderConfigurationData(data, locale) {
         const configurationCode = get(data, 'code.value', '');
         return (
             <div className="configuration-data">
@@ -204,7 +206,7 @@ export default class ConfigurationDataSheet extends Component {
                             <div className="section-title">{T('productionDataLabel')}</div>
                             <a
                                 style={styles.link}
-                                href={`${networkConfig.frontendBaseURL}configurations/zip/production/${configurationCode}`}
+                                href={`${networkConfig.frontendBaseURL}configurations/zip/production/${configurationCode}?_language=${locale.replace('-', '_')}`}
                             >
                                 {T('productionDataDownloadButtonLabel')}
                             </a>
@@ -216,12 +218,12 @@ export default class ConfigurationDataSheet extends Component {
     }
 
     render() {
-        const { postData, hideDetails, entityState } = this.props;
+        const { postData, hideDetails, entityState, locale } = this.props;
         const { data, isReady } = entityState;
 
         return (
             <div style={{ height: '100%', width: '100%' }}>
-                {isReady && this.renderConfigurationData(data)}
+                {isReady && this.renderConfigurationData(data, locale)}
 
                 <div className="action-buttons">
                     {postData && (

package/src/Screens/Savedconfigurations/Components/ConfigurationDataSheet.js

@@ -52,7 +52,7 @@ const styles = {
 };
 
 export default class ConfigurationDataSheet extends Component {
-    renderConfigurationData(data) {
+    renderConfigurationData(data, locale) {
         const configurationCode = get(data, 'code.value', '');
         return (
             <div className="configuration-data">
@@ -220,7 +220,7 @@ export default class ConfigurationDataSheet extends Component {
                             <div className="section-title">{T('productionDataLabel')}</div>
                             <a
                                 style={styles.link}
-                                href={`${networkConfig.frontendBaseURL}configurations/zip/production/${configurationCode}`}
+                                href={`${networkConfig.frontendBaseURL}configurations/zip/production/${configurationCode}?_language=${locale.replace('-', '_')}`}
                             >
                                 {T('productionDataDownloadButtonLabel')}
                             </a>
@@ -232,12 +232,12 @@ export default class ConfigurationDataSheet extends Component {
     }
 
     render() {
-        const { postData, hideDetails, entityState } = this.props;
+        const { postData, hideDetails, entityState, locale } = this.props;
         const { data, isReady } = entityState;
-
+        
         return (
             <div style={{ height: '100%', width: '100%' }}>
-                {isReady && this.renderConfigurationData(data)}
+                {isReady && this.renderConfigurationData(data, locale)}
 
                 <div className="action-buttons">
                     {postData && (