Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .storybook/preview-body.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
window.theme;
window.mainFont;
window.codeFont;
window.isJaegerEnabled;
window.recentActivityRefreshInterval;
window.recentActivityExpirationLimit;
window.recentActivityDocumentationURL;
window.wizardSkipInstallationStep;
window.assetsRefreshInterval;
window.insightsRefreshInterval;
</script>
18 changes: 11 additions & 7 deletions src/components/RecentActivity/RecentActivityTable/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import { Button } from "../../common/Button";
import { BottleneckIcon } from "../../common/icons/BottleneckIcon";
import { CrosshairIcon } from "../../common/icons/CrosshairIcon";
import { MeterHighIcon } from "../../common/icons/MeterHighIcon";
import { SQLDatabaseIcon } from "../../common/icons/SQLDatabaseIcon";
import { ScalesIcon } from "../../common/icons/ScalesIcon";
import { SnailIcon } from "../../common/icons/SnailIcon";
import { SpotIcon } from "../../common/icons/SpotIcon";
import { SQLDatabaseIcon } from "../../common/icons/SQLDatabaseIcon";
import { ViewMode } from "../EnvironmentPanel/types";
import { ActivityEntry, EntrySpan, SlimInsight } from "../types";
import { SpanLink } from "./SpanLink";
Expand Down Expand Up @@ -201,11 +201,15 @@ export const RecentActivityTable = (props: RecentActivityTableProps) => {
header: "Insights",
cell: (info) => renderInsights(info.getValue())
}),
columnHelper.accessor((row) => row, {
id: "latestTraceId",
header: "",
cell: (info) => renderTraceButton(info.getValue())
})
...(props.isTraceButtonVisible
? [
columnHelper.accessor((row) => row, {
id: "latestTraceId",
header: "",
cell: (info) => renderTraceButton(info.getValue())
})
]
: [])
];

const table = useReactTable({
Expand Down Expand Up @@ -259,7 +263,7 @@ export const RecentActivityTable = (props: RecentActivityTableProps) => {
{renderSpanLinks(entry)}
{renderDuration(entry.latestTraceDuration, props.viewMode)}
{renderInsights(entry.slimAggregatedInsights)}
{renderTraceButton(entry)}
{props.isTraceButtonVisible && renderTraceButton(entry)}
</s.ListItem>
))}
</s.List>
Expand Down
1 change: 1 addition & 0 deletions src/components/RecentActivity/RecentActivityTable/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export interface RecentActivityTableProps {
onSpanLinkClick: (span: EntrySpan, environment: string) => void;
onTraceButtonClick: (traceId: string, span: EntrySpan) => void;
viewMode: ViewMode;
isTraceButtonVisible: boolean;
}

export enum INSIGHT_TYPES {
Expand Down
28 changes: 25 additions & 3 deletions src/components/RecentActivity/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ import { CursorFollower } from "../common/CursorFollower";
import { DigmaLogoFlatIcon } from "../common/icons/DigmaLogoFlatIcon";
import { EnvironmentPanel } from "./EnvironmentPanel";
import { ViewMode } from "./EnvironmentPanel/types";
import { isRecent, RecentActivityTable } from "./RecentActivityTable";
import { RecentActivityTable, isRecent } from "./RecentActivityTable";
import * as s from "./styles";
import { EntrySpan, RecentActivityData, RecentActivityProps } from "./types";
import {
EntrySpan,
RecentActivityData,
RecentActivityProps,
SetIsJaegerData
} from "./types";

const documentationURL =
typeof window.recentActivityDocumentationURL === "string"
Expand All @@ -27,7 +32,8 @@ const actions = getActions(ACTION_PREFIX, {
getData: "GET_DATA",
setData: "SET_DATA",
goToSpan: "GO_TO_SPAN",
goToTrace: "GO_TO_TRACE"
goToTrace: "GO_TO_TRACE",
setIsJaegerEnabled: "SET_IS_JAEGER_ENABLED"
});

const renderNoData = () => {
Expand Down Expand Up @@ -61,6 +67,9 @@ export const RecentActivity = (props: RecentActivityProps) => {
const [data, setData] = useState<RecentActivityData>();
const previousSelectedEnvironment = usePrevious(selectedEnvironment);
const [viewMode, setViewMode] = useState<ViewMode>("table");
const [isJaegerEnabled, setIsJaegerEnabled] = useState(
window.isJaegerEnabled === true
);

useEffect(() => {
window.sendMessageToDigma({
Expand All @@ -76,7 +85,15 @@ export const RecentActivity = (props: RecentActivityProps) => {
setData(data as RecentActivityData);
};

const handleSetIsJaegerEnabledData = (data: unknown) => {
setIsJaegerEnabled((data as SetIsJaegerData).isJaegerEnabled);
};

dispatcher.addActionListener(actions.setData, handleRecentActivityData);
dispatcher.addActionListener(
actions.setIsJaegerEnabled,
handleSetIsJaegerEnabledData
);

return () => {
clearInterval(refreshInterval);
Expand All @@ -85,6 +102,10 @@ export const RecentActivity = (props: RecentActivityProps) => {
actions.setData,
handleRecentActivityData
);
dispatcher.removeActionListener(
actions.setIsJaegerEnabled,
handleSetIsJaegerEnabledData
);
};
}, []);

Expand Down Expand Up @@ -170,6 +191,7 @@ export const RecentActivity = (props: RecentActivityProps) => {
data={environmentActivities[selectedEnvironment]}
onSpanLinkClick={handleSpanLinkClick}
onTraceButtonClick={handleTraceButtonClick}
isTraceButtonVisible={isJaegerEnabled}
/>
)}
</s.Container>
Expand Down
4 changes: 4 additions & 0 deletions src/components/RecentActivity/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,7 @@ export interface RecentActivityData {
export interface RecentActivityProps {
data?: RecentActivityData;
}

export interface SetIsJaegerData {
isJaegerEnabled: boolean;
}
1 change: 1 addition & 0 deletions src/globals.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ declare global {
environment?: unknown;
mainFont?: unknown;
codeFont?: unknown;
isJaegerEnabled?: unknown;
recentActivityRefreshInterval?: unknown;
recentActivityExpirationLimit?: unknown;
recentActivityDocumentationURL?: unknown;
Expand Down