From cad1388b30f47ece3e9d26790d7af371ef7e6d4b Mon Sep 17 00:00:00 2001 From: svishnev Date: Thu, 18 Oct 2018 18:23:00 +0300 Subject: dual list sort fix Issue-ID: SDC-1852 Change-Id: Ia5e0fa01fee267f909d42afae324d2eabcd67095 Signed-off-by: svishnev --- .../input/dualListbox/DualListboxView.jsx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx b/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx index 7ab4c8242c..f36d999249 100644 --- a/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx +++ b/openecomp-ui/src/nfvo-components/input/dualListbox/DualListboxView.jsx @@ -1,17 +1,17 @@ -/*! - * 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. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express - * or implied. See the License for the specific language governing - * permissions and limitations under the License. + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ import React from 'react'; import PropTypes from 'prop-types'; @@ -57,6 +57,7 @@ class DualListboxView extends React.Component { filterTitle, isReadOnlyMode } = this.props; + let { availableListFilter, selectedValuesListFilter } = this.state; let unselectedList = availableList.filter( @@ -67,9 +68,7 @@ class DualListboxView extends React.Component { selectedValuesList.find(value => value === availableItem.id) ); selectedList = selectedList.sort( - (a, b) => - selectedValuesList.indexOf(a.id) - - selectedValuesList.indexOf(b.id) + (a, b) => availableList.indexOf(a.id) - availableList.indexOf(b.id) ); return (
-- cgit 1.2.3-korg