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: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
"build:documentation:dev": "webpack --config webpack.dev.ts --env app=documentation",
"build:insights:dev": "webpack --config webpack.dev.ts --env app=insights",
"build:installation-wizard:dev": "webpack --config webpack.dev.ts --env app=installationWizard",
"build:main:dev": "webpack --config webpack.dev.ts --env app=main",
"build:navigation:dev": "webpack --config webpack.dev.ts --env app=navigation",
"build:notifications:dev": "webpack --config webpack.dev.ts --env app=notifications",
"build:recentActivity:dev": "webpack --config webpack.dev.ts --env app=recentActivity",
Expand All @@ -28,6 +29,7 @@
"build:documentation:prod": "webpack --config webpack.prod.ts --env app=documentation",
"build:insights:prod": "webpack --config webpack.prod.ts --env app=insights",
"build:installation-wizard:prod": "webpack --config webpack.prod.ts --env app=installationWizard",
"build:main:prod": "webpack --config webpack.prod.ts --env app=main",
"build:navigation:prod": "webpack --config webpack.prod.ts --env app=navigation",
"build:notifications:prod": "webpack --config webpack.prod.ts --env app=notifications",
"build:recentActivity:prod": "webpack --config webpack.prod.ts --env app=recentActivity",
Expand Down
1 change: 0 additions & 1 deletion src/components/Assets/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { addPrefix } from "../../utils/addPrefix";
const ACTION_PREFIX = "ASSETS";

