From a38f3d6bb17a478d08016e49d6c2a667ac483d4a Mon Sep 17 00:00:00 2001 From: Arul Date: Mon, 15 Jan 2018 11:04:25 -0500 Subject: Introduction of external URLs Introduce external URLs to get AAI UI to show a specific graph Change-Id: Ibc10dab32540f2c8347df1be535e48b88308b9ec Signed-off-by: Arul Issue-ID: AAI-626 --- src/app/tierSupport/TierSupport.jsx | 3 +- src/app/tierSupport/TierSupportReducer.js | 3 + .../LaunchExternalResource.jsx | 70 ++++++++++++++++++++ .../LaunchExternalResourceReducer.js | 76 ++++++++++++++++++++++ .../selectedNodeDetails/SelectedNodeDetails.jsx | 4 +- .../SelectedNodeDetailsReducer.js | 4 +- 6 files changed, 156 insertions(+), 4 deletions(-) create mode 100644 src/app/tierSupport/launchExternalResource/LaunchExternalResource.jsx create mode 100644 src/app/tierSupport/launchExternalResource/LaunchExternalResourceReducer.js (limited to 'src/app/tierSupport') diff --git a/src/app/tierSupport/TierSupport.jsx b/src/app/tierSupport/TierSupport.jsx index c2d1c57..315b6a0 100644 --- a/src/app/tierSupport/TierSupport.jsx +++ b/src/app/tierSupport/TierSupport.jsx @@ -20,6 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ + import React, {Component} from 'react'; import {connect} from 'react-redux'; import SplitPane from 'react-split-pane'; @@ -131,7 +132,7 @@ class TierSupport extends Component { this.props.match.params.viParam) { this.props.onNewVIParam(nextProps.match.params.viParam); } - if(nextProps.match.params.viParam === undefined && nextProps.match.params.viParam !== + if(nextProps.match.params.viParam && nextProps.match.params.viParam !== this.props.match.params.viParam) { this.props.onRequestClearData(); } diff --git a/src/app/tierSupport/TierSupportReducer.js b/src/app/tierSupport/TierSupportReducer.js index 186c4f1..1560427 100644 --- a/src/app/tierSupport/TierSupportReducer.js +++ b/src/app/tierSupport/TierSupportReducer.js @@ -20,6 +20,7 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ + import {combineReducers} from 'redux'; import ForceDirectedGraph from 'generic-components/graph/ForceDirectedGraph.jsx'; import {aaiActionTypes} from 'app/MainScreenWrapperConstants.js'; @@ -28,6 +29,7 @@ import { } from 'app/tierSupport/TierSupportConstants.js'; import SelectedNodeDetailsReducer from 'app/tierSupport/selectedNodeDetails/SelectedNodeDetailsReducer.js'; import GlobalAutoCompleteSearchBarReducer from 'app/globalAutoCompleteSearchBar/GlobalAutoCompleteSearchBarReducer.js'; +import LaunchInContextReducer from 'app/tierSupport/launchExternalResource/LaunchExternalResourceReducer.js'; import { MESSAGE_LEVEL_DANGER, MESSAGE_LEVEL_WARNING } from 'utils/GlobalConstants.js'; @@ -37,6 +39,7 @@ import { export default combineReducers({ selectedNodeDetails: SelectedNodeDetailsReducer, + launchExternalResourceReducer: LaunchInContextReducer, globalAutoCompleteSearchBar: GlobalAutoCompleteSearchBarReducer, tierSupportReducer: (state = {}, action) => { switch (action.type) { diff --git a/src/app/tierSupport/launchExternalResource/LaunchExternalResource.jsx b/src/app/tierSupport/launchExternalResource/LaunchExternalResource.jsx new file mode 100644 index 0000000..095669b --- /dev/null +++ b/src/app/tierSupport/launchExternalResource/LaunchExternalResource.jsx @@ -0,0 +1,70 @@ +/* + * ============LICENSE_START=================================================== + * SPARKY (AAI UI service) + * ============================================================================ + * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 Amdocs + * All rights reserved. + * ============================================================================ + * 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. + * ============LICENSE_END===================================================== + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + */ + +import {connect} from 'react-redux'; +import React, {Component} from 'react'; +import {isEmpty} from 'lodash'; +import Button from 'react-bootstrap/lib/Button.js'; + +let mapStateToProps = ({tierSupport: {launchExternalResourceReducer}}) => { + let {externalResourcePayload = {}} = launchExternalResourceReducer; + + return { + externalResourcePayload + }; +}; + +class LaunchExternalResource extends Component { + static propTypes = { + externalResourcePayload: React.PropTypes.object + }; + + render() { + const {externalResourcePayload} = this.props; + + let launchExternalResourceClass = 'hidden'; + if(!isEmpty(externalResourcePayload) && (externalResourcePayload.message.payload.params.objectName.length > 0)){ + launchExternalResourceClass = ''; + } + + return ( +
+
+ ); + } + handleClick = () => { + var getWindowUrl = function (url) { + var split = url.split('/'); + return split[0] + '//' + split[2]; + }; + if(document.referrer) { + window.parent.postMessage(JSON.stringify(this.props.externalResourcePayload), getWindowUrl(document.referrer)); + } + } +} +export default connect(mapStateToProps)(LaunchExternalResource); diff --git a/src/app/tierSupport/launchExternalResource/LaunchExternalResourceReducer.js b/src/app/tierSupport/launchExternalResource/LaunchExternalResourceReducer.js new file mode 100644 index 0000000..493afaa --- /dev/null +++ b/src/app/tierSupport/launchExternalResource/LaunchExternalResourceReducer.js @@ -0,0 +1,76 @@ +/* + * ============LICENSE_START=================================================== + * SPARKY (AAI UI service) + * ============================================================================ + * Copyright © 2017 AT&T Intellectual Property. + * Copyright © 2017 Amdocs + * All rights reserved. + * ============================================================================ + * 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. + * ============LICENSE_END===================================================== + * + * ECOMP and OpenECOMP are trademarks + * and service marks of AT&T Intellectual Property. + */ + +import {tierSupportActionTypes} from 'app/tierSupport/TierSupportConstants.js'; +import { + globalAutoCompleteSearchBarActionTypes +} from 'app/globalAutoCompleteSearchBar/GlobalAutoCompleteSearchBarConstants.js'; +import {isEmpty} from 'lodash'; + +export default (state = {}, action) => { + switch (action.type) { + case tierSupportActionTypes.TS_NODE_SEARCH_RESULTS: + if(!isEmpty(action.data.nodes)){ + for (const node of action.data.nodes) { + if (node.nodeMeta.searchTarget === true) { + let externalResourcePayload = {}; + if(!isEmpty(node.externalResourcePayload)){ + externalResourcePayload = node.externalResourcePayload; + } + return { + ...state, + externalResourcePayload: externalResourcePayload + }; + } + } + } + return { + ...state, + externalResourcePayload: {} + }; + + case tierSupportActionTypes.TS_GRAPH_NODE_SELECTED: + let externalResourcePayload; + if(action.data.externalResourcePayload){ + externalResourcePayload = action.data.externalResourcePayload; + } else { + externalResourcePayload = {}; + } + return { + ...state, + externalResourcePayload: externalResourcePayload + }; + + case globalAutoCompleteSearchBarActionTypes.SEARCH_WARNING_EVENT: + case tierSupportActionTypes.TIER_SUPPORT_NETWORK_ERROR: + case tierSupportActionTypes.TIER_SUPPORT_CLEAR_DATA: + case tierSupportActionTypes.TS_NODE_SEARCH_NO_RESULTS: + return { + ...state, + externalResourcePayload: {} + }; + } + return state; +}; diff --git a/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetails.jsx b/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetails.jsx index 5ff4104..1dbd71b 100644 --- a/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetails.jsx +++ b/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetails.jsx @@ -20,9 +20,11 @@ * * ECOMP is a trademark and service mark of AT&T Intellectual Property. */ + import {connect} from 'react-redux'; import React, {Component} from 'react'; import Table from 'react-bootstrap/lib/Table'; +import LaunchInContext from 'app/tierSupport/launchExternalResource/LaunchExternalResource.jsx'; import i18n from 'utils/i18n/i18n'; import { SELECTED_NODE_TITLE, @@ -82,7 +84,7 @@ class SelectedNodeDetails extends Component {

{i18n(SELECTED_NODE_TITLE)}

{nodeType}

- {uid} + {uid} diff --git a/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetailsReducer.js b/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetailsReducer.js index d088e73..17eaed1 100644 --- a/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetailsReducer.js +++ b/src/app/tierSupport/selectedNodeDetails/SelectedNodeDetailsReducer.js @@ -40,7 +40,7 @@ export default (state = {}, action) => { } return { ...state, - nodeData: [], + nodeData: {}, nodeType: '', uid: '' }; @@ -60,7 +60,7 @@ export default (state = {}, action) => { case tierSupportActionTypes.TS_NODE_SEARCH_NO_RESULTS: return { ...state, - nodeData: [], + nodeData: {}, nodeType: '', uid: '' }; -- cgit 1.2.3-korg