From 9a800991a589c10ad6845728456d935168c041fa Mon Sep 17 00:00:00 2001
From: Kyrylo Shmidt <kshmidt@digma.ai>
Date: Wed, 6 Mar 2024 19:30:53 +0100
Subject: [PATCH 1/2] Improve types

---
 src/components/Assets/index.tsx                     |  4 ++--
 src/components/Insights/InsightsCatalog/index.tsx   | 10 +++++-----
 .../Insights/common/InsightCard/index.tsx           |  2 +-
 .../Insights/common/InsightCard/styles.ts           | 13 +++++++------
 src/components/Insights/common/InsightCard/types.ts |  2 +-
 src/components/Insights/tracking.ts                 |  2 +-
 src/components/Insights/types.ts                    |  7 ++++---
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/components/Assets/index.tsx b/src/components/Assets/index.tsx
index c1a382160..baad64d03 100644
--- a/src/components/Assets/index.tsx
+++ b/src/components/Assets/index.tsx
@@ -204,9 +204,9 @@ export const Assets = () => {
               />
             )
           )}
-          <Tooltip title="Refresh">
+          <Tooltip title={"Refresh"}>
             <s.RefreshButton
-              buttonType="tertiary"
+              buttonType={"tertiary"}
               icon={RefreshIcon}
               onClick={handleRefresh}
             />
diff --git a/src/components/Insights/InsightsCatalog/index.tsx b/src/components/Insights/InsightsCatalog/index.tsx
index f36353dad..dbcd11c70 100644
--- a/src/components/Insights/InsightsCatalog/index.tsx
+++ b/src/components/Insights/InsightsCatalog/index.tsx
@@ -145,9 +145,9 @@ export const InsightsCatalog = (props: InsightsCatalogProps) => {
           ]}
           default={defaultQuery.sorting}
         />
-        <Tooltip title="Refresh">
+        <Tooltip title={"Refresh"}>
           <s.RefreshButton
-            buttonType="tertiary"
+            buttonType={"tertiary"}
             icon={RefreshIcon}
             onClick={handleRefreshButtonClick}
           />
