diff options
Diffstat (limited to 'ui-react/src')
| -rw-r--r-- | ui-react/src/components/dialogs/Policy/PolicyModal.js | 2 | ||||
| -rw-r--r-- | ui-react/src/components/menu/MenuBar.js | 12 | ||||
| -rw-r--r-- | ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap | 21 |
3 files changed, 16 insertions, 19 deletions
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.js b/ui-react/src/components/dialogs/Policy/PolicyModal.js index 634c5ac57..08bc8e0de 100644 --- a/ui-react/src/components/dialogs/Policy/PolicyModal.js +++ b/ui-react/src/components/dialogs/Policy/PolicyModal.js @@ -117,7 +117,7 @@ export default class PolicyModal extends React.Component { display_required_only: false, show_opt_in: true, prompt_before_delete: true, - required_by_default: true + required_by_default: false }) } diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js index 4eafaa448..7cf56570b 100644 --- a/ui-react/src/components/menu/MenuBar.js +++ b/ui-react/src/components/menu/MenuBar.js @@ -85,7 +85,6 @@ export default class MenuBar extends React.Component { render () { return ( - <Navbar.Collapse> <StyledNavDropdown title="Loop Templates"> <NavDropdown.Item as={StyledLink} to="/ViewLoopTemplatesModal">View All Templates</NavDropdown.Item> @@ -93,16 +92,15 @@ export default class MenuBar extends React.Component { <StyledNavDropdown title="Policy Models"> <NavDropdown.Item as={StyledLink} to="/uploadToscaPolicyModal">Upload Tosca Model</NavDropdown.Item> <NavDropdown.Item as={StyledLink} to="/viewToscaPolicyModal">View Tosca Models</NavDropdown.Item> - </StyledNavDropdown> - <StyledNavDropdown title="Dictionaries"> - <NavDropdown.Item as={StyledLink} to="/ManageDictionaries">Manage Dictionaries</NavDropdown.Item> + <NavDropdown.Item as={StyledLink} to="/ManageDictionaries">Manage Metadata Dictionaries</NavDropdown.Item> </StyledNavDropdown> <StyledNavDropdown title="Loop Instance"> <NavDropdown.Item as={StyledLink} to="/createLoop">Create</NavDropdown.Item> - <NavDropdown.Item as={StyledLink} to="/openLoop">Open</NavDropdown.Item> + <NavDropdown.Item as={StyledLink} to="/openLoop">Open</NavDropdown.Item> + <NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item> + <NavDropdown.Item as={StyledLink} to="/modifyLoop" disabled={this.state.disabled}>Modify</NavDropdown.Item> + <NavDropdown.Divider /> <NavDropdown.Item as={StyledLink} to="/loopProperties" disabled={this.state.disabled}>Properties</NavDropdown.Item> - <NavDropdown.Item as={StyledLink} to="/closeLoop" disabled={this.state.disabled}>Close</NavDropdown.Item> - <NavDropdown.Item as={StyledLink} to="/modifyLoop" disabled={this.state.disabled}>Modify</NavDropdown.Item> <NavDropdown.Item as={StyledLink} to="/refreshStatus" disabled={this.state.disabled}>Refresh Status</NavDropdown.Item> </StyledNavDropdown> <StyledNavDropdown title="Loop Operations"> diff --git a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap index 9070e87e9..92444ea3d 100644 --- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap +++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap @@ -162,10 +162,6 @@ exports[`Verify MenuBar Test the render method 1`] = ` > View Tosca Models </DropdownItem> - </Styled(NavDropdown)> - <Styled(NavDropdown) - title="Dictionaries" - > <DropdownItem as={ Object { @@ -215,7 +211,7 @@ exports[`Verify MenuBar Test the render method 1`] = ` disabled={false} to="/ManageDictionaries" > - Manage Dictionaries + Manage Metadata Dictionaries </DropdownItem> </Styled(NavDropdown)> <Styled(NavDropdown) @@ -370,9 +366,9 @@ exports[`Verify MenuBar Test the render method 1`] = ` } } disabled={true} - to="/loopProperties" + to="/closeLoop" > - Properties + Close </DropdownItem> <DropdownItem as={ @@ -421,10 +417,13 @@ exports[`Verify MenuBar Test the render method 1`] = ` } } disabled={true} - to="/closeLoop" + to="/modifyLoop" > - Close + Modify </DropdownItem> + <DropdownDivider + role="separator" + /> <DropdownItem as={ Object { @@ -472,9 +471,9 @@ exports[`Verify MenuBar Test the render method 1`] = ` } } disabled={true} - to="/modifyLoop" + to="/loopProperties" > - Modify + Properties </DropdownItem> <DropdownItem as={ |