export const actions = addPrefix(ACTION_PREFIX, {
INITIALIZE: "INITIALIZE",
GET_DATA: "GET_DATA",
SET_DATA: "SET_DATA",
GO_TO_ASSET: "GO_TO_ASSET",
Expand Down
15 changes: 1 addition & 14 deletions src/components/Assets/index.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
import {
useContext,
useEffect,
useLayoutEffect,
useMemo,
useState
} from "react";
import { useContext, useEffect, useMemo, useState } from "react";
import { lt, valid } from "semver";
import {
featureFlagMinBackendVersions,
Expand All @@ -27,7 +21,6 @@ import { AssetsViewScopeConfiguration } from "./AssetsViewScopeConfiguration";
import { AssetScopeOption } from "./AssetsViewScopeConfiguration/types";
import { NoDataMessage } from "./NoDataMessage";
import { ServicesFilter } from "./ServicesFilter";
import { actions } from "./actions";
import * as s from "./styles";
import { trackingEvents } from "./tracking";
import { DataRefresher } from "./types";
Expand Down Expand Up @@ -74,12 +67,6 @@ export const Assets = () => {
);
}, [config]);

useLayoutEffect(() => {
window.sendMessageToDigma({
action: actions.INITIALIZE
});
}, []);

useEffect(() => {
if (!config.scope?.span) {
setAssetScopeOption(null);
Expand Down
1 change: 0 additions & 1 deletion src/components/Insights/InsightJiraTicket/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
InsightsGetDataListQuery,
LinkTicketResponse
} from "./types";
import { Attachment } from "../../common/JiraTicket/types";

export const InsightJiraTicket = (props: InsightJiraTicketProps) => {
const [errorMessage, setErrorMessage] = useState<string | null>();
Expand Down
20 changes: 12 additions & 8 deletions src/components/Insights/InsightsCatalog/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,9 @@ import { useCallback, useContext, useEffect, useState } from "react";
import { usePrevious } from "../../../hooks/usePrevious";

import { useTheme } from "styled-components";
import { getFeatureFlagValue } from "../../../featureFlags";
import { useDebounce } from "../../../hooks/useDebounce";
import { isNumber } from "../../../typeGuards/isNumber";
import { isUndefined } from "../../../typeGuards/isUndefined";
import { FeatureFlag } from "../../../types";
import { sendTrackingEvent } from "../../../utils/sendTrackingEvent";
import { ConfigContext } from "../../common/App/ConfigContext";
import { Pagination } from "../../common/Pagination";
Expand Down Expand Up @@ -53,20 +51,27 @@ export const InsightsCatalog = (props: InsightsCatalogProps) => {
const previousMode = usePrevious(mode);
const theme = useTheme();

const isViewModeButtonVisible = Boolean(
getFeatureFlagValue(config, FeatureFlag.IS_INSIGHT_DISMISSAL_ENABLED) &&
(isUndefined(props.dismissedCount) || props.dismissedCount > 0) // isUndefined - check for backward compatibility, always show when BE does not return this counter
);
const isViewModeButtonVisible =
props.isDismissalEnabled &&
(isUndefined(props.dismissedCount) || props.dismissedCount > 0); // isUndefined - check for backward compatibility, always show when BE does not return this counter

const refreshData = useCallback(
() =>
props.onQueryChange({
...props.defaultQuery,
page,
sorting,
searchQuery: debouncedSearchInputValue,
showDismissed: mode === ViewMode.OnlyDismissed
}),
[page, sorting, debouncedSearchInputValue, props, mode]
[
page,
sorting,
debouncedSearchInputValue,
props.onQueryChange,
props.defaultQuery,
mode
]
);

const handleRefreshButtonClick = () => {
Expand Down Expand Up @@ -119,7 +124,6 @@ export const InsightsCatalog = (props: InsightsCatalogProps) => {
page,
debouncedSearchInputValue,
previousSearchQuery,
props.onQueryChange,
refreshData,
mode,
previousMode
Expand Down
1 change: 1 addition & 0 deletions src/components/Insights/InsightsCatalog/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export interface InsightsCatalogProps {
onQueryChange: (query: InsightsQuery) => void;
defaultQuery: InsightsQuery;
onRefresh: () => void;
isDismissalEnabled: boolean;
}

export enum SORTING_CRITERION {
Expand Down
1 change: 0 additions & 1 deletion src/components/Insights/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { addPrefix } from "../../utils/addPrefix";
const ACTION_PREFIX = "INSIGHTS";

export const actions = addPrefix(ACTION_PREFIX, {
INITIALIZE: "INITIALIZE",
GET_DATA: "GET_DATA",
SET_DATA: "SET_DATA",
GO_TO_ERRORS: "GO_TO_ERRORS",
Expand Down
28 changes: 16 additions & 12 deletions src/components/Insights/common/useInsightsData.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { dispatcher } from "../../../dispatcher";
import { usePrevious } from "../../../hooks/usePrevious";
import { ConfigContext } from "../../common/App/ConfigContext";
import {
ConfigContextData,
GlobalState,
InsightsQuery as InsightsDataQuery
} from "../../common/App/types";
Expand All @@ -22,14 +21,15 @@ interface UseInsightDataProps {
query: InsightsQuery;
}

const getData = (query: ScopedInsightsQuery, context: ConfigContextData) => {
const getData = (query: ScopedInsightsQuery, state?: GlobalState) => {
const getDataQuery: InsightsDataQuery = {
displayName: query.searchQuery,
sortBy: query.sorting.criterion,
sortOrder: query.sorting.order,
page: query.page,
scopedSpanCodeObjectId: query.scopedSpanCodeObjectId,
showDismissed: query.showDismissed
showDismissed: query.showDismissed,
insightViewType: query.insightViewType
};

window.sendMessageToDigma({
Expand All @@ -39,12 +39,15 @@ const getData = (query: ScopedInsightsQuery, context: ConfigContextData) => {
}
});

const globalStateSlice =
query.insightViewType === "Analytics" ? "analytics" : "insights";

window.sendMessageToDigma<GlobalState>({
action: globalActions.UPDATE_STATE,
payload: {
...context.state,
insights: {
...context.state?.insights,
...state,
[globalStateSlice]: {
...state?.[globalStateSlice],
query: getDataQuery
}
}
Expand All @@ -64,8 +67,9 @@ export const useInsightsData = (props: UseInsightDataProps) => {
const [isLoading, setIsLoading] = useState(false);
const previousLastSetDataTimeStamp = usePrevious(lastSetDataTimeStamp);
const refreshTimerId = useRef<number>();
const ctx = useContext(ConfigContext);
const { scope, environment } = ctx;
const config = useContext(ConfigContext);
const { scope, environment, state } = config;

const query = useMemo(
() => ({
...props.query,
Expand All @@ -75,7 +79,7 @@ export const useInsightsData = (props: UseInsightDataProps) => {
);

useEffect(() => {
getData(query, ctx);
getData(query, state);

setIsInitialLoading(true);
setIsLoading(true);
Expand Down Expand Up @@ -110,7 +114,7 @@ export const useInsightsData = (props: UseInsightDataProps) => {
window.clearTimeout(refreshTimerId.current);
refreshTimerId.current = window.setTimeout(
(insightsQuery: ScopedInsightsQuery) => {
getData(insightsQuery, ctx);
getData(insightsQuery, state);
},
props.refreshInterval,
query
Expand All @@ -135,14 +139,14 @@ export const useInsightsData = (props: UseInsightDataProps) => {
...props.query,
scopedSpanCodeObjectId: scope?.span?.spanCodeObjectId || null
},
ctx
state
);
}, [props.query, scope, environment]);

return {
isInitialLoading,
data,
isLoading,
refresh: () => getData(query, ctx)
refresh: () => getData(query, state)
};
};
30 changes: 18 additions & 12 deletions src/components/Insights/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
import { useContext, useEffect, useLayoutEffect, useState } from "react";
import { actions as globalActions } from "../../actions";
import { SLACK_WORKSPACE_URL } from "../../constants";
import { getFeatureFlagValue } from "../../featureFlags";
import { usePrevious } from "../../hooks/usePrevious";
import { trackingEvents as globalTrackingEvents } from "../../trackingEvents";
import { isNumber } from "../../typeGuards/isNumber";
import { FeatureFlag } from "../../types";
import { openURLInDefaultBrowser } from "../../utils/openURLInDefaultBrowser";
import { sendTrackingEvent } from "../../utils/sendTrackingEvent";
import { ConfigContext } from "../common/App/ConfigContext";
Expand All @@ -20,7 +22,6 @@ import { OpenTelemetryLogoCrossedSmallIcon } from "../common/icons/OpenTelemetry
import { SlackLogoIcon } from "../common/icons/SlackLogoIcon";
import { InsightsCatalog } from "./InsightsCatalog";
import { SORTING_CRITERION } from "./InsightsCatalog/types";
import { actions } from "./actions";
import { useInsightsData } from "./common/useInsightsData";
import * as s from "./styles";
import { BottleneckInsightTicket } from "./tickets/BottleneckInsightTicket";
Expand Down Expand Up @@ -63,16 +64,6 @@ const REFRESH_INTERVAL = isNumber(window.insightsRefreshInterval)
? window.insightsRefreshInterval
: 10 * 1000; // in milliseconds

const DEFAULT_QUERY = {
page: 0,
sorting: {
criterion: SORTING_CRITERION.LATEST,
order: SORTING_ORDER.DESC
},
searchQuery: null,
showDismissed: false
};

const renderInsightTicket = (
data: InsightTicketInfo<GenericCodeObjectInsight>,
onClose: () => void
Expand Down Expand Up @@ -190,6 +181,16 @@ const sendMessage = (action: string, data?: object) => {
};

export const Insights = (props: InsightsProps) => {
const DEFAULT_QUERY: InsightsQuery = {
page: 0,
sorting: {
criterion: SORTING_CRITERION.LATEST,
order: SORTING_ORDER.DESC
},
searchQuery: null,
showDismissed: false,
insightViewType: props.insightViewType
};
// const [isAutofixing, setIsAutofixing] = useState(false);
const [query, setQuery] = useState<InsightsQuery>(DEFAULT_QUERY);
const { isInitialLoading, data, refresh } = useInsightsData({
Expand All @@ -205,8 +206,12 @@ export const Insights = (props: InsightsProps) => {
const [isRegistrationInProgress, setIsRegistrationInProgress] =
useState(false);

const isDismissalEnabled = Boolean(
getFeatureFlagValue(config, FeatureFlag.IS_INSIGHT_DISMISSAL_ENABLED) &&
props.insightViewType === "Issues"
);

useLayoutEffect(() => {
sendMessage(actions.INITIALIZE);
sendMessage(globalActions.GET_STATE);
}, []);

Expand Down Expand Up @@ -296,6 +301,7 @@ export const Insights = (props: InsightsProps) => {
onRefresh={refresh}
defaultQuery={DEFAULT_QUERY}
dismissedCount={data.dismissedCount}
isDismissalEnabled={isDismissalEnabled}
/>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { InsightType } from "../../../../types";
import { getCriticalityLabel } from "../../../../utils/getCriticalityLabel";
import { intersperse } from "../../../../utils/intersperse";
import { ConfigContext } from "../../../common/App/ConfigContext";
import { Attachment } from "../../../common/JiraTicket/types";
import { InsightJiraTicket } from "../../InsightJiraTicket";
import { EndpointSpanNPlusOneInsight, SpanNPlusOneInsight } from "../../types";
import { useEndpointDataSource } from "../common";
Expand Down Expand Up @@ -73,7 +74,7 @@ export const EndpointNPlusOneInsightTicket = (
);

const traceId = span?.traceId;
const attachments = [
const attachments: Attachment[] = [
...(traceId
? [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { getCriticalityLabel } from "../../../../utils/getCriticalityLabel";
import { getDurationString } from "../../../../utils/getDurationString";
import { intersperse } from "../../../../utils/intersperse";
import { ConfigContext } from "../../../common/App/ConfigContext";
import { Attachment } from "../../../common/JiraTicket/types";
import { InsightJiraTicket } from "../../InsightJiraTicket";
import {
EndpointQueryOptimizationInsight,
Expand Down Expand Up @@ -101,7 +102,7 @@ export const EndpointQueryOptimizationInsightTicket = (
);

const traceId = span?.traceId;
const attachments = [
const attachments: Attachment[] = [
...(traceId
? [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { ReactElement, useContext } from "react";
import { getCriticalityLabel } from "../../../../utils/getCriticalityLabel";
import { intersperse } from "../../../../utils/intersperse";
import { ConfigContext } from "../../../common/App/ConfigContext";
import { Attachment } from "../../../common/JiraTicket/types";
import { InsightJiraTicket } from "../../InsightJiraTicket";
import { SpanNPlusOneInsight } from "../../types";
import { useSpanDataSource } from "../common";
Expand Down Expand Up @@ -66,7 +67,7 @@ export const NPlusOneInsightTicket = (
);

const traceId = props.data.insight.traceId;
const attachments = [
const attachments: Attachment[] = [
...(traceId
? [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { getCriticalityLabel } from "../../../../utils/getCriticalityLabel";
import { getDurationString } from "../../../../utils/getDurationString";
import { intersperse } from "../../../../utils/intersperse";
import { ConfigContext } from "../../../common/App/ConfigContext";
import { Attachment } from "../../../common/JiraTicket/types";
import { InsightJiraTicket } from "../../InsightJiraTicket";
import { QueryOptimizationInsight } from "../../types";
import { useCommitInfos } from "../common";
Expand Down Expand Up @@ -80,7 +81,7 @@ export const QueryOptimizationInsightTicket = (
);

const traceId = props.data.insight.traceId;
const attachments = [
const attachments: Attachment[] = [
...(traceId
? [
{
Expand Down
Loading