correct release note

[clamp.git] / ui-react / src / components / dialogs / ConfigurationPolicy / ConfigurationPolicyModal.js

diff --git a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
index 8178bf4..3ff1ebe 100644 (file)
--- a/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
+++ b/ui-react/src/components/dialogs/ConfigurationPolicy/ConfigurationPolicyModal.js
@@ -38,7 +38,7 @@ export default class ConfigurationPolicyModal extends React.Component {
                show: true,
                loopCache: this.props.loopCache,
                jsonEditor: null,
-               componentName: "",
+               policyName: this.props.match.params.policyName
        };
 
        constructor(props, context) {
@@ -46,25 +46,26 @@ export default class ConfigurationPolicyModal extends React.Component {
                this.handleClose = this.handleClose.bind(this);
                this.handleSave = this.handleSave.bind(this);
                this.renderJsonEditor = this.renderJsonEditor.bind(this);
-               this.state.componentName = props.match.params.componentName;
        }
 
        handleSave() {
-
                var errors = this.state.jsonEditor.validate();
                var editorData = this.state.jsonEditor.getValue();
 
                if (errors.length !== 0) {
                        console.error("Errors detected during config policy data validation ", errors);
+                       this.setState({ show: false });
+                       this.props.history.push('/');
                }
                else {
                        console.info("NO validation errors found in config policy data");
-                       this.state.loopCache.updateMicroServiceProperties(this.state.componentName, editorData[0]);
-                       LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.componentName));
+                       this.state.loopCache.updateMicroServiceProperties(this.state.policyName, editorData[0]);
+                       LoopService.setMicroServiceProperties(this.state.loopCache.getLoopName(), this.state.loopCache.getMicroServiceForName(this.state.policyName)).then(resp => {
+                               this.setState({ show: false });
+                               this.props.history.push('/');
+                               this.props.loadLoopFunction(this.state.loopCache.getLoopName());
+                       });
                }
-
-               this.setState({ show: false });
-               this.props.history.push('/');
        }
 
        handleClose() {
@@ -77,32 +78,33 @@ export default class ConfigurationPolicyModal extends React.Component {
        }
 
        renderJsonEditor() {
-               console.debug("Rendering ConfigurationPolicyModal ", this.state.componentName);
-               var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.componentName);
+               console.debug("Rendering ConfigurationPolicyModal ", this.state.policyName);
+               var toscaModel = this.state.loopCache.getMicroServiceJsonRepresentationForName(this.state.policyName);
                if (toscaModel == null) {
                        return;
                }
-               var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.componentName);
-
-               JSONEditor.defaults.options.theme = 'bootstrap4';
-               //JSONEditor.defaults.options.iconlib = 'bootstrap2';
-               JSONEditor.defaults.options.object_layout = 'grid';
-               JSONEditor.defaults.options.disable_properties = true;
-               JSONEditor.defaults.options.disable_edit_json = false;
-               JSONEditor.defaults.options.disable_array_reorder = true;
-               JSONEditor.defaults.options.disable_array_delete_last_row = true;
-               JSONEditor.defaults.options.disable_array_delete_all_rows = false;
-               JSONEditor.defaults.options.show_errors = 'always';
+               var editorData = this.state.loopCache.getMicroServicePropertiesForName(this.state.policyName);
 
                this.setState({
                        jsonEditor: new JSONEditor(document.getElementById("editor"),
-                               { schema: toscaModel.schema, startval: editorData })
+                               {
+                                   schema: toscaModel,
+                                   startval: editorData,
+                                   theme: 'bootstrap4',
+                    object_layout: 'grid',
+                    disable_properties: true,
+                    disable_edit_json: false,
+                    disable_array_reorder: true,
+                    disable_array_delete_last_row: true,
+                    disable_array_delete_all_rows: false,
+                    show_errors: 'always'
+                                })
                })
        }
 
        render() {
                return (
-                       <ModalStyled size="lg" show={this.state.show} onHide={this.handleClose}>
+                       <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} >
                                <Modal.Header closeButton>
                                        <Modal.Title>Configuration policies</Modal.Title>
                                </Modal.Header>