diff options
Diffstat (limited to 'ui-react')
4 files changed, 5 insertions, 146 deletions
diff --git a/ui-react/src/api/PolicyToscaService.js b/ui-react/src/api/PolicyToscaService.js index 52e68fac4..610a11418 100644 --- a/ui-react/src/api/PolicyToscaService.js +++ b/ui-react/src/api/PolicyToscaService.js @@ -78,8 +78,8 @@ export default class PolicyToscaService { }); } - static createPolicyModelFromToscaModel(policyModelType, jsonData) { - return fetch('/restservices/clds/v2/policyToscaModels/' + policyModelType, { + static createPolicyModelFromToscaModel(jsonData) { + return fetch('/restservices/clds/v2/policyToscaModels', { method: 'POST', credentials: 'same-origin', headers: { diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js index 2e0460f61..1937485b0 100644 --- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js +++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.js @@ -39,12 +39,10 @@ export default class UploadToscaPolicyModal extends React.Component { this.handleCreateFromToscaPolicyModel = this.handleCreateFromToscaPolicyModel.bind(this); this.handleClose = this.handleClose.bind(this); - this.handlePolicyModelType = this.handlePolicyModelType.bind(this); this.fileSelectedHandler = this.fileSelectedHandler.bind(this); this.state = { show: true, selectedFile: '', - policyModelType: '', policyModelTosca: [], apiResponseStatus: '', apiResponseMessage: '', @@ -56,7 +54,7 @@ export default class UploadToscaPolicyModal extends React.Component { if (event.target.files && event.target.files[0]) { const scope = this; let reader = new FileReader(); - this.setState({policyModelType: '', policyModelTosca: '' }); + this.setState({policyModelTosca: '' }); reader.onload = function(e) { scope.setState({ policyModelTosca: reader.result}); }; @@ -73,9 +71,8 @@ export default class UploadToscaPolicyModal extends React.Component { handleCreateFromToscaPolicyModel(e) { e.preventDefault(); - console.log("Policy Model Type is", this.state.policyModelType); - if(this.state.policyModelType && this.state.policyModelTosca) { - PolicyToscaService.createPolicyModelFromToscaModel(this.state.policyModelType, this.state.policyModelTosca).then(resp => { + if(this.state.policyModelTosca) { + PolicyToscaService.createPolicyModelFromToscaModel(this.state.policyModelTosca).then(resp => { if(resp.status === 200) { this.setState({apiResponseStatus: resp.status, apiResponseMessage: resp.message, upldBtnClicked: true}); } else { @@ -87,12 +84,6 @@ export default class UploadToscaPolicyModal extends React.Component { } } - handlePolicyModelType = event => { - this.setState({ - policyModelType: event.target.value - }) - } - render() { return ( <ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}> @@ -108,11 +99,6 @@ export default class UploadToscaPolicyModal extends React.Component { <Alert variant="secondary"> <p>{this.state.selectedFile.name}</p> </Alert> - <Form.Label column sm="2">Policy Model Type:</Form.Label> - <input type="text" style={{width: '50%'}} - value={this.state.policyModelType} - onChange={this.handlePolicyModelType} - /> </Col> </Form.Group> </Modal.Body> diff --git a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js index dac8ac920..e4842062a 100644 --- a/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js +++ b/ui-react/src/components/dialogs/Tosca/UploadToscaPolicyModal.test.js @@ -27,22 +27,6 @@ import UploadToscaPolicyModal from './UploadToscaPolicyModal'; describe('Test Upload Tosca Policy Model', () => { - it('Test handleMicroServiceName', () => { - - const component = shallow(<UploadToscaPolicyModal />); - - const inputValue = 'TCA' - - const button = component.find('input').at(1); - - button.simulate('change', { target: { value: inputValue }}); - - expect(component.state('policyModelType')).toEqual(inputValue); - - expect(component).toMatchSnapshot(); - - }); - it('Test handleUploadToscaPolicyModel for Tosca Model', () => { const component = shallow(<UploadToscaPolicyModal />); diff --git a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap b/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap deleted file mode 100644 index 8e801367b..000000000 --- a/ui-react/src/components/dialogs/Tosca/__snapshots__/UploadToscaPolicyModal.test.js.snap +++ /dev/null @@ -1,111 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Test Upload Tosca Policy Model Test handleMicroServiceName 1`] = ` -<Styled(Bootstrap(Modal)) - onHide={[Function]} - show={true} - size="lg" -> - <ModalHeader - closeButton={true} - closeLabel="Close" - > - <ModalTitle> - Upload Tosca Model - </ModalTitle> - </ModalHeader> - <ModalBody> - <FormGroup - as={ - Object { - "$$typeof": Symbol(react.forward_ref), - "defaultProps": Object { - "noGutters": false, - }, - "render": [Function], - } - } - controlId="formPlaintextEmail" - > - <Col - sm="10" - > - <input - accept=".yaml" - name="file" - onChange={[Function]} - style={ - Object { - "display": "none", - } - } - type="file" - /> - <button - onClick={[Function]} - > - Pick Tosca File - </button> - <Alert - closeLabel="Close alert" - show={true} - transition={ - Object { - "$$typeof": Symbol(react.forward_ref), - "defaultProps": Object { - "appear": false, - "in": false, - "mountOnEnter": false, - "timeout": 300, - "unmountOnExit": false, - }, - "displayName": "Fade", - "render": [Function], - } - } - variant="secondary" - > - <p /> - </Alert> - <FormLabel - column={true} - sm="2" - srOnly={false} - > - Policy Model Type: - </FormLabel> - <input - onChange={[Function]} - style={ - Object { - "width": "50%", - } - } - type="text" - value="TCA" - /> - </Col> - </FormGroup> - </ModalBody> - <ModalFooter> - <Button - active={false} - disabled={false} - onClick={[Function]} - type="null" - variant="secondary" - > - Cancel - </Button> - <Button - active={false} - disabled={true} - onClick={[Function]} - type="submit" - variant="primary" - > - Create - </Button> - </ModalFooter> -</Styled(Bootstrap(Modal))> -`; |