diff options
Diffstat (limited to 'ui-react')
| -rw-r--r-- | ui-react/src/api/LoopCache.js | 6 | ||||
| -rw-r--r-- | ui-react/src/api/LoopCache.test.js | 2 | ||||
| -rw-r--r-- | ui-react/src/api/LoopCache_mokeLoopJsonCache.json | 2 | ||||
| -rw-r--r-- | ui-react/src/components/menu/MenuBar.js | 1 | ||||
| -rw-r--r-- | ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js index b17723089..03cec9fa6 100644 --- a/ui-react/src/api/LoopCache.js +++ b/ui-react/src/api/LoopCache.js @@ -31,7 +31,7 @@ export default class LoopCache { updateMicroServiceProperties(name, newMsProperties) { for (var policy in this.loopJsonCache["microServicePolicies"]) { if (this.loopJsonCache["microServicePolicies"][policy]["name"] === name) { - this.loopJsonCache["microServicePolicies"][policy]["properties"] = newMsProperties; + this.loopJsonCache["microServicePolicies"][policy]["configurationsJson"] = newMsProperties; } } } @@ -91,7 +91,7 @@ export default class LoopCache { getOperationalPolicyPropertiesForName(name) { var opConfig = this.getOperationalPolicyForName(name); if (opConfig !== null) { - return opConfig["properties"]; + return opConfig["configurationsJson"]; } return null; } @@ -118,7 +118,7 @@ export default class LoopCache { getMicroServicePropertiesForName(name) { var msConfig = this.getMicroServiceForName(name); if (msConfig !== null) { - return msConfig["properties"]; + return msConfig["configurationsJson"]; } return null; } diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js index 471fa4d71..97c09fa36 100644 --- a/ui-react/src/api/LoopCache.test.js +++ b/ui-react/src/api/LoopCache.test.js @@ -103,7 +103,7 @@ describe('Verify LoopCache functions', () => { const msJson = { "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca", "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app", - "properties": {"domain": "measurementsForVfScaling"}, + "configurationsJson": {"domain": "measurementsForVfScaling"}, "shared": false, "jsonRepresentation": {"schema": {}} }; diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json index 087ab5d45..23ea354ea 100644 --- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json +++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json @@ -103,7 +103,7 @@ { "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca", "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app", - "properties": {"domain": "measurementsForVfScaling"}, + "configurationsJson": {"domain": "measurementsForVfScaling"}, "shared": false, "jsonRepresentation": {"schema": {}} } diff --git a/ui-react/src/components/menu/MenuBar.js b/ui-react/src/components/menu/MenuBar.js index 2f13cfe32..92380ab6c 100644 --- a/ui-react/src/components/menu/MenuBar.js +++ b/ui-react/src/components/menu/MenuBar.js @@ -107,6 +107,7 @@ export default class MenuBar extends React.Component { <NavDropdown.Item as={StyledLink} to="/stop" disabled={this.state.disabled}>Undeploy from Policy Engine (STOP)</NavDropdown.Item> <NavDropdown.Item as={StyledLink} to="/restart" disabled={this.state.disabled}>ReDeploy to Policy Engine (RESTART)</NavDropdown.Item> <NavDropdown.Item as={StyledLink} to="/delete" disabled={this.state.disabled}>Delete loop instance (DELETE)</NavDropdown.Item> + <NavDropdown.Divider /> <NavDropdown.Item as={StyledLink} to="/deploy" disabled={this.state.disabled}>Deploy to DCAE (DEPLOY)</NavDropdown.Item> <NavDropdown.Item as={StyledLink} to="/undeploy" disabled={this.state.disabled}>UnDeploy to DCAE (UNDEPLOY)</NavDropdown.Item> </StyledNavDropdown> 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 63d3f6543..dfc6a5682 100644 --- a/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap +++ b/ui-react/src/components/menu/__snapshots__/MenuBar.test.js.snap @@ -680,6 +680,9 @@ exports[`Verify MenuBar Test the render method 1`] = ` > Delete loop instance (DELETE) </DropdownItem> + <DropdownDivider + role="separator" + /> <DropdownItem as={ Object { |