From 385e91652ac247cfcb9d9bee6fc7d0f508e7bcdb Mon Sep 17 00:00:00 2001
From: Miguel Serrano <mserranom@users.noreply.github.com>
Date: Mon, 8 May 2023 09:58:15 +0200
Subject: [PATCH] Merge pull request #12929 from overleaf/msm-fix-templates-sp

[web] Fix template rendering in Server Pro

GitOrigin-RevId: 01dad18d61eb5a0e524cc80ddfcb55d0140a14cb
---
 .../web/app/src/Features/Project/ProjectController.js  | 10 +++++++---
 .../project-list/components/new-project-button.tsx     |  9 +++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js
index 934653ecd2..3e97205589 100644
--- a/services/web/app/src/Features/Project/ProjectController.js
+++ b/services/web/app/src/Features/Project/ProjectController.js
@@ -1274,6 +1274,12 @@ const ProjectController = {
               }
             }
 
+            const isAdminOrTemplateOwner =
+              hasAdminAccess(user) || Settings.templates?.user_id === userId
+            const showTemplatesServerPro =
+              Features.hasFeature('templates-server-pro') &&
+              isAdminOrTemplateOwner
+
             const debugPdfDetach = shouldDisplayFeature('debug_pdf_detach')
 
             const detachRole = req.params.detachRole
@@ -1390,9 +1396,7 @@ const ProjectController = {
               gitBridgePublicBaseUrl: Settings.gitBridgePublicBaseUrl,
               wsUrl,
               showSupport: Features.hasFeature('support'),
-              showTemplatesServerPro: Features.hasFeature(
-                'templates-server-pro'
-              ),
+              showTemplatesServerPro,
               pdfjsVariant: pdfjsAssignment.variant,
               debugPdfDetach,
               isParticipatingInVisualEditorNamingTest,
diff --git a/services/web/frontend/js/features/project-list/components/new-project-button.tsx b/services/web/frontend/js/features/project-list/components/new-project-button.tsx
index fbc350e87a..350d4cb89d 100644
--- a/services/web/frontend/js/features/project-list/components/new-project-button.tsx
+++ b/services/web/frontend/js/features/project-list/components/new-project-button.tsx
@@ -221,8 +221,13 @@ function NewProjectButton({
               ))}
             </>
           ) : null}
-          <MenuItem divider />
-          <MenuItem header>{t('templates')}</MenuItem>
+
+          {templateLinks && templateLinks.length > 0 && (
+            <>
+              <MenuItem divider />
+              <MenuItem header>{t('templates')}</MenuItem>
+            </>
+          )}
           {templateLinks?.map((templateLink, index) => (
             <MenuItem
               key={`new-project-button-template-${index}`}