From 125db4f0deb9870b1cc3bb4fc8db0da655b93b2f Mon Sep 17 00:00:00 2001
From: matias-portainer <104775949+matias-portainer@users.noreply.github.com>
Date: Wed, 9 Aug 2023 10:09:15 -0300
Subject: [PATCH] fix(edge/stacks): fix UI issues EE-5844 (#10022)

---
 .../EditEdgeStackForm/EditEdgeStackForm.tsx   |  2 +-
 .../EnvironmentsDatatable/columns.tsx         |  1 +
 .../TableSettingsMenus.tsx                    | 22 ++++++++++---------
 .../components/PrivateRegistryFieldset.tsx    |  2 +-
 .../AutoUpdateFieldset/AutoUpdateFieldset.tsx |  4 ++--
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/EditEdgeStackForm.tsx b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/EditEdgeStackForm.tsx
index 5681d0c77..00545b097 100644
--- a/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/EditEdgeStackForm.tsx
+++ b/app/react/edge/edge-stacks/ItemView/EditEdgeStackForm/EditEdgeStackForm.tsx
@@ -214,7 +214,7 @@ function InnerForm({
                     checked={values.retryDeploy}
                     name="retryDeploy"
                     label="Retry deployment"
-                    tooltip="When enabled, this will allow edge agent keep retrying deployment if failure occur"
+                    tooltip="When enabled, this will allow the edge agent to retry deployment if failed to deploy initially"
                     labelClass="col-sm-3 col-lg-2"
                     onChange={(value) => setFieldValue('retryDeploy', value)}
                   />
diff --git a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
index 0177c2e94..3c1c91a71 100644
--- a/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
+++ b/app/react/edge/edge-stacks/ItemView/EnvironmentsDatatable/columns.tsx
@@ -121,6 +121,7 @@ function ErrorCell({ getValue }: CellContext<EdgeStackEnvironment, string>) {
 
   return (
     <Button
+      color="none"
       className="flex cursor-pointer"
       onClick={() => setIsExpanded(!isExpanded)}
     >
diff --git a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/TableSettingsMenus.tsx b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/TableSettingsMenus.tsx
index 47e49b8b3..7062c66e6 100644
--- a/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/TableSettingsMenus.tsx
+++ b/app/react/edge/edge-stacks/ListView/EdgeStacksDatatable/TableSettingsMenus.tsx
@@ -20,16 +20,18 @@ export function TableSettingsMenus({
 
   return (
     <>
-      <ColumnVisibilityMenu<DecoratedEdgeStack>
-        columns={columnsToHide}
-        onChange={(hiddenColumns) => {
-          tableState.setHiddenColumns(hiddenColumns);
-          tableInstance.setColumnVisibility(
-            Object.fromEntries(hiddenColumns.map((col) => [col, false]))
-          );
-        }}
-        value={tableState.hiddenColumns}
-      />
+      {columnsToHide && columnsToHide.length > 0 && (
+        <ColumnVisibilityMenu<DecoratedEdgeStack>
+          columns={columnsToHide}
+          onChange={(hiddenColumns) => {
+            tableState.setHiddenColumns(hiddenColumns);
+            tableInstance.setColumnVisibility(
+              Object.fromEntries(hiddenColumns.map((col) => [col, false]))
+            );
+          }}
+          value={tableState.hiddenColumns}
+        />
+      )}
       <TableSettingsMenu>
         <TableSettingsMenuAutoRefresh
           value={tableState.autoRefreshRate}
diff --git a/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx b/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx
index acbc87cdb..85b96e650 100644
--- a/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx
+++ b/app/react/edge/edge-stacks/components/PrivateRegistryFieldset.tsx
@@ -38,7 +38,7 @@ export function PrivateRegistryFieldset({
   const [selected, setSelected] = useState(value);
 
   const tooltipMessage =
-    'Use this when using a private registry that requires credentials';
+    'This allows you to provide credentials when using a private registry that requires authentication';
 
   useEffect(() => {
     if (checked) {
diff --git a/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx b/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx
index a55bcc471..25031e42c 100644
--- a/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx
+++ b/app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx
@@ -51,8 +51,8 @@ export function AutoUpdateFieldset({
             We&#39;ve renamed &quot;Automatic updates&quot; to better align with
             industry terminology and clarify its purpose for all users.
             Originally chosen during the early emergence of GitOps, the name has
-            changed, but the functionality remains the same. GitOps has rapidly
-            emerged as a revolutionary approach to manage infrastructure and
+            changed, but the functionality remains unchanged. GitOps has rapidly
+            emerged as a revolutionary approach to managing infrastructure and
             application changes, and we want to ensure our platform reflects the
             latest advancements in the industry.
           </p>