From 2953848b9aa153d0eb92b9e81b6e715bf45ff6f1 Mon Sep 17 00:00:00 2001
From: Dakota Walsh <101994734+dakota-portainer@users.noreply.github.com>
Date: Fri, 25 Aug 2023 15:32:08 +1200
Subject: [PATCH] feat(gpu): remove GPU lightbubble EE-5254 (#10096)

---
 app/docker/react/components/index.ts          |  2 --
 .../views/endpoints/edit/endpoint.html        |  5 ---
 .../docker/host/SetupView/GpusInsights.tsx    | 29 ----------------
 .../WizardDocker/APITab/APIForm.tsx           | 34 ++-----------------
 .../WizardDocker/APITab/APITab.tsx            |  5 ++-
 .../WizardDocker/SocketTab/SocketForm.tsx     | 34 ++-----------------
 .../WizardDocker/SocketTab/SocketTab.tsx      |  8 ++---
 .../WizardDocker/WizardDocker.tsx             |  2 --
 8 files changed, 8 insertions(+), 111 deletions(-)
 delete mode 100644 app/react/docker/host/SetupView/GpusInsights.tsx

diff --git a/app/docker/react/components/index.ts b/app/docker/react/components/index.ts
index b20e2d5f4..df5338c60 100644
--- a/app/docker/react/components/index.ts
+++ b/app/docker/react/components/index.ts
@@ -13,7 +13,6 @@ import { withUIRouter } from '@/react-tools/withUIRouter';
 import { DockerfileDetails } from '@/react/docker/images/ItemView/DockerfileDetails';
 import { HealthStatus } from '@/react/docker/containers/ItemView/HealthStatus';
 import { GpusList } from '@/react/docker/host/SetupView/GpusList';
-import { GpusInsights } from '@/react/docker/host/SetupView/GpusInsights';
 import { InsightsBox } from '@/react/components/InsightsBox';
 import { BetaAlert } from '@/react/portainer/environments/update-schedules/common/BetaAlert';
 import { ImagesDatatable } from '@/react/docker/images/ListView/ImagesDatatable/ImagesDatatable';
@@ -71,7 +70,6 @@ const ngModule = angular
     ])
   )
   .component('betaAlert', r2a(BetaAlert, ['className', 'message', 'isHtml']))
