From d6bb9b64b5c51df374e46fb3fdb767e72953f8b5 Mon Sep 17 00:00:00 2001 From: gmutuhu Date: Mon, 30 Nov 2015 16:04:11 +0300 Subject: [PATCH] IATIIT-142 --- import-core/import-ui/src/main/webapp/bower.json | 3 ++- .../src/main/webapp/client/scripts/components/home.jsx | 2 +- .../client/scripts/components/reports/import-list.jsx | 2 +- .../client/scripts/components/reports/import-log.jsx | 2 +- .../scripts/components/reports/workflow-list.jsx | 2 +- .../client/scripts/components/wizard/choose-fields.jsx | 10 +++++----- .../scripts/components/wizard/choose-projects.jsx | 2 +- .../client/scripts/components/wizard/filter-data.jsx | 4 ++-- .../webapp/client/scripts/components/wizard/index.jsx | 4 ++-- .../client/scripts/components/wizard/map-values.jsx | 4 ++-- .../client/scripts/components/wizard/review-import.jsx | 2 +- .../components/wizard/save-field-mappings-dlg.jsx | 2 +- .../components/wizard/save-value-mappings-dlg.jsx | 2 +- .../client/scripts/components/wizard/upload-file.jsx | 2 +- import-core/import-ui/src/main/webapp/package.json | 2 +- 15 files changed, 23 insertions(+), 22 deletions(-) diff --git a/import-core/import-ui/src/main/webapp/bower.json b/import-core/import-ui/src/main/webapp/bower.json index 6361636d..d1179b39 100644 --- a/import-core/import-ui/src/main/webapp/bower.json +++ b/import-core/import-ui/src/main/webapp/bower.json @@ -2,11 +2,12 @@ "name": "import-ui", "version": "0.0.1", "dependencies": { + "jquery": "jquery#1.9.1", "consolelog": "~2.0.1", "html5shiv": "~3.7.2", "modernizr": "~2.8.1", "normalize.css": "~3.0.1", - "es5-shim": "~3.4.0", + "es5-shim": "~4.3.1", "bootstrap": "~3.3.4", "bootstrap-fileinput": "~4.2.0", "typeahead.js": "~0.10.5", diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/home.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/home.jsx index 75e1196a..e9043609 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/home.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/home.jsx @@ -22,7 +22,7 @@ var Home = React.createClass({ this.listenTo(systemInfoStore, this.updateSystemInfo); appActions.checkBackendStatus.triggerPromise().then(function(data) { this.updateSystemInfo(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.updateSystemInfo({status:"DOWN"}); }.bind(this)); }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-list.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-list.jsx index 2e2085b7..df901470 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-list.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-list.jsx @@ -37,7 +37,7 @@ var ImportList = React.createClass({ var params = {size:10, page:this.state.activePage - 1, sort: this.state.sort} appActions.loadImportListData(params).then(function(data) { this.updateImportList(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { console.log('Error loading importList'); }.bind(this)); }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-log.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-log.jsx index d6a83d0a..703ecd40 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-log.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/import-log.jsx @@ -41,7 +41,7 @@ var PreviousImports = React.createClass({ var sortParams = {size:10, page:this.state.activePage - 1} appActions.loadImportLog(this.props.params.id,sortParams).then(function(data) { this.updateImportLog(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { console.log('Error loading import logs'); }.bind(this)); }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/workflow-list.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/workflow-list.jsx index b88d6554..5b720745 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/reports/workflow-list.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/reports/workflow-list.jsx @@ -33,7 +33,7 @@ var WorkflowList = React.createClass({ loadData: function(){ appActions.loadWorkflowData().then(function(data) { this.updateWorkflowList(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { console.log('Error loading workflows'); }.bind(this)); }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-fields.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-fields.jsx index 7eab206b..701c1eb2 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-fields.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-fields.jsx @@ -76,7 +76,7 @@ var ChooseFields = React.createClass({ this.updateDestinationFields(data); this.destDataLoaded = true; this.hideLoadingIcon(); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.destDataLoaded = true; this.hideLoadingIcon(); this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_destination_fields'); @@ -87,7 +87,7 @@ var ChooseFields = React.createClass({ this.updateSourceFields(data); this.sourceDataLoaded = true; this.hideLoadingIcon(); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.sourceDataLoaded = true; this.hideLoadingIcon(); this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_source_fields'); @@ -98,7 +98,7 @@ var ChooseFields = React.createClass({ this.updateFieldMappingStore(data); this.mappingDataLoaded = true; this.hideLoadingIcon(); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.mappingDataLoaded = true; this.hideLoadingIcon(); this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_mappings'); @@ -107,7 +107,7 @@ var ChooseFields = React.createClass({ appActions.loadFieldMappingsTemplateList.triggerPromise().then(function(data) { this.updateMappingTemplatesData(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_templates'); this.displayError(); }.bind(this)); @@ -216,7 +216,7 @@ var ChooseFields = React.createClass({ reloadTemplateData: function(){ appActions.loadFieldMappingsTemplateList.triggerPromise().then(function(data) { this.updateMappingTemplatesData(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.errorMsg += this.props.i18nLib.t('wizard.map_fields.msg_error_retrieving_templates'); this.displayError(); }.bind(this)); diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-projects.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-projects.jsx index 9e957622..0c42cf99 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-projects.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/choose-projects.jsx @@ -124,7 +124,7 @@ var ChooseProjects = React.createClass({ } else{ this.setState({statusMessage:data.documentMappingStatus.message}); } - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.props.eventHandlers.hideLoadingIcon(); this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.choose_projects.msg_error_select_project')); }.bind(this)); diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/filter-data.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/filter-data.jsx index f247e9f1..c7ca036d 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/filter-data.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/filter-data.jsx @@ -41,7 +41,7 @@ var FilterData = React.createClass({ this.updateLanguages(data); this.languageDataLoaded = true; this.hideLoadingIcon(); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.languageDataLoaded = true; this.hideLoadingIcon(); this.errorMsg += this.props.i18nLib.t('wizard.filter_data.msg_error_retrieving_languages'); @@ -52,7 +52,7 @@ var FilterData = React.createClass({ this.updateFilters(data); this.filterDataLoaded = true; this.hideLoadingIcon(); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.filterDataLoaded = true; this.hideLoadingIcon(); this.errorMsg += this.props.i18nLib.t('wizard.filter_data.msg_error_retrieving_filters'); diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/index.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/index.jsx index 640059e7..fcada978 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/index.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/index.jsx @@ -46,7 +46,7 @@ var Wizard = React.createClass({ Cookies.set("WORKSPACE", data['team']); this.initImportSession(sourceProcessor, destinationProcessor); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { }.bind(this)); }, @@ -121,7 +121,7 @@ var Wizard = React.createClass({ }else{ this.transitionTo('projects', this.props.params); } - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { console.log("Error retrieving values"); }) }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/map-values.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/map-values.jsx index 4e0c7b0a..71603ded 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/map-values.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/map-values.jsx @@ -44,7 +44,7 @@ var MapValues = React.createClass({ appActions.loadValueMappingData.triggerPromise().then(function(data) { this.props.eventHandlers.hideLoadingIcon(); this.updateValueMappingStore(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.map_values.msg_error_retrieving_value_mappings')); }.bind(this)); this.loadTemplateData(); @@ -106,7 +106,7 @@ var MapValues = React.createClass({ loadTemplateData: function(){ appActions.loadValueMappingsTemplateList.triggerPromise().then(function(data) { this.updateMappingTemplatesData(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.map_values.msg_error_loading_templates')); }.bind(this)); }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/review-import.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/review-import.jsx index 38e2fbba..58ac7380 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/review-import.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/review-import.jsx @@ -25,7 +25,7 @@ var ReviewImport = React.createClass({ appActions.loadImportSummary.triggerPromise().then(function(data) { this.updateImportSummary(data); this.props.eventHandlers.hideLoadingIcon(); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.hideLoadingIcon(); this.props.eventHandlers.hideLoadingIcon(); this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.review_import.msg_error_retrieving_summary')); diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-field-mappings-dlg.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-field-mappings-dlg.jsx index c4b27d0b..22722dc2 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-field-mappings-dlg.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-field-mappings-dlg.jsx @@ -13,7 +13,7 @@ var SaveMappingsDialog = React.createClass({ this.props.reloadTemplateData(); $('#saveMapFields').modal('hide'); } - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.displayError(this.props.i18nLib.t('wizard.save_field_mappings_dlg.msg_error_saving')); }.bind(this)); }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-value-mappings-dlg.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-value-mappings-dlg.jsx index 3d0f53ca..167575b0 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-value-mappings-dlg.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/save-value-mappings-dlg.jsx @@ -29,7 +29,7 @@ var SaveMappingsDialog = React.createClass({ this.props.reloadTemplateData(); $('#saveMapValues').modal('hide'); } - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.displayError(this.props.i18nLib.t('wizard.save_value_mappings_dlg.msg_error_saving')); }.bind(this)); }, diff --git a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/upload-file.jsx b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/upload-file.jsx index ff9e6095..9f55ba37 100644 --- a/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/upload-file.jsx +++ b/import-core/import-ui/src/main/webapp/client/scripts/components/wizard/upload-file.jsx @@ -57,7 +57,7 @@ var UploadFile = React.createClass({ appActions.loadFileData.triggerPromise().then(function(data) { this.props.eventHandlers.hideLoadingIcon(); this.updateFileData(data); - }.bind(this)).catch(function(err) { + }.bind(this))["catch"](function(err) { this.props.eventHandlers.hideLoadingIcon(); this.props.eventHandlers.displayError(this.props.i18nLib.t('wizard.upload_file.msg_error_retrieving_files')); }.bind(this)); diff --git a/import-core/import-ui/src/main/webapp/package.json b/import-core/import-ui/src/main/webapp/package.json index f6cd590a..898ceb93 100644 --- a/import-core/import-ui/src/main/webapp/package.json +++ b/import-core/import-ui/src/main/webapp/package.json @@ -12,7 +12,7 @@ "object-assign": "~1.0.0", "react": "~0.13.0", "react-async": "~2.1.0", - "react-router": "~0.13.2", + "react-router": "~0.13.4", "react-bootstrap": "^0.23.7", "reflux": "~0.2.7", "superagent": "~0.21.0"