From 3d2997c44970bb9b1392780941b3e83b2afc6c19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliver=20G=C3=BCnther?= <mail@oliverguenther.de>
Date: Thu, 23 Apr 2020 14:42:41 +0200
Subject: [PATCH] [33130] Don't prepend BCF component to WP in core edition

https://community.openproject.com/wp/33130
---
 frontend/src/app/modules/bim/bcf/openproject-bcf.module.ts | 4 ++++
 modules/bim/spec/features/bcf/api_authorization_spec.rb    | 5 ++++-
 modules/bim/spec/features/bcf/bcf_snapshot_column_spec.rb  | 6 +++++-
 modules/bim/spec/features/bcf/create_spec.rb               | 6 +++++-
 modules/bim/spec/features/bcf/export_spec.rb               | 5 ++++-
 modules/bim/spec/features/bim_filter_spec.rb               | 5 ++++-
 modules/bim/spec/features/bim_navigation_spec.rb           | 5 ++++-
 modules/bim/spec/features/model_management_spec.rb         | 5 ++++-
 modules/bim/spec/features/model_viewer_spec.rb             | 5 ++++-
 modules/bim/spec/features/show_default_spec.rb             | 5 ++++-
 modules/bim/spec/features/viewer/create_viewpoint_spec.rb  | 5 ++++-
 modules/bim/spec/features/viewer/delete_viewpoint_spec.rb  | 5 ++++-
 modules/bim/spec/features/viewer/show_viewpoint_spec.rb    | 5 ++++-
 13 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/frontend/src/app/modules/bim/bcf/openproject-bcf.module.ts b/frontend/src/app/modules/bim/bcf/openproject-bcf.module.ts
index b01c1ab7f05..8826c3000d2 100644
--- a/frontend/src/app/modules/bim/bcf/openproject-bcf.module.ts
+++ b/frontend/src/app/modules/bim/bcf/openproject-bcf.module.ts
@@ -111,6 +111,10 @@ export class OpenprojectBcfModule {
 
     const hookService = injector.get(HookService);
     hookService.register('prependedAttributeGroups', (workPackage:WorkPackageResource) => {
+      if (!window.OpenProject.isBimEdition) {
+        return;
+      }
+
       if (workPackage.isNew) {
         return BcfNewWpAttributeGroupComponent;
       } else {
diff --git a/modules/bim/spec/features/bcf/api_authorization_spec.rb b/modules/bim/spec/features/bcf/api_authorization_spec.rb
index 503a033742c..156db6eab81 100644
--- a/modules/bim/spec/features/bcf/api_authorization_spec.rb
+++ b/modules/bim/spec/features/bcf/api_authorization_spec.rb
@@ -28,7 +28,10 @@
 
 require 'spec_helper'
 
-describe 'authorization for BCF api', type: :feature, js: true do
+describe 'authorization for BCF api',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let!(:user) { FactoryBot.create(:admin) }
   let(:client_secret) { app.plaintext_secret }
   let(:scope) { 'bcf_v2_1' }
diff --git a/modules/bim/spec/features/bcf/bcf_snapshot_column_spec.rb b/modules/bim/spec/features/bcf/bcf_snapshot_column_spec.rb
index d097b359496..26ca65d67cf 100644
--- a/modules/bim/spec/features/bcf/bcf_snapshot_column_spec.rb
+++ b/modules/bim/spec/features/bcf/bcf_snapshot_column_spec.rb
@@ -1,6 +1,10 @@
 require 'spec_helper'
 
-describe 'BCF snapshot column', type: :feature, js: true, with_mail: false do
+describe 'BCF snapshot column',
+         type: :feature,
+         js: true,
+         with_config: { edition: 'bim' },
+         with_mail: false do
   let(:project) { FactoryBot.create(:project, enabled_module_names: %w[bim work_package_tracking]) }
   let(:wp_table) { Pages::WorkPackagesTable.new(project) }
   let(:permissions) { %i[add_work_packages view_work_packages view_linked_issues] }
diff --git a/modules/bim/spec/features/bcf/create_spec.rb b/modules/bim/spec/features/bcf/create_spec.rb
index 7e29ba33346..b0f740320cb 100644
--- a/modules/bim/spec/features/bcf/create_spec.rb
+++ b/modules/bim/spec/features/bcf/create_spec.rb
@@ -1,6 +1,10 @@
 require_relative '../../spec_helper'
 
-describe 'Create BCF', type: :feature, js: true, with_mail: false do
+describe 'Create BCF',
+         type: :feature,
+         js: true,
+         with_config: { edition: 'bim' },
+         with_mail: false do
   let(:project) do
     FactoryBot.create(:project,
                       types: [type, type_with_cf],
diff --git a/modules/bim/spec/features/bcf/export_spec.rb b/modules/bim/spec/features/bcf/export_spec.rb
index 9f27918aa7f..ae864d67852 100644
--- a/modules/bim/spec/features/bcf/export_spec.rb
+++ b/modules/bim/spec/features/bcf/export_spec.rb
@@ -28,7 +28,10 @@
 require 'spec_helper'
 require_relative '../../support/pages/ifc_models/show_default'
 
-describe 'bcf export', type: :feature, js: true do
+describe 'bcf export',
+         type: :feature,
+         js: true,
+         with_config: { edition: 'bim' } do
   let(:status) { FactoryBot.create(:status, name: 'New', is_default: true) }
   let(:closed_status) { FactoryBot.create(:closed_status, name: 'Closed') }
   let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }
diff --git a/modules/bim/spec/features/bim_filter_spec.rb b/modules/bim/spec/features/bim_filter_spec.rb
index ce74a31e90c..09152800dca 100644
--- a/modules/bim/spec/features/bim_filter_spec.rb
+++ b/modules/bim/spec/features/bim_filter_spec.rb
@@ -31,7 +31,10 @@ require 'spec_helper'
 require_relative '../support/pages/ifc_models/show'
 require_relative '../support/pages/ifc_models/show_default'
 
-describe 'BIM filter spec', type: :feature, js: true do
+describe 'BIM filter spec',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: %w(bim work_package_tracking) }
   let(:open_status) { FactoryBot.create(:status, is_closed: false) }
   let(:closed_status) { FactoryBot.create(:status, is_closed: true) }
diff --git a/modules/bim/spec/features/bim_navigation_spec.rb b/modules/bim/spec/features/bim_navigation_spec.rb
index 7410ba9ec77..1425cd9959e 100644
--- a/modules/bim/spec/features/bim_navigation_spec.rb
+++ b/modules/bim/spec/features/bim_navigation_spec.rb
@@ -28,7 +28,10 @@
 
 require_relative '../spec_helper'
 
-describe 'BIM navigation spec', type: :feature, js: true do
+describe 'BIM navigation spec',
+         type: :feature,
+         with_config: { edition: 'bim' },
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let!(:work_package) { FactoryBot.create(:work_package, project: project) }
   let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_ifc_models view_work_packages]) }
