From 82775724cf35060294388f84d2e7d2b0671ee838 Mon Sep 17 00:00:00 2001 From: sebdet Date: Mon, 16 Mar 2020 07:07:18 -0700 Subject: Fix the legacy Guard UI Fix the legacy policies UI because guard content can't be set in PolicyModal component. It was due to Jsoneditor bugged parameter Issue-ID: CLAMP-780 Signed-off-by: sebdet Change-Id: I8070d8c57e48c9a386e19475f1d377f91104aef1 Signed-off-by: sebdet --- .../ManageDictionaries/ManageDictionaries.js | 1 - .../src/components/dialogs/Policy/PolicyModal.js | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) (limited to 'ui-react/src') diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js index 18952376..d8065ede 100644 --- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js +++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js @@ -236,7 +236,6 @@ export default class ManageDictionaries extends React.Component { TemplateMenuService.getDictionary().then(dictionaryNames => { this.setState({ dictionaryNames: dictionaryNames }) }); - var dictNamesingetDict = this.state.dictionaryNames; } getDictionaryElements(dictionaryName) { diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js index 7151725c..0f41beb0 100644 --- a/ui-react/src/components/dialogs/Policy/PolicyModal.js +++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js @@ -102,10 +102,25 @@ export default class PolicyModal extends React.Component { } createJsonEditor(toscaModel, editorData) { + JSONEditor.defaults.themes.myBootstrap4 = JSONEditor.defaults.themes.bootstrap4.extend({ + getTab: function(text,tabId) { + var liel = document.createElement('li'); + liel.classList.add('nav-item'); + var ael = document.createElement("a"); + ael.classList.add("nav-link"); + ael.setAttribute("style",'padding:10px;max-width:160px;'); + ael.setAttribute("href", "#" + tabId); + ael.setAttribute('data-toggle', 'tab'); + text.setAttribute("style",'word-wrap:break-word;'); + ael.appendChild(text); + liel.appendChild(ael); + return liel; + } + }); return new JSONEditor(document.getElementById("editor"), { schema: toscaModel, startval: editorData, - theme: 'bootstrap4', + theme: 'myBootstrap4', object_layout: 'grid', disable_properties: true, disable_edit_json: false, @@ -117,10 +132,9 @@ export default class PolicyModal extends React.Component { collapsed:true, show_errors: 'always', display_required_only: false, - show_opt_in: true, + show_opt_in: false, prompt_before_delete: true, - required_by_default: false, - array_controls_top: true + required_by_default: false }) } -- cgit 1.2.3-korg