From 80882869b0f8632748397190abbf6147e86abf42 Mon Sep 17 00:00:00 2001 From: "saul.gill" Date: Thu, 3 Jun 2021 18:06:18 +0100 Subject: Added GET Tosca Service Template components Added in header, using existing styling Integrated with existing FE Issue-ID: POLICY-3222 Change-Id: I5b6a9f4be3296b2969baa559a7a48c87d2ab9258 Signed-off-by: saul.gill --- gui-clamp/ui-react/package.json | 37 ++++++---- gui-clamp/ui-react/src/LoopUI.js | 14 ++-- .../ui-react/src/__snapshots__/LoopUI.test.js.snap | 4 + .../src/__snapshots__/OnapClamp.test.js.snap | 4 + gui-clamp/ui-react/src/api/GetToscaTemplate.js | 56 ++++++++++++++ .../src/components/dialogs/ReadAndConvertYaml.js | 85 ++++++++++++++++++++++ gui-clamp/ui-react/src/components/menu/MenuBar.js | 14 ++-- .../menu/__snapshots__/MenuBar.test.js.snap | 69 ++++++++++++++++++ 8 files changed, 252 insertions(+), 31 deletions(-) create mode 100644 gui-clamp/ui-react/src/api/GetToscaTemplate.js create mode 100644 gui-clamp/ui-react/src/components/dialogs/ReadAndConvertYaml.js (limited to 'gui-clamp/ui-react') diff --git a/gui-clamp/ui-react/package.json b/gui-clamp/ui-react/package.json index fd3dc0a..3826255 100644 --- a/gui-clamp/ui-react/package.json +++ b/gui-clamp/ui-react/package.json @@ -25,33 +25,38 @@ "src/theme" ], "dependencies": { - "@json-editor/json-editor": "2.5.2", "@fortawesome/fontawesome-free": "5.15.2", - "react": "17.0.2", - "react-dom": "17.0.2", - "react-scripts": "4.0.3", - "react-bootstrap": "1.5.2", - "bootstrap-css-only": "4.3.1", - "styled-components": "5.2.1", - "react-router-dom": "5.2.0", + "@json-editor/json-editor": "2.5.2", "@material-ui/core": "4.11.3", "@material-ui/icons": "4.11.2", - "@material-ui/pickers": "3.3.10", "@material-ui/lab": "4.0.0-alpha.57", + "@material-ui/pickers": "3.3.10", + "bootstrap-css-only": "4.3.1", + "js-yaml": "4.1.0", + "js-yaml-loader": "1.2.2", "material-table": "1.68.1", - "react-select": "4.2.1" + "react": "17.0.2", + "react-bootstrap": "1.5.2", + "react-dom": "17.0.2", + "react-native-fs": "2.18.0", + "react-router-dom": "5.2.0", + "react-scripts": "4.0.3", + "react-select": "4.2.1", + "react-uuid": "1.0.2", + "styled-components": "5.2.1" }, "devDependencies": { - "jest": "26.6.0", - "babel-jest": "26.6.0", + "@babel/plugin-proposal-class-properties": "7.13.0", "@babel/preset-env": "7.13.10", "@babel/preset-react": "7.12.13", - "@babel/plugin-proposal-class-properties": "7.13.0", - "enzyme": "3.11.0", "@wojtekmaj/enzyme-adapter-react-17": "0.6.1", + "babel-jest": "26.6.0", + "enzyme": "3.11.0", + "enzyme-adapter-react-17-updated": "1.0.2", "enzyme-to-json": "3.6.1", - "jest-fetch-mock": "3.0.3", - "jest-canvas-mock": "2.3.1" + "jest": "26.6.0", + "jest-canvas-mock": "2.3.1", + "jest-fetch-mock": "3.0.3" }, "browserslist": [ ">0.2%", diff --git a/gui-clamp/ui-react/src/LoopUI.js b/gui-clamp/ui-react/src/LoopUI.js index d998762..9461871 100644 --- a/gui-clamp/ui-react/src/LoopUI.js +++ b/gui-clamp/ui-react/src/LoopUI.js @@ -1,26 +1,22 @@ /*- * ============LICENSE_START======================================================= - * ONAP CLAMP - * ================================================================================ - * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2021 Nordix Foundation. * ================================================================================ * 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. - * ============LICENSE_END============================================ - * =================================================================== * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= */ - import React from 'react'; import styled from 'styled-components'; import MenuBar from './components/menu/MenuBar'; @@ -54,6 +50,7 @@ import Alert from 'react-bootstrap/Alert'; import Spinner from 'react-bootstrap/Spinner'; import { Link } from 'react-router-dom'; +import ReadAndConvertYaml from "./components/dialogs/ReadAndConvertYaml"; const StyledMainDiv = styled.div` background-color: ${ props => props.theme.backgroundColor }; @@ -298,6 +295,7 @@ export default class LoopUI extends React.Component { renderRoutes() { return ( + () }/> () }/> () }/> () }/> diff --git a/gui-clamp/ui-react/src/__snapshots__/LoopUI.test.js.snap b/gui-clamp/ui-react/src/__snapshots__/LoopUI.test.js.snap index 322c931..f30a85d 100644 --- a/gui-clamp/ui-react/src/__snapshots__/LoopUI.test.js.snap +++ b/gui-clamp/ui-react/src/__snapshots__/LoopUI.test.js.snap @@ -5,6 +5,10 @@ exports[`Verify LoopUI Test the render method 1`] = ` id="main_div" > + + { + + const [windowLocationPathName, setWindowLocationPathname] = useState(''); + + const getTemplateHandler = async () => { + + setWindowLocationPathname(window.location.pathname); + + const params = { + name: props.templateName, + version: props.templateVersion + } + + const response = await fetch(windowLocationPathName + + '/restservices/clds/v2/toscaControlLoop/getToscaTemplate' + '?' + (new URLSearchParams(params))); + + const data = await response.json(); + + props.onGetToscaServiceTemplate(data); + + } + + return ( + + + + ); + + +} + +export default GetToscaTemplate; diff --git a/gui-clamp/ui-react/src/components/dialogs/ReadAndConvertYaml.js b/gui-clamp/ui-react/src/components/dialogs/ReadAndConvertYaml.js new file mode 100644 index 0000000..03b76b8 --- /dev/null +++ b/gui-clamp/ui-react/src/components/dialogs/ReadAndConvertYaml.js @@ -0,0 +1,85 @@ +/*- + * ============LICENSE_START======================================================= + * Copyright (C) 2021 Nordix Foundation. + * ================================================================================ + * 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. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ +import React, { useState } from "react"; +import GetToscaTemplate from "../../api/GetToscaTemplate"; +import Modal from "react-bootstrap/Modal"; +import Button from "react-bootstrap/Button"; + +import styled from 'styled-components'; + +const ModalStyled = styled(Modal)` + background-color: transparent; +` + +const ErrMsgStyled = styled.div` + color: red; +` + +const PreStyled = styled.pre` + color: #7F0055; + overflow: auto; + max-height: 70vh; +` + +const ReadAndConvertYaml = (props) => { + const [show, setShow] = useState(true); + const [toscaTemplateData, setToscaTemplateData] = useState(); + const name = 'ToscaServiceTemplateSimple'; + const version = '1.0.0'; + + const handleClose = () => { + setShow(false); + props.history.push('/'); + } + + const getToscaServiceTemplateHandler = (toscaServiceTemplate) => { + const toscaData = { + ...toscaServiceTemplate, + id: Math.random().toString() + }; + console.log(toscaData); + setToscaTemplateData(toscaData); + } + + return ( + + + View Tosca Template + + + + { JSON.stringify(toscaTemplateData, null, 2) } + + + + + + ); +} + +export default ReadAndConvertYaml; diff --git a/gui-clamp/ui-react/src/components/menu/MenuBar.js b/gui-clamp/ui-react/src/components/menu/MenuBar.js index 8956c8b..75a56d7 100644 --- a/gui-clamp/ui-react/src/components/menu/MenuBar.js +++ b/gui-clamp/ui-react/src/components/menu/MenuBar.js @@ -1,24 +1,21 @@ /*- * ============LICENSE_START======================================================= - * ONAP POLICY-CLAMP - * ================================================================================ - * Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2021 Nordix Foundation. * ================================================================================ * 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. - * ============LICENSE_END============================================ - * =================================================================== * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= */ import React from 'react'; import Nav from 'react-bootstrap/Nav'; @@ -90,6 +87,9 @@ export default class MenuBar extends React.Component { render() { return ( + + View Tosca Template + View All Policies diff --git a/gui-clamp/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/gui-clamp/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap index 317c5a0..01f692b 100644 --- a/gui-clamp/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap +++ b/gui-clamp/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap @@ -2,6 +2,75 @@ exports[`Verify MenuBar Test the render method 1`] = ` + + + View Tosca Template + + -- cgit 1.2.3-korg