diff options
Diffstat (limited to 'ui-react/src')
9 files changed, 12 insertions, 36 deletions
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js index 4642ff52f..b0eef755c 100644 --- a/ui-react/src/api/LoopCache.test.js +++ b/ui-react/src/api/LoopCache.test.js @@ -34,7 +34,6 @@ describe('Verify LoopCache functions', () => { const opPolicy = [{ "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", "configurationsJson": { - "guard_policies": {}, "operational_policy": { "controlLoop": {}, "policies": [] @@ -51,7 +50,6 @@ describe('Verify LoopCache functions', () => { const opPolicy = [{ "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", "configurationsJson": { - "guard_policies": {}, "operational_policy": { "controlLoop": {}, "policies": [] @@ -157,7 +155,7 @@ describe('Verify LoopCache functions', () => { "id": 1, "logType": "INFO", "logComponent": "CLAMP", - "message": "Operational and Guard policies UPDATED", + "message": "Operational policies UPDATED", "logInstant": "2019-07-08T09:44:37Z" } ]; @@ -196,7 +194,6 @@ describe('Verify LoopCache functions', () => { it('updateOperationalPolicyProperties', () => { const newOpPolicy = { - "guard_policies": {}, "operational_policy": { "controlLoop": {}, "policies": [] diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json index 23ea354ea..788306b8e 100644 --- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json +++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json @@ -88,7 +88,6 @@ { "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", "configurationsJson": { - "guard_policies": {}, "operational_policy": { "controlLoop": {}, "policies": [] @@ -113,7 +112,7 @@ "id": 1, "logType": "INFO", "logComponent": "CLAMP", - "message": "Operational and Guard policies UPDATED", + "message": "Operational policies UPDATED", "logInstant": "2019-07-08T09:44:37Z" } ] diff --git a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js index 2af1b7ce4..538688dac 100644 --- a/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js +++ b/ui-react/src/components/dialogs/ManageDictionaries/ManageDictionaries.js @@ -21,7 +21,7 @@ */ -import React from 'react'; +import React, { forwardRef } from 'react'; import Button from 'react-bootstrap/Button'; import Modal from 'react-bootstrap/Modal'; import styled from 'styled-components'; @@ -30,7 +30,6 @@ import MaterialTable, {MTableToolbar} from "material-table"; import IconButton from '@material-ui/core/IconButton'; import Tooltip from '@material-ui/core/Tooltip'; import Grid from '@material-ui/core/Grid'; -import { forwardRef } from 'react'; import AddBox from '@material-ui/icons/AddBox'; import ArrowUpward from '@material-ui/icons/ArrowUpward'; import Check from '@material-ui/icons/Check'; @@ -204,7 +203,7 @@ export default class ManageDictionaries extends React.Component { cellStyle: cellStyle, headerStyle: headerStyle }, - { + { title: "Sub-Dictionary", field: "subDictionary", editComponent: props => ( <div> @@ -214,7 +213,7 @@ export default class ManageDictionaries extends React.Component { cellStyle: cellStyle, headerStyle: headerStyle }, - { + { title: "Updated By", field: "updatedBy", editable: 'never', cellStyle: cellStyle, headerStyle: headerStyle @@ -294,7 +293,7 @@ export default class ManageDictionaries extends React.Component { var dictionaryElements = []; if (event.target.files[0].type === 'text/csv' ) { if (event.target.files && event.target.files[0]) { - let reader = new FileReader(); + const reader = new FileReader(); reader.onload = function(e) { var dictElems = reader.result.split('\n'); var jsonObj = []; @@ -312,7 +311,6 @@ export default class ManageDictionaries extends React.Component { const mandatoryKeys = [ 'Element Short Name', 'Element Name', 'Element Type' ]; const validTypes = ['string','number','datetime','json','map']; if (!dictElems){ - text.setState({validData: false}); } else if (headers.length !== dictKeys.length){ text.setState({validImport: false}); @@ -373,7 +371,7 @@ export default class ManageDictionaries extends React.Component { } } - + render() { return ( <ModalStyled size="xl" show={this.state.show} onHide={this.handleClose} backdrop="static" keyboard={false} > @@ -440,7 +438,7 @@ export default class ManageDictionaries extends React.Component { new Promise((resolve, reject) => { setTimeout(() => { { - let data = this.state.dictionaryNames; + const data = this.state.dictionaryNames; const index = data.indexOf(oldData); data.splice(index, 1); this.setState({ data }, () => resolve()); diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js index c10c6ff0a..4c11ce535 100644 --- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js +++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js @@ -41,7 +41,6 @@ describe('Verify OperationalPolicyModal', () => { "operationalPolicies": [{ "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", "configurationsJson": { - "guard_policies": {}, "operational_policy": { "controlLoop": {}, "policies": [] diff --git a/ui-react/src/components/dialogs/OperationalPolicy/template.json b/ui-react/src/components/dialogs/OperationalPolicy/template.json index 6b4477f88..7c9dc0cdd 100644 --- a/ui-react/src/components/dialogs/OperationalPolicy/template.json +++ b/ui-react/src/components/dialogs/OperationalPolicy/template.json @@ -3,21 +3,6 @@ { "name": "OPERATIONAL_LOOP_NAME", "configurationsJson": { - "guard_policies": { - "guard.minmax.new": { - "recipe": "", - "clname": "LOOP_NAME", - "actor": "", - "targets": "", - "min": "", - "max": "", - "limit": "", - "timeUnits": "", - "timeWindow": "", - "guardActiveStart": "00:00:00Z", - "guardActiveEnd": "00:00:01Z" - } - }, "operational_policy": { "controlLoop": { "trigger_policy": "new", diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js index bf0b91096..d4021c97c 100644 --- a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js +++ b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js @@ -42,7 +42,6 @@ describe('Verify PolicyModal', () => { "operationalPolicies": [{ "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", "configurationsJson": { - "guard_policies": {}, "operational_policy": { "controlLoop": {}, "policies": [] diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js index 5c478f6a5..3b7fd413a 100644 --- a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js +++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js @@ -34,7 +34,7 @@ describe('Verify LoopLogs', () => { "id": 1, "logType": "INFO", "logComponent": "CLAMP", - "message": "Operational and Guard policies UPDATED", + "message": "Operational policies UPDATED", "logInstant": "2019-07-08T09:44:37Z" } ] @@ -51,14 +51,14 @@ describe('Verify LoopLogs', () => { "id": 1, "logType": "INFO", "logComponent": "CLAMP", - "message": "Operational and Guard policies UPDATED", + "message": "Operational policies UPDATED", "logInstant": "2019-07-08T09:44:37Z" }, { "id": 2, "logType": "INFO", "logComponent": "CLAMP", - "message": "Operational and Guard policies UPDATED", + "message": "Operational policies UPDATED", "logInstant": "2019-07-08T09:44:50Z" } ] diff --git a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap index 174a3202b..25736d2e9 100644 --- a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap +++ b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap @@ -51,7 +51,7 @@ exports[`Verify LoopLogs Test the render method 1`] = ` "logComponent": "CLAMP", "logInstant": "2019-07-08T09:44:37Z", "logType": "INFO", - "message": "Operational and Guard policies UPDATED", + "message": "Operational policies UPDATED", } } /> diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js index 17f4b3563..e54b500f5 100644 --- a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js +++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js @@ -39,7 +39,6 @@ describe('Verify LoopSvg', () => { "operationalPolicies": [{ "name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca", "configurationsJson": { - "guard_policies": {}, "operational_policy": { "controlLoop": {}, "policies": [] |