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

Merge branch 'fix-empty-pod-logs-tab-content' into fix-logs-double-scrollbars-bug

Browse Source
This commit is contained in:
Alex Andreev 2023-02-17 11:06:45 +03:00 committed by GitHub
commit ba7ce9f30b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/core/src/renderer/components/dock/logs/logs-view-model.injectable.ts
View File

@ -28,7 +28,7 @@ export interface InstantiateArgs {
const logsViewModelInjectable = getInjectable({ const logsViewModelInjectable = getInjectable({
id: "logs-view-model", id: "logs-view-model",
instantiate: async (di, tabId: TabId) => new LogTabViewModel(tabId, { instantiate: (di, tabId) => new LogTabViewModel(tabId, {
getLogs: di.inject(getLogsInjectable), getLogs: di.inject(getLogsInjectable),
getLogsWithoutTimestamps: di.inject(getLogsWithoutTimestampsInjectable), getLogsWithoutTimestamps: di.inject(getLogsWithoutTimestampsInjectable),
getTimestampSplitLogs: di.inject(getTimestampSplitLogsInjectable), getTimestampSplitLogs: di.inject(getTimestampSplitLogsInjectable),

7
packages/core/src/renderer/components/dock/logs/view.tsx
View File

@ -20,7 +20,6 @@ import type { SubscribeStores } from "../../../kube-watch-api/kube-watch-api";
import subscribeStoresInjectable from "../../../kube-watch-api/subscribe-stores.injectable"; import subscribeStoresInjectable from "../../../kube-watch-api/subscribe-stores.injectable";
import type { PodStore } from "../../+workloads-pods/store"; import type { PodStore } from "../../+workloads-pods/store";
import podStoreInjectable from "../../+workloads-pods/store.injectable"; import podStoreInjectable from "../../+workloads-pods/store.injectable";
import { Spinner } from "../../spinner";
export interface LogsDockTabProps { export interface LogsDockTabProps {
className?: string; className?: string;
@ -100,11 +99,9 @@ const NonInjectedLogsDockTab = observer(({
export const LogsDockTab = withInjectables<Dependencies, LogsDockTabProps>(NonInjectedLogsDockTab, { export const LogsDockTab = withInjectables<Dependencies, LogsDockTabProps>(NonInjectedLogsDockTab, {
getPlaceholder: () => <Spinner center data-testid="pod-logs-tab-content-spinner" />, getProps: (di, props) => ({
getProps: async (di, props) => ({
...props, ...props,
model: await di.inject(logsViewModelInjectable, props.tab.id), model: di.inject(logsViewModelInjectable, props.tab.id),
subscribeStores: di.inject(subscribeStoresInjectable), subscribeStores: di.inject(subscribeStoresInjectable),
podStore: di.inject(podStoreInjectable), podStore: di.inject(podStoreInjectable),
}), }),