diff options
author | Arielk <Ariel.Kenan@amdocs.com> | 2018-05-07 13:25:29 +0300 |
---|---|---|
committer | Einav Keidar <einavw@amdocs.com> | 2018-05-23 09:00:43 +0000 |
commit | 134783cf629d515f35df39d1e0a583ecf8ffdc56 (patch) | |
tree | 8cdcea637ebe51a65c931cddab065ee1e5279bc3 /openecomp-ui/src/sdc-app/onboarding/versionsPage | |
parent | 44288aebbfc62466e6e423c5041f5524ffc62d19 (diff) |
sort version lists by version name
Change-Id: I85bd0a8e174d55e0ca6e0f62e2001937474b1450
Issue-ID: SDC-1256
Signed-off-by: Arielk <Ariel.Kenan@amdocs.com>
Diffstat (limited to 'openecomp-ui/src/sdc-app/onboarding/versionsPage')
-rw-r--r-- | openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js | 10 | ||||
-rw-r--r-- | openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx | 14 |
2 files changed, 10 insertions, 14 deletions
diff --git a/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js b/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js index 457d096219..a3c1a8af6c 100644 --- a/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js +++ b/openecomp-ui/src/sdc-app/onboarding/versionsPage/VersionsPage.js @@ -33,15 +33,7 @@ export const mapStateToProps = ({ let { versions = [], selectedVersion } = versionsList; let { owner, contributors, viewers } = permissions; - // sorting the version list - versions.sort((a, b) => { - let statusCompare = b.status.localeCompare(a.status); - if (statusCompare === 0) { - return b.modificationTime - a.modificationTime; - } else { - return statusCompare; - } - }); + versions.sort((a, b) => Number(a.name) > Number(b.name)); const curentSoftwareProduct = softwareProductList.find( item => item.id === itemId ); diff --git a/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx b/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx index d74805eccc..f9d6d57801 100644 --- a/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx +++ b/openecomp-ui/src/sdc-app/onboarding/versionsPage/components/VersionList.jsx @@ -79,11 +79,15 @@ const VersionListItem = ({ className={`version-item-row ${ isHeader ? 'header-row' : 'clickable' } ${isSelected ? 'selected' : ''}`} - onClick={e => { - e.stopPropagation(); - onSelectVersion(); - onNavigateToVersion(); - }}> + onClick={ + isHeader + ? null + : e => { + e.stopPropagation(); + onSelectVersion(); + onNavigateToVersion(); + } + }> <div className={`version-item-field ${ isHeader ? 'header-field item-version' : 'item-version' |