From bce898678176acd991d88bd5b6e1f5ebd2083184 Mon Sep 17 00:00:00 2001 From: Arielk Date: Wed, 30 May 2018 14:52:00 +0300 Subject: removed fields from LA EP and LKG Change-Id: I20b9d81721125ac19c2910a36e11290c3fda27bd Issue-ID: SDC-1381 Signed-off-by: Arielk --- openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js | 2 -- openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js | 8 -------- 2 files changed, 10 deletions(-) (limited to 'openecomp-ui/src/sdc-app/common/merge') diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js b/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js index c54b9feb93..50d2a5ba93 100644 --- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js +++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js @@ -26,7 +26,6 @@ import ItemsHelper from '../../common/helpers/ItemsHelper.js'; 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'; @@ -442,7 +441,6 @@ const MergeEditorActionHelper = { getEnumList({ fieldName }) { const enumLists = { licenseTerm: laOptionsValues.LICENSE_MODEL_TYPE, - operationalScope: epOptionsValues.OPERATIONAL_SCOPE, processType: processOptionValues.PROCESS_TYPE, limitType: [ { title: 'Service Provider', enum: 'ServiceProvider' }, diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js b/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js index b82d08683f..bb25a1af06 100644 --- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js +++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorConstants.js @@ -119,10 +119,6 @@ export const dataRules = { referencingFeatureGroups: { rule: rules.SKIP, functionName: 'getFeatureGroups' - }, - operationalScope: { - rule: rules.FUNCTION, - functionName: 'processChoices' } }, [fileTypes.FG]: { @@ -150,10 +146,6 @@ export const dataRules = { } }, [fileTypes.LKG]: { - operationalScope: { - rule: rules.FUNCTION, - functionName: 'processChoices' - }, referencingFeatureGroups: { rule: rules.SKIP, functionName: 'getFeatureGroups' -- cgit 1.2.3-korg