Merge remote-tracking branch 'origin/release/13.1' into dev

config/initializers/feature_decisions.rb

@@ -38,5 +38,3 @@
 #   initializer 'the_engine.feature_decisions' do
 #     OpenProject::FeatureDecisions.add :some_flag
 #   end
-
-OpenProject::FeatureDecisions.add :work_package_sharing

frontend/src/app/features/in-app-notifications/center/menu/menu.component.ts

@@ -101,15 +101,14 @@ export class IanMenuComponent implements OnInit {
       isEnterprise: true,
       ...this.eeGuardedDateAlertRoute,
     },
+    {
+      key: 'shared',
+      title: this.I18n.t('js.notifications.menu.shared'),
+      icon: 'share',
+      ...getUiLinkForFilters({ filter: 'reason', name: 'shared' }),
+    },
   ];
 
-  sharedMenuItem = {
-    key: 'shared',
-    title: this.I18n.t('js.notifications.menu.shared'),
-    icon: 'share',
-    ...getUiLinkForFilters({ filter: 'reason', name: 'shared' }),
-  };
-
   notificationsByProject$ = this.ianMenuService.notificationsByProject$.pipe(
     map((items) => items
       .map((item) => ({
@@ -171,11 +170,7 @@ export class IanMenuComponent implements OnInit {
     readonly state:StateService,
     readonly bannersService:BannersService,
     readonly configurationService:ConfigurationService,
-  ) {
-    if (this.configurationService.activeFeatureFlags.includes('workPackageSharing')) {
-      this.reasonMenuItems.push(this.sharedMenuItem);
-    }
-  }
+  ) { }
 
   ngOnInit():void {
     this.ianMenuService.reload();

frontend/src/app/features/user-preferences/notifications-settings/page/notifications-settings-page.component.html

@@ -56,7 +56,6 @@ <h5>{{ text.notifyImmediately.title }}</h5>
   <spot-selector-field
     [label]="text.shared"
     [control]="form.get('shared')"
-    *ngIf="displaySharedOption"
   >
     <input
       slot="input"

frontend/src/app/features/user-preferences/notifications-settings/page/notifications-settings-page.component.ts

@@ -67,8 +67,6 @@ export class NotificationsSettingsPageComponent extends UntilDestroyedMixin impl
 
   public eeShowBanners = false;
 
-  public displaySharedOption = false;
-
   public form = new UntypedFormGroup({
     assignee: new UntypedFormControl(false),
     responsible: new UntypedFormControl(false),
@@ -154,7 +152,6 @@ export class NotificationsSettingsPageComponent extends UntilDestroyedMixin impl
     this.form.disable();
     this.userId = (this.userId || this.uiRouterGlobals.params.userId) as string;
     this.eeShowBanners = this.bannersService.eeShowBanners;
-    this.displaySharedOption = this.configurationService.activeFeatureFlags.includes('workPackageSharing');
 
     this
       .currentUserService

frontend/src/app/features/user-preferences/notifications-settings/table/notification-settings-table.component.html

@@ -72,7 +72,7 @@ <h5>{{ text.notifyImmediately.title }}</h5>
           </td>
         </ng-container>
       </tr>
-      <tr *ngIf="displaySharedOption">
+      <tr>
         <th class="op-table--cell op-table--cell_soft-heading">
           {{ text.shared }}
         </th>

frontend/src/app/features/user-preferences/notifications-settings/table/notification-settings-table.component.ts

@@ -28,8 +28,6 @@ export class NotificationSettingsTableComponent implements OnInit {
 
   public eeShowBanners = false;
 
-  public displaySharedOption = false;
-
   public availableTimes = [
     {
       value: null,
@@ -89,7 +87,6 @@ export class NotificationSettingsTableComponent implements OnInit {
 
   ngOnInit():void {
     this.eeShowBanners = this.bannersService.eeShowBanners;
-    this.displaySharedOption = this.configurationService.activeFeatureFlags.includes('workPackageSharing');
   }
 
   projectLink(href:string) {

frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.component.ts

@@ -26,22 +26,26 @@
 // See COPYRIGHT and LICENSE files for more details.
 //++
 
-import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
+import {
+  HalResourceEditingService,
+} from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service';
 import { I18nService } from 'core-app/core/i18n/i18n.service';
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnInit } from '@angular/core';
 import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource';
 import { ConfigurationService } from 'core-app/core/config/configuration.service';
+import { CurrentUserService } from 'core-app/core/current-user/current-user.service';
+import { Observable } from 'rxjs';
 
 @Component({
   selector: 'wp-details-toolbar',
   templateUrl: './wp-details-toolbar.html',
 })
-export class WorkPackageSplitViewToolbarComponent {
+export class WorkPackageSplitViewToolbarComponent implements OnInit {
   @Input() workPackage:WorkPackageResource;
 
   @Input() displayNotificationsButton:boolean;
 
-  public displayShareButton = false;
+  public displayShareButton$:false|Observable<boolean> = false;
 
   public text = {
     button_more: this.I18n.t('js.button_more'),
@@ -51,7 +55,11 @@ export class WorkPackageSplitViewToolbarComponent {
     readonly I18n:I18nService,
     readonly halEditing:HalResourceEditingService,
     readonly configurationService:ConfigurationService,
+    readonly currentUserService:CurrentUserService,
   ) {
-    this.displayShareButton = this.configurationService.activeFeatureFlags.includes('workPackageSharing');
+  }
+
+  ngOnInit() {
+    this.displayShareButton$ = this.currentUserService.hasCapabilities$('work_package_shares/index', this.workPackage.project.id);
   }
 }

frontend/src/app/features/work-packages/components/wp-details/wp-details-toolbar.html

@@ -11,7 +11,7 @@
   ></op-work-package-mark-notification-button>
 
   <wp-share-button [workPackage]="workPackage"
-                   *ngIf="displayShareButton">
+                   *ngIf="displayShareButton$ | async">
   </wp-share-button>
 
   <button class="button dropdown-relative"

frontend/src/app/features/work-packages/routing/wp-full-view/wp-full-view.component.ts

@@ -107,8 +107,7 @@ export class WorkPackagesFullViewComponent extends WorkPackageSingleViewBase imp
     this.isWatched = Object.prototype.hasOwnProperty.call(wp, 'unwatch');
     this.displayWatchButton = Object.prototype.hasOwnProperty.call(wp, 'unwatch') || Object.prototype.hasOwnProperty.call(wp, 'watch');
     this.displayTimerButton = Object.prototype.hasOwnProperty.call(wp, 'logTime');
-    this.displayShareButton$ = this.configurationService.activeFeatureFlags.includes('workPackageSharing')
-      && this.currentUserService.hasCapabilities$('work_package_shares/index', wp.project.id);
+    this.displayShareButton$ = this.currentUserService.hasCapabilities$('work_package_shares/index', wp.project.id);
 
     // watchers
     if (wp.watchers) {

spec/features/notifications/notification_center/notification_center_sidemenu_spec.rb

@@ -3,8 +3,7 @@
 RSpec.describe "Notification center sidemenu",
                :js,
                :with_cuprite,
-               with_ee: %i[date_alerts],
-               with_flag: { work_package_sharing: true } do
+               with_ee: %i[date_alerts] do
   shared_let(:project) { create(:project) }
   shared_let(:project2) { create(:project) }
   shared_let(:project3) { create(:project, parent: project2) }

spec/features/users/notifications/shared_examples.rb

@@ -1,7 +1,6 @@
 RSpec.shared_examples 'notification settings workflow' do
   describe 'with another project the user can see',
-           with_ee: %i[date_alerts],
-           with_flag: { work_package_sharing: true } do
+           with_ee: %i[date_alerts] do
     shared_let(:project) { create(:project) }
     shared_let(:project_alt) { create(:project) }
     shared_let(:role) { create(:project_role, permissions: %i[view_project]) }
@@ -118,7 +117,7 @@
       container = page.find('[data-test-selector="notification-setting-inline-create"] ng-select')
       settings_page.search_autocomplete container, query: project.name, results_selector: 'body'
       expect(page).to have_text 'This project is already selected'
-      expect(page).to have_selector('.ng-option-disabled', text: project.name)
+      expect(page).to have_css('.ng-option-disabled', text: project.name)
     end
 
     context 'when overdue alerts are disabled for one project, enabled for another' do

spec/features/work_packages/share/bulk_sharing_spec.rb

@@ -32,8 +32,7 @@
 
 RSpec.describe 'Work Packages', 'Bulk Sharing',
                :js, :with_cuprite,
-               with_ee: %i[work_package_sharing],
-               with_flag: { work_package_sharing: true } do
+               with_ee: %i[work_package_sharing] do
   shared_let(:view_work_package_role)    { create(:view_work_package_role)    }
   shared_let(:comment_work_package_role) { create(:comment_work_package_role) }
   shared_let(:edit_work_package_role)    { create(:edit_work_package_role)    }

spec/features/work_packages/share/enterprise_restriction_spec.rb

@@ -30,9 +30,7 @@
 
 require 'rails_helper'
 
-RSpec.describe 'Work Package Sharing Enterprise Restriction',
-               :js, :with_cuprite,
-               with_flag: { work_package_sharing: true } do
+RSpec.describe 'Work Package Sharing Enterprise Restriction', :js, :with_cuprite do
   shared_let(:view_work_package_role)    { create(:view_work_package_role)    }
   shared_let(:comment_work_package_role) { create(:comment_work_package_role) }
   shared_let(:edit_work_package_role)    { create(:edit_work_package_role)    }

spec/features/work_packages/share/filter_spec.rb

@@ -32,8 +32,7 @@
 
 RSpec.describe 'Work package sharing',
                :js, :with_cuprite,
-               with_ee: %i[work_package_sharing],
-               with_flag: { work_package_sharing: true } do
+               with_ee: %i[work_package_sharing] do
   shared_let(:view_work_package_role) { create(:view_work_package_role) }
   shared_let(:comment_work_package_role) { create(:comment_work_package_role) }
   shared_let(:edit_work_package_role) { create(:edit_work_package_role) }

spec/features/work_packages/share/multi_invite_spec.rb

@@ -32,8 +32,7 @@
 
 RSpec.describe 'Work package sharing',
                :js, :with_cuprite,
-               with_ee: %i[work_package_sharing],
-               with_flag: { work_package_sharing: true } do
+               with_ee: %i[work_package_sharing] do
   shared_let(:view_work_package_role) { create(:view_work_package_role) }
   shared_let(:comment_work_package_role) { create(:comment_work_package_role) }
   shared_let(:edit_work_package_role) { create(:edit_work_package_role) }

spec/features/work_packages/share/share_account_activation_spec.rb

@@ -32,8 +32,7 @@
 
 RSpec.describe 'Work package sharing invited users',
                :js, :with_cuprite,
-               with_ee: %i[work_package_sharing],
-               with_flag: { work_package_sharing: true } do
+               with_ee: %i[work_package_sharing] do
   shared_let(:view_work_package_role) { create(:view_work_package_role) }
   shared_let(:editor) { create(:admin, firstname: 'Mr.', lastname: 'Sharer') }
 

spec/features/work_packages/share_spec.rb

@@ -32,8 +32,7 @@
 
 RSpec.describe 'Work package sharing',
                :js, :with_cuprite,
-               with_ee: %i[work_package_sharing],
-               with_flag: { work_package_sharing: true } do
+               with_ee: %i[work_package_sharing] do
   shared_let(:view_work_package_role) { create(:view_work_package_role) }
   shared_let(:comment_work_package_role) { create(:comment_work_package_role) }
   shared_let(:edit_work_package_role) { create(:edit_work_package_role) }
@@ -267,7 +266,6 @@ def inherited_member_roles(group:)
     end
   end
 
-
   context 'when lacking share permission but having the viewing permission' do
     let(:sharer_role) do
       create(:project_role,
@@ -316,16 +314,6 @@ def inherited_member_roles(group:)
     end
   end
 
-  context 'without the feature flag enabled', with_flag: { work_package_sharing: false } do
-    let(:sharer_role) do
-      create(:project_role,
-             permissions: %i(view_work_packages
-                             view_shared_work_packages))
-    end
-
-    it_behaves_like "'Share' button is not rendered"
-  end
-
   context "without the viewing permission" do
     let(:sharer_role) do
       create(:project_role,