diff --git a/web/client/components/manager/importer/Import.jsx b/web/client/components/manager/importer/Import.jsx index 036770c6a5..5d8fd54668 100644 --- a/web/client/components/manager/importer/Import.jsx +++ b/web/client/components/manager/importer/Import.jsx @@ -138,7 +138,7 @@ const Task = React.createClass({ - + diff --git a/web/client/components/manager/importer/Importer.jsx b/web/client/components/manager/importer/Importer.jsx index 9f7a7fc2b3..75fd5e97d5 100644 --- a/web/client/components/manager/importer/Importer.jsx +++ b/web/client/components/manager/importer/Importer.jsx @@ -220,7 +220,7 @@ const Importer = React.createClass({ createWorkspace={this.props.createWorkspace} datastoreTemplates={this.props.datastoreTemplates} selectWorkSpace={this.props.selectWorkSpace} - selectedWorkSpace={this.getTargetWorkspace()} + selectedWorkSpace={this.getTargetWorkspace(this.props.selectedImport)} workspaces={this.props.workspaces} loadWorkspaces={this.props.loadWorkspaces}/> diff --git a/web/client/components/manager/importer/ImportsGrid.jsx b/web/client/components/manager/importer/ImportsGrid.jsx index d5813de77a..571db16655 100644 --- a/web/client/components/manager/importer/ImportsGrid.jsx +++ b/web/client/components/manager/importer/ImportsGrid.jsx @@ -69,7 +69,7 @@ const ImportsGrid = React.createClass({
#
- + diff --git a/web/client/components/manager/importer/TransformsGrid.jsx b/web/client/components/manager/importer/TransformsGrid.jsx index 5010422124..bd316c13ac 100644 --- a/web/client/components/manager/importer/TransformsGrid.jsx +++ b/web/client/components/manager/importer/TransformsGrid.jsx @@ -55,7 +55,7 @@ const TransformsGrid = React.createClass({
#
- + diff --git a/web/client/components/manager/importer/Workspace.jsx b/web/client/components/manager/importer/Workspace.jsx index 95a3897661..6182b04faa 100644 --- a/web/client/components/manager/importer/Workspace.jsx +++ b/web/client/components/manager/importer/Workspace.jsx @@ -45,9 +45,13 @@ module.exports = React.createClass({ }, renderAlert() { if (this.props.status && (this.props.status.status === "error")) { - return ( Error creating workspace: {this.props.status && this.props.status.error && this.props.status.error.data}); + return ( + + ); } else if (this.props.status && (this.props.status.status === "success")) { - return (Workspace "{this.props.status.workspace}" successfully created); + return ( + + ); } }, render() { @@ -67,7 +71,7 @@ module.exports = React.createClass({ }))} />)}
- + + style={{width: "100%"}}/> + {this.renderAlert()}
); diff --git a/web/client/plugins/manager/Importer.jsx b/web/client/plugins/manager/Importer.jsx index 4bead410e0..86186e116f 100644 --- a/web/client/plugins/manager/Importer.jsx +++ b/web/client/plugins/manager/Importer.jsx @@ -5,12 +5,11 @@ * This source code is licensed under the BSD-style license found in the * LICENSE file in the root directory of this source tree. */ - - +const React = require('react'); +const Message = require('../../components/I18N/Message'); const {connect} = require('react-redux'); const {bindActionCreators} = require('redux'); - const { loadImports, createImport, loadImport, runImport, deleteImport, @@ -44,7 +43,8 @@ const ImporterPlugin = connect( workspaces: state.importer && state.importer.workspaces, selectedWorkSpace: state.importer && state.importer.selectedWorkSpace, workspaceCreationStatus: state.importer && state.importer.workspaceCreationStatus - }; }, + }; + }, (dispatch, ownProps) => { return bindActionCreators({ loadImports: loadImports.bind(null, getURL(ownProps)), @@ -84,7 +84,7 @@ module.exports = { id: "importer", name: 'importer', position: 1, - title: 'Import Data', + title: , glyph: "import" } }), diff --git a/web/client/translations/data.en-US b/web/client/translations/data.en-US index 534af0ce44..b92be10512 100644 --- a/web/client/translations/data.en-US +++ b/web/client/translations/data.en-US @@ -537,8 +537,12 @@ "process": "Session", "number": "#", "workspace": { - "create": "create a new workspace: ", + "create": "Create", + "createWS": "create a new workspace: ", "target": "target workspace: ", + "select": "Select TargetWorkspace", + "success": "Error creating workspace: {statusWS}", + "failure": "Workspace {statusWS} successfully created", "new": "New workspace name..." }, "import": { diff --git a/web/client/translations/data.fr-FR b/web/client/translations/data.fr-FR index 59cfb122ff..d0f3878b16 100644 --- a/web/client/translations/data.fr-FR +++ b/web/client/translations/data.fr-FR @@ -539,8 +539,12 @@ "process": "Processus", "number": "#", "workspace": { - "create": "créer un nouvel espace de travail: ", + "create": "Créer", + "createWS": "créer un nouvel espace de travail: ", "target": "cible espace de travail: ", + "success": "Erreur de création espace de travail: {statusWS}", + "failure": "Espace de travail {statusWS} créé avec succès", + "select": "Sélectionnez l'espace de travail cible", "new": "Nom..." }, "import": { diff --git a/web/client/translations/data.it-IT b/web/client/translations/data.it-IT index c66c21cc98..22a30b762b 100644 --- a/web/client/translations/data.it-IT +++ b/web/client/translations/data.it-IT @@ -538,8 +538,12 @@ "process": "Processo", "number": "#", "workspace": { - "create": "Crea un nuovo workspace: ", + "create": "Crea", + "createWS": "Crea un nuovo workspace: ", "target": "Workspace di destinazione: ", + "success": "Errore durante la creazione del workspace: {statusWS}", + "failure": "Workspace {statusWS} creato correttamente", + "select": "Seleziona il workspace di destinazione", "new": "Nome del workspace..." }, "import": {
#