From f4db09a534565cff0e5ef5bef259acd72e93aad8 Mon Sep 17 00:00:00 2001
From: Matt Hook <hookenz@gmail.com>
Date: Thu, 8 Feb 2024 11:38:04 +1300
Subject: [PATCH] fix(kube-apps): add helm insights, remove namespace insights
 panel [EE-6671] (#11077)

---
 .../applicationsDatatable.html                  |  2 +-
 app/kubernetes/react/components/index.ts        |  2 ++
 .../ApplicationsDatatable/HelmInsightsBox.tsx   | 17 +++++++++++++++++
 .../ApplicationsStacksDatatable.tsx             |  8 ++------
 4 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100644 app/react/kubernetes/applications/ListView/ApplicationsDatatable/HelmInsightsBox.tsx

diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
index b4ce05c44..3956d3f88 100644
--- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
+++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html
@@ -140,7 +140,7 @@
             </span>
           </div>
           <div class="w-fit">
-            <insights-box type="'slim'" header="'From 2.18 on, you can filter this view by namespace.'" insight-close-id="'k8s-namespace-filtering'"></insights-box>
+            <helm-insights-box></helm-insights-box>
           </div>
         </div>
       </div>
diff --git a/app/kubernetes/react/components/index.ts b/app/kubernetes/react/components/index.ts
index c1bcb54aa..e04ec5000 100644
--- a/app/kubernetes/react/components/index.ts
+++ b/app/kubernetes/react/components/index.ts
@@ -58,6 +58,7 @@ import { deploymentTypeValidation } from '@/react/kubernetes/applications/compon
 import { AppDeploymentTypeFormSection } from '@/react/kubernetes/applications/components/AppDeploymentTypeFormSection/AppDeploymentTypeFormSection';
 import { EnvironmentVariablesFormSection } from '@/react/kubernetes/applications/components/EnvironmentVariablesFormSection/EnvironmentVariablesFormSection';
 import { kubeEnvVarValidationSchema } from '@/react/kubernetes/applications/components/EnvironmentVariablesFormSection/kubeEnvVarValidationSchema';
+import { HelmInsightsBox } from '@/react/kubernetes/applications/ListView/ApplicationsDatatable/HelmInsightsBox';
 
 import { applicationsModule } from './applications';
 
@@ -88,6 +89,7 @@ export const ngModule = angular
       'value',
     ])
   )
+  .component('helmInsightsBox', r2a(HelmInsightsBox, []))
   .component(
     'namespaceAccessUsersSelector',
     r2a(NamespaceAccessUsersSelector, [
diff --git a/app/react/kubernetes/applications/ListView/ApplicationsDatatable/HelmInsightsBox.tsx b/app/react/kubernetes/applications/ListView/ApplicationsDatatable/HelmInsightsBox.tsx
new file mode 100644
index 000000000..25dddb37a
--- /dev/null
+++ b/app/react/kubernetes/applications/ListView/ApplicationsDatatable/HelmInsightsBox.tsx
@@ -0,0 +1,17 @@
+import { InsightsBox } from '@@/InsightsBox';
+
+export function HelmInsightsBox() {
+  return (
+    <InsightsBox
+      header="Helm option"
+      content={
+        <span>
+          From 2.20 and on, the Helm menu sidebar option has moved to the{' '}
+          <strong>Create from manifest screen</strong> - accessed via the button
+          above.
+        </span>
+      }
+      insightCloseId="k8s-helm"
+    />
+  );
+}
diff --git a/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx b/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx
index 682b31024..010c6199a 100644
--- a/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx
+++ b/app/react/kubernetes/applications/ListView/ApplicationsStacksDatatable/ApplicationsStacksDatatable.tsx
@@ -8,9 +8,9 @@ import { createStore } from '@/react/kubernetes/datatables/default-kube-datatabl
 import { ExpandableDatatable } from '@@/datatables/ExpandableDatatable';
 import { useRepeater } from '@@/datatables/useRepeater';
 import { useTableState } from '@@/datatables/useTableState';
-import { InsightsBox } from '@@/InsightsBox';
 
 import { KubernetesStack } from '../../types';
+import { HelmInsightsBox } from '../ApplicationsDatatable/HelmInsightsBox';
 
 import { columns } from './columns';
 import { SubRows } from './SubRows';
@@ -88,11 +88,7 @@ export function ApplicationsStacksDatatable({
             />
 
             <div className="w-fit">
-              <InsightsBox
-                type="slim"
-                header="From 2.18 on, you can filter this view by namespace."
-                insightCloseId="k8s-namespace-filtering"
-              />
+              <HelmInsightsBox />
             </div>
           </div>
         </div>