Skip to content

Commit 3d2997c

Browse files
[33130] Don't prepend BCF component to WP in core edition
https://community.openproject.com/wp/33130
1 parent 3478cb8 commit 3d2997c

13 files changed

+54
-12
lines changed

frontend/src/app/modules/bim/bcf/openproject-bcf.module.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,10 @@ export class OpenprojectBcfModule {
111111

112112
const hookService = injector.get(HookService);
113113
hookService.register('prependedAttributeGroups', (workPackage:WorkPackageResource) => {
114+
if (!window.OpenProject.isBimEdition) {
115+
return;
116+
}
117+
114118
if (workPackage.isNew) {
115119
return BcfNewWpAttributeGroupComponent;
116120
} else {

modules/bim/spec/features/bcf/api_authorization_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
require 'spec_helper'
3030

31-
describe 'authorization for BCF api', type: :feature, js: true do
31+
describe 'authorization for BCF api',
32+
with_config: { edition: 'bim' },
33+
type: :feature,
34+
js: true do
3235
let!(:user) { FactoryBot.create(:admin) }
3336
let(:client_secret) { app.plaintext_secret }
3437
let(:scope) { 'bcf_v2_1' }

modules/bim/spec/features/bcf/bcf_snapshot_column_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
require 'spec_helper'
22

3-
describe 'BCF snapshot column', type: :feature, js: true, with_mail: false do
3+
describe 'BCF snapshot column',
4+
type: :feature,
5+
js: true,
6+
with_config: { edition: 'bim' },
7+
with_mail: false do
48
let(:project) { FactoryBot.create(:project, enabled_module_names: %w[bim work_package_tracking]) }
59
let(:wp_table) { Pages::WorkPackagesTable.new(project) }
610
let(:permissions) { %i[add_work_packages view_work_packages view_linked_issues] }

modules/bim/spec/features/bcf/create_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
require_relative '../../spec_helper'
22

3-
describe 'Create BCF', type: :feature, js: true, with_mail: false do
3+
describe 'Create BCF',
4+
type: :feature,
5+
js: true,
6+
with_config: { edition: 'bim' },
7+
with_mail: false do
48
let(:project) do
59
FactoryBot.create(:project,
610
types: [type, type_with_cf],

modules/bim/spec/features/bcf/export_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
require 'spec_helper'
2929
require_relative '../../support/pages/ifc_models/show_default'
3030

31-
describe 'bcf export', type: :feature, js: true do
31+
describe 'bcf export',
32+
type: :feature,
33+
js: true,
34+
with_config: { edition: 'bim' } do
3235
let(:status) { FactoryBot.create(:status, name: 'New', is_default: true) }
3336
let(:closed_status) { FactoryBot.create(:closed_status, name: 'Closed') }
3437
let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }

modules/bim/spec/features/bim_filter_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@
3131
require_relative '../support/pages/ifc_models/show'
3232
require_relative '../support/pages/ifc_models/show_default'
3333

34-
describe 'BIM filter spec', type: :feature, js: true do
34+
describe 'BIM filter spec',
35+
with_config: { edition: 'bim' },
36+
type: :feature,
37+
js: true do
3538
let(:project) { FactoryBot.create :project, enabled_module_names: %w(bim work_package_tracking) }
3639
let(:open_status) { FactoryBot.create(:status, is_closed: false) }
3740
let(:closed_status) { FactoryBot.create(:status, is_closed: true) }

modules/bim/spec/features/bim_navigation_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
require_relative '../spec_helper'
3030

31-
describe 'BIM navigation spec', type: :feature, js: true do
31+
describe 'BIM navigation spec',
32+
type: :feature,
33+
with_config: { edition: 'bim' },
34+
js: true do
3235
let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
3336
let!(:work_package) { FactoryBot.create(:work_package, project: project) }
3437
let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_ifc_models view_work_packages]) }

modules/bim/spec/features/model_management_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030

3131
require_relative '../support/pages/ifc_models/index'
3232

33-
describe 'model management', type: :feature, js: true do
33+
describe 'model management',
34+
with_config: { edition: 'bim' },
35+
type: :feature,
36+
js: true do
3437
let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }
3538
let(:index_page) { Pages::IfcModels::Index.new(project) }
3639
let(:role) { FactoryBot.create(:role, permissions: %i[view_ifc_models manage_bcf manage_ifc_models view_work_packages]) }

modules/bim/spec/features/model_viewer_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
require_relative '../spec_helper'
3030

31-
describe 'model viewer', type: :feature, js: true do
31+
describe 'model viewer',
32+
with_config: { edition: 'bim' },
33+
type: :feature,
34+
js: true do
3235
let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
3336
# TODO: Add empty viewpoint and stub method to load viewpoints once defined
3437
let(:work_package) { FactoryBot.create(:work_package, project: project) }

modules/bim/spec/features/show_default_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
require_relative '../spec_helper'
3030

31-
describe 'show default model', type: :feature, js: true do
31+
describe 'show default model',
32+
with_config: { edition: 'bim' },
33+
type: :feature,
34+
js: true do
3235
let(:project) { FactoryBot.create :project, enabled_module_names: %i[bim work_package_tracking] }
3336
let(:index_page) { Pages::IfcModels::Index.new(project) }
3437
let(:show_default_page) { Pages::IfcModels::ShowDefault.new(project) }

modules/bim/spec/features/viewer/create_viewpoint_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
require_relative '../../spec_helper'
3030

31-
describe 'Create viewpoint from BCF details page', type: :feature, js: true do
31+
describe 'Create viewpoint from BCF details page',
32+
type: :feature,
33+
with_config: { edition: 'bim' },
34+
js: true do
3235
let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
3336
let(:user) { FactoryBot.create :admin }
3437

modules/bim/spec/features/viewer/delete_viewpoint_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
require_relative '../../spec_helper'
3030

31-
describe 'Delete viewpoint in model viewer', type: :feature, js: true do
31+
describe 'Delete viewpoint in model viewer',
32+
with_config: { edition: 'bim' },
33+
type: :feature,
34+
js: true do
3235
let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
3336
let(:user) { FactoryBot.create :admin }
3437

modules/bim/spec/features/viewer/show_viewpoint_spec.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828

2929
require_relative '../../spec_helper'
3030

31-
describe 'Show viewpoint in model viewer', type: :feature, js: true do
31+
describe 'Show viewpoint in model viewer',
32+
with_config: { edition: 'bim' },
33+
type: :feature,
34+
js: true do
3235
let(:project) { FactoryBot.create :project, enabled_module_names: [:bim, :work_package_tracking] }
3336
let(:user) { FactoryBot.create :admin }
3437

0 commit comments

Comments
 (0)