From 66db8533285192ea7ca64cfdf680389b30518f91 Mon Sep 17 00:00:00 2001
From: Jonas Jabari <j.jabari@openproject.com>
Date: Tue, 26 Mar 2024 12:07:26 +0700
Subject: [PATCH 1/2] [#53577] Handle no active project attributes in project
 overview sidebar

https://community.openproject.org/work_packages/53577

From beaaa312adc0da7a476dfa32bf9871dad28217da Mon Sep 17 00:00:00 2001
From: Jonas Jabari <j.jabari@openproject.com>
Date: Tue, 26 Mar 2024 12:25:31 +0700
Subject: [PATCH 2/2] show sidebar based on project custom fields count

---
 app/views/layouts/_common_head.html.erb                  | 3 ++-
 .../app/core/current-project/current-project.service.ts  | 9 +++++++--
 frontend/src/app/features/overview/overview.component.ts | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb
index 429cec0a4233..f6e22cb7d1cf 100644
--- a/app/views/layouts/_common_head.html.erb
+++ b/app/views/layouts/_common_head.html.erb
@@ -10,7 +10,8 @@
   <meta name="current_project"
         data-project-name="<%= h @project.name %>"
         data-project-id="<%= @project.id %>"
-        data-project-identifier="<%= @project.identifier %>"/>
+        data-project-identifier="<%= @project.identifier %>"
+        data-project-custom-fields-count="<%= @project.project_custom_fields.visible.count %>"/>
 <% end %>
 <meta name="current_user"
       data-name="<%= User.current.name %>"
diff --git a/frontend/src/app/core/current-project/current-project.service.ts b/frontend/src/app/core/current-project/current-project.service.ts
index 06a95e4f6b2a..14022de03432 100644
--- a/frontend/src/app/core/current-project/current-project.service.ts
+++ b/frontend/src/app/core/current-project/current-project.service.ts
@@ -32,7 +32,7 @@ import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service';
 
 @Injectable({ providedIn: 'root' })
 export class CurrentProjectService {
-  private current:{ id:string, identifier:string, name:string };
+  private current:{ id:string, identifier:string, name:string, customFieldsCount:string };
 
   constructor(
     private PathHelper:PathHelperService,
@@ -73,7 +73,11 @@ export class CurrentProjectService {
     return this.getCurrent('identifier');
   }
 
-  private getCurrent(key:'id'|'identifier'|'name') {
+  public get customFieldsCount():string|null {
+    return this.getCurrent('customFieldsCount');
+  }
+
+  private getCurrent(key:'id'|'identifier'|'name'|'customFieldsCount') {
     if (this.current && this.current[key]) {
       return this.current[key].toString();
     }
@@ -91,6 +95,7 @@ export class CurrentProjectService {
         id: element.dataset.projectId!,
         name: element.dataset.projectName!,
         identifier: element.dataset.projectIdentifier!,
+        customFieldsCount: element.dataset.projectCustomFieldsCount!,
       };
     }
   }
diff --git a/frontend/src/app/features/overview/overview.component.ts b/frontend/src/app/features/overview/overview.component.ts
index 9746c96c12a5..973df236f68c 100644
--- a/frontend/src/app/features/overview/overview.component.ts
+++ b/frontend/src/app/features/overview/overview.component.ts
@@ -14,7 +14,7 @@ export class OverviewComponent extends GridPageComponent {
   }
 
   protected isTurboFrameSidebarEnabled():boolean {
-    return true;
+    return this.currentProject.customFieldsCount !== '0';
   }
 
   protected turboFrameSidebarSrc():string {