diff options
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools')
4 files changed, 15 insertions, 79 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsActionHelper.js index 181fc11c9d..51f353f7d9 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsActionHelper.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsActionHelper.js @@ -37,7 +37,6 @@ function postEntitlementPool(licenseModelId, entitlementPool, version) { thresholdValue: entitlementPool.thresholdValue, thresholdUnits: getValue(entitlementPool.thresholdUnits), increments: entitlementPool.increments, - operationalScope: getValue(entitlementPool.operationalScope), time: entitlementPool.time, startDate: entitlementPool.startDate, expiryDate: entitlementPool.expiryDate @@ -58,7 +57,6 @@ function putEntitlementPool( thresholdValue: entitlementPool.thresholdValue, thresholdUnits: getValue(entitlementPool.thresholdUnits), increments: entitlementPool.increments, - operationalScope: getValue(entitlementPool.operationalScope), time: entitlementPool.time, startDate: entitlementPool.startDate, expiryDate: entitlementPool.expiryDate diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsConstants.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsConstants.js index e69ff688ab..dbb6b447a9 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsConstants.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsConstants.js @@ -49,7 +49,6 @@ export const defaultState = { ENTITLEMENT_POOLS_EDITOR_DATA: { entitlementMetric: { choice: '', other: '' }, aggregationFunction: { choice: '', other: '' }, - operationalScope: { choices: [], other: '' }, time: { choice: '', other: '' } } }; @@ -60,16 +59,6 @@ export const thresholdUnitType = { }; export const optionsInputValues = { - OPERATIONAL_SCOPE: [ - { enum: '', title: i18n('please select…') }, - { enum: 'Network_Wide', title: 'Network Wide' }, - { enum: 'Availability_Zone', title: 'Availability Zone' }, - { enum: 'Data_Center', title: 'Data Center' }, - { enum: 'Tenant', title: 'Tenant' }, - { enum: 'VM', title: 'VM' }, - { enum: 'CPU', title: 'CPU' }, - { enum: 'Core', title: 'Core' } - ], TIME: [ { enum: '', title: i18n('please select…') }, { enum: 'Hour', title: 'Hour' }, diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorReducer.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorReducer.js index 4556b87129..f773fa1c37 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorReducer.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorReducer.js @@ -61,11 +61,6 @@ export default (state = {}, action) => { errorText: '', validations: [{ type: 'maxLength', data: 120 }] }, - operationalScope: { - isValid: true, - errorText: '', - validations: [] - }, thresholdUnits: { isValid: true, errorText: '', diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx index 350dc0b9f8..c74354c5a4 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsEditorView.jsx @@ -20,13 +20,11 @@ import i18n from 'nfvo-utils/i18n/i18n.js'; import Validator from 'nfvo-utils/Validator.js'; import Input from 'nfvo-components/input/validation/Input.jsx'; -import InputOptions from 'nfvo-components/input/validation/InputOptions.jsx'; import Form from 'nfvo-components/input/validation/Form.jsx'; import Button from 'sdc-ui/lib/react/Button.js'; import GridSection from 'nfvo-components/grid/GridSection.jsx'; import GridItem from 'nfvo-components/grid/GridItem.jsx'; import { - optionsInputValues as EntitlementPoolsOptionsInputValues, SP_ENTITLEMENT_POOL_FORM, tabIds } from './EntitlementPoolsConstants.js'; @@ -36,7 +34,6 @@ import { thresholdValueValidation } from '../LicenseModelValidations.js'; import { DATE_FORMAT } from 'sdc-app/onboarding/OnboardingConstants.js'; -import { other as optionInputOther } from 'nfvo-components/input/validation/InputOptions.jsx'; import Tabs from 'sdc-ui/lib/react/Tabs.js'; import Tab from 'sdc-ui/lib/react/Tab.js'; import EntitlementPoolsLimits from './EntitlementPoolsLimits.js'; @@ -49,10 +46,6 @@ const EntitlementPoolPropType = PropTypes.shape({ id: PropTypes.string, name: PropTypes.string, description: PropTypes.string, - operationalScope: PropTypes.shape({ - choices: PropTypes.array, - other: PropTypes.string - }), thresholdUnits: PropTypes.string, thresholdValue: PropTypes.string, increments: PropTypes.string, @@ -71,7 +64,6 @@ const EntitlementPoolsFormContent = ({ let { name, description, - operationalScope, thresholdUnits, thresholdValue, increments, @@ -97,59 +89,6 @@ const EntitlementPoolsFormContent = ({ /> </GridItem> <GridItem colSpan={2} lastColInRow> - <InputOptions - onInputChange={() => {}} - isMultiSelect={true} - onEnumChange={operationalScope => - onDataChanged( - { - operationalScope: { - choices: operationalScope, - other: '' - } - }, - SP_ENTITLEMENT_POOL_FORM - ) - } - onOtherChange={operationalScope => - onDataChanged( - { - operationalScope: { - choices: [optionInputOther.OTHER], - other: operationalScope - } - }, - SP_ENTITLEMENT_POOL_FORM - ) - } - label={i18n('Operational Scope')} - data-test-id="create-ep-operational-scope" - type="select" - multiSelectedEnum={ - operationalScope && operationalScope.choices - } - otherValue={operationalScope && operationalScope.other} - values={ - EntitlementPoolsOptionsInputValues.OPERATIONAL_SCOPE - } - isValid={genericFieldInfo.operationalScope.isValid} - errorText={genericFieldInfo.operationalScope.errorText} - /> - </GridItem> - <GridItem colSpan={2} stretch> - <Input - onChange={description => - onDataChanged({ description }, SP_ENTITLEMENT_POOL_FORM) - } - isValid={genericFieldInfo.description.isValid} - errorText={genericFieldInfo.description.errorText} - label={i18n('Description')} - value={description} - data-test-id="create-ep-description" - type="textarea" - /> - </GridItem> - <GridItem colSpan={2} lastColInRow> <div className="threshold-section"> <Input onChange={e => { @@ -205,6 +144,21 @@ const EntitlementPoolsFormContent = ({ type="text" /> </div> + </GridItem> + <GridItem colSpan={2} stretch> + <Input + onChange={description => + onDataChanged({ description }, SP_ENTITLEMENT_POOL_FORM) + } + isValid={genericFieldInfo.description.isValid} + errorText={genericFieldInfo.description.errorText} + label={i18n('Description')} + value={description} + data-test-id="create-ep-description" + type="textarea" + /> + </GridItem> + <GridItem colSpan={2} lastColInRow> <Input onChange={increments => onDataChanged({ increments }, SP_ENTITLEMENT_POOL_FORM) |