From 81f5cab8902c7221013a751c72f3634b429fde29 Mon Sep 17 00:00:00 2001 From: sebdet Date: Wed, 6 Nov 2019 11:40:46 +0100 Subject: Upgrade the libs Upgrade the version of some libraries for NPM so for React UI Issue-ID: CLAMP-544 Change-Id: Ie5238c699a2b441892e6e12f3a6f17640d26b10c Signed-off-by: sebdet --- ui-react/package.json | 10 +- ui-react/src/LoopUI.js | 4 +- ui-react/src/__snapshots__/LoopUI.test.js.snap | 2 +- ui-react/src/__snapshots__/OnapClamp.test.js.snap | 2 +- ui-react/src/api/TemplateMenu.js | 40 ----- ui-react/src/api/TemplateMenuService.js | 40 +++++ .../__snapshots__/OpenLoopModal.test.js.snap | 4 +- .../dialogs/ViewToscaModal/ViewToscaModal.js | 147 ++++++++++++++++++ .../dialogs/ViewToscaModal/ViewToscaModal.test.js | 89 +++++++++++ .../__snapshots__/ViewToscaModal.test.js.snap | 169 +++++++++++++++++++++ .../dialogs/ViewToscaModals/ViewToscaModals.js | 151 ------------------ .../ViewToscaModals/ViewToscaModals.test.js | 89 ----------- .../__snapshots__/ViewToscaModals.test.js.snap | 169 --------------------- ui-react/src/components/menu/MenuBar.js | 2 +- .../menu/__snapshots__/MenuBar.test.js.snap | 50 +++--- 15 files changed, 481 insertions(+), 487 deletions(-) delete mode 100644 ui-react/src/api/TemplateMenu.js create mode 100644 ui-react/src/api/TemplateMenuService.js create mode 100644 ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.js create mode 100644 ui-react/src/components/dialogs/ViewToscaModal/ViewToscaModal.test.js create mode 100644 ui-react/src/components/dialogs/ViewToscaModal/__snapshots__/ViewToscaModal.test.js.snap delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.js delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/ViewToscaModals.test.js delete mode 100644 ui-react/src/components/dialogs/ViewToscaModals/__snapshots__/ViewToscaModals.test.js.snap (limited to 'ui-react') diff --git a/ui-react/package.json b/ui-react/package.json index d876b6c71..2d70e270e 100644 --- a/ui-react/package.json +++ b/ui-react/package.json @@ -30,14 +30,14 @@ "react": "16.9.0", "react-dom": "16.9.0", "react-scripts": "3.1.1", - "react-bootstrap": "1.0.0-beta.12", + "react-bootstrap": "1.0.0-beta.14", "bootstrap-css-only": "4.3.1", "styled-components": "4.3.2", "react-router-dom": "5.0.1", - "@material-ui/core": "4.3.2", - "@material-ui/icons": "4.2.1", - "material-table": "1.48.0", - "react-select": "3.0.4" + "@material-ui/core": "4.6.0", + "@material-ui/icons": "4.5.1", + "material-table": "1.53.0", + "react-select": "3.0.8" }, "devDependencies": { "jest": "24.8.0", diff --git a/ui-react/src/LoopUI.js b/ui-react/src/LoopUI.js index 11808da38..05f466bc6 100644 --- a/ui-react/src/LoopUI.js +++ b/ui-react/src/LoopUI.js @@ -42,7 +42,7 @@ import ConfigurationPolicyModal from './components/dialogs/ConfigurationPolicy/C import LoopProperties from './components/dialogs/LoopProperties'; import UserInfo from './components/dialogs/UserInfo'; import LoopService from './api/LoopService'; -import ViewToscaModals from './components/dialogs/ViewToscaModals/ViewToscaModals'; +import ViewToscaModal from './components/dialogs/ViewToscaModal/ViewToscaModal'; import PerformAction from './components/dialogs/PerformActions'; import RefreshStatus from './components/dialogs/RefreshStatus'; import DeployLoop from './components/dialogs/DeployLoop'; @@ -248,7 +248,7 @@ export default class LoopUI extends React.Component { render() { return ( - ()} /> + ()} /> ()} /> ()} /> diff --git a/ui-react/src/__snapshots__/LoopUI.test.js.snap b/ui-react/src/__snapshots__/LoopUI.test.js.snap index 3c84e9564..ab4ea4999 100644 --- a/ui-react/src/__snapshots__/LoopUI.test.js.snap +++ b/ui-react/src/__snapshots__/LoopUI.test.js.snap @@ -5,7 +5,7 @@ exports[`Verify LoopUI Test the render method 1`] = ` id="main_div" > - + Read Only rowData.tableData.id + 1, + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Micro Service Name", field: "toscaModelName", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "PolicyType", field: "policyType", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Version", field: "version", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Uploaded By", field: "userId", + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + }, + { title: "Uploaded Date", field: "lastUpdatedDate", editable: 'never', + cellStyle: vtmCellStyle, + headerStyle: vtmHeaderStyle + } + ], + tableIcons: { + FirstPage: forwardRef((props, ref) => ), + LastPage: forwardRef((props, ref) => ), + NextPage: forwardRef((props, ref) => ), + PreviousPage: forwardRef((props, ref) => ), + ResetSearch: forwardRef((props, ref) => ), + Search: forwardRef((props, ref) => ), + SortArrow: forwardRef((props, ref) => ) + } + }; + + constructor(props, context) { + super(props, context); + this.handleClose = this.handleClose.bind(this); + this.getToscaModels = this.getToscaModels.bind(this); + this.handleYamlContent = this.handleYamlContent.bind(this); + } + + componentWillMount() { + this.getToscaModels(); + } + + getToscaModels() { + TemplateMenuService.getToscaModels().then(toscaNames => { + this.setState({ toscaNames: toscaNames }); + }); + } + + handleYamlContent(event) { + this.setState({ content: event.target.value }); + } + + handleClose() { + this.setState({ show: false }); + this.props.history.push('/'); + } + + render() { + return ( + + + View Tosca Model + + + {this.setState({content: rowData.toscaModelRevisions[0].toscaModelYaml, selectedRow: rowData.tableData.id})}} + options={{ + headerStyle: vtmRowHeaderStyle, + rowStyle: rowData => ({ + backgroundColor: (this.state.selectedRow !== -1 && this.state.selectedRow === rowData.tableData.id) ? '#EEE' : '#FFF' + }) + }} + /> +
+