diff --git a/modules/bim/spec/features/model_management_spec.rb b/modules/bim/spec/features/model_management_spec.rb
index 86e3236893c..26566a152d9 100644
--- a/modules/bim/spec/features/model_management_spec.rb
+++ b/modules/bim/spec/features/model_management_spec.rb
@@ -30,7 +30,10 @@ require 'spec_helper'
 
 require_relative '../support/pages/ifc_models/index'
 
-describe 'model management', type: :feature, js: true do
+describe 'model management',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }
   let(:index_page) { Pages::IfcModels::Index.new(project) }
   let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_bcf manage_ifc_models view_work_packages]) }
diff --git a/modules/bim/spec/features/model_viewer_spec.rb b/modules/bim/spec/features/model_viewer_spec.rb
index c1b7fe6dc1b..216a21fd775 100644
--- a/modules/bim/spec/features/model_viewer_spec.rb
+++ b/modules/bim/spec/features/model_viewer_spec.rb
@@ -28,7 +28,10 @@
 
 require_relative '../spec_helper'
 
-describe 'model viewer', type: :feature, js: true do
+describe 'model viewer',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   # TODO: Add empty viewpoint and stub method to load viewpoints once defined
   let(:work_package) { FactoryBot.create(:work_package, project: project) }
diff --git a/modules/bim/spec/features/show_default_spec.rb b/modules/bim/spec/features/show_default_spec.rb
index 7bfadfb15d3..23218477326 100644
--- a/modules/bim/spec/features/show_default_spec.rb
+++ b/modules/bim/spec/features/show_default_spec.rb
@@ -28,7 +28,10 @@
 
 require_relative '../spec_helper'
 
-describe 'show default model', type: :feature, js: true do
+describe 'show default model',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }
   let(:index_page) { Pages::IfcModels::Index.new(project) }
   let(:show_default_page) { Pages::IfcModels::ShowDefault.new(project) }
diff --git a/modules/bim/spec/features/viewer/create_viewpoint_spec.rb b/modules/bim/spec/features/viewer/create_viewpoint_spec.rb
index 79bdff9ec2e..60393521d59 100644
--- a/modules/bim/spec/features/viewer/create_viewpoint_spec.rb
+++ b/modules/bim/spec/features/viewer/create_viewpoint_spec.rb
@@ -28,7 +28,10 @@
 
 require_relative '../../spec_helper'
 
-describe 'Create viewpoint from BCF details page', type: :feature, js: true do
+describe 'Create viewpoint from BCF details page',
+         type: :feature,
+         with_config: { edition: 'bim' },
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let(:user) { FactoryBot.create :admin }
 
diff --git a/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb b/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb
index c52457bc916..a2582c69af8 100644
--- a/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb
+++ b/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb
@@ -28,7 +28,10 @@
 
 require_relative '../../spec_helper'
 
-describe 'Delete viewpoint in model viewer', type: :feature, js: true do
+describe 'Delete viewpoint in model viewer',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let(:user) { FactoryBot.create :admin }
 
diff --git a/modules/bim/spec/features/viewer/show_viewpoint_spec.rb b/modules/bim/spec/features/viewer/show_viewpoint_spec.rb
index 68cd1d87f37..2cdc76612db 100644
--- a/modules/bim/spec/features/viewer/show_viewpoint_spec.rb
+++ b/modules/bim/spec/features/viewer/show_viewpoint_spec.rb
@@ -28,7 +28,10 @@
 
 require_relative '../../spec_helper'
 
-describe 'Show viewpoint in model viewer', type: :feature, js: true do
+describe 'Show viewpoint in model viewer',
+         with_config: { edition: 'bim' },
+         type: :feature,
+         js: true do
   let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
   let(:user) { FactoryBot.create :admin }