From e7fffedb147defbc3c70329e994ca37519db2b3b Mon Sep 17 00:00:00 2001 From: svishnev Date: Sun, 14 Oct 2018 14:10:54 +0300 Subject: EP & LKG sorting fix Issue-ID: SDC-1833 Change-Id: Iffca952f923188983e79ecf45d3d9acab079ecf7 Signed-off-by: svishnev --- .../licenseModel/featureGroups/FeatureGroupEditor.js | 15 +++++++++++---- .../licenseAgreement/LicenseAgreementEditor.js | 10 +++++++--- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditor.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditor.js index 997a6e09ed..c002d06c07 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditor.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/featureGroups/FeatureGroupEditor.js @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2018 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,11 @@ * permissions and limitations under the License. */ import { connect } from 'react-redux'; - +import sortByStringProperty from 'nfvo-utils/sortByStringProperty.js'; import FeatureGroupsActionHelper from './FeatureGroupsActionHelper.js'; import FeatureGroupEditorView from './FeatureGroupEditorView.jsx'; import ValidationHelper from 'sdc-app/common/helpers/ValidationHelper.js'; +import { SORTING_PROPERTY_NAME } from 'sdc-app/onboarding/licenseModel/LicenseModelConstants.js'; export const mapStateToProps = ({ licenseModel: { featureGroup, entitlementPool, licenseKeyGroup } @@ -58,8 +59,14 @@ export const mapStateToProps = ({ data, previousData, selectedTab, - entitlementPoolsList, - licenseKeyGroupsList, + entitlementPoolsList: sortByStringProperty( + entitlementPoolsList, + SORTING_PROPERTY_NAME + ), + licenseKeyGroupsList: sortByStringProperty( + licenseKeyGroupsList, + SORTING_PROPERTY_NAME + ), isFormValid, formReady, genericFieldInfo, diff --git a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditor.js b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditor.js index 735531a175..c9d3e4c136 100644 --- a/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditor.js +++ b/openecomp-ui/src/sdc-app/onboarding/licenseModel/licenseAgreement/LicenseAgreementEditor.js @@ -1,5 +1,5 @@ /*! - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * Copyright © 2016-2018 European Support Limited * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,10 +14,11 @@ * permissions and limitations under the License. */ import { connect } from 'react-redux'; +import sortByStringProperty from 'nfvo-utils/sortByStringProperty.js'; import LicenseAgreementActionHelper from './LicenseAgreementActionHelper.js'; import LicenseAgreementEditorView from './LicenseAgreementEditorView.jsx'; import ValidationHelper from 'sdc-app/common/helpers/ValidationHelper.js'; - +import { SORTING_PROPERTY_NAME } from 'sdc-app/onboarding/licenseModel/LicenseModelConstants.js'; export const mapStateToProps = ({ licenseModel: { licenseAgreement, featureGroup } }) => { @@ -60,7 +61,10 @@ export const mapStateToProps = ({ data, previousData, selectedTab, - featureGroupsList, + featureGroupsList: sortByStringProperty( + featureGroupsList, + SORTING_PROPERTY_NAME + ), LANames, genericFieldInfo, isFormValid, -- cgit 1.2.3-korg