@@ -156,8 +156,8 @@ export const InsightsCatalog = (props: InsightsCatalogProps) => {
       {mode === ViewMode.OnlyDismissed && (
         <s.InsightsViewModeToolbar>
           <Button
-            buttonType="tertiary"
-            label="Back to All Insights"
+            buttonType={"tertiary"}
+            label={"Back to All Insights"}
             icon={(props) => (
               <ChevronIcon {...props} direction={Direction.LEFT} />
             )}
@@ -198,7 +198,7 @@ export const InsightsCatalog = (props: InsightsCatalogProps) => {
           </>
         )}
         <Button
-          buttonType="tertiary"
+          buttonType={"tertiary"}
           icon={(props) => (
             <GroupIcon
               {...props}
diff --git a/src/components/Insights/common/InsightCard/index.tsx b/src/components/Insights/common/InsightCard/index.tsx
index 4a2edc615..0c818d99b 100644
--- a/src/components/Insights/common/InsightCard/index.tsx
+++ b/src/components/Insights/common/InsightCard/index.tsx
@@ -114,7 +114,7 @@ export const InsightCard = (props: InsightCardProps) => {
   };
 
   const handleShowClick = () => {
-    sendTrackingEvent(trackingEvents.UNDISMISS_BUTTON_CLICKED, {
+    sendTrackingEvent(trackingEvents.SHOW_BUTTON_CLICKED, {
       insightType: props.insight.type
     });
 
diff --git a/src/components/Insights/common/InsightCard/styles.ts b/src/components/Insights/common/InsightCard/styles.ts
index 1f21c4073..8505c5239 100644
--- a/src/components/Insights/common/InsightCard/styles.ts
+++ b/src/components/Insights/common/InsightCard/styles.ts
@@ -1,4 +1,4 @@
-import styled from "styled-components";
+import styled, { css } from "styled-components";
 import { subscriptRegularTypography } from "../../../common/App/typographies";
 import { Button } from "../../../common/v3/Button";
 import { Card } from "../../../common/v3/Card";
@@ -40,11 +40,12 @@ export const ContentContainer = styled.div`
 `;
 
 export const StyledInsightCard = styled(Card)<StyledInsightCardProps>`
-  ${({ $isDismissed, theme }) => {
-    if ($isDismissed) {
-      return `background: ${theme.colors.v3.surface.sidePanelHeader}`;
-    }
-  }}
+  ${({ $isDismissed, theme }) =>
+    $isDismissed
+      ? css`
+          background: ${theme.colors.v3.surface.sidePanelHeader};
+        `
+      : ""}
 `;
 
 export const DismissButton = styled(Button)`
diff --git a/src/components/Insights/common/InsightCard/types.ts b/src/components/Insights/common/InsightCard/types.ts
index dad41237d..39f5d3e9d 100644
--- a/src/components/Insights/common/InsightCard/types.ts
+++ b/src/components/Insights/common/InsightCard/types.ts
@@ -29,5 +29,5 @@ export interface InsightCardProps {
 }
 
 export interface StyledInsightCardProps extends CardProps {
-  $isDismissed: boolean;
+  $isDismissed?: boolean;
 }
diff --git a/src/components/Insights/tracking.ts b/src/components/Insights/tracking.ts
index 64849f1be..6a8b0f35b 100644
--- a/src/components/Insights/tracking.ts
+++ b/src/components/Insights/tracking.ts
@@ -12,7 +12,7 @@ export const trackingEvents = addPrefix(
       "jira ticket attachment download button clicked",
     JIRA_TICKET_HINT_CLOSED: "jira ticket hint closed",
     DISMISS_BUTTON_CLICKED: "insight dismiss button clicked",
-    UNDISMISS_BUTTON_CLICKED: "insight show button clicked",
+    SHOW_BUTTON_CLICKED: "insight show button clicked",
     REFRESH_BUTTON_CLICKED: "refresh button clicked"
   },
   " "
diff --git a/src/components/Insights/types.ts b/src/components/Insights/types.ts
index d5e41ab12..f93304d4a 100644
--- a/src/components/Insights/types.ts
+++ b/src/components/Insights/types.ts
@@ -164,7 +164,8 @@ export enum InsightStatus {
   Active = "Active",
   InEvaluation = "InEvaluation",
   PossiblyFixed = "PossiblyFixed",
-  Regression = "Regression"
+  Regression = "Regression",
+  Inactive = "Inactive"
 }
 
 export interface CodeObjectInsight extends Insight {
@@ -196,8 +197,8 @@ export interface CodeObjectInsight extends Insight {
   ticketLink: string | null;
   id: string;
   sourceSpanCodeObjectInsight: string;
-  isDismissed: boolean;
-  isDismissible: boolean;
+  isDismissed?: boolean;
+  isDismissible?: boolean;
   status?: InsightStatus;
 }
 

From bbbc6e376af8715e781cb32f5df23aebe5ec1034 Mon Sep 17 00:00:00 2001
From: Kyrylo Shmidt <kshmidt@digma.ai>
Date: Wed, 6 Mar 2024 19:48:40 +0100
Subject: [PATCH 2/2] Add feature flag

---
 .../Insights/InsightsCatalog/index.tsx        | 39 ++++++++++++-------
 src/featureFlags.ts                           |  3 +-
 src/types.ts                                  |  3 +-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/components/Insights/InsightsCatalog/index.tsx b/src/components/Insights/InsightsCatalog/index.tsx
index dbcd11c70..c54fcd780 100644
--- a/src/components/Insights/InsightsCatalog/index.tsx
+++ b/src/components/Insights/InsightsCatalog/index.tsx
@@ -2,8 +2,10 @@ 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 { FeatureFlag } from "../../../types";
 import { sendTrackingEvent } from "../../../utils/sendTrackingEvent";
 import { ConfigContext } from "../../common/App/ConfigContext";
 import { Pagination } from "../../common/Pagination";
@@ -50,6 +52,11 @@ export const InsightsCatalog = (props: InsightsCatalogProps) => {
   const previousMode = usePrevious(mode);
   const theme = useTheme();
 
+  const isViewModeButtonVisible = getFeatureFlagValue(
+    config,
+    FeatureFlag.IS_INSIGHT_DISMISSAL_ENABLED
+  );
+
   const refreshData = useCallback(
     () =>
       props.onQueryChange({
@@ -197,21 +204,23 @@ export const InsightsCatalog = (props: InsightsCatalogProps) => {
             </s.FooterItemsCount>
           </>
         )}
-        <Button
-          buttonType={"tertiary"}
-          icon={(props) => (
-            <GroupIcon
-              {...props}
-              crossOut={mode !== ViewMode.OnlyDismissed}
-              color={
-                mode === ViewMode.OnlyDismissed
-                  ? theme.colors.v3.icon.brandSecondary
-                  : props.color
-              }
-            />
-          )}
-          onClick={handleViewModeChange}
-        />
+        {isViewModeButtonVisible && (
+          <Button
+            buttonType={"tertiary"}
+            icon={(props) => (
+              <GroupIcon
+                {...props}
+                crossOut={mode !== ViewMode.OnlyDismissed}
+                color={
+                  mode === ViewMode.OnlyDismissed
+                    ? theme.colors.v3.icon.brandSecondary
+                    : props.color
+                }
+              />
+            )}
+            onClick={handleViewModeChange}
+          />
+        )}
       </s.Footer>
     </>
   );
diff --git a/src/featureFlags.ts b/src/featureFlags.ts
index bcb718825..da3553bea 100644
--- a/src/featureFlags.ts
+++ b/src/featureFlags.ts
@@ -8,7 +8,8 @@ export const featureFlagMinBackendVersions: Record<FeatureFlag, string> = {
   [FeatureFlag.IS_ASSETS_SERVICE_FILTER_VISIBLE]: "v0.2.174",
   [FeatureFlag.IS_ASSETS_OVERALL_IMPACT_HIDDEN]: "v0.2.181-alpha.1",
   [FeatureFlag.IS_INSIGHT_TICKET_LINKAGE_ENABLED]: "v0.2.200",
-  [FeatureFlag.IS_ASSETS_COMPLEX_FILTER_ENABLED]: "v0.2.215"
+  [FeatureFlag.IS_ASSETS_COMPLEX_FILTER_ENABLED]: "v0.2.215",
+  [FeatureFlag.IS_INSIGHT_DISMISSAL_ENABLED]: "v0.2.238"
 };
 
 export const getFeatureFlagValue = (
diff --git a/src/types.ts b/src/types.ts
index ac852f2fd..abb7885ca 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -5,7 +5,8 @@ export enum FeatureFlag {
   IS_ASSETS_SERVICE_FILTER_VISIBLE,
   IS_ASSETS_OVERALL_IMPACT_HIDDEN,
   IS_INSIGHT_TICKET_LINKAGE_ENABLED,
-  IS_ASSETS_COMPLEX_FILTER_ENABLED
+  IS_ASSETS_COMPLEX_FILTER_ENABLED,
+  IS_INSIGHT_DISMISSAL_ENABLED
 }
 
 export enum InsightType {