From 1eb66b78d3b1f1fc60a82ce6dbd16b12f2845e9a Mon Sep 17 00:00:00 2001 From: svishnev Date: Thu, 11 Jan 2018 14:39:45 +0200 Subject: React version upgrade Issue-ID: SDC-894 Change-Id: I7c200a4b0b1d09a8fec638906db4258cafe252b5 Signed-off-by: svishnev --- dox-sequence-diagram-ui/package.json | 14 +- .../webapp/lib/ecomp/asdc/sequencer/Sequencer.jsx | 14 +- .../components/application/Application.jsx | 12 +- .../asdc/sequencer/components/diagram/Diagram.jsx | 9 +- .../components/diagram/components/popup/Popup.jsx | 7 +- .../asdc/sequencer/components/dialog/Dialog.jsx | 10 +- .../asdc/sequencer/components/editor/Editor.jsx | 11 +- .../editor/components/designer/Designer.jsx | 6 +- .../designer/components/actions/Actions.jsx | 11 +- .../designer/components/lifeline/Lifeline.jsx | 25 +-- .../designer/components/lifeline/LifelineNew.jsx | 9 +- .../designer/components/lifeline/Lifelines.jsx | 14 +- .../designer/components/message/Message.jsx | 25 +-- .../designer/components/message/MessageNew.jsx | 9 +- .../designer/components/message/Messages.jsx | 10 +- .../designer/components/metadata/Metadata.jsx | 6 +- .../components/editor/components/source/Source.jsx | 6 +- .../editor/components/toolbar/Toolbar.jsx | 8 +- .../ecomp/asdc/sequencer/components/icons/Icon.jsx | 8 +- .../src/main/webapp/lib/main.jsx | 20 +- openecomp-ui/.babelrc | 13 +- openecomp-ui/package.json | 29 +-- openecomp-ui/pom.xml | 4 +- .../src/nfvo-components/modal/GlobalModal.js | 34 +++- openecomp-ui/src/sdc-app/AppStore.js | 41 ++-- openecomp-ui/src/sdc-app/Reducers.js | 33 ++++ openecomp-ui/src/sdc-app/onboarding/Onboarding.js | 22 +++ .../sdc-app/onboarding/OnboardingActionHelper.js | 18 +- .../src/sdc-app/onboarding/OnboardingPunchOut.jsx | 212 ++++----------------- .../src/sdc-app/onboarding/OnboardingView.jsx | 183 ++++++++++++++++++ .../SoftwareProductComponentsMonitoringView.jsx | 19 +- .../landingPage/SoftwareProductLandingPageView.jsx | 19 +- .../SoftwareProductProcessesEditorForm.jsx | 26 +-- .../processes/SoftwareProductProcessesView.jsx | 17 +- openecomp-ui/src/sdc-app/sdc.app.jsx | 17 +- openecomp-ui/test-utils/Util.js | 18 +- openecomp-ui/test/flows/FlowsListEditor.test.js | 24 +-- openecomp-ui/test/flows/flowsEditorModal.test.js | 22 +-- .../creation/LicenseModelCreation.test.js | 20 +- .../LicenseModelFeatureGroupEditor.test.js | 18 +- .../LicenseModelFeatureGroupListEditor.test.js | 18 +- .../overview/listItems/EntitlementPool.test.js | 18 +- .../overview/listItems/FeatureGroup.test.js | 18 +- .../overview/listItems/LicenseAgreement.test.js | 18 +- .../overview/listItems/LicenseKeyGroup.test.js | 18 +- .../overview/summary/SummaryCountList.test.js | 18 +- .../overview/summary/VendorDataView.test.js | 18 +- .../test/licenseModel/overview/views.test.js | 23 +-- .../nfvo-components/SubmitErrorResponse.test.js | 18 +- .../nfvo-components/editor/TabulatedEditor.test.js | 21 +- .../input/dualListBox/dualListbox.test.js | 21 +- .../nfvo-components/input/validation/input.test.js | 26 +-- .../nfvo-components/listEditor/listEditor.test.js | 18 +- .../test/nfvo-components/modal/globalModal.test.js | 37 ++-- .../VersionController/versionController.test.js | 22 +-- .../test/onboard/onboardingCatalog/views.test.js | 18 +- .../test/permissions/permissionsManaager.test.js | 20 +- openecomp-ui/test/revisions/revisions.test.js | 20 +- .../SoftwareProductAttachmentsView.test.js | 21 +- .../attachments/setup/heatSetup.test.js | 18 +- .../validation/HeatValidationView.test.js | 20 +- .../SoftwareProductComponentComputeEditor.test.js | 20 +- .../SoftwareProductComponentsComputes.test.js | 20 +- .../SoftwareProductComponentsGeneral.test.js | 20 +- .../softwareProductComponentLoadbalancing.test.js | 20 +- .../SoftwareProductComponentsMonitoring.test.js | 23 +-- .../SoftwareProductComponentsNICEditor.test.js | 22 ++- .../SoftwareProductComponentsNetwork.test.js | 20 +- ...oftwareProductComponentsProcessesEditor.test.js | 18 +- .../SoftwareProductComponentsProcessesView.test.js | 35 ++-- .../creation/SoftwareProductCreation.test.js | 22 +-- .../SoftwareProductDeploymentEditor.test.js | 21 +- .../SoftwareProductDeploymentView.test.js | 20 +- .../softwareProduct/details/detailsView.test.js | 21 +- .../landingPage/landingPage.test.js | 24 ++- .../networks/SoftwareProductNetworksView.test.js | 20 +- .../processes/SoftwareProductEditor.test.js | 18 +- .../processes/SoftwareProductProcessesView.test.js | 34 ++-- .../test/versionsPage/VersionsPage.test.js | 20 +- .../creation/VersionsPageCreation.test.js | 22 +-- openecomp-ui/webpack.common.js | 2 - openecomp-ui/webpack.config.js | 3 +- 82 files changed, 1010 insertions(+), 867 deletions(-) create mode 100644 openecomp-ui/src/sdc-app/Reducers.js create mode 100644 openecomp-ui/src/sdc-app/onboarding/Onboarding.js create mode 100644 openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx diff --git a/dox-sequence-diagram-ui/package.json b/dox-sequence-diagram-ui/package.json index 826bc547e0..3aeb057ea3 100644 --- a/dox-sequence-diagram-ui/package.json +++ b/dox-sequence-diagram-ui/package.json @@ -14,10 +14,11 @@ "dependencies": { "d3": "^3.5.16", "lodash": "^4.12.0", - "react": "^15.1.0", - "react-dnd": "^2.1.2", - "react-dnd-html5-backend": "^2.1.2", - "react-dom": "^15.1.0", + "prop-types": "^15.6.0", + "react": "^15.6.2", + "react-dnd": "^2.5.4", + "react-dnd-html5-backend": "^2.5.4", + "react-dom": "^15.6.2", "react-redux": "^4.4.5", "react-select": "1.0.0-rc.5", "redux": "^3.5.2" @@ -44,11 +45,11 @@ "file-loader": "^0.8.5", "json-loader": "^0.5.4", "node-http-proxy": "^0.2.3", - "node-sass": "^3.7.0", + "node-sass": "^4.5.3", "path": "^0.12.7", "raw-loader": "^0.5.1", "redux-devtools": "^3.3.1", - "sass-loader": "^3.2.0", + "sass-loader": "^6.0.6", "style-loader": "^0.13.1", "svg-sprite-loader": "0.0.19", "url-loader": "^0.5.7", @@ -59,5 +60,4 @@ "node": ">=5.1", "npm": ">=3.3" } - } diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/Sequencer.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/Sequencer.jsx index ff8e9a22ca..fc2bfbc0e3 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/Sequencer.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/Sequencer.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ import React from 'react'; +import PropTypes from 'prop-types'; import Application from './components/application/Application'; import Common from './common/Common'; import Options from './common/Options'; @@ -26,7 +27,7 @@ import '../../../../res/sdc-sequencer.scss'; /** * ASDC Sequencer entry point. */ -export default class Sequencer extends React.Component { +class Sequencer extends React.Component { // ////////////////////////////////////////////////////////////////////////////////////////////// @@ -193,7 +194,10 @@ export default class Sequencer extends React.Component { } Sequencer.propTypes = { - options: React.PropTypes.object.isRequired, - model: React.PropTypes.object, - metamodel: React.PropTypes.object, + options: PropTypes.object.isRequired, + model: PropTypes.object, + metamodel: PropTypes.object, }; + + +export default Sequencer; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/application/Application.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/application/Application.jsx index 63b82c03c9..6889e0ab9f 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/application/Application.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/application/Application.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; import Common from '../../common/Common'; import Logger from '../../common/Logger'; import Diagram from '../diagram/Diagram'; @@ -27,7 +27,7 @@ import Overlay from '../overlay/Overlay'; /** * Application controller, also a view. */ -export default class Application extends React.Component { +class Application extends React.Component { /** * Construct application view. @@ -278,6 +278,8 @@ export default class Application extends React.Component { /** React properties. */ Application.propTypes = { - options: React.PropTypes.object.isRequired, - sequencer: React.PropTypes.object.isRequired, + options: PropTypes.object.isRequired, + sequencer: PropTypes.object.isRequired, }; + +export default Application; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx index a035e6c4a3..b3544d7066 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/Diagram.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ import React from 'react'; +import PropTypes from 'prop-types'; import _template from 'lodash/template'; import _merge from 'lodash/merge'; import * as d3 from 'd3'; @@ -26,7 +27,7 @@ import Popup from './components/popup/Popup'; /** * SVG diagram view. */ -export default class Diagram extends React.Component { +class Diagram extends React.Component { // /////////////////////////////////////////////////////////////////////////////////////////////// @@ -918,5 +919,7 @@ export default class Diagram extends React.Component { Diagram.propTypes = { - application: React.PropTypes.object.isRequired, + application: PropTypes.object.isRequired, }; + +export default Diagram; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/components/popup/Popup.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/components/popup/Popup.jsx index b8e2d932f8..8f8f859aad 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/components/popup/Popup.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/diagram/components/popup/Popup.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,6 @@ */ import React from 'react'; - import Icon from '../../../icons/Icon'; import iconEdit from '../../../../../../../../res/ecomp/asdc/sequencer/sprites/icons/edit.svg'; @@ -25,7 +24,7 @@ import iconEdit from '../../../../../../../../res/ecomp/asdc/sequencer/sprites/i * @returns {XML} * @constructor */ -export default class Popup extends React.Component { +class Popup extends React.Component { // /////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -106,3 +105,5 @@ export default class Popup extends React.Component { ); } } + +export default Popup; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/dialog/Dialog.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/dialog/Dialog.jsx index e6e48243fd..d48ef3bd88 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/dialog/Dialog.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/dialog/Dialog.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; import Icon from '../icons/Icon'; import iconQuestion from '../../../../../../res/ecomp/asdc/sequencer/sprites/icons/question.svg'; import iconExclaim from '../../../../../../res/ecomp/asdc/sequencer/sprites/icons/exclaim.svg'; @@ -27,7 +27,7 @@ import iconClose from '../../../../../../res/ecomp/asdc/sequencer/sprites/icons/ * Multi-purpose dialog. Rendered into the page on initialization, and then * configured, shown and hidden as required. */ -export default class Dialog extends React.Component { +class Dialog extends React.Component { // /////////////////////////////////////////////////////////////////////////////////////////////// @@ -232,5 +232,7 @@ export default class Dialog extends React.Component { } Dialog.propTypes = { - application: React.PropTypes.object.isRequired, + application: PropTypes.object.isRequired, }; + +export default Dialog; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/Editor.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/Editor.jsx index 09703b84bf..00c8f7c47c 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/Editor.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/Editor.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; import Logger from '../../common/Logger'; import Common from '../../common/Common'; import Designer from './components/designer/Designer'; @@ -25,7 +25,7 @@ import Source from './components/source/Source'; /** * Editor view, aggregating the designer, the code editor, the toolbar. */ -export default class Editor extends React.Component { +class Editor extends React.Component { // /////////////////////////////////////////////////////////////////////////////////////////////// @@ -167,5 +167,8 @@ export default class Editor extends React.Component { /** Element properties. */ Editor.propTypes = { - application: React.PropTypes.object.isRequired, + application: PropTypes.object.isRequired, }; + +export default Editor; + diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx index 38f5550b89..39ed0909a0 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/Designer.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; import HTML5Backend from 'react-dnd-html5-backend'; import { DragDropContext } from 'react-dnd'; @@ -397,7 +397,7 @@ class Designer extends React.Component { /** Element properties. */ Designer.propTypes = { - application: React.PropTypes.object.isRequired, + application: PropTypes.object.isRequired, }; export default DragDropContext(HTML5Backend)(Designer); diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/actions/Actions.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/actions/Actions.jsx index 9f2e808c5c..5a8343cccf 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/actions/Actions.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/actions/Actions.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ import React from 'react'; +import PropTypes from 'prop-types'; import Select from 'react-select'; import Common from '../../../../../../common/Common'; @@ -34,7 +35,7 @@ import iconFragmentStop from '../../../../../../../../../../res/ecomp/asdc/seque /** * Action menu view. */ -export default class Actions extends React.Component { +class Actions extends React.Component { // /////////////////////////////////////////////////////////////////////////////////////////////// @@ -466,6 +467,8 @@ export default class Actions extends React.Component { /** Element properties. */ Actions.propTypes = { - application: React.PropTypes.object.isRequired, - model: React.PropTypes.object.isRequired, + application: PropTypes.object.isRequired, + model: PropTypes.object.isRequired, }; + +export default Actions; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifeline.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifeline.jsx index 8a3d1847c2..86ee80f72e 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifeline.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifeline.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ import React from 'react'; +import PropTypes from 'prop-types'; import { DragSource, DropTarget } from 'react-dnd'; import Common from '../../../../../../common/Common'; @@ -191,17 +192,17 @@ class Lifeline extends React.Component { * Declare properties. */ Lifeline.propTypes = { - application: React.PropTypes.object.isRequired, - designer: React.PropTypes.object.isRequired, - lifeline: React.PropTypes.object.isRequired, - active: React.PropTypes.bool.isRequired, - metamodel: React.PropTypes.object.isRequired, - id: React.PropTypes.any.isRequired, - index: React.PropTypes.number.isRequired, - lifelines: React.PropTypes.object.isRequired, - isDragging: React.PropTypes.bool.isRequired, - connectDragSource: React.PropTypes.func.isRequired, - connectDropTarget: React.PropTypes.func.isRequired, + application: PropTypes.object.isRequired, + designer: PropTypes.object.isRequired, + lifeline: PropTypes.object.isRequired, + active: PropTypes.bool.isRequired, + metamodel: PropTypes.object.isRequired, + id: PropTypes.any.isRequired, + index: PropTypes.number.isRequired, + lifelines: PropTypes.object.isRequired, + isDragging: PropTypes.bool.isRequired, + connectDragSource: PropTypes.func.isRequired, + connectDropTarget: PropTypes.func.isRequired, }; /** DND. */ diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/LifelineNew.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/LifelineNew.jsx index 8e7c30f9da..a8147be370 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/LifelineNew.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/LifelineNew.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ import React from 'react'; +import PropTypes from 'prop-types'; import { DragSource } from 'react-dnd'; import Icon from '../../../../../icons/Icon'; @@ -89,9 +90,9 @@ class LifelineNew extends React.Component { /** Element properties. */ LifelineNew.propTypes = { - designer: React.PropTypes.object.isRequired, - lifelines: React.PropTypes.object.isRequired, - connectDragSource: React.PropTypes.func.isRequired, + designer: PropTypes.object.isRequired, + lifelines: PropTypes.object.isRequired, + connectDragSource: PropTypes.func.isRequired, }; /** DND. */ diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifelines.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifelines.jsx index 2e2f2ee7fd..2f82fec7a0 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifelines.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/lifeline/Lifelines.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; import Common from '../../../../../../common/Common'; import Lifeline from './Lifeline'; @@ -27,7 +27,7 @@ import LifelineNew from './LifelineNew'; * @returns {*} * @constructor */ -export default class Lifelines extends React.Component { +class Lifelines extends React.Component { // /////////////////////////////////////////////////////////////////////////////////////////////// @@ -130,7 +130,9 @@ export default class Lifelines extends React.Component { * Declare properties. */ Lifelines.propTypes = { - application: React.PropTypes.object.isRequired, - designer: React.PropTypes.object.isRequired, - activeLifelineId: React.PropTypes.string, + application: PropTypes.object.isRequired, + designer: PropTypes.object.isRequired, + activeLifelineId: PropTypes.string, }; + +export default Lifelines; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Message.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Message.jsx index 39f31279cc..a2c7f5122a 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Message.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Message.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ import React from 'react'; +import PropTypes from 'prop-types'; import Select from 'react-select'; import { DragSource, DropTarget } from 'react-dnd'; @@ -516,17 +517,17 @@ class Message extends React.Component { * @type {{designer: *, message: *, from: *, to: *, model: *, connectDragSource: *}} */ Message.propTypes = { - application: React.PropTypes.object.isRequired, - designer: React.PropTypes.object.isRequired, - message: React.PropTypes.object.isRequired, - active: React.PropTypes.bool.isRequired, - from: React.PropTypes.object.isRequired, - to: React.PropTypes.object.isRequired, - model: React.PropTypes.object.isRequired, - index: React.PropTypes.number.isRequired, - messages: React.PropTypes.object.isRequired, - connectDragSource: React.PropTypes.func.isRequired, - connectDropTarget: React.PropTypes.func.isRequired, + application: PropTypes.object.isRequired, + designer: PropTypes.object.isRequired, + message: PropTypes.object.isRequired, + active: PropTypes.bool.isRequired, + from: PropTypes.object.isRequired, + to: PropTypes.object.isRequired, + model: PropTypes.object.isRequired, + index: PropTypes.number.isRequired, + messages: PropTypes.object.isRequired, + connectDragSource: PropTypes.func.isRequired, + connectDropTarget: PropTypes.func.isRequired, }; /** DND. */ diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/MessageNew.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/MessageNew.jsx index dbb6b11021..c47cf28a64 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/MessageNew.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/MessageNew.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,6 +15,7 @@ */ import React from 'react'; +import PropTypes from 'prop-types'; import { DragSource } from 'react-dnd'; import Icon from '../../../../../icons/Icon'; @@ -82,9 +83,9 @@ class MessageNew extends React.Component { /** Element properties. */ MessageNew.propTypes = { - designer: React.PropTypes.object.isRequired, - messages: React.PropTypes.object.isRequired, - connectDragSource: React.PropTypes.func.isRequired, + designer: PropTypes.object.isRequired, + messages: PropTypes.object.isRequired, + connectDragSource: PropTypes.func.isRequired, }; /** DND. */ diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Messages.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Messages.jsx index a305a6bd86..417155498e 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Messages.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/message/Messages.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; import Common from '../../../../../../common/Common'; import Message from './Message'; @@ -137,7 +137,7 @@ export default class Messages extends React.Component { /** Element properties. */ Messages.propTypes = { - application: React.PropTypes.object.isRequired, - designer: React.PropTypes.object.isRequired, - activeMessageId: React.PropTypes.string, + application: PropTypes.object.isRequired, + designer: PropTypes.object.isRequired, + activeMessageId: PropTypes.string, }; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/metadata/Metadata.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/metadata/Metadata.jsx index a17a197ca0..cc1faddcba 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/metadata/Metadata.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/designer/components/metadata/Metadata.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; /** * Metadata view. */ @@ -28,7 +28,7 @@ const Metadata = function Metadata(props) { }; Metadata.propTypes = { - metadata: React.PropTypes.object.isRequired, + metadata: PropTypes.object.isRequired, }; export default Metadata; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/source/Source.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/source/Source.jsx index 3d13d830da..04ea5280ba 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/source/Source.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/source/Source.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; /** * Editor view, aggregating the designer, the code editor, the toolbar. */ @@ -81,6 +81,6 @@ export default class Source extends React.Component { } Source.propTypes = { - application: React.PropTypes.object.isRequired, + application: PropTypes.object.isRequired, }; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/toolbar/Toolbar.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/toolbar/Toolbar.jsx index b6b0f574a2..4ac9c3dfad 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/toolbar/Toolbar.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/editor/components/toolbar/Toolbar.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; import Common from '../../../../common/Common'; import iconPlus from '../../../../../../../../res/ecomp/asdc/sequencer/sprites/icons/plus.svg'; @@ -270,6 +270,6 @@ export default class Toolbar extends React.Component { } Toolbar.propTypes = { - application: React.PropTypes.object.isRequired, - editor: React.PropTypes.object.isRequired, + application: PropTypes.object.isRequired, + editor: PropTypes.object.isRequired, }; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx index 6bc04f997f..6ed2d451d9 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/ecomp/asdc/sequencer/components/icons/Icon.jsx @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ import React from 'react'; - +import PropTypes from 'prop-types'; /** * Simple icon view. * @param glyph glyph definition, from import. @@ -33,8 +33,8 @@ const Icon = function Icon({ glyph, className }) { /** Declare properties. */ Icon.propTypes = { - className: React.PropTypes.string, - glyph: React.PropTypes.string.isRequired, + className: PropTypes.string, + glyph: PropTypes.string.isRequired, }; export default Icon; diff --git a/dox-sequence-diagram-ui/src/main/webapp/lib/main.jsx b/dox-sequence-diagram-ui/src/main/webapp/lib/main.jsx index 33a62f7228..1898ba2e57 100644 --- a/dox-sequence-diagram-ui/src/main/webapp/lib/main.jsx +++ b/dox-sequence-diagram-ui/src/main/webapp/lib/main.jsx @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import { render } from 'react-dom'; +import { ReactDOM } from 'react-dom'; import Sequencer from './ecomp/asdc/sequencer/Sequencer'; import '../res/ecomp/asdc/sequencer/sequencer-development.scss'; import '../res/thirdparty/react-select/react-select.min.css'; @@ -25,7 +25,7 @@ function renderApplication() { shell.setAttribute('style', 'height:100%;width:100%;margin:0;padding:0'); document.body.appendChild(shell); const options = { demo: true }; - render(, shell); + ReactDOM.render(, shell); } if (window.addEventListener) { diff --git a/openecomp-ui/.babelrc b/openecomp-ui/.babelrc index a902be2cfc..378bcda37d 100644 --- a/openecomp-ui/.babelrc +++ b/openecomp-ui/.babelrc @@ -1,13 +1,16 @@ { - "presets": [["es2015", { "modules": false }],"stage-0", "react"], + "presets": [["env", { + "targets": { + "browsers": ["last 2 versions", "Firefox >= 47"] + } + }],"react"], "plugins": [ - "transform-es2015-modules-commonjs", - "transform-es2015-destructuring", - "transform-es2015-spread", "transform-object-rest-spread", "transform-class-properties", "transform-runtime", - "transform-decorators-legacy" + "transform-decorators-legacy", + "transform-runtime", + "react-hot-loader/babel" ], "sourceMap": "inline" } diff --git a/openecomp-ui/package.json b/openecomp-ui/package.json index 556431d7a6..4b7fa6141c 100644 --- a/openecomp-ui/package.json +++ b/openecomp-ui/package.json @@ -20,8 +20,8 @@ "build-storybook": "build-storybook -c .storybook -o .storybook-dist && gulp copy-storybook-fonts" }, "dependencies": { - "axios": "^0.16.2", "attr-accept": "^1.1.0", + "axios": "^0.16.2", "classnames": "^2.2.5", "core-js": "^2.4.0", "d3": "^4.9.1", @@ -34,12 +34,16 @@ "md5": "^2.1.0", "prop-types": "^15.6.0", "randomstring": "^1.1.5", - "react": "~15.3.2", - "react-bootstrap": "^0.30.1", + "react": "^15.6.2", + "react-bootstrap": "^0.31.5", "react-click-outside": "^2.3.1", - "react-dom": "~15.3.2", - "react-dropzone": "3.7.3", - "react-redux": "^4.4.1", + "react-datepicker": "^0.61.0", + "react-dnd": "^2.5.4", + "react-dnd-html5-backend": "^2.5.4", + "react-dom": "^15.6.2", + "react-dropzone": "4.2.3", + "react-input-autosize": "^2.2.0", + "react-redux": "^4.4.5", "react-select": "1.0.0-rc.5", "react-show-more": "^1.1.1", "react-sortable": "^1.2.0", @@ -56,14 +60,14 @@ "babel-eslint": "^7.2.1", "babel-jest": "^19.0.0", "babel-loader": "^7.0.0-beta.1", - "babel-plugin-transform-class-properties": "^6.10.2", + "babel-plugin-transform-class-properties": "^6.10.2", "babel-plugin-transform-decorators-legacy": "^1.3.4", "babel-plugin-transform-es2015-destructuring": "^6.9.0", "babel-plugin-transform-es2015-modules-commonjs": "^6.10.3", "babel-plugin-transform-es2015-spread": "^6.8.0", "babel-plugin-transform-object-rest-spread": "^6.8.0", "babel-plugin-transform-runtime": "^6.22.0", - "babel-preset-es2015": "^6.24.0", + "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.23.0", "babel-preset-stage-0": "^6.22.0", "css-loader": "^0.23.1", @@ -85,7 +89,7 @@ "http-proxy-middleware": "^0.17.4", "ignore-loader": "^0.1.1", "jasmine-core": "^2.5.2", - "jest": "^19.0.2", + "jest": "^21.2.1", "jshint": "^2.9.4", "json-loader": "^0.5.4", "jsx-loader": "^0.13.2", @@ -94,11 +98,10 @@ "node-watch": "^0.3.5", "prompt": "^0.2.14", "react-addons-test-utils": "~15.3.2", - "react-click-outside": "^2.3.1", - "react-datepicker": "^0.48.0", - "react-hot-loader": "^1.3.1", + "react-datepicker": "^0.61.0", + "react-hot-loader": "^3.1.3", "rosie": "^1.6.0", - "sass-loader": "^3.2.3", + "sass-loader": "^6.0.6", "source-map-loader": "^0.1.5", "storyshots": "^3.2.2", "style-loader": "^0.13.0", diff --git a/openecomp-ui/pom.xml b/openecomp-ui/pom.xml index 311403eade..39193c1dee 100644 --- a/openecomp-ui/pom.xml +++ b/openecomp-ui/pom.xml @@ -76,8 +76,8 @@ install-node-and-npm - v6.9.5 - 3.10.10 + v8.9.2 + 5.5.1 diff --git a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js index a47c42a1fb..75b7983ac3 100644 --- a/openecomp-ui/src/nfvo-components/modal/GlobalModal.js +++ b/openecomp-ui/src/nfvo-components/modal/GlobalModal.js @@ -1,17 +1,17 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; @@ -68,6 +68,12 @@ ModalFooter.defaultProps = { cancelButtonText: i18n('Cancel') }; +ModalFooter.PropTypes = { + type: PropTypes.string, + confirmationButtonText: PropTypes.string, + cancelButtonText: PropTypes.string +}; + export const mapStateToProps = ({modal}) => { const show = !!modal; return { @@ -139,4 +145,16 @@ export class GlobalModalView extends React.Component { } }; +GlobalModalView.propTypes = { + show: PropTypes.bool, + type: PropTypes.oneOf(['default', 'error', 'warning', 'success']), + title: PropTypes.string, + modalComponentProps: PropTypes.object, + modalComponentName: PropTypes.string, + onConfirmed: PropTypes.func, + onDeclined: PropTypes.func, + confirmationButtonText: PropTypes.string, + cancelButtonText: PropTypes.string +}; + export default connect(mapStateToProps, mapActionToProps, null, {withRef: true})(GlobalModalView); diff --git a/openecomp-ui/src/sdc-app/AppStore.js b/openecomp-ui/src/sdc-app/AppStore.js index be1a4254a1..bafef7dcd6 100644 --- a/openecomp-ui/src/sdc-app/AppStore.js +++ b/openecomp-ui/src/sdc-app/AppStore.js @@ -1,25 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ -import {combineReducers, createStore, applyMiddleware, compose} from 'redux'; -import onBoardingReducersMap from './onboarding/OnboardingReducersMap.js'; -import flowsReducersMap from './flows/FlowsReducersMap.js'; -import loaderReducer from 'nfvo-components/loader/LoaderReducer.js'; -import globalModalReducer from 'nfvo-components/modal/GlobalModalReducer.js'; -import notificationsReducer from 'sdc-app/onboarding/userNotifications/NotificationsReducer.js'; +import {createStore, applyMiddleware, compose} from 'redux'; +import Reducers from './Reducers.js'; const thunk = store => next => action => typeof action === 'function' ? action(store.dispatch, store.getState) : @@ -27,18 +23,15 @@ const thunk = store => next => action => const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose; -export const storeCreator = (initialState) => createStore(combineReducers({ - // on-boarding reducers - ...onBoardingReducersMap, - - // flows reducers - ...flowsReducersMap, - modal: globalModalReducer, - loader: loaderReducer, - notifications: notificationsReducer -}), initialState, composeEnhancers(applyMiddleware(thunk))); +export const storeCreator = (initialState) => createStore(Reducers, initialState, composeEnhancers(applyMiddleware(thunk))); const store = storeCreator(); +if (module.hot) { + module.hot.accept('./Reducers.js', () => + store.replaceReducer(require('./Reducers.js').default) + ); +} + export default store; diff --git a/openecomp-ui/src/sdc-app/Reducers.js b/openecomp-ui/src/sdc-app/Reducers.js new file mode 100644 index 0000000000..a0a8ebafa1 --- /dev/null +++ b/openecomp-ui/src/sdc-app/Reducers.js @@ -0,0 +1,33 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import {combineReducers} from 'redux'; +import onBoardingReducersMap from './onboarding/OnboardingReducersMap.js'; +import flowsReducersMap from './flows/FlowsReducersMap.js'; +import loaderReducer from 'nfvo-components/loader/LoaderReducer.js'; +import globalModalReducer from 'nfvo-components/modal/GlobalModalReducer.js'; +import notificationsReducer from 'sdc-app/onboarding/userNotifications/NotificationsReducer.js'; + +export default combineReducers({ + // on-boarding reducers + ...onBoardingReducersMap, + + // flows reducers + ...flowsReducersMap, + modal: globalModalReducer, + loader: loaderReducer, + notifications: notificationsReducer +}); diff --git a/openecomp-ui/src/sdc-app/onboarding/Onboarding.js b/openecomp-ui/src/sdc-app/onboarding/Onboarding.js new file mode 100644 index 0000000000..faec816d42 --- /dev/null +++ b/openecomp-ui/src/sdc-app/onboarding/Onboarding.js @@ -0,0 +1,22 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import OnboardingView from './OnboardingView.jsx'; +import {connect} from 'react-redux'; + +const mapStateToProps = ({currentScreen}) => ({currentScreen}); +const Onboarding = connect(mapStateToProps, null)(OnboardingView); +export default Onboarding; diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js index 794f5c1781..4c4c709a7b 100644 --- a/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js +++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingActionHelper.js @@ -1,18 +1,19 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + import UsersActionHelper from './users/UsersActionHelper.js'; import VersionsPageActionHelper from './versionsPage/VersionsPageActionHelper.js'; import PermissionsActionHelper from './permissions/PermissionsActionHelper.js'; @@ -32,7 +33,6 @@ import SoftwareProductDependenciesActionHelper from './softwareProduct/dependenc import ComputeFlavorActionHelper from './softwareProduct/components/compute/ComputeFlavorActionHelper.js'; import OnboardActionHelper from './onboard/OnboardActionHelper.js'; import MergeEditorActionHelper from 'sdc-app/common/merge/MergeEditorActionHelper.js'; -// import {SyncStates} from 'sdc-app/common/merge/MergeEditorConstants.js'; import SoftwareProductComponentsMonitoringAction from './softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringActionHelper.js'; import {actionTypes, enums} from './OnboardingConstants.js'; import {actionTypes as SoftwareProductActionTypes, onboardingOriginTypes} from 'sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js'; diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx b/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx index e576bb3f85..fbb12022c1 100644 --- a/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx @@ -1,24 +1,26 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ + import React from 'react'; -import PropTypes from 'prop-types'; + +import {render} from 'react-dom'; import ReactDOM from 'react-dom'; -import {connect} from 'react-redux'; + import isEqual from 'lodash/isEqual.js'; -import objectValues from 'lodash/values.js'; + import lodashUnionBy from 'lodash/unionBy.js'; import i18n from 'nfvo-utils/i18n/i18n.js'; @@ -27,175 +29,17 @@ import store from 'sdc-app/AppStore.js'; import Configuration from 'sdc-app/config/Configuration.js'; import ScreensHelper from 'sdc-app/common/helpers/ScreensHelper.js'; -import Onboard from './onboard/Onboard.js'; -import VersionsPage from './versionsPage/VersionsPage.js'; -import LicenseModel from './licenseModel/LicenseModel.js'; -import LicenseModelOverview from './licenseModel/overview/LicenseModelOverview.js'; -import ActivityLog from 'sdc-app/common/activity-log/ActivityLog.js'; - -import LicenseAgreementListEditor from './licenseModel/licenseAgreement/LicenseAgreementListEditor.js'; -import FeatureGroupListEditor from './licenseModel/featureGroups/FeatureGroupListEditor.js'; -import LicenseKeyGroupsListEditor from './licenseModel/licenseKeyGroups/LicenseKeyGroupsListEditor.js'; -import EntitlementPoolsListEditor from './licenseModel/entitlementPools/EntitlementPoolsListEditor.js'; -import SoftwareProduct from './softwareProduct/SoftwareProduct.js'; -import SoftwareProductLandingPage from './softwareProduct/landingPage/SoftwareProductLandingPage.js'; -import SoftwareProductDetails from './softwareProduct/details/SoftwareProductDetails.js'; -import SoftwareProductAttachments from './softwareProduct/attachments/SoftwareProductAttachments.js'; -import SoftwareProductProcesses from './softwareProduct/processes/SoftwareProductProcesses.js'; -import SoftwareProductDeployment from './softwareProduct/deployment/SoftwareProductDeployment.js'; -import SoftwareProductNetworks from './softwareProduct/networks/SoftwareProductNetworks.js'; -import SoftwareProductDependencies from './softwareProduct/dependencies/SoftwareProductDependencies.js'; - -import SoftwareProductComponentsList from './softwareProduct/components/SoftwareProductComponents.js'; -import SoftwareProductComponentProcessesList from './softwareProduct/components/processes/SoftwareProductComponentProcessesList.js'; -import SoftwareProductComponentStorage from './softwareProduct/components/storage/SoftwareProductComponentStorage.js'; -import SoftwareProductComponentsNetworkList from './softwareProduct/components/network/SoftwareProductComponentsNetworkList.js'; -import SoftwareProductComponentsGeneral from './softwareProduct/components/general/SoftwareProductComponentsGeneral.js'; -import SoftwareProductComponentsCompute from './softwareProduct/components/compute/SoftwareProductComponentCompute.js'; -import SoftwareProductComponentLoadBalancing from './softwareProduct/components/loadBalancing/SoftwareProductComponentLoadBalancing.js'; -import SoftwareProductComponentsImageList from './softwareProduct/components/images/SoftwareProductComponentsImageList.js'; -import SoftwareProductComponentsMonitoring from './softwareProduct/components/monitoring/SoftwareProductComponentsMonitoring.js'; + import {onboardingMethod as onboardingMethodTypes, onboardingOriginTypes} from 'sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js'; import {itemTypes} from './versionsPage/VersionsPageConstants.js'; +import {AppContainer} from 'react-hot-loader'; import HeatSetupActionHelper from './softwareProduct/attachments/setup/HeatSetupActionHelper.js'; import {actionTypes, enums, screenTypes} from './OnboardingConstants.js'; import OnboardingActionHelper from './OnboardingActionHelper.js'; - -class OnboardingView extends React.Component { - static propTypes = { - currentScreen: PropTypes.shape({ - screen: PropTypes.oneOf(objectValues(enums.SCREEN)).isRequired, - props: PropTypes.object.isRequired, - itemPermission: PropTypes.object - }).isRequired - }; - - componentDidMount() { - let element = ReactDOM.findDOMNode(this); - element.addEventListener('click', event => { - if (event.target.tagName === 'A') { - event.preventDefault(); - } - }); - ['wheel', 'mousewheel', 'DOMMouseScroll'].forEach(eventType => - element.addEventListener(eventType, event => event.stopPropagation()) - ); - } - - render() { - let {currentScreen} = this.props; - let {screen, props} = currentScreen; - - return ( -
- {(() => { - switch (screen) { - case enums.SCREEN.ONBOARDING_CATALOG: - return ; - case enums.SCREEN.VERSIONS_PAGE: - return ; - - case enums.SCREEN.LICENSE_AGREEMENTS: - case enums.SCREEN.FEATURE_GROUPS: - case enums.SCREEN.ENTITLEMENT_POOLS: - case enums.SCREEN.LICENSE_KEY_GROUPS: - case enums.SCREEN.LICENSE_MODEL_OVERVIEW: - case enums.SCREEN.ACTIVITY_LOG: - return ( - - { - (()=>{ - switch(screen) { - case enums.SCREEN.LICENSE_MODEL_OVERVIEW: - return ; - case enums.SCREEN.LICENSE_AGREEMENTS: - return ; - case enums.SCREEN.FEATURE_GROUPS: - return ; - case enums.SCREEN.ENTITLEMENT_POOLS: - return ; - case enums.SCREEN.LICENSE_KEY_GROUPS: - return ; - case enums.SCREEN.ACTIVITY_LOG: - return ; - } - })() - } - - ); - - case enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE: - case enums.SCREEN.SOFTWARE_PRODUCT_DETAILS: - case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS: - case enums.SCREEN.SOFTWARE_PRODUCT_PROCESSES: - case enums.SCREEN.SOFTWARE_PRODUCT_DEPLOYMENT: - case enums.SCREEN.SOFTWARE_PRODUCT_NETWORKS: - case enums.SCREEN.SOFTWARE_PRODUCT_DEPENDENCIES: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_PROCESSES: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_STORAGE: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_NETWORK: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_GENERAL: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_COMPUTE: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_LOAD_BALANCING: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_IMAGES: - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_MONITORING: - case enums.SCREEN.SOFTWARE_PRODUCT_ACTIVITY_LOG: - return ( - - { - (()=>{ - switch(screen) { - case enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_DETAILS: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_PROCESSES: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_DEPLOYMENT: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_NETWORKS: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_DEPENDENCIES: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_PROCESSES: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_STORAGE: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_NETWORK: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_GENERAL: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_COMPUTE: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_LOAD_BALANCING: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_IMAGES: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_MONITORING: - return ; - case enums.SCREEN.SOFTWARE_PRODUCT_ACTIVITY_LOG: - return ; - } - })() - } - - ); - } - })()} -
- ); - } -} -const mapStateToProps = ({currentScreen}) => ({currentScreen}); -let Onboarding = connect(mapStateToProps, null)(OnboardingView); +import Onboarding from './Onboarding.js'; export default class OnboardingPunchOut { @@ -214,13 +58,29 @@ export default class OnboardingPunchOut { this.handleData(data); if (!this.rendered) { - ReactDOM.render( - - - , + render( + + + + + , element ); + if (module.hot) { + module.hot.accept('sdc-app/onboarding/Onboarding.js', () => { + const NextOnboarding = require('sdc-app/onboarding/Onboarding.js').default; + render( + + + + + , + element + ); + }); + } this.rendered = true; + } } diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx b/openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx new file mode 100644 index 0000000000..7877085316 --- /dev/null +++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingView.jsx @@ -0,0 +1,183 @@ +/* + * Copyright © 2016-2017 European Support Limited + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import Onboard from './onboard/Onboard.js'; +import VersionsPage from './versionsPage/VersionsPage.js'; +import LicenseModel from './licenseModel/LicenseModel.js'; +import LicenseModelOverview from './licenseModel/overview/LicenseModelOverview.js'; +import ActivityLog from 'sdc-app/common/activity-log/ActivityLog.js'; + +import LicenseAgreementListEditor from './licenseModel/licenseAgreement/LicenseAgreementListEditor.js'; +import FeatureGroupListEditor from './licenseModel/featureGroups/FeatureGroupListEditor.js'; +import LicenseKeyGroupsListEditor from './licenseModel/licenseKeyGroups/LicenseKeyGroupsListEditor.js'; +import EntitlementPoolsListEditor from './licenseModel/entitlementPools/EntitlementPoolsListEditor.js'; +import SoftwareProduct from './softwareProduct/SoftwareProduct.js'; +import SoftwareProductLandingPage from './softwareProduct/landingPage/SoftwareProductLandingPage.js'; +import SoftwareProductDetails from './softwareProduct/details/SoftwareProductDetails.js'; +import SoftwareProductAttachments from './softwareProduct/attachments/SoftwareProductAttachments.js'; +import SoftwareProductProcesses from './softwareProduct/processes/SoftwareProductProcesses.js'; +import SoftwareProductDeployment from './softwareProduct/deployment/SoftwareProductDeployment.js'; +import SoftwareProductNetworks from './softwareProduct/networks/SoftwareProductNetworks.js'; +import SoftwareProductDependencies from './softwareProduct/dependencies/SoftwareProductDependencies.js'; + +import SoftwareProductComponentsList from './softwareProduct/components/SoftwareProductComponents.js'; +import SoftwareProductComponentProcessesList from './softwareProduct/components/processes/SoftwareProductComponentProcessesList.js'; +import SoftwareProductComponentStorage from './softwareProduct/components/storage/SoftwareProductComponentStorage.js'; +import SoftwareProductComponentsNetworkList from './softwareProduct/components/network/SoftwareProductComponentsNetworkList.js'; +import SoftwareProductComponentsGeneral from './softwareProduct/components/general/SoftwareProductComponentsGeneral.js'; +import SoftwareProductComponentsCompute from './softwareProduct/components/compute/SoftwareProductComponentCompute.js'; +import SoftwareProductComponentLoadBalancing from './softwareProduct/components/loadBalancing/SoftwareProductComponentLoadBalancing.js'; +import SoftwareProductComponentsImageList from './softwareProduct/components/images/SoftwareProductComponentsImageList.js'; +import SoftwareProductComponentsMonitoring from './softwareProduct/components/monitoring/SoftwareProductComponentsMonitoring.js'; +import objectValues from 'lodash/values.js'; +import PropTypes from 'prop-types'; + +import React from 'react'; + +import ReactDOM from 'react-dom'; +import {enums} from './OnboardingConstants.js'; + +export default class OnboardingView extends React.Component { + static propTypes = { + currentScreen: PropTypes.shape({ + screen: PropTypes.oneOf(objectValues(enums.SCREEN)).isRequired, + props: PropTypes.object.isRequired, + itemPermission: PropTypes.object + }).isRequired + }; + + componentDidMount() { + let element = ReactDOM.findDOMNode(this); + element.addEventListener('click', event => { + if (event.target.tagName === 'A') { + event.preventDefault(); + } + }); + ['wheel', 'mousewheel', 'DOMMouseScroll'].forEach(eventType => + element.addEventListener(eventType, event => event.stopPropagation()) + ); + } + + render() { + let {currentScreen} = this.props; + let {screen, props} = currentScreen; + + return ( +
+ {(() => { + switch (screen) { + case enums.SCREEN.ONBOARDING_CATALOG: + return ; + case enums.SCREEN.VERSIONS_PAGE: + return ; + + case enums.SCREEN.LICENSE_AGREEMENTS: + case enums.SCREEN.FEATURE_GROUPS: + case enums.SCREEN.ENTITLEMENT_POOLS: + case enums.SCREEN.LICENSE_KEY_GROUPS: + case enums.SCREEN.LICENSE_MODEL_OVERVIEW: + case enums.SCREEN.ACTIVITY_LOG: + return ( + + { + (()=>{ + switch(screen) { + case enums.SCREEN.LICENSE_MODEL_OVERVIEW: + return ; + case enums.SCREEN.LICENSE_AGREEMENTS: + return ; + case enums.SCREEN.FEATURE_GROUPS: + return ; + case enums.SCREEN.ENTITLEMENT_POOLS: + return ; + case enums.SCREEN.LICENSE_KEY_GROUPS: + return ; + case enums.SCREEN.ACTIVITY_LOG: + return ; + } + })() + } + + ); + + case enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE: + case enums.SCREEN.SOFTWARE_PRODUCT_DETAILS: + case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS: + case enums.SCREEN.SOFTWARE_PRODUCT_PROCESSES: + case enums.SCREEN.SOFTWARE_PRODUCT_DEPLOYMENT: + case enums.SCREEN.SOFTWARE_PRODUCT_NETWORKS: + case enums.SCREEN.SOFTWARE_PRODUCT_DEPENDENCIES: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_PROCESSES: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_STORAGE: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_NETWORK: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_GENERAL: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_COMPUTE: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_LOAD_BALANCING: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_IMAGES: + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_MONITORING: + case enums.SCREEN.SOFTWARE_PRODUCT_ACTIVITY_LOG: + return ( + + { + (()=>{ + switch(screen) { + case enums.SCREEN.SOFTWARE_PRODUCT_LANDING_PAGE: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_DETAILS: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_ATTACHMENTS: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_PROCESSES: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_DEPLOYMENT: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_NETWORKS: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_DEPENDENCIES: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENTS: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_PROCESSES: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_STORAGE: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_NETWORK: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_GENERAL: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_COMPUTE: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_LOAD_BALANCING: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_IMAGES: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_COMPONENT_MONITORING: + return ; + case enums.SCREEN.SOFTWARE_PRODUCT_ACTIVITY_LOG: + return ; + } + })() + } + + ); + } + })()} +
+ ); + } +} + diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx index 41acee43ca..95d1e4e283 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx @@ -1,17 +1,17 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React, {Component} from 'react'; import PropTypes from 'prop-types'; @@ -66,8 +66,7 @@ class SoftwareProductComponentsMonitoringView extends Component { disableClick={true} ref={refAndName} name={refAndName} - accept='.zip' - disabled> + accept='.zip'>
{typeDisplayName}
{fileName ? this.renderUploadedFileName(fileName, type, isReadOnlyMode) : this.renderUploadButton(refAndName)} diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx index 56402b4417..97f6829812 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/landingPage/SoftwareProductLandingPageView.jsx @@ -1,17 +1,17 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; import PropTypes from 'prop-types'; @@ -79,8 +79,7 @@ class SoftwareProductLandingPageView extends React.Component { disableClick={true} ref='fileInput' name='fileInput' - accept='.zip, .csar' - disabled> + accept='.zip, .csar'>
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesEditorForm.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesEditorForm.jsx index 72b2f8cb38..d1bd602683 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesEditorForm.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesEditorForm.jsx @@ -1,17 +1,17 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; import PropTypes from 'prop-types'; @@ -24,7 +24,7 @@ import Input from 'nfvo-components/input/validation/Input.jsx'; import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; -const SoftwareProductProcessEditorPropType = React.PropTypes.shape({ +const SoftwareProductProcessEditorPropType = PropTypes.shape({ id: PropTypes.string, name: PropTypes.string, description: PropTypes.string, @@ -40,10 +40,10 @@ class SoftwareProductProcessesEditorForm extends React.Component { static propTypes = { data: SoftwareProductProcessEditorPropType, previousData: SoftwareProductProcessEditorPropType, - isReadOnlyMode: React.PropTypes.bool, - onDataChanged: React.PropTypes.func, - onSubmit: React.PropTypes.func, - onCancel: React.PropTypes.func + isReadOnlyMode: PropTypes.bool, + onDataChanged: PropTypes.func, + onSubmit: PropTypes.func, + onCancel: PropTypes.func }; state = { dragging: false, diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesView.jsx b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesView.jsx index e2cb4edf74..b0da767a2b 100644 --- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesView.jsx @@ -1,23 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; import PropTypes from 'prop-types'; import i18n from 'nfvo-utils/i18n/i18n.js'; import Modal from 'nfvo-components/modal/Modal.jsx'; - import SoftwareProductProcessesEditor from './SoftwareProductProcessesEditor.js'; import SoftwareProductProcessListView from './SoftwareProductProcessListView.jsx'; diff --git a/openecomp-ui/src/sdc-app/sdc.app.jsx b/openecomp-ui/src/sdc-app/sdc.app.jsx index 5fdea27fea..b467e3ca9d 100644 --- a/openecomp-ui/src/sdc-app/sdc.app.jsx +++ b/openecomp-ui/src/sdc-app/sdc.app.jsx @@ -1,17 +1,17 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import '../../resources/scss/bootstrap.scss'; import 'react-select/dist/react-select.min.css'; @@ -30,3 +30,4 @@ SVGElement.prototype.getTransformToElement = SVGElement.prototype.getTransformTo }; ReactDOM.render(, document.getElementById('sdc-app')); + diff --git a/openecomp-ui/test-utils/Util.js b/openecomp-ui/test-utils/Util.js index 415736fa60..ee05f13bd9 100644 --- a/openecomp-ui/test-utils/Util.js +++ b/openecomp-ui/test-utils/Util.js @@ -1,23 +1,23 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import deepFreeze from 'deep-freeze'; import times from 'lodash/times'; import pick from 'lodash/pick'; import intersection from 'lodash/intersection'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; export const buildListFromFactory = (factory, quantity = 3, overrides) => { let list = []; diff --git a/openecomp-ui/test/flows/FlowsListEditor.test.js b/openecomp-ui/test/flows/FlowsListEditor.test.js index 007b137ab0..5b57e8b2c1 100644 --- a/openecomp-ui/test/flows/FlowsListEditor.test.js +++ b/openecomp-ui/test/flows/FlowsListEditor.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import {mapStateToProps} from 'sdc-app/flows/FlowsListEditor.js'; import FlowsListEditorView from 'sdc-app/flows/FlowsListEditorView.jsx'; @@ -113,7 +113,7 @@ describe('Flows List Editor Mapper and View Classes: ', function () { }); it('basic view component run with empty flowList and should show the list', () => { - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); let currentFlow = FlowBasicFactory.build(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); @@ -122,14 +122,14 @@ describe('Flows List Editor Mapper and View Classes: ', function () { it('basic view component run with empty flowList and should show the diagram', () => { const flow = FlowUpdateRequestFactory.build(); - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); }); it('basic view component run with empty flowList and should show popup modal', () => { - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); let currentFlow = FlowBasicFactory.build(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); diff --git a/openecomp-ui/test/flows/flowsEditorModal.test.js b/openecomp-ui/test/flows/flowsEditorModal.test.js index 8371432032..cc6525fd46 100644 --- a/openecomp-ui/test/flows/flowsEditorModal.test.js +++ b/openecomp-ui/test/flows/flowsEditorModal.test.js @@ -1,24 +1,24 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {mapStateToProps} from 'sdc-app/flows/FlowsEditorModal.js'; import FlowsEditorModalView from 'sdc-app/flows/FlowsEditorModalView.jsx'; - +import ShallowRenderer from 'react-test-renderer/shallow'; import {FlowBasicFactory} from 'test-utils/factories/flows/FlowsFactories.js'; describe('Flows Editor Modal Mapper and View Classes: ', function () { @@ -54,7 +54,7 @@ describe('Flows Editor Modal Mapper and View Classes: ', function () { }); it('basic modal view component run with empty artifact', () => { - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( {}} diff --git a/openecomp-ui/test/licenseModel/creation/LicenseModelCreation.test.js b/openecomp-ui/test/licenseModel/creation/LicenseModelCreation.test.js index 935360b04b..9c8043b943 100644 --- a/openecomp-ui/test/licenseModel/creation/LicenseModelCreation.test.js +++ b/openecomp-ui/test/licenseModel/creation/LicenseModelCreation.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import {mapStateToProps } from 'sdc-app/onboarding/licenseModel/creation/LicenseModelCreation.js'; import LicenseModelCreationView from 'sdc-app/onboarding/licenseModel/creation/LicenseModelCreationView.jsx'; import {LicenseModelCreationFactory} from 'test-utils/factories/licenseModel/LicenseModelFactories.js'; @@ -66,7 +66,7 @@ describe('License Model Creation Module Tests', function() { it('simple jsx test', () => { let data = LicenseModelCreationFactory.build(); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( { - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( ); @@ -60,7 +61,7 @@ describe('License Model Overview - View: ', function () { selectedTab: selectedButton.VLM_LIST_VIEW, onTabSelect: () => {} }; - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( ); diff --git a/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js b/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js index 7231fe4abc..ecb7159ee5 100644 --- a/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js +++ b/openecomp-ui/test/nfvo-components/SubmitErrorResponse.test.js @@ -1,22 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import SubmitErrorResponse from 'nfvo-components/SubmitErrorResponse.jsx'; import {SubmitErrorMessageFactory} from 'test-utils/factories/SubnitErrorMessageFactorie.js'; diff --git a/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js b/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js index 5f9f06b714..505bc91636 100644 --- a/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js +++ b/openecomp-ui/test/nfvo-components/editor/TabulatedEditor.test.js @@ -1,22 +1,23 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; +import TestUtils from 'react-dom/test-utils'; import TabulatedEditor from 'nfvo-components/editor/TabulatedEditor.jsx'; import { Provider } from 'react-redux'; import {storeCreator} from 'sdc-app/AppStore.js'; @@ -24,7 +25,7 @@ import {storeCreator} from 'sdc-app/AppStore.js'; describe('Tabulated Editor test: ', function () { const store = storeCreator(); it('basic view test', () => { - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( ); diff --git a/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js b/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js index c578178d35..2df15c61b1 100644 --- a/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js +++ b/openecomp-ui/test/nfvo-components/input/dualListBox/dualListbox.test.js @@ -1,22 +1,23 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import DualListboxView from 'nfvo-components/input/dualListbox/DualListboxView.jsx'; +import ShallowRenderer from 'react-test-renderer/shallow'; const ITEMS = [{id: '1', name: 'aaa'}, {id: '2', name: 'bbb'}, {id: '3', name: 'ccc'}]; @@ -24,7 +25,7 @@ describe('dualListBox Module Tests', function () { it('should render basically', () => { - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render({}}/>); var renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); diff --git a/openecomp-ui/test/nfvo-components/input/validation/input.test.js b/openecomp-ui/test/nfvo-components/input/validation/input.test.js index 7743483603..719e01fb97 100644 --- a/openecomp-ui/test/nfvo-components/input/validation/input.test.js +++ b/openecomp-ui/test/nfvo-components/input/validation/input.test.js @@ -1,24 +1,25 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {scryRenderedDOMComponentsWithTestId} from 'test-utils/Util.js'; import Input from 'nfvo-components/input/validation/Input.jsx'; import Overlay from 'react-bootstrap/lib/Overlay.js'; +import {shallow} from 'enzyme'; describe('Input', function () { it('should render with type text', () => { @@ -72,10 +73,11 @@ describe('Input', function () { }); it('should render error overlay when invalid', () => { - let renderedOutput = TestUtils.renderIntoDocument(); - const elem = TestUtils.findRenderedComponentWithType(renderedOutput,Overlay); + const elem = shallow(); expect(elem).toBeTruthy(); - expect(elem.props.show).toBe(true); + const overlay = elem.find(Overlay); + expect(overlay).toBeTruthy(); + expect(overlay.props().show).toBe(true); }); it('should not render error overlay when valid', () => { diff --git a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js index b1127386f7..a0c1c9978c 100644 --- a/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js +++ b/openecomp-ui/test/nfvo-components/listEditor/listEditor.test.js @@ -1,22 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; import {mount} from 'enzyme'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import ListEditorView from 'src/nfvo-components/listEditor/ListEditorView.jsx'; import ListEditorItemView from 'src/nfvo-components/listEditor/ListEditorItemView.jsx'; diff --git a/openecomp-ui/test/nfvo-components/modal/globalModal.test.js b/openecomp-ui/test/nfvo-components/modal/globalModal.test.js index f27b1359f8..0636aed6e1 100644 --- a/openecomp-ui/test/nfvo-components/modal/globalModal.test.js +++ b/openecomp-ui/test/nfvo-components/modal/globalModal.test.js @@ -1,22 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import GlobalModal, {GlobalModalView, mapStateToProps} from 'src/nfvo-components/modal/GlobalModal.js'; import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import store from 'sdc-app/AppStore.js'; import {actionTypes, typeEnum} from 'src/nfvo-components/modal/GlobalModalConstants.js'; @@ -31,7 +31,7 @@ describe('Global Modal tests: ', function () { it ('mapStateToProps should return show as true', () => { let state = { modal: { - type: '' + type: '' } }; let props = mapStateToProps(state); @@ -49,15 +49,15 @@ describe('Global Modal tests: ', function () { const modal = store.getState().modal; expect(modal).toBeTruthy(); expect(modal.title).toBe(title); - expect(modal.msg).toBe(msg); + expect(modal.msg).toBe(msg); }); it('global modal should show with type success with connected component', () => { store.dispatch({type: actionTypes.GLOBAL_MODAL_SHOW, data: {title, msg}}); expect(store.getState().modal).toBeTruthy(); - - let renderer = TestUtils.createRenderer(); + + const renderer = new ShallowRenderer(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); @@ -67,10 +67,9 @@ describe('Global Modal tests: ', function () { it('global modal should show with type success with connected component and closed after', () => { store.dispatch({type: actionTypes.GLOBAL_MODAL_SHOW, data: {title, msg}}); - + expect(store.getState().modal).toBeTruthy(); - - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); @@ -82,11 +81,11 @@ describe('Global Modal tests: ', function () { it('checking component default render', ()=> { expect(window.document).toBeTruthy(); - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render({}} />); - let globalModalView = renderer.getRenderOutput(); + const globalModalView = renderer.getRenderOutput(); expect(globalModalView).toBeTruthy(); - }); +}); }); diff --git a/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js b/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js index f2db01f3f1..64304ab9de 100644 --- a/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js +++ b/openecomp-ui/test/nfvo-components/panel/VersionController/versionController.test.js @@ -1,23 +1,23 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; - -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; +import TestUtils from 'react-dom/test-utils'; import VersionController from 'nfvo-components/panel/versionController/VersionController.jsx'; import {actionsEnum} from 'nfvo-components/panel/versionController/VersionControllerConstants.js'; import {scryRenderedDOMComponentsWithTestId} from 'test-utils/Util.js'; @@ -36,7 +36,7 @@ describe('versionController UI Component', () => { const store = storeCreator(); it('function does exist', () => { - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); var renderedOutput = renderer.getRenderOutput(); diff --git a/openecomp-ui/test/onboard/onboardingCatalog/views.test.js b/openecomp-ui/test/onboard/onboardingCatalog/views.test.js index fedd25b160..9b9a0b7301 100644 --- a/openecomp-ui/test/onboard/onboardingCatalog/views.test.js +++ b/openecomp-ui/test/onboard/onboardingCatalog/views.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {defaultStoreFactory} from 'test-utils/factories/onboard/OnboardingCatalogFactories.js'; import {FinalizedLicenseModelFactory} from 'test-utils/factories/licenseModel/LicenseModelFactories.js'; import {VSPEditorFactory} from 'test-utils/factories/softwareProduct/SoftwareProductEditorFactories.js'; diff --git a/openecomp-ui/test/permissions/permissionsManaager.test.js b/openecomp-ui/test/permissions/permissionsManaager.test.js index 2d880c7ce0..d835276fd1 100644 --- a/openecomp-ui/test/permissions/permissionsManaager.test.js +++ b/openecomp-ui/test/permissions/permissionsManaager.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {UserFactory} from 'test-utils/factories/users/UsersFactories.js'; import {mapStateToProps} from 'sdc-app/onboarding/permissions/PermissionsManager.js'; @@ -107,4 +107,4 @@ describe('Manage Permissions: ', function () { -}); \ No newline at end of file +}); diff --git a/openecomp-ui/test/revisions/revisions.test.js b/openecomp-ui/test/revisions/revisions.test.js index 1b5f35c9db..73650f2635 100644 --- a/openecomp-ui/test/revisions/revisions.test.js +++ b/openecomp-ui/test/revisions/revisions.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {scryRenderedDOMComponentsWithTestId} from 'test-utils/Util.js'; import deepFreeze from 'deep-freeze'; import mockRest from 'test-utils/MockRest.js'; @@ -31,7 +31,7 @@ import {RevisionsPagePropsFactory} from 'test-utils/factories/revisions/Revision import {UserFactory} from 'test-utils/factories/users/UsersFactories.js'; import VersionFactory from 'test-utils/factories/common/VersionFactory.js'; import {screenTypes} from 'sdc-app/onboarding/OnboardingConstants.js'; -import ReactTestUtils from 'react-addons-test-utils'; +import ReactTestUtils from 'react-dom/test-utils'; import {enums} from 'sdc-app/onboarding/OnboardingConstants.js'; const state = {}; diff --git a/openecomp-ui/test/softwareProduct/attachments/SoftwareProductAttachmentsView.test.js b/openecomp-ui/test/softwareProduct/attachments/SoftwareProductAttachmentsView.test.js index 355a3162b1..f610f6d298 100644 --- a/openecomp-ui/test/softwareProduct/attachments/SoftwareProductAttachmentsView.test.js +++ b/openecomp-ui/test/softwareProduct/attachments/SoftwareProductAttachmentsView.test.js @@ -1,21 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; +import TestUtils from 'react-dom/test-utils'; import {VSPAttachmentTreeNodeWithChildrenFactory, VSPAttachmentDetailedError} from 'test-utils/factories/softwareProduct/SoftwareProductAttachmentsFactories.js'; import {defaultStoreFactory} from 'test-utils/factories/onboard/OnboardingCatalogFactories.js'; @@ -68,7 +69,7 @@ describe('SoftwareProduct Attachments - View: ', function () { let data = defaultStoreFactory.build({softwareProduct: {softwareProductAttachments, softwareProductEditor: {data: {...versionControllerData}}}}); var params = mapStateToProps(data); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); var renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); diff --git a/openecomp-ui/test/softwareProduct/attachments/setup/heatSetup.test.js b/openecomp-ui/test/softwareProduct/attachments/setup/heatSetup.test.js index 80e9401f1a..97df10f4aa 100644 --- a/openecomp-ui/test/softwareProduct/attachments/setup/heatSetup.test.js +++ b/openecomp-ui/test/softwareProduct/attachments/setup/heatSetup.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/attachments/setup/HeatSetup.js'; import HeatSetupView from 'sdc-app/onboarding/softwareProduct/attachments/setup/HeatSetupView.jsx'; import {storeCreator} from 'sdc-app/AppStore.js'; diff --git a/openecomp-ui/test/softwareProduct/attachments/validation/HeatValidationView.test.js b/openecomp-ui/test/softwareProduct/attachments/validation/HeatValidationView.test.js index a0a8a42660..8dee07d77b 100644 --- a/openecomp-ui/test/softwareProduct/attachments/validation/HeatValidationView.test.js +++ b/openecomp-ui/test/softwareProduct/attachments/validation/HeatValidationView.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/attachments/validation/HeatValidation.js'; import HeatValidationView from 'sdc-app/onboarding/softwareProduct/attachments/validation/HeatValidationView.jsx'; @@ -165,7 +165,7 @@ describe('SoftwareProductAttachments Modal Mapper and View Classes', () => { var onDeSelect = () => { return null; } ; var onToggle = () => { return null; } ; - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( {} }; - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); var renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); diff --git a/openecomp-ui/test/softwareProduct/components/compute/SoftwareProductComponentsComputes.test.js b/openecomp-ui/test/softwareProduct/components/compute/SoftwareProductComponentsComputes.test.js index 6d2361b20d..f48a19af18 100644 --- a/openecomp-ui/test/softwareProduct/components/compute/SoftwareProductComponentsComputes.test.js +++ b/openecomp-ui/test/softwareProduct/components/compute/SoftwareProductComponentsComputes.test.js @@ -1,22 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import deepFreeze from 'deep-freeze'; import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import {storeCreator} from 'sdc-app/AppStore.js'; import ComputeFlavors from 'sdc-app/onboarding/softwareProduct/components/compute/computeComponents/ComputeFlavors.js'; import {ComputeFlavorBaseData} from 'test-utils/factories/softwareProduct/SoftwareProductComponentsComputeFactory.js'; @@ -32,7 +32,7 @@ describe('Software Product Component ComputeFlavors - View Classes.', () => { const ComputeFlavorsList = ComputeFlavorBaseData.buildList(1); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( { name: '' }; - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( const versionControllerData = VSPComponentsVersionControllerFactory.build(); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( ); let renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); @@ -79,7 +80,7 @@ describe('SoftwareProductComponentsMonitoring Module Tests', function () { expect(results.filenames[trap]).toEqual(monitoring[trap]); expect(results.filenames[ves]).toEqual(monitoring[ves]); - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); let renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); diff --git a/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js b/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js index 78d88b008a..ff0371ab4f 100644 --- a/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js +++ b/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNICEditor.test.js @@ -1,21 +1,22 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; +import TestUtils from 'react-dom/test-utils'; import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/components/network/SoftwareProductComponentsNICEditor.js'; import SoftwareProductComponentsNICEditorView from 'sdc-app/onboarding/softwareProduct/components/network/SoftwareProductComponentsNICEditorView.jsx'; @@ -25,6 +26,7 @@ import {VSPComponentsNicFactory, VSPComponentsNetworkQDataFactory, VSPComponents VSPComponentsNicFactoryGenericFieldInfo, VSPComponentsNetworkDataMapFactory} from 'test-utils/factories/softwareProduct/SoftwareProductComponentsNetworkFactories.js'; import CurrentScreenFactory from 'test-utils/factories/common/CurrentScreenFactory.js'; + describe('Software Product Component Network NIC Editor and View Classes', () => { it('mapStateToProps mapper exists', () => { expect(mapStateToProps).toBeTruthy(); @@ -80,7 +82,7 @@ describe('Software Product Component Network NIC Editor and View Classes', () => protocols: [] }; - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); var renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); diff --git a/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNetwork.test.js b/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNetwork.test.js index d35659c93b..129bd42f23 100644 --- a/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNetwork.test.js +++ b/openecomp-ui/test/softwareProduct/components/network/SoftwareProductComponentsNetwork.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/components/network/SoftwareProductComponentsNetworkList.js'; import SoftwareProductComponentsNetworkListView from 'sdc-app/onboarding/softwareProduct/components/network/SoftwareProductComponentsNetworkListView.jsx'; @@ -71,7 +71,7 @@ describe('Software Product Component Network Mapper and View Classes', () => { const nicList = VSPComponentsNicWithIdFactory.buildList(1); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( { const currentSoftwareProductComponent = VSPComponentsFactory.build(); const processesList = VSPProcessStoreFactory.buildList(2); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( ); @@ -107,7 +107,7 @@ describe('Software Product Creation Module Tests', function() { } }; let props = Object.assign({}, mapStateToProps(state), mapActionsToProps(dispatch)); - let renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( ); diff --git a/openecomp-ui/test/softwareProduct/deployment/SoftwareProductDeploymentEditor.test.js b/openecomp-ui/test/softwareProduct/deployment/SoftwareProductDeploymentEditor.test.js index c355d9d273..79b041cc2d 100644 --- a/openecomp-ui/test/softwareProduct/deployment/SoftwareProductDeploymentEditor.test.js +++ b/openecomp-ui/test/softwareProduct/deployment/SoftwareProductDeploymentEditor.test.js @@ -1,20 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; +import TestUtils from 'react-dom/test-utils'; import { mapStateToProps } from 'sdc-app/onboarding/softwareProduct/deployment/editor/SoftwareProductDeploymentEditor.js'; import SoftwareProductDeploymentEditorView from 'sdc-app/onboarding/softwareProduct/deployment/editor/SoftwareProductDeploymentEditorView.jsx'; import { VSPComponentsFactory } from 'test-utils/factories/softwareProduct/SoftwareProductComponentsFactories.js'; @@ -66,7 +67,7 @@ describe('Software Product Deployment Editor Module Tests', function () { it('jsx view test', () => { const componentsList = VSPComponentsFactory.buildList(1); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( { const deploymentFlavors = VSPDeploymentStoreFactory.buildList(2); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render( { const networksList = VSPNetworkFactory.buildList(2); const versionControllerData = VSPComponentsVersionControllerFactory.build(); - var renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); var renderedOutput = renderer.getRenderOutput(); expect(renderedOutput).toBeTruthy(); diff --git a/openecomp-ui/test/softwareProduct/processes/SoftwareProductEditor.test.js b/openecomp-ui/test/softwareProduct/processes/SoftwareProductEditor.test.js index b4df9bebd9..3ff092d2e8 100644 --- a/openecomp-ui/test/softwareProduct/processes/SoftwareProductEditor.test.js +++ b/openecomp-ui/test/softwareProduct/processes/SoftwareProductEditor.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import TestUtils from 'react-dom/test-utils'; import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesEditor.js'; import SoftwareProductProcessesEditorView from 'sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesEditorView.jsx'; import {VSPEditorFactory} from 'test-utils/factories/softwareProduct/SoftwareProductEditorFactories.js'; diff --git a/openecomp-ui/test/softwareProduct/processes/SoftwareProductProcessesView.test.js b/openecomp-ui/test/softwareProduct/processes/SoftwareProductProcessesView.test.js index 2d7da91cbb..7e8ff903f5 100644 --- a/openecomp-ui/test/softwareProduct/processes/SoftwareProductProcessesView.test.js +++ b/openecomp-ui/test/softwareProduct/processes/SoftwareProductProcessesView.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcesses.js'; import SoftwareProductProcessesView from 'sdc-app/onboarding/softwareProduct/processes/SoftwareProductProcessesView.jsx'; @@ -24,11 +24,11 @@ import {VSPEditorFactory} from 'test-utils/factories/softwareProduct/SoftwarePro import {VSPComponentsVersionControllerFactory} from 'test-utils/factories/softwareProduct/SoftwareProductComponentsNetworkFactories.js'; describe('SoftwareProductProcesses Mapper and View Classes', () => { - it ('mapStateToProps mapper exists', () => { + it ('mapStateToProps mapper exists', () => { expect(mapStateToProps).toBeTruthy(); }); - it ('mapStateToProps data test', () => { + it ('mapStateToProps data test', () => { const currentSoftwareProduct = VSPEditorFactory.build(); const processesList = VSPProcessStoreFactory.buildList(2); @@ -49,19 +49,19 @@ describe('SoftwareProductProcesses Mapper and View Classes', () => { expect(results.processesList).toBeTruthy(); }); - it ('view simple test', () => { - const currentSoftwareProduct = VSPEditorFactory.build(); + it ('view simple test', () => { + const currentSoftwareProduct = VSPEditorFactory.build(); const processesList = VSPProcessStoreFactory.buildList(2); const versionControllerData = VSPComponentsVersionControllerFactory.build(); - - - var renderer = TestUtils.createRenderer(); + + + const renderer = new ShallowRenderer(); renderer.render( {}} onEditProcess={() => {}} onDeleteProcess={() => {}} diff --git a/openecomp-ui/test/versionsPage/VersionsPage.test.js b/openecomp-ui/test/versionsPage/VersionsPage.test.js index 7265ebf0a9..e066b37dfc 100644 --- a/openecomp-ui/test/versionsPage/VersionsPage.test.js +++ b/openecomp-ui/test/versionsPage/VersionsPage.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import deepFreeze from 'deep-freeze'; import mockRest from 'test-utils/MockRest.js'; import Configuration from 'sdc-app/config/Configuration.js'; @@ -72,7 +72,7 @@ describe('Versions Page Module Tests', () => { const additionalProps = VersionsPageAdditionalPropsFactory.build(); const props = Object.assign({}, mapStateToProps(state), mapActionsToProps(dispatch, additionalProps)); - const renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); const renderedOutput = renderer.getRenderOutput(); diff --git a/openecomp-ui/test/versionsPage/creation/VersionsPageCreation.test.js b/openecomp-ui/test/versionsPage/creation/VersionsPageCreation.test.js index d490111178..b6c7b0919a 100644 --- a/openecomp-ui/test/versionsPage/creation/VersionsPageCreation.test.js +++ b/openecomp-ui/test/versionsPage/creation/VersionsPageCreation.test.js @@ -1,21 +1,21 @@ -/*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +/* + * Copyright © 2016-2017 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * + * + * http://www.apache.org/licenses/LICENSE-2.0 + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; -import TestUtils from 'react-addons-test-utils'; +import ShallowRenderer from 'react-test-renderer/shallow'; import {mapStateToProps, mapActionsToProps} from 'sdc-app/onboarding/versionsPage/creation/VersionsPageCreation.js'; import {VERSION_CREATION_FORM_NAME} from 'sdc-app/onboarding/versionsPage/creation/VersionsPageCreationConstants.js'; import VersionsPageCreationActionHelper from 'sdc-app/onboarding/versionsPage/creation/VersionsPageCreationActionHelper.js'; @@ -92,7 +92,7 @@ describe('Versions Page Creation Module Tests', function() { }; const props = Object.assign({}, mapStateToProps(state), mapActionsToProps(dispatch, additionalProps), additionalProps); - const renderer = TestUtils.createRenderer(); + const renderer = new ShallowRenderer(); renderer.render(); const renderedOutput = renderer.getRenderOutput(); @@ -110,4 +110,4 @@ describe('Versions Page Creation Module Tests', function() { }); -}); \ No newline at end of file +}); diff --git a/openecomp-ui/webpack.common.js b/openecomp-ui/webpack.common.js index 68d8923458..36287c8dfa 100644 --- a/openecomp-ui/webpack.common.js +++ b/openecomp-ui/webpack.common.js @@ -9,7 +9,6 @@ try { console.log('Could not find local dev config.'); } let devConfig = Object.assign({}, require('./devConfig.defaults'), localDevConfig); - module.exports = { entry: devConfig.bundles, resolve: { @@ -27,7 +26,6 @@ module.exports = { rules: [ {test: /\.(js|jsx)$/, loader: 'source-map-loader', exclude: [/node_modules/, path.resolve(__dirname, '../dox-sequence-diagram/')], enforce: 'pre'}, {test: /\.(js|jsx)$/, use: [ - {loader : 'react-hot-loader'}, {loader : 'babel-loader'}, {loader : 'eslint-loader'}], exclude: [/node_modules/, path.resolve(__dirname, '../dox-sequence-diagram/')]}, {test: /\.(css|scss)$/, use: [ diff --git a/openecomp-ui/webpack.config.js b/openecomp-ui/webpack.config.js index c723a7a86c..c59e6f4486 100644 --- a/openecomp-ui/webpack.config.js +++ b/openecomp-ui/webpack.config.js @@ -16,6 +16,7 @@ let webpackCommon = require('./webpack.common'); function getEntrySources(sources) { for (let i in sources) { if (sources.hasOwnProperty(i)) { + sources[i].push('react-hot-loader/patch'); sources[i].push('webpack-dev-server/client?http://localhost:' + devPort); sources[i].push('webpack/hot/only-dev-server'); } @@ -36,8 +37,8 @@ let webpackDevConfig = Object.assign({}, webpackCommon, { historyApiFallback: true, publicPath: `http://localhost:${devPort}/onboarding/`, contentBase: path.join(__dirname, 'dist'), - hot: true, inline: true, + hot: true, stats: { colors: true, exclude: ['node_modules'] -- cgit 1.2.3-korg