{ + params?: P; + query?: Q; +} + +export function buildURL
(path: string | any) {
+ const pathBuilder = compile(String(path));
+ return function ({ params, query }: IURLParams {lb} {route} {
- params?: P;
- query?: IQueryParams & Q;
-}
-
-// todo: extract building urls to commons (also used in menu.ts)
-// fixme: missing types validation for params & query
-export function buildURL (path: string | string[]) {
- const pathBuilder = compile(path.toString());
- return function ({ params, query }: IURLParams
+
+ {_i18n._(t`Reason`)}: {status.lastState.terminated.reason} - {_i18n._(t`exit code`)}: {status.lastState.terminated.exitCode}
+ {_i18n._(t`Started at`)}: {status.lastState.terminated.startedAt}
+ {_i18n._(t`Finished at`)}: {status.lastState.terminated.finishedAt}
+
+ )
+ }
+ }
+
render() {
const { pod, container, metrics } = this.props
if (!pod || !container) return null
const { name, image, imagePullPolicy, ports, volumeMounts, command, args } = container
const status = pod.getContainerStatuses().find(status => status.name === container.name)
const state = status ? Object.keys(status.state)[0] : ""
+ const lastState = status ? Object.keys(status.lastState)[0] : ""
const ready = status ? status.ready : ""
const liveness = pod.getLivenessProbe(container)
const readiness = pod.getReadinessProbe(container)
@@ -48,10 +73,12 @@ export class PodDetailsContainer extends React.Component
)
}
diff --git a/src/renderer/components/cluster-manager/cluster-view.route.ts b/src/renderer/components/cluster-manager/cluster-view.route.ts
index 82e99497d5..bb66f56005 100644
--- a/src/renderer/components/cluster-manager/cluster-view.route.ts
+++ b/src/renderer/components/cluster-manager/cluster-view.route.ts
@@ -1,8 +1,5 @@
-import { reaction } from "mobx";
-import { ipcRenderer } from "electron";
-import { matchPath, RouteProps } from "react-router";
-import { buildURL, navigation } from "../../navigation";
-import { clusterStore } from "../../../common/cluster-store";
+import type { RouteProps } from "react-router";
+import { buildURL } from "../../../common/utils/buildUrl";
export interface IClusterViewRouteParams {
clusterId: string;
@@ -14,33 +11,3 @@ export const clusterViewRoute: RouteProps = {
}
export const clusterViewURL = buildURL
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index 46d10a37ac..8e2db6ceaa 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -1,8 +1,9 @@
-import type { Cluster } from "../../../main/cluster";
import "./clusters-menu.scss"
-import { remote } from "electron"
import React from "react";
+import { remote } from "electron"
+import type { Cluster } from "../../../main/cluster";
+import { DragDropContext, Draggable, DraggableProvided, Droppable, DroppableProvided, DropResult } from "react-beautiful-dnd";
import { observer } from "mobx-react";
import { _i18n } from "../../i18n";
import { t, Trans } from "@lingui/macro";
@@ -21,7 +22,6 @@ import { Tooltip } from "../tooltip";
import { ConfirmDialog } from "../confirm-dialog";
import { clusterIpc } from "../../../common/cluster-ipc";
import { clusterViewURL } from "./cluster-view.route";
-import { DragDropContext, Draggable, DraggableProvided, Droppable, DroppableProvided, DropResult } from "react-beautiful-dnd";
import { globalPageRegistry } from "../../../extensions/registries/page-registry";
interface Props {
@@ -31,13 +31,11 @@ interface Props {
@observer
export class ClustersMenu extends React.Component
+ {({ innerRef, droppableProps, placeholder }: DroppableProvided) => (
+
{clusters.map((cluster, index) => {
const isActive = cluster.id === clusterStore.activeClusterId;
return (
+ {({ draggableProps, dragHandleProps, innerRef }: DraggableProvided) => (
+
)}
@@ -150,16 +140,14 @@ export class ClustersMenu extends React.Component
)}
- )}
- )}
- {provided.placeholder}
+ )
+ })}
+ {placeholder}
{globalPageRegistry.getItems().map(({ path, url = String(path), hideInMenu, components: { MenuIcon } }) => {
- if (!MenuIcon || hideInMenu) {
- return;
- }
+ if (!MenuIcon || hideInMenu) return;
return
diff --git a/src/renderer/components/cluster-manager/lens-views.ts b/src/renderer/components/cluster-manager/lens-views.ts
index d23bdd6072..48c3578a0e 100644
--- a/src/renderer/components/cluster-manager/lens-views.ts
+++ b/src/renderer/components/cluster-manager/lens-views.ts
@@ -1,6 +1,6 @@
import { observable, when } from "mobx";
import { ClusterId, clusterStore, getClusterFrameUrl } from "../../../common/cluster-store";
-import { getMatchedCluster } from "./cluster-view.route"
+import { getMatchedClusterId } from "../../navigation";
import logger from "../../../main/logger";
export interface LensView {
@@ -51,7 +51,7 @@ export async function autoCleanOnRemove(clusterId: ClusterId, iframe: HTMLIFrame
}
export function refreshViews() {
- const cluster = getMatchedCluster();
+ const cluster = clusterStore.getById(getMatchedClusterId());
lensViews.forEach(({ clusterId, view, isLoaded }) => {
const isCurrent = clusterId === cluster?.id;
const isReady = cluster?.available && cluster?.ready;
diff --git a/src/renderer/components/dock/pod-log-controls.tsx b/src/renderer/components/dock/pod-log-controls.tsx
new file mode 100644
index 0000000000..d3ba81e7ab
--- /dev/null
+++ b/src/renderer/components/dock/pod-log-controls.tsx
@@ -0,0 +1,116 @@
+import React from "react";
+import { observer } from "mobx-react";
+import { IPodLogsData, podLogsStore } from "./pod-logs.store";
+import { t, Trans } from "@lingui/macro";
+import { Select, SelectOption } from "../select";
+import { Badge } from "../badge";
+import { Icon } from "../icon";
+import { _i18n } from "../../i18n";
+import { cssNames, downloadFile } from "../../utils";
+import { Pod } from "../../api/endpoints";
+
+interface Props {
+ ready: boolean
+ tabId: string
+ tabData: IPodLogsData
+ logs: string[][]
+ save: (data: Partial
+
+ );
+});
\ No newline at end of file
diff --git a/src/renderer/components/dock/pod-logs.scss b/src/renderer/components/dock/pod-logs.scss
index 73c6f523fb..2ea1d1bff1 100644
--- a/src/renderer/components/dock/pod-logs.scss
+++ b/src/renderer/components/dock/pod-logs.scss
@@ -27,7 +27,7 @@
display: block;
height: 0;
border-top: 1px solid $primary;
- margin: $margin * 2;
+ margin: $margin * 2 0;
&:after {
position: absolute;
@@ -40,4 +40,21 @@
border-radius: $radius;
}
}
+
+ .jump-to-bottom {
+ position: absolute;
+ right: 30px;
+ padding: $unit / 2 $unit * 1.5;
+ border-radius: $unit * 2;
+ opacity: 0;
+ transition: opacity 0.2s;
+
+ &.active {
+ opacity: 1;
+ }
+
+ .Icon {
+ --size: $unit * 2;
+ }
+ }
}
\ No newline at end of file
diff --git a/src/renderer/components/dock/pod-logs.store.ts b/src/renderer/components/dock/pod-logs.store.ts
index fa1da38c68..8a4e0a90e9 100644
--- a/src/renderer/components/dock/pod-logs.store.ts
+++ b/src/renderer/components/dock/pod-logs.store.ts
@@ -1,10 +1,11 @@
-import { autorun, observable } from "mobx";
-import { Pod, IPodContainer, podsApi } from "../../api/endpoints";
+import { autorun, computed, observable, reaction } from "mobx";
+import { Pod, IPodContainer, podsApi, IPodLogsQuery } from "../../api/endpoints";
import { autobind, interval } from "../../utils";
import { DockTabStore } from "./dock-tab.store";
import { dockStore, IDockTab, TabKind } from "./dock.store";
import { t } from "@lingui/macro";
import { _i18n } from "../../i18n";
+import { isDevelopment } from "../../../common/vars";
export interface IPodLogsData {
pod: Pod;
@@ -12,22 +13,25 @@ export interface IPodLogsData {
containers: IPodContainer[]
initContainers: IPodContainer[]
showTimestamps: boolean
- tailLines: number
previous: boolean
}
type TabId = string;
+type PodLogLine = string;
-interface PodLogs {
- oldLogs?: string
- newLogs?: string
-}
+// Number for log lines to load
+export const logRange = isDevelopment ? 100 : 1000;
@autobind()
export class PodLogsStore extends DockTabStore
+ {since && (
+ <>
+
+
+
+
-
+
);
}
renderLogs() {
+ const [oldLogs, newLogs] = this.logs;
if (!this.ready) {
return
- {timestamps && (
- <>
-
-
-
-
+
+ )}
+
+ {newLogs.length > 0 && (
<>
-
-
+
+
)}
@@ -229,15 +193,26 @@ export class PodLogs extends React.Component
diff --git a/src/renderer/components/icon/logo-full.svg b/src/renderer/components/icon/logo-lens.svg
similarity index 100%
rename from src/renderer/components/icon/logo-full.svg
rename to src/renderer/components/icon/logo-lens.svg
diff --git a/src/renderer/components/icon/logo.svg b/src/renderer/components/icon/logo.svg
deleted file mode 100644
index 6b05f1ba17..0000000000
--- a/src/renderer/components/icon/logo.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-
\ No newline at end of file
diff --git a/src/renderer/components/layout/sidebar.tsx b/src/renderer/components/layout/sidebar.tsx
index 9eb8268785..4619e48de7 100644
--- a/src/renderer/components/layout/sidebar.tsx
+++ b/src/renderer/components/layout/sidebar.tsx
@@ -80,7 +80,7 @@ export class Sidebar extends React.Component this.logsElement = e}>
+ {this.renderJumpToBottom()}
{this.renderLogs()}
Lens