From 1898a4d68e874ff058f7179043357a38d17a1a61 Mon Sep 17 00:00:00 2001 From: alexfront Date: Wed, 7 Sep 2022 15:21:23 +0300 Subject: [PATCH] Remove unused code Signed-off-by: alexfront --- src/renderer/components/dock/logs/search.tsx | 6 +--- src/renderer/components/dock/logs/view.tsx | 32 ++------------------ 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/src/renderer/components/dock/logs/search.tsx b/src/renderer/components/dock/logs/search.tsx index 892874c53a..286a626e8d 100644 --- a/src/renderer/components/dock/logs/search.tsx +++ b/src/renderer/components/dock/logs/search.tsx @@ -13,11 +13,10 @@ import type { LogTabViewModel } from "./logs-view-model"; export interface PodLogSearchProps { onSearch?: (query: string) => void; - scrollToOverlay: (lineNumber: number | undefined) => void; model: LogTabViewModel; } -export const LogSearch = observer(({ onSearch, scrollToOverlay, model: { logTabData, searchStore, ...model }}: PodLogSearchProps) => { +export const LogSearch = observer(({ onSearch, model: { logTabData, searchStore, ...model }}: PodLogSearchProps) => { const tabData = logTabData.get(); if (!tabData) { @@ -33,17 +32,14 @@ export const LogSearch = observer(({ onSearch, scrollToOverlay, model: { logTabD const setSearch = (query: string) => { searchStore.onSearch(logs, query); onSearch?.(query); - scrollToOverlay(searchStore.activeOverlayLine); }; const onPrevOverlay = () => { setPrevOverlayActive(); - scrollToOverlay(searchStore.activeOverlayLine); }; const onNextOverlay = () => { setNextOverlayActive(); - scrollToOverlay(searchStore.activeOverlayLine); }; const onClear = () => { diff --git a/src/renderer/components/dock/logs/view.tsx b/src/renderer/components/dock/logs/view.tsx index 19d1b84691..63154653ba 100644 --- a/src/renderer/components/dock/logs/view.tsx +++ b/src/renderer/components/dock/logs/view.tsx @@ -3,12 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import React, { createRef, useEffect } from "react"; +import React, { useEffect } from "react"; import { observer } from "mobx-react"; import { InfoPanel } from "../info-panel"; import { LogResourceSelector } from "./resource-selector"; -import type { LogListRef } from "./list"; -// import { LogList } from "./list"; import { LogSearch } from "./search"; import { LogControls } from "./controls"; import { withInjectables } from "@ogre-tools/injectable-react"; @@ -20,7 +18,6 @@ import type { SubscribeStores } from "../../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../../kube-watch-api/subscribe-stores.injectable"; import type { PodStore } from "../../+workloads-pods/store"; import podStoreInjectable from "../../+workloads-pods/store.injectable"; -import { noop } from "lodash"; import { LogList } from "./log-list"; export interface LogsDockTabProps { @@ -41,7 +38,6 @@ const NonInjectedLogsDockTab = observer(({ subscribeStores, podStore, }: Dependencies & LogsDockTabProps) => { - const logListElement = createRef(); const data = model.logTabData.get(); useEffect(() => { @@ -55,27 +51,6 @@ const NonInjectedLogsDockTab = observer(({ namespaces: data ? [data.namespace] : [], }), [data?.namespace]); - const scrollToOverlay = (overlayLine: number | undefined) => { - if (!logListElement.current || overlayLine === undefined) { - return; - } - - // Scroll vertically - logListElement.current.scrollToItem(overlayLine, "center"); - // Scroll horizontally in timeout since virtual list need some time to prepare its contents - setTimeout(() => { - const overlay = document.querySelector(".PodLogs .list span.active"); - - if (!overlay) return; - // Note: .scrollIntoViewIfNeeded() is non-standard and thus not present in js-dom. - overlay?.scrollIntoViewIfNeeded?.(); - }, 100); - }; - - if (!data) { - return null; - } - return (
- +
)} showSubmitClose={false}