fix (dashboard): don't show double scrollbar in configuration editor (#2792)

Fixes #2789

.changeset/stale-rocks-work.md

@@ -0,0 +1,5 @@
+---
+'@nhost/dashboard': minor
+---
+
+fix: don't show double scrollbar in configuration editor

dashboard/src/components/layout/SettingsLayout/SettingsLayout.tsx

@@ -47,46 +47,51 @@ export default function SettingsLayout({
         sx={{ backgroundColor: 'background.default' }}
         className="flex w-full flex-auto flex-col overflow-y-auto overflow-x-hidden"
       >
-        <RetryableErrorBoundary>
-          <div className="flex flex-col space-y-2">
-            {hasGitRepo && (
-              <Alert
-                severity="warning"
-                className="grid grid-flow-row place-content-center gap-2"
-              >
-                <Text color="warning" className="text-sm ">
-                  As you have a connected repository, make sure to synchronize
-                  your changes with{' '}
-                  <code
-                    className={twMerge(
-                      'rounded-md px-2 py-px',
-                      theme.palette.mode === 'dark'
-                        ? 'bg-brown text-copper'
-                        : 'bg-slate-200 text-slate-700',
-                    )}
-                  >
-                    nhost config pull
-                  </code>{' '}
-                  or they may be reverted with the next push.
-                  <br />
-                  If there are multiple projects linked to the same repository
-                  and you only want these changes to apply to a subset of them,
-                  please check out{' '}
-                  <a
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="underline"
-                    href="https://docs.nhost.io/cli/overlays"
-                  >
-                    docs.nhost.io/cli/overlays
-                  </a>{' '}
-                  for guidance.
-                </Text>
-              </Alert>
-            )}
-          </div>
-          {children}
-        </RetryableErrorBoundary>
+        <Box
+          sx={{ backgroundColor: 'background.default' }}
+          className="flex h-full flex-col"
+        >
+          <RetryableErrorBoundary>
+            <div className="flex flex-col space-y-2">
+              {hasGitRepo && (
+                <Alert
+                  severity="warning"
+                  className="grid grid-flow-row place-content-center gap-2"
+                >
+                  <Text color="warning" className="text-sm ">
+                    As you have a connected repository, make sure to synchronize
+                    your changes with{' '}
+                    <code
+                      className={twMerge(
+                        'rounded-md px-2 py-px',
+                        theme.palette.mode === 'dark'
+                          ? 'bg-brown text-copper'
+                          : 'bg-slate-200 text-slate-700',
+                      )}
+                    >
+                      nhost config pull
+                    </code>{' '}
+                    or they may be reverted with the next push.
+                    <br />
+                    If there are multiple projects linked to the same repository
+                    and you only want these changes to apply to a subset of
+                    them, please check out{' '}
+                    <a
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="underline"
+                      href="https://docs.nhost.io/cli/overlays"
+                    >
+                      docs.nhost.io/cli/overlays
+                    </a>{' '}
+                    for guidance.
+                  </Text>
+                </Alert>
+              )}
+            </div>
+            {children}
+          </RetryableErrorBoundary>
+        </Box>
       </Box>
     </ProjectLayout>
   );

dashboard/src/features/projects/common/components/settings/TOMLEditor/TOMLEditor.tsx

@@ -143,7 +143,7 @@ export default function TOMLEditor() {
   };
 
   return (
-    <Box className="flex h-full flex-col">
+    <>
       <Box className="flex w-full flex-col space-y-2 border-b p-4">
         <Text className="font-semibold">Configuration Editor</Text>
       </Box>
@@ -187,6 +187,6 @@ export default function TOMLEditor() {
           Save
         </Button>
       </Box>
-    </Box>
+    </>
   );
 }