From 1f04fde82d64861256261f378178fea5e215e3d4 Mon Sep 17 00:00:00 2001 From: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com> Date: Wed, 19 Apr 2023 14:56:29 +0300 Subject: [PATCH] Use ItemObject from list-layout package Signed-off-by: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com> --- packages/core/src/common/item.store.ts | 5 +---- .../core/src/common/k8s-api/endpoints/helm-releases.api.ts | 2 +- packages/core/src/common/k8s-api/kube-object.ts | 2 +- .../core/src/renderer/components/+cluster/cluster-issues.tsx | 2 +- .../src/renderer/components/item-object-list/content.tsx | 2 +- .../core/src/renderer/components/item-object-list/header.tsx | 2 +- .../src/renderer/components/item-object-list/list-layout.tsx | 2 +- .../kube-object-list-layout/kube-object-list-layout.tsx | 3 +-- packages/core/src/renderer/components/table/table.tsx | 2 +- packages/core/src/renderer/port-forward/port-forward-item.ts | 2 +- 10 files changed, 10 insertions(+), 14 deletions(-) diff --git a/packages/core/src/common/item.store.ts b/packages/core/src/common/item.store.ts index 4d7c3343ef..cb9b27ed2e 100644 --- a/packages/core/src/common/item.store.ts +++ b/packages/core/src/common/item.store.ts @@ -3,14 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ +import type { ItemObject } from "@k8slens/list-layout"; import autoBind from "auto-bind"; import orderBy from "lodash/orderBy"; import { action, computed, observable, when, makeObservable } from "mobx"; -export interface ItemObject { - getId(): string; - getName(): string; -} export abstract class ItemStore { protected defaultSorting = (item: Item) => item.getName(); diff --git a/packages/core/src/common/k8s-api/endpoints/helm-releases.api.ts b/packages/core/src/common/k8s-api/endpoints/helm-releases.api.ts index 3460378e59..a5807edb68 100644 --- a/packages/core/src/common/k8s-api/endpoints/helm-releases.api.ts +++ b/packages/core/src/common/k8s-api/endpoints/helm-releases.api.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import type { ItemObject } from "../../item.store"; +import type { ItemObject } from "@k8slens/list-layout"; import type { HelmReleaseDetails } from "./helm-releases.api/request-details.injectable"; export interface HelmReleaseUpdateDetails { diff --git a/packages/core/src/common/k8s-api/kube-object.ts b/packages/core/src/common/k8s-api/kube-object.ts index a45d5c415f..e43633aed6 100644 --- a/packages/core/src/common/k8s-api/kube-object.ts +++ b/packages/core/src/common/k8s-api/kube-object.ts @@ -22,7 +22,7 @@ import { isTypedArray, isRecord, } from "@k8slens/utilities"; -import type { ItemObject } from "../item.store"; +import type { ItemObject } from "@k8slens/list-layout"; import type { Patch } from "rfc6902"; import assert from "assert"; import type { JsonObject } from "type-fest"; diff --git a/packages/core/src/renderer/components/+cluster/cluster-issues.tsx b/packages/core/src/renderer/components/+cluster/cluster-issues.tsx index d338f23f73..1b7fe9c2b6 100644 --- a/packages/core/src/renderer/components/+cluster/cluster-issues.tsx +++ b/packages/core/src/renderer/components/+cluster/cluster-issues.tsx @@ -13,7 +13,7 @@ import { Icon } from "../icon"; import { SubHeader } from "../layout/sub-header"; import { Table, TableCell, TableHead, TableRow } from "../table"; import { cssNames, prevDefault } from "@k8slens/utilities"; -import type { ItemObject } from "../../../common/item.store"; +import type { ItemObject } from "@k8slens/list-layout"; import { Spinner } from "../spinner"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { KubeObjectAge } from "../kube-object/age"; diff --git a/packages/core/src/renderer/components/item-object-list/content.tsx b/packages/core/src/renderer/components/item-object-list/content.tsx index 2b11a97570..279f3f6d4b 100644 --- a/packages/core/src/renderer/components/item-object-list/content.tsx +++ b/packages/core/src/renderer/components/item-object-list/content.tsx @@ -19,7 +19,7 @@ import type { AddRemoveButtonsProps } from "../add-remove-buttons"; import { AddRemoveButtons } from "../add-remove-buttons"; import { NoItems } from "../no-items"; import { Spinner } from "../spinner"; -import type { ItemObject } from "../../../common/item.store"; +import type { ItemObject } from "@k8slens/list-layout"; import type { Filter, PageFiltersStore } from "./page-filters/store"; import type { LensTheme } from "../../themes/lens-theme"; import { MenuActions } from "../menu/menu-actions"; diff --git a/packages/core/src/renderer/components/item-object-list/header.tsx b/packages/core/src/renderer/components/item-object-list/header.tsx index 6da69312f5..b7b9502b7f 100644 --- a/packages/core/src/renderer/components/item-object-list/header.tsx +++ b/packages/core/src/renderer/components/item-object-list/header.tsx @@ -10,7 +10,7 @@ import React from "react"; import { observer } from "mobx-react"; import type { IClassName } from "@k8slens/utilities"; import { cssNames, isDefined } from "@k8slens/utilities"; -import type { ItemObject } from "../../../common/item.store"; +import type { ItemObject } from "@k8slens/list-layout"; import type { Filter } from "./page-filters/store"; import type { HeaderCustomizer, HeaderPlaceholders, ItemListStore, SearchFilter } from "./list-layout"; import { SearchInputUrl } from "../input"; diff --git a/packages/core/src/renderer/components/item-object-list/list-layout.tsx b/packages/core/src/renderer/components/item-object-list/list-layout.tsx index 525558f533..da6ac127e0 100644 --- a/packages/core/src/renderer/components/item-object-list/list-layout.tsx +++ b/packages/core/src/renderer/components/item-object-list/list-layout.tsx @@ -14,7 +14,7 @@ import type { TableCellProps, TableProps, TableRowProps, TableSortCallbacks } fr import type { IClassName, SingleOrMany } from "@k8slens/utilities"; import { cssNames, noop } from "@k8slens/utilities"; import type { AddRemoveButtonsProps } from "../add-remove-buttons"; -import type { ItemObject } from "../../../common/item.store"; +import type { ItemObject } from "@k8slens/list-layout"; import type { SearchInputUrlProps } from "../input"; import type { PageFiltersStore } from "./page-filters/store"; import { FilterType } from "./page-filters/store"; diff --git a/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx b/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx index 0bcd5e6e23..a3806467f2 100644 --- a/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx +++ b/packages/core/src/renderer/components/kube-object-list-layout/kube-object-list-layout.tsx @@ -29,8 +29,7 @@ import type { ToggleKubeDetailsPane } from "../kube-detail-params/toggle-details import kubeSelectedUrlParamInjectable from "../kube-detail-params/kube-selected-url.injectable"; import toggleKubeDetailsPaneInjectable from "../kube-detail-params/toggle-details.injectable"; import type { ClusterContext } from "../../cluster-frame-context/cluster-frame-context"; -import type { KubeObjectListLayoutColumn } from "@k8slens/list-layout"; -import type { ItemObject } from "../../../common/item.store"; +import type { KubeObjectListLayoutColumn, ItemObject } from "@k8slens/list-layout"; import { kubeObjectListLayoutColumnInjectionToken } from "@k8slens/list-layout"; import { sortBy } from "lodash"; diff --git a/packages/core/src/renderer/components/table/table.tsx b/packages/core/src/renderer/components/table/table.tsx index 6930ed4bd3..66eb21d524 100644 --- a/packages/core/src/renderer/components/table/table.tsx +++ b/packages/core/src/renderer/components/table/table.tsx @@ -20,7 +20,7 @@ import { getSorted } from "./sorting"; import type { TableModel } from "./table-model/table-model"; import { withInjectables } from "@ogre-tools/injectable-react"; import tableModelInjectable from "./table-model/table-model.injectable"; -import type { ItemObject } from "../../../common/item.store"; +import type { ItemObject } from "@k8slens/list-layout"; import assert from "assert"; import orderByUrlParamInjectable from "./order-by-url-param.injectable"; import sortByUrlParamInjectable from "./sort-by-url-param.injectable"; diff --git a/packages/core/src/renderer/port-forward/port-forward-item.ts b/packages/core/src/renderer/port-forward/port-forward-item.ts index 0ea56bc4cd..05f8a2f8a2 100644 --- a/packages/core/src/renderer/port-forward/port-forward-item.ts +++ b/packages/core/src/renderer/port-forward/port-forward-item.ts @@ -5,7 +5,7 @@ import autoBind from "auto-bind"; -import type { ItemObject } from "../../common/item.store"; +import type { ItemObject } from "@k8slens/list-layout"; export type ForwardedPortStatus = "Active" | "Disabled"; export interface ForwardedPort {