directiveModule.directive('ng2InterfaceOperation', downgradeComponent({
component: InterfaceOperationComponent,
- inputs: ['component', 'readonly', 'state'],
+ inputs: ['component', 'readonly'],
outputs: []
}) as angular.IDirectiveFactory);
"License model name must be unique": "License model name must be unique",
"please select…": "please select…",
"Warning": "Warning",
- "Operational Scope": "Operational Scope",
"Threshold Units": "Threshold Units",
"Threshold Value": "Threshold Value",
"Entitlement Metric": "Entitlement Metric",
"This feature group is associated with one ore more license agreements": "This feature group is associated with one ore more license agreements",
"Available Feature Groups": "Available Feature Groups",
"Selected Feature Groups": "Selected Feature Groups",
- "Requirements and Constraints": "Requirements and Constraints",
"License Term": "License Term",
"There is no available feature groups": "There is no available feature groups",
"License Agreement by the name \\": "License Agreement by the name \\",
"EntitlementPool/name" : "Name",
"EntitlementPool/description" : "Description",
"EntitlementPool/referencingFeatureGroups" : "Referencing Feature Groups",
- "EntitlementPool/operationalScope" : "Operational Scope",
"EntitlementPool/thresholdValue" : "Threshold Value",
"EntitlementPool/thresholdUnits" : "Threshold Units",
"EntitlementPool/increments" : "Increments",
"LicenseAgreement/featureGroupsIds" : "Related Feature Groups",
"LicenseAgreement/licenseTerm" : "Term",
"LicenseAgreement/name" : "Name",
- "LicenseAgreement/requirementsAndConstrains" : "Requirements and Constraints",
"LicenseKeyGroup" : "License Key Group",
"LicenseKeyGroup/description" : "Description",
"LicenseKeyGroup/expiryDate" : "Expiry Date",
"LicenseKeyGroup/increments" : "Increments",
"LicenseKeyGroup/name" : "Name",
- "LicenseKeyGroup/operationalScope" : "Operational Scope",
"LicenseKeyGroup/referencingFeatureGroups" : "Referencing Feature Group(s)",
"LicenseKeyGroup/startDate" : "Start Date",
"LicenseKeyGroup/thresholdUnits" : "Threshold Units",
import { modalContentMapper } from 'sdc-app/common/modal/ModalContentMapper.js';
import { actionTypes as modalActionTypes } from 'nfvo-components/modal/GlobalModalConstants.js';
import i18n from 'nfvo-utils/i18n/i18n.js';
-import { optionsInputValues as epOptionsValues } from 'sdc-app/onboarding/licenseModel/entitlementPools/EntitlementPoolsConstants.js';
import { optionsInputValues as laOptionsValues } from 'sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementConstants.js';
import { optionsInputValues as processOptionValues } from 'sdc-app/onboarding/softwareProduct/components/processes/SoftwareProductComponentProcessesConstants.js';
import { selectValues as limitSelectValues } from 'sdc-app/onboarding/licenseModel/limits/LimitEditorConstants.js';
getEnumList({ fieldName }) {
const enumLists = {
licenseTerm: laOptionsValues.LICENSE_MODEL_TYPE,
- operationalScope: epOptionsValues.OPERATIONAL_SCOPE,
processType: processOptionValues.PROCESS_TYPE,
limitType: [
{ title: 'Service Provider', enum: 'ServiceProvider' },
referencingFeatureGroups: {
rule: rules.SKIP,
functionName: 'getFeatureGroups'
- },
- operationalScope: {
- rule: rules.FUNCTION,
- functionName: 'processChoices'
}
},
[fileTypes.FG]: {
}
},
[fileTypes.LKG]: {
- operationalScope: {
- rule: rules.FUNCTION,
- functionName: 'processChoices'
- },
referencingFeatureGroups: {
rule: rules.SKIP,
functionName: 'getFeatureGroups'
thresholdValue: entitlementPool.thresholdValue,
thresholdUnits: getValue(entitlementPool.thresholdUnits),
increments: entitlementPool.increments,
- operationalScope: getValue(entitlementPool.operationalScope),
time: entitlementPool.time,
startDate: entitlementPool.startDate,
expiryDate: entitlementPool.expiryDate
thresholdValue: entitlementPool.thresholdValue,
thresholdUnits: getValue(entitlementPool.thresholdUnits),
increments: entitlementPool.increments,
- operationalScope: getValue(entitlementPool.operationalScope),
time: entitlementPool.time,
startDate: entitlementPool.startDate,
expiryDate: entitlementPool.expiryDate
ENTITLEMENT_POOLS_EDITOR_DATA: {
entitlementMetric: { choice: '', other: '' },
aggregationFunction: { choice: '', other: '' },
- operationalScope: { choices: [], other: '' },
time: { choice: '', other: '' }
}
};
};
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' },
errorText: '',
validations: [{ type: 'maxLength', data: 120 }]
},
- operationalScope: {
- isValid: true,
- errorText: '',
- validations: []
- },
thresholdUnits: {
isValid: true,
errorText: '',
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';
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';
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,
let {
name,
description,
- operationalScope,
thresholdUnits,
thresholdValue,
increments,
type="text"
/>
</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
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)
name: licenseAgreement.name,
description: licenseAgreement.description,
licenseTerm: licenseAgreement.licenseTerm,
- requirementsAndConstrains: licenseAgreement.requirementsAndConstrains,
addedFeatureGroupsIds: licenseAgreement.featureGroupsIds
});
}
name: licenseAgreement.name,
description: licenseAgreement.description,
licenseTerm: licenseAgreement.licenseTerm,
- requirementsAndConstrains:
- licenseAgreement.requirementsAndConstrains,
addedFeatureGroupsIds: featureGroupsIds.filter(
featureGroupId =>
prevFeatureGroupsIds.indexOf(featureGroupId) === -1
LicenseAgreementEnums.SELECTED_LICENSE_AGREEMENT_TAB
.GENERAL
},
- requirementsAndConstrains: {
- isValid: true,
- errorText: '',
- validations: [{ type: 'maxLength', data: 1000 }],
- tabId:
- LicenseAgreementEnums.SELECTED_LICENSE_AGREEMENT_TAB
- .GENERAL
- },
licenseTerm: {
isValid: true,
errorText: '',
id: PropTypes.string,
name: PropTypes.string,
description: PropTypes.string,
- requirementsAndConstrains: PropTypes.string,
licenseTerm: PropTypes.object,
featureGroupsIds: PropTypes.arrayOf(PropTypes.string),
version: PropTypes.object
onDataChanged,
validateName
}) => {
- let { name, description, requirementsAndConstrains, licenseTerm } = data;
+ let { name, description, licenseTerm } = data;
return (
<GridSection hasLastColSet>
<GridItem colSpan={2}>
isRequired={true}
type="text"
/>
- <Input
- isValid={genericFieldInfo.requirementsAndConstrains.isValid}
- errorText={
- genericFieldInfo.requirementsAndConstrains.errorText
- }
- onChange={requirementsAndConstrains =>
- onDataChanged(
- { requirementsAndConstrains },
- LA_EDITOR_FORM
- )
- }
- label={i18n('Requirements and Constraints')}
- value={requirementsAndConstrains}
- data-test-id="create-la-requirements-constants"
- name="license-agreement-requirements-and-constraints"
- type="textarea"
- />
<InputOptions
onInputChange={() => {}}
isMultiSelect={false}
return RestAPIUtil.post(baseUrl(licenseModelId, version), {
name: licenseKeyGroup.name,
description: licenseKeyGroup.description,
- operationalScope: getValue(licenseKeyGroup.operationalScope),
type: licenseKeyGroup.type,
increments: licenseKeyGroup.increments,
thresholdValue: licenseKeyGroup.thresholdValue,
{
name: licenseKeyGroup.name,
description: licenseKeyGroup.description,
- operationalScope: getValue(licenseKeyGroup.operationalScope),
type: licenseKeyGroup.type,
increments: licenseKeyGroup.increments,
thresholdValue: licenseKeyGroup.thresholdValue,
export const defaultState = {
licenseKeyGroupsEditor: {
- type: '',
- operationalScope: { choices: [], other: '' }
+ type: ''
}
};
export const LKG_FORM_NAME = 'LKGFORM';
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' }
- ],
TYPE: [
{ enum: '', title: i18n('please select…') },
{ enum: 'Universal', title: 'Universal' },
: '';
};
-export const getOperationalScopes = operationalScope => {
- if (
- operationalScope.choices.toString() === i18n(optionInputOther.OTHER) &&
- operationalScope.other !== ''
- ) {
- return operationalScope.other;
- } else {
- let allOpScopes = '';
- for (let opScope of operationalScope.choices) {
- allOpScopes +=
- allOpScopes === ''
- ? InputOptions.getTitleByName(optionsInputValues, opScope)
- : `, ${InputOptions.getTitleByName(
- optionsInputValues,
- opScope
- )}`;
- }
- return allOpScopes;
- }
-};
-
export const tabIds = {
GENERAL: 'GENERAL',
SP_LIMITS: 'SP_LIMITS',
errorText: '',
validations: [{ type: 'required', data: true }]
},
- operationalScope: {
- isValid: true,
- errorText: '',
- validations: []
- },
thresholdUnits: {
isValid: true,
errorText: '',
validateStartDate,
thresholdValueValidation
} from '../LicenseModelValidations.js';
-import { other as optionInputOther } from 'nfvo-components/input/validation/InputOptions.jsx';
-import InputOptions from 'nfvo-components/input/validation/InputOptions.jsx';
import { DATE_FORMAT } from 'sdc-app/onboarding/OnboardingConstants.js';
name: PropTypes.string,
description: PropTypes.string,
increments: PropTypes.string,
- operationalScope: PropTypes.shape({
- choices: PropTypes.array,
- other: PropTypes.string
- }),
type: PropTypes.string,
thresholdUnits: PropTypes.string,
thresholdValue: PropTypes.number,
name,
description,
increments,
- operationalScope,
type,
thresholdUnits,
thresholdValue,
type="text"
/>
</GridItem>
- <GridItem colSpan={2} lastColInRow>
- <InputOptions
- onInputChange={() => {}}
- isMultiSelect={true}
- onEnumChange={operationalScope =>
- onDataChanged(
- {
- operationalScope: {
- choices: operationalScope,
- other: ''
- }
- },
- LKG_FORM_NAME
- )
- }
- onOtherChange={operationalScope =>
- onDataChanged(
- {
- operationalScope: {
- choices: [optionInputOther.OTHER],
- other: operationalScope
- }
- },
- LKG_FORM_NAME
- )
- }
- label={i18n('Operational Scope')}
- data-test-id="create-lkg-operational-scope"
- type="select"
- multiSelectedEnum={
- operationalScope && operationalScope.choices
- }
- otherValue={operationalScope && operationalScope.other}
- values={licenseKeyGroupOptionsInputValues.OPERATIONAL_SCOPE}
- isValid={genericFieldInfo.operationalScope.isValid}
- errorText={genericFieldInfo.operationalScope.errorText}
- />
- </GridItem>
- <GridItem colSpan={2}>
- <Input
- onChange={description =>
- onDataChanged({ description }, LKG_FORM_NAME)
- }
- label={i18n('Description')}
- data-test-id="create-lkg-description"
- value={description}
- isValid={genericFieldInfo.description.isValid}
- errorText={genericFieldInfo.description.errorText}
- type="textarea"
- overlayPos="bottom"
- />
- </GridItem>
- <GridItem colSpan={2} lastColInRow>
- <Input
- isRequired={true}
- onChange={e => {
- const selectedIndex = e.target.selectedIndex;
- const val = e.target.options[selectedIndex].value;
- onDataChanged({ type: val }, LKG_FORM_NAME);
- }}
- value={type}
- label={i18n('Type')}
- data-test-id="create-lkg-type"
- isValid={genericFieldInfo.type.isValid}
- errorText={genericFieldInfo.type.errorText}
- groupClassName="bootstrap-input-options"
- className="input-options-select"
- overlayPos="bottom"
- type="select">
- {licenseKeyGroupOptionsInputValues.TYPE.map(type => (
- <option key={type.enum} value={type.enum}>
- {type.title}
- </option>
- ))}
- </Input>
- </GridItem>
<GridItem>
<Input
onChange={e => {
)}
</Input>
</GridItem>
- <GridItem>
+ <GridItem lastColInRow>
<Input
className="entitlement-pools-form-row-threshold-value"
onChange={thresholdValue =>
type="text"
/>
</GridItem>
+ <GridItem colSpan={2}>
+ <Input
+ onChange={description =>
+ onDataChanged({ description }, LKG_FORM_NAME)
+ }
+ label={i18n('Description')}
+ data-test-id="create-lkg-description"
+ value={description}
+ isValid={genericFieldInfo.description.isValid}
+ errorText={genericFieldInfo.description.errorText}
+ type="textarea"
+ overlayPos="bottom"
+ />
+ </GridItem>
+ <GridItem colSpan={2} lastColInRow>
+ <Input
+ onChange={increments =>
+ onDataChanged({ increments }, LKG_FORM_NAME)
+ }
+ label={i18n('Increments')}
+ value={increments}
+ data-test-id="create-ep-increments"
+ type="text"
+ />
+ </GridItem>
+ <GridItem colSpan={2}>
+ <Input
+ isRequired={true}
+ onChange={e => {
+ const selectedIndex = e.target.selectedIndex;
+ const val = e.target.options[selectedIndex].value;
+ onDataChanged({ type: val }, LKG_FORM_NAME);
+ }}
+ value={type}
+ label={i18n('Type')}
+ data-test-id="create-lkg-type"
+ isValid={genericFieldInfo.type.isValid}
+ errorText={genericFieldInfo.type.errorText}
+ groupClassName="bootstrap-input-options"
+ className="input-options-select"
+ overlayPos="bottom"
+ type="select">
+ {licenseKeyGroupOptionsInputValues.TYPE.map(type => (
+ <option key={type.enum} value={type.enum}>
+ {type.title}
+ </option>
+ ))}
+ </Input>
+ </GridItem>
<GridItem>
<Input
type="date"
selectsEnd
/>
</GridItem>
- <GridItem colSpan={2}>
- <Input
- onChange={increments =>
- onDataChanged({ increments }, LKG_FORM_NAME)
- }
- label={i18n('Increments')}
- value={increments}
- data-test-id="create-ep-increments"
- type="text"
- />
- </GridItem>
</GridSection>
);
};
if (localFilter.trim()) {
const filter = new RegExp(escape(localFilter), 'i');
return licenseKeyGroupsList.filter(
- ({
- name = '',
- description = '',
- operationalScope = '',
- type = ''
- }) => {
+ ({ name = '', description = '', type = '' }) => {
return (
escape(name).match(filter) ||
escape(description).match(filter) ||
- escape(this.extractValue(operationalScope)).match(
- filter
- ) ||
escape(type).match(filter)
);
}
}
renderLicenseKeyGroupListItem(licenseKeyGroup, isReadOnlyMode) {
- let { id, name, description, operationalScope, type } = licenseKeyGroup;
+ let { id, name, description, type } = licenseKeyGroup;
let {
onEditLicenseKeyGroupClick,
onDeleteLicenseKeyGroupClick
</div>
<div className="list-editor-item-view-field">
- <div className="title">{i18n('Operational Scope')}</div>
- <div className="text operational-scope">
- {operationalScope &&
- this.getOperationalScopes(operationalScope)}
- </div>
-
<div className="title">{i18n('Type')}</div>
<div className="text type">
{InputOptions.getTitleByName(optionsInputValues, type)}
</div>
</div>
+
<div className="list-editor-item-view-field">
<div className="title">{i18n('Description')}</div>
<div className="text description">{description}</div>
);
}
- getOperationalScopes(operationalScope) {
- if (
- operationalScope.choices &&
- operationalScope.choices.toString() === i18n(optionInputOther.OTHER)
- ) {
- return operationalScope.other;
- } else if (operationalScope.choices) {
- let allOpScopes = '';
- for (let opScope of operationalScope.choices) {
- allOpScopes +=
- allOpScopes === ''
- ? InputOptions.getTitleByName(
- optionsInputValues,
- opScope
- )
- : `, ${InputOptions.getTitleByName(
- optionsInputValues,
- opScope
- )}`;
- }
- return allOpScopes;
- } else {
- return '';
- }
- }
-
extractValue(item) {
if (item === undefined) {
return '';
*/
import React, { Component } from 'react';
import i18n from 'nfvo-utils/i18n/i18n.js';
-import {
- extractValue,
- getOperationalScopes
-} from '../../licenseKeyGroups/LicenseKeyGroupsConstants.js';
+import { extractValue } from '../../licenseKeyGroups/LicenseKeyGroupsConstants.js';
import ArrowCol from './listItemsComponents/ArrowCol.jsx';
import ItemInfo from './listItemsComponents/ItemInfo.jsx';
import IconCol from './listItemsComponents/IconCol.jsx';
class LicenseKeyGroup extends Component {
render() {
- let {
- lkgData: { name, description, operationalScope, type },
- isOrphan
- } = this.props;
+ let { lkgData: { name, description, type }, isOrphan } = this.props;
return (
<div
className={`vlm-list-item vlm-list-item-lkg ${
<IconCol className="lkg-icon" text="LKG" />
<ItemInfo name={name} description={description} />
<AdditionalDataCol>
- {operationalScope &&
- operationalScope.choices && (
- <AdditionalDataElement
- className="vlm-list-item-operational-scope"
- name={i18n('Operational Scope')}
- value={getOperationalScopes(operationalScope)}
- />
- )}
<AdditionalDataElement
className="vlm-list-item-group-type"
name={i18n('Type')}
Factory.define('EntitlementPoolExtendedBaseFactory')
.extend('EntitlementPoolBaseFactory')
.attrs({
- thresholdValue: 75,
+ thresholdValue: 76,
thresholdUnits: '%',
- increments: 'string',
- operationalScope: {'choices': ['Other'], 'other': 'blabla'},
+ increments: 'string',
startDate: (new Date()).getTime(),
expiryDate: (new Date()).getTime()
});
});
Factory.define('LicenseAgreementExtendedBaseFactory')
- .extend('LicenseAgreementBaseFactory')
- .attrs({
- requirementsAndConstrains: 'req_and_constraints_ADDED_LA'
- });
+ .extend('LicenseAgreementBaseFactory');
export const LicenseAgreementListItemFactory = new Factory()
.extend('LicenseAgreementExtendedBaseFactory')
.attrs({
name: 'License Key Group',
description: 'wewe',
- type: 'Unique',
- operationalScope: {
- choices: ['Data_Center']
- }
+ type: 'Unique'
});
export const LicenseKeyGroupListItemFactory = new Factory()
Code Review / sdc.git / commitdiff