-  .component('gpusInsights', r2a(GpusInsights, []))
   .component(
     'dockerImagesDatatable',
     r2a(withUIRouter(withCurrentUser(ImagesDatatable)), [
diff --git a/app/portainer/views/endpoints/edit/endpoint.html b/app/portainer/views/endpoints/edit/endpoint.html
index 9d969b2b5..044e9acfb 100644
--- a/app/portainer/views/endpoints/edit/endpoint.html
+++ b/app/portainer/views/endpoints/edit/endpoint.html
@@ -211,11 +211,6 @@
             </div>
           </div>
           <!-- !open-amt info -->
-          <!-- gpus info -->
-          <div class="mb-4" ng-if="isDockerStandaloneEnv">
-            <gpus-insights></gpus-insights>
-          </div>
-          <!-- gpus info -->
           <div class="form-group">
             <div class="col-sm-12">
               <button
diff --git a/app/react/docker/host/SetupView/GpusInsights.tsx b/app/react/docker/host/SetupView/GpusInsights.tsx
deleted file mode 100644
index d4492bdd3..000000000
--- a/app/react/docker/host/SetupView/GpusInsights.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { InsightsBox } from '@@/InsightsBox';
-
-export function GpusInsights() {
-  return (
-    <InsightsBox
-      content={
-        <>
-          <p>
-            From 2.18 on, the set-up of available GPUs for a Docker Standalone
-            environment has been shifted from Add environment and Environment
-            details to Host -&gt; Setup, so as to align with other settings.
-          </p>
-          <p>
-            A toggle has been introduced for enabling/disabling management of
-            GPU settings in the Portainer UI - to alleviate the performance
-            impact of showing those settings.
-          </p>
-          <p>
-            The UI has been updated to clarify that GPU settings support is only
-            for Docker Standalone (and not Docker Swarm, which was never
-            supported in the UI).
-          </p>
-        </>
-      }
-      header="GPU settings update"
-      insightCloseId="gpu-settings-update-closed"
-    />
-  );
-}
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APIForm.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APIForm.tsx
index 169b2d8bd..c4c91e4f0 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APIForm.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APIForm.tsx
@@ -13,7 +13,6 @@ import { TLSFieldset } from '@/react/components/TLSFieldset/TLSFieldset';
 import { LoadingButton } from '@@/buttons/LoadingButton';
 import { FormControl } from '@@/form-components/FormControl';
 import { Input } from '@@/form-components/Input';
-import { InsightsBox } from '@@/InsightsBox';
 
 import { NameField } from '../../shared/NameField';
 import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
@@ -23,10 +22,9 @@ import { FormValues } from './types';
 
 interface Props {
   onCreate(environment: Environment): void;
-  isDockerStandalone?: boolean;
 }
 
-export function APIForm({ onCreate, isDockerStandalone }: Props) {
+export function APIForm({ onCreate }: Props) {
   const [formKey, clearForm] = useReducer((state) => state + 1, 0);
   const initialValues: FormValues = {
     url: '',
@@ -83,35 +81,7 @@ export function APIForm({ onCreate, isDockerStandalone }: Props) {
             errors={errors.tlsConfig}
           />
 
-          <MoreSettingsSection>
-            {isDockerStandalone && (
-              <InsightsBox
-                content={
-                  <>
-                    <p>
-                      From 2.18 on, the set-up of available GPUs for a Docker
-                      Standalone environment has been shifted from Add
-                      environment and Environment details to Host -&gt; Setup,
-                      so as to align with other settings.
-                    </p>
-                    <p>
-                      A toggle has been introduced for enabling/disabling
-                      management of GPU settings in the Portainer UI - to
-                      alleviate the performance impact of showing those
-                      settings.
-                    </p>
-                    <p>
-                      The UI has been updated to clarify that GPU settings
-                      support is only for Docker Standalone (and not Docker
-                      Swarm, which was never supported in the UI).
-                    </p>
-                  </>
-                }
-                header="GPU settings update"
-                insightCloseId="gpu-settings-update-closed"
-              />
-            )}
-          </MoreSettingsSection>
+          <MoreSettingsSection />
 
           <div className="form-group">
             <div className="col-sm-12">
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APITab.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APITab.tsx
index 21cd917fa..3b39cd44d 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APITab.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/APITab/APITab.tsx
@@ -4,13 +4,12 @@ import { APIForm } from './APIForm';
 
 interface Props {
   onCreate(environment: Environment): void;
-  isDockerStandalone?: boolean;
 }
 
-export function APITab({ onCreate, isDockerStandalone }: Props) {
+export function APITab({ onCreate }: Props) {
   return (
     <div className="mt-5">
-      <APIForm onCreate={onCreate} isDockerStandalone={isDockerStandalone} />
+      <APIForm onCreate={onCreate} />
     </div>
   );
 }
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketForm.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketForm.tsx
index 2ff6bc0e8..0c5fba9d1 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketForm.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketForm.tsx
@@ -10,7 +10,6 @@ import { LoadingButton } from '@@/buttons/LoadingButton';
 import { FormControl } from '@@/form-components/FormControl';
 import { Input } from '@@/form-components/Input';
 import { SwitchField } from '@@/form-components/SwitchField';
-import { InsightsBox } from '@@/InsightsBox';
 
 import { NameField } from '../../shared/NameField';
 import { MoreSettingsSection } from '../../shared/MoreSettingsSection';
@@ -20,10 +19,9 @@ import { FormValues } from './types';
 
 interface Props {
   onCreate(environment: Environment): void;
-  isDockerStandalone?: boolean;
 }
 
-export function SocketForm({ onCreate, isDockerStandalone }: Props) {
+export function SocketForm({ onCreate }: Props) {
   const [formKey, clearForm] = useReducer((state) => state + 1, 0);
   const initialValues: FormValues = {
     name: '',
@@ -49,35 +47,7 @@ export function SocketForm({ onCreate, isDockerStandalone }: Props) {
 
           <OverrideSocketFieldset />
 
-          <MoreSettingsSection>
-            {isDockerStandalone && (
-              <InsightsBox
-                content={
-                  <>
-                    <p>
-                      From 2.18 on, the set-up of available GPUs for a Docker
-                      Standalone environment has been shifted from Add
-                      environment and Environment details to Host -&gt; Setup,
-                      so as to align with other settings.
-                    </p>
-                    <p>
-                      A toggle has been introduced for enabling/disabling
-                      management of GPU settings in the Portainer UI - to
-                      alleviate the performance impact of showing those
-                      settings.
-                    </p>
-                    <p>
-                      The UI has been updated to clarify that GPU settings
-                      support is only for Docker Standalone (and not Docker
-                      Swarm, which was never supported in the UI).
-                    </p>
-                  </>
-                }
-                header="GPU settings update"
-                insightCloseId="gpu-settings-update-closed"
-              />
-            )}
-          </MoreSettingsSection>
+          <MoreSettingsSection />
 
           <div className="form-group">
             <div className="col-sm-12">
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketTab.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketTab.tsx
index 3fbbf6281..a93b0e253 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketTab.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/SocketTab/SocketTab.tsx
@@ -6,19 +6,15 @@ import { SocketForm } from './SocketForm';
 
 interface Props {
   onCreate(environment: Environment): void;
-  isDockerStandalone?: boolean;
 }
 
-export function SocketTab({ onCreate, isDockerStandalone }: Props) {
+export function SocketTab({ onCreate }: Props) {
   return (
     <>
       <DeploymentScripts />
 
       <div className="mt-5">
-        <SocketForm
-          onCreate={onCreate}
-          isDockerStandalone={isDockerStandalone}
-        />
+        <SocketForm onCreate={onCreate} />
       </div>
     </>
   );
diff --git a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
index 3fc8112e5..1f1904fbb 100644
--- a/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
+++ b/app/react/portainer/environments/wizard/EnvironmentsCreationView/WizardDocker/WizardDocker.tsx
@@ -101,14 +101,12 @@ export function WizardDocker({ onCreate, isDockerStandalone }: Props) {
         return (
           <APITab
             onCreate={(environment) => onCreate(environment, 'dockerApi')}
-            isDockerStandalone={isDockerStandalone}
           />
         );
       case 'socket':
         return (
           <SocketTab
             onCreate={(environment) => onCreate(environment, 'localEndpoint')}
-            isDockerStandalone={isDockerStandalone}
           />
         );
       case 'edgeAgentStandard':