ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-04-11 05:10:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Separate out object name checking from the sorting function (#4677)

Browse Source
This commit is contained in:
Khalid Adil 2022-02-09 11:59:56 -06:00 committed by GitHub
parent 22604220de
commit ce98c10145
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/ui/layout/mct-tree.vue
View File

@ -480,32 +480,36 @@ export default {
return scrollTopAmount >= treeStart && scrollTopAmount < treeEnd;
},
sortNameAscending(a, b) {
// sorting tree children items
if (!(a.name && b.name)) {
if (a.object.name.toLowerCase()
> b.object.name.toLowerCase()) {
return 1;
}
if (b.object.name.toLowerCase()
> a.object.name.toLowerCase()) {
return -1;
}
getLowercaseObjectName(domainObject) {
let objectName;
if (!domainObject) {
return objectName;
}
// sorting composition items
if (!a.name || !b.name) {
if (domainObject.name) {
objectName = domainObject.name.toLowerCase();
}
if (domainObject.object && domainObject.object.name) {
objectName = domainObject.object.name.toLowerCase();
}
return objectName;
},
sortNameAscending(a, b) {
// sorting tree children items
let objectAName = this.getLowercaseObjectName(a);
let objectBName = this.getLowercaseObjectName(b);
if (!objectAName || !objectBName) {
return 0;
}
if (a.name.toLowerCase()
> b.name.toLowerCase()) {
// sorting composition items
if (objectAName > objectBName) {
return 1;
}
if (b.name.toLowerCase()
> a.name.toLowerCase()) {
if (objectBName > objectAName) {
return -1;
}