🪟 Move Source and Destination Settings into Organization section in E…

…nterprise (#11429)
airbytehq · Feb 27, 2024 · a6c41c1 · a6c41c1
1 parent 7c2a5de
commit a6c41c1
Showing 1 changed file with 28 additions and 25 deletions.
diff --git 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 />}>