From 01e483ae3e1eb3a737c6f967c07b65f8a0b2ae38 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 21 Feb 2024 16:22:02 +0100 Subject: [PATCH] Merge pull request #17241 from overleaf/msm-fix-sp-git-settings [web] Prevent render of Sync section in SP when git is disabled GitOrigin-RevId: 5bfd1baadaff21db72d84a11d3f926431739dae4 --- services/web/app/src/Features/User/UserPagesController.js | 2 ++ services/web/app/views/user/settings.pug | 2 ++ .../js/features/settings/components/linking-section.tsx | 6 +++++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/services/web/app/src/Features/User/UserPagesController.js b/services/web/app/src/Features/User/UserPagesController.js index 77b3c21c99..dab34a619b 100644 --- a/services/web/app/src/Features/User/UserPagesController.js +++ b/services/web/app/src/Features/User/UserPagesController.js @@ -162,6 +162,8 @@ async function settingsPage(req, res) { isManagedAccount: !!req.managedBy, userRestrictions: Array.from(req.userRestrictions || []), currentManagedUserAdminEmail, + gitBridgeEnabled: Settings.enableGitBridge, + isSaas: Features.hasFeature('saas'), }) } diff --git a/services/web/app/views/user/settings.pug b/services/web/app/views/user/settings.pug index 1f7017bd59..95560ca5a5 100644 --- a/services/web/app/views/user/settings.pug +++ b/services/web/app/views/user/settings.pug @@ -27,6 +27,8 @@ block append meta meta(name="ol-personalAccessTokens", data-type="json" content=personalAccessTokens) meta(name="ol-emailAddressLimit", data-type="json", content=emailAddressLimit) meta(name="ol-currentManagedUserAdminEmail" data-type="string" content=currentManagedUserAdminEmail) + meta(name="ol-gitBridgeEnabled" data-type="boolean" content=gitBridgeEnabled) + meta(name="ol-isSaas" data-type="boolean" content=isSaas) block content main.content.content-alt#main-content diff --git a/services/web/frontend/js/features/settings/components/linking-section.tsx b/services/web/frontend/js/features/settings/components/linking-section.tsx index 61189d7b5f..bb50afdc71 100644 --- a/services/web/frontend/js/features/settings/components/linking-section.tsx +++ b/services/web/frontend/js/features/settings/components/linking-section.tsx @@ -37,6 +37,9 @@ function LinkingSection() { path: string }[] + const renderSyncSection = + getMeta('ol-isSaas') || getMeta('ol-gitBridgeEnabled') + const showPersonalAccessTokenComponents: boolean = getMeta('ol-showPersonalAccessToken') || getMeta('ol-optionalPersonalAccessToken') @@ -62,7 +65,8 @@ function LinkingSection() { const haslangFeedbackLinkingWidgets = langFeedbackLinkingWidgets.length && shouldLoadWritefull - const hasIntegrationLinkingSection = allIntegrationLinkingWidgets.length + const hasIntegrationLinkingSection = + renderSyncSection && allIntegrationLinkingWidgets.length const hasReferencesLinkingSection = referenceLinkingWidgets.length // Filter out SSO providers that are not allowed to be linked by