From a6c41c15c1f32f0b7fba9627aa38a10cc05d5788 Mon Sep 17 00:00:00 2001
From: Teal Larson <LARSON.TEAL@GMAIL.COM>
Date: Tue, 27 Feb 2024 08:58:03 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=AA=9F=20Move=20Source=20and=20Destinatio?=
 =?UTF-8?q?n=20Settings=20into=20Organization=20section=20in=20Enterprise?=
 =?UTF-8?q?=20(#11429)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/SettingsPage/SettingsPage.tsx   | 53 ++++++++++---------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx b/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx
index f1f8645c66a..30c87d449b3 100644
--- a/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx
+++ b/airbyte-webapp/src/pages/SettingsPage/SettingsPage.tsx
@@ -93,31 +93,34 @@ export const SettingsPage: React.FC = () => {
               />
             </SettingsNavigationBlock>
           )}
-          {multiWorkspaceUI && canViewOrganizationSettings && (
-            <SettingsNavigationBlock title={formatMessage({ id: "settings.organizationSettings" })}>
-              <SettingsLink
-                iconType="community"
-                name={formatMessage({ id: "settings.members" })}
-                to={SettingsRoutePaths.Organization}
-              />
-            </SettingsNavigationBlock>
-          )}
-          {multiWorkspaceUI && canViewWorkspaceSettings && (
-            <SettingsNavigationBlock title={formatMessage({ id: "settings.instanceSettings" })}>
-              <SettingsLink
-                iconType="source"
-                count={countNewSourceVersion}
-                name={formatMessage({ id: "tables.sources" })}
-                to={SettingsRoutePaths.Source}
-              />
-              <SettingsLink
-                iconType="destination"
-                count={countNewDestinationVersion}
-                name={formatMessage({ id: "tables.destinations" })}
-                to={SettingsRoutePaths.Destination}
-              />
-            </SettingsNavigationBlock>
-          )}
+          {canViewOrganizationSettings ||
+            (canViewWorkspaceSettings && (
+              <SettingsNavigationBlock title={formatMessage({ id: "settings.organizationSettings" })}>
+                {multiWorkspaceUI && canViewOrganizationSettings && (
+                  <SettingsLink
+                    iconType="community"
+                    name={formatMessage({ id: "settings.members" })}
+                    to={SettingsRoutePaths.Organization}
+                  />
+                )}
+                {multiWorkspaceUI && canViewWorkspaceSettings && (
+                  <>
+                    <SettingsLink
+                      iconType="source"
+                      count={countNewSourceVersion}
+                      name={formatMessage({ id: "tables.sources" })}
+                      to={SettingsRoutePaths.Source}
+                    />
+                    <SettingsLink
+                      iconType="destination"
+                      count={countNewDestinationVersion}
+                      name={formatMessage({ id: "tables.destinations" })}
+                      to={SettingsRoutePaths.Destination}
+                    />
+                  </>
+                )}
+              </SettingsNavigationBlock>
+            ))}
         </SettingsNavigation>
         <FlexItem grow>
           <Suspense fallback={<LoadingPage />}>