Use only labels to sort application node children

dgolovin · dgolovin · commit 914b1b74f33c · 2021-07-12T20:42:37.000-07:00
This PR fixes #2202. Signed-off-by: Denis Golovin dgolovin@redhat.com
diff --git a/src/odo.ts b/src/odo.ts
@@ -67,12 +67,7 @@ export enum ContextType {
 }
 
 function compareNodes(a: OpenShiftObject, b: OpenShiftObject): number {
-    if (!a.contextValue) return -1;
-    if (!b.contextValue) return 1;
-    const acontext = a.contextValue.includes('_') ? a.contextValue.substr(0, a.contextValue.indexOf('_')) : a.contextValue;
-    const bcontext = b.contextValue.includes('_') ? b.contextValue.substr(0, b.contextValue.indexOf('_')) : b.contextValue;
-    const t = acontext.localeCompare(bcontext);
-    return t || a.label.localeCompare(b.label);
+    return a.label.localeCompare(b.label);
 }
 
 function insert(array: OpenShiftObject[], item: OpenShiftObject): OpenShiftObject {

Original file line number	Diff line number	Diff line change
`@@ -67,12 +67,7 @@ export enum ContextType {`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`function compareNodes(a: OpenShiftObject, b: OpenShiftObject): number {`
`70`		`- if (!a.contextValue) return -1;`
`71`		`- if (!b.contextValue) return 1;`
`72`		`- const acontext = a.contextValue.includes('_') ? a.contextValue.substr(0, a.contextValue.indexOf('_')) : a.contextValue;`
`73`		`- const bcontext = b.contextValue.includes('_') ? b.contextValue.substr(0, b.contextValue.indexOf('_')) : b.contextValue;`
`74`		`- const t = acontext.localeCompare(bcontext);`
`75`		`- return t \|\| a.label.localeCompare(b.label);`
	`70`	`+ return a.label.localeCompare(b.label);`
`76`	`71`	`}`
`77`	`72`
`78`	`73`	`function insert(array: OpenShiftObject[], item: OpenShiftObject): OpenShiftObject {`