hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix Pod Container sorting not correlating to visuals (#5175)

Browse Source
This commit is contained in:
Sebastian Malton 2022-08-02 09:44:32 -07:00 committed by GitHub
parent 95ed0dda1b
commit 2b24a42883
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/utils/tuple.ts
View File

@ -24,8 +24,9 @@ type TupleOfImpl<T, N extends number, R extends unknown[]> = R["length"] extends
* @yields A tuple of the next element from each of the sources * @yields A tuple of the next element from each of the sources
* @returns The tuple of all the sources as soon as at least one of the sources is exausted * @returns The tuple of all the sources as soon as at least one of the sources is exausted
*/ */
export function zip<T>(src1: T[]): Iterator<[T], Tuple<T[], 1>>; export function zip<T>(...sources: Tuple<T[], 0>): Iterator<Tuple<T, 0>, Tuple<T[], 0>>;
export function zip<T>(src1: T[], src2: T[]): Iterator<[T, T], Tuple<T[], 2>>; export function zip<T>(...sources: Tuple<T[], 1>): Iterator<Tuple<T, 1>, Tuple<T[], 1>>;
export function zip<T>(...sources: Tuple<T[], 2>): Iterator<Tuple<T, 2>, Tuple<T[], 2>>;
export function* zip<T, N extends number>(...sources: Tuple<T[], N>): Iterator<Tuple<T, N>, Tuple<T[], N>> { export function* zip<T, N extends number>(...sources: Tuple<T[], N>): Iterator<Tuple<T, N>, Tuple<T[], N>> {
const maxSafeLength = Math.min(...sources.map(source => source.length)); const maxSafeLength = Math.min(...sources.map(source => source.length));

2
src/renderer/components/+workloads-pods/pods.tsx
View File

@ -113,7 +113,7 @@ class NonInjectedPods extends React.Component<Dependencies> {
sortingCallbacks={{ sortingCallbacks={{
[columnId.name]: pod => getConvertedParts(pod.getName()), [columnId.name]: pod => getConvertedParts(pod.getName()),
[columnId.namespace]: pod => pod.getNs(), [columnId.namespace]: pod => pod.getNs(),
[columnId.containers]: pod => pod.getContainers().length, [columnId.containers]: pod => pod.getContainerStatuses().length,
[columnId.restarts]: pod => pod.getRestartsCount(), [columnId.restarts]: pod => pod.getRestartsCount(),
[columnId.owners]: pod => pod.getOwnerRefs().map(ref => ref.kind), [columnId.owners]: pod => pod.getOwnerRefs().map(ref => ref.kind),
[columnId.qos]: pod => pod.getQosClass(), [columnId.qos]: pod => pod.getQosClass(),

4
src/renderer/components/table/__tests__/getSorted.test.ts
View File

@ -26,10 +26,10 @@ describe("Table tests", () => {
expect(i).toStrictEqual([1, 2, 4, 3]); expect(i).toStrictEqual([1, 2, 4, 3]);
}); });
it("should sort numerically asc (by defaul) and not touch the original list", () => { it("should sort numerically asc (by default) and not touch the original list", () => {
const i = [1, 2, 4, 3]; const i = [1, 2, 4, 3];
expect(getSorted(i, v => v, "foobar")).toStrictEqual([1, 2, 3, 4]); expect(getSorted(i, v => v)).toStrictEqual([1, 2, 3, 4]);
expect(i).toStrictEqual([1, 2, 4, 3]); expect(i).toStrictEqual([1, 2, 4, 3]);
}); });

5
src/renderer/components/table/sorting.ts
View File

@ -3,15 +3,14 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import type { TableSortCallback } from "./table"; import type { TableOrderBy, TableSortCallback } from "./table";
import { Ordering, rectifyOrdering, sortCompare, tuple } from "../../utils"; import { Ordering, rectifyOrdering, sortCompare, tuple } from "../../utils";
export function getSorted<T>(rawItems: T[], sortingCallback: TableSortCallback<T> | undefined, orderByRaw: string): T[] { export function getSorted<T>(rawItems: T[], sortingCallback: TableSortCallback<T> | undefined, orderBy: TableOrderBy = "asc"): T[] {
if (typeof sortingCallback !== "function") { if (typeof sortingCallback !== "function") {
return rawItems; return rawItems;
} }
const orderBy = orderByRaw === "asc" || orderByRaw === "desc" ? orderByRaw : "asc";
const sortData = rawItems.map((item, index) => ({ const sortData = rawItems.map((item, index) => ({
index, index,
sortBy: sortingCallback(item), sortBy: sortingCallback(item),