diff options
8 files changed, 252 insertions, 31 deletions
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 ( <React.Fragment> + <Route path="/readToscaTemplate" render={ (routeProps) => (<ReadAndConvertYaml { ...routeProps } />) }/> <Route path="/viewLoopTemplatesModal" render={ (routeProps) => (<ViewLoopTemplatesModal { ...routeProps } />) }/> <Route path="/manageDictionaries" render={ (routeProps) => (<ManageDictionaries { ...routeProps } />) }/> <Route path="/viewAllPolicies" render={ (routeProps) => (<ViewAllPolicies { ...routeProps } />) }/> 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 @@ -6,6 +6,10 @@ exports[`Verify LoopUI Test the render method 1`] = ` > <Memo(l) /> <Route + path="/readToscaTemplate" + render={[Function]} + /> + <Route path="/viewLoopTemplatesModal" render={[Function]} /> diff --git a/gui-clamp/ui-react/src/__snapshots__/OnapClamp.test.js.snap b/gui-clamp/ui-react/src/__snapshots__/OnapClamp.test.js.snap index 353bc11..9205eed 100644 --- a/gui-clamp/ui-react/src/__snapshots__/OnapClamp.test.js.snap +++ b/gui-clamp/ui-react/src/__snapshots__/OnapClamp.test.js.snap @@ -35,6 +35,10 @@ exports[`Verify OnapClamp Test the render method 1`] = ` > <Memo(l) /> <Route + path="/readToscaTemplate" + render={[Function]} + /> + <Route path="/viewLoopTemplatesModal" render={[Function]} /> diff --git a/gui-clamp/ui-react/src/api/GetToscaTemplate.js b/gui-clamp/ui-react/src/api/GetToscaTemplate.js new file mode 100644 index 0000000..2c29d18 --- /dev/null +++ b/gui-clamp/ui-react/src/api/GetToscaTemplate.js @@ -0,0 +1,56 @@ +/*- + * ============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 Button from "react-bootstrap/Button"; + +const GetToscaTemplate = (props) => { + + 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 ( + <React.Fragment> + <Button variant="primary" + type="submit" + onClick={ getTemplateHandler }>Get Tosca Service Template</Button> + </React.Fragment> + ); + + +} + +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 ( + <ModalStyled size="xl" + show={ show } + onHide={ handleClose } + backdrop="static" + keyboard={ false }> + <Modal.Header closeButton> + <Modal.Title>View Tosca Template</Modal.Title> + </Modal.Header> + <Modal.Body> + <GetToscaTemplate templateName={ name } + templateVersion={ version } + onGetToscaServiceTemplate={ getToscaServiceTemplateHandler }/> + <PreStyled>{ JSON.stringify(toscaTemplateData, null, 2) }</PreStyled> + </Modal.Body> + <Modal.Footer> + <Button variant="secondary" + type="null" + onClick={ handleClose }>Cancel</Button> + </Modal.Footer> + </ModalStyled> + ); +} + +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 ( <Navbar.Collapse> + <StyledNavDropdown title="Tosca"> + <NavDropdown.Item as={ StyledLink } to="/readToscaTemplate">View Tosca Template</NavDropdown.Item> + </StyledNavDropdown> <StyledNavDropdown title="POLICY Framework"> <NavDropdown.Item as={ StyledLink } to="/viewAllPolicies">View All Policies</NavDropdown.Item> </StyledNavDropdown> 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 @@ -3,6 +3,75 @@ exports[`Verify MenuBar Test the render method 1`] = ` <NavbarCollapse> <Styled(NavDropdown) + title="Tosca" + > + <DropdownItem + as={ + Object { + "$$typeof": Symbol(react.forward_ref), + "attrs": Array [], + "componentStyle": e { + "baseHash": 1014106698, + "baseStyle": undefined, + "componentId": "sc-bdfBwQ", + "isStatic": false, + "rules": Array [ + " + color: ", + [Function], + "; + background-color: ", + [Function], + "; + font-weight: normal; + display: block; + width: 100%; + padding: .25rem 1.5rem; + clear: both; + text-align: inherit; + white-space: nowrap; + border: 0; + + :hover { + text-decoration: none; + background-color: ", + [Function], + "; + color: ", + [Function], + "; + } +", + ], + "staticRulesId": "", + }, + "foldedComponentIds": Array [], + "render": [Function], + "shouldForwardProp": undefined, + "styledComponentId": "sc-bdfBwQ", + "target": Object { + "$$typeof": Symbol(react.forward_ref), + "propTypes": Object { + "innerRef": [Function], + "onClick": [Function], + "replace": [Function], + "target": [Function], + "to": [Function], + }, + "render": [Function], + }, + "toString": [Function], + "warnTooManyClasses": [Function], + "withComponent": [Function], + } + } + disabled={false} + to="/readToscaTemplate" + > + View Tosca Template + </DropdownItem> + </Styled(NavDropdown)> + <Styled(NavDropdown) title="POLICY Framework" > <DropdownItem |