Merge branch 'ph/removeParticipantsFromSidebarEntity' into 'master'

Removes participants and subscriptions from sidebar entity

See merge request gitlab-org/gitlab!68032

app/assets/javascripts/sidebar/services/sidebar_service.js

@@ -22,7 +22,6 @@ export default class SidebarService {
   constructor(endpointMap) {
     if (!SidebarService.singleton) {
       this.endpoint = endpointMap.endpoint;
-      this.toggleSubscriptionEndpoint = endpointMap.toggleSubscriptionEndpoint;
       this.moveIssueEndpoint = endpointMap.moveIssueEndpoint;
       this.projectsAutocompleteEndpoint = endpointMap.projectsAutocompleteEndpoint;
       this.fullPath = endpointMap.fullPath;
@@ -75,10 +74,6 @@ export default class SidebarService {
     });
   }
 
-  toggleSubscription() {
-    return axios.post(this.toggleSubscriptionEndpoint);
-  }
-
   moveIssue(moveToProjectId) {
     return axios.post(this.moveIssueEndpoint, {
       move_to_project_id: moveToProjectId,

app/assets/javascripts/sidebar/sidebar_mediator.js

@@ -17,7 +17,6 @@ export default class SidebarMediator {
     this.store = new Store(options);
     this.service = new Service({
       endpoint: options.endpoint,
-      toggleSubscriptionEndpoint: options.toggleSubscriptionEndpoint,
       moveIssueEndpoint: options.moveIssueEndpoint,
       projectsAutocompleteEndpoint: options.projectsAutocompleteEndpoint,
       fullPath: options.fullPath,
@@ -85,22 +84,6 @@ export default class SidebarMediator {
     this.store.setAssigneeData(data);
     this.store.setReviewerData(data);
     this.store.setTimeTrackingData(data);
-    this.store.setParticipantsData(data);
-    this.store.setSubscriptionsData(data);
-  }
-
-  toggleSubscription() {
-    this.store.setFetchingState('subscriptions', true);
-    return this.service
-      .toggleSubscription()
-      .then(() => {
-        this.store.setSubscribedState(!this.store.subscribed);
-        this.store.setFetchingState('subscriptions', false);
-      })
-      .catch((err) => {
-        this.store.setFetchingState('subscriptions', false);
-        throw err;
-      });
   }
 
   fetchAutocompleteProjects(searchTerm) {

app/assets/javascripts/sidebar/stores/sidebar_store.js

@@ -22,8 +22,6 @@ export default class SidebarStore {
     this.isFetching = {
       assignees: true,
       reviewers: true,
-      participants: true,
-      subscriptions: true,
     };
     this.isLoading = {};
     this.autocompleteProjects = [];
@@ -63,18 +61,6 @@ export default class SidebarStore {
     this.humanTotalTimeSpent = data.human_total_time_spent;
   }
 
-  setParticipantsData(data) {
-    this.isFetching.participants = false;
-    this.participants = data.participants || [];
-  }
-
-  setSubscriptionsData(data) {
-    this.projectEmailsDisabled = data.project_emails_disabled || false;
-    this.subscribeDisabledDescription = data.subscribe_disabled_description;
-    this.isFetching.subscriptions = false;
-    this.subscribed = data.subscribed || false;
-  }
-
   setFetchingState(key, value) {
     this.isFetching[key] = value;
   }

app/serializers/issuable_sidebar_extras_entity.rb

@@ -3,23 +3,6 @@
 class IssuableSidebarExtrasEntity < Grape::Entity
   include RequestAwareEntity
   include TimeTrackableEntity
-  include NotificationsHelper
-
-  expose :participants, using: ::API::Entities::UserBasic do |issuable|
-    issuable.participants(request.current_user)
-  end
-
-  expose :project_emails_disabled do |issuable|
-    issuable.project.emails_disabled?
-  end
-
-  expose :subscribe_disabled_description do |issuable|
-    notification_description(:owner_disabled)
-  end
-
-  expose :subscribed do |issuable|
-    issuable.subscribed?(request.current_user, issuable.project)
-  end
 
   expose :assignees, using: ::API::Entities::UserBasic
 end

spec/frontend/sidebar/sidebar_mediator_spec.js

@@ -63,8 +63,6 @@ describe('Sidebar mediator', () => {
     expect(mediator.store.assignees).toEqual(mockData.assignees);
     expect(mediator.store.humanTimeEstimate).toEqual(mockData.human_time_estimate);
     expect(mediator.store.humanTotalTimeSpent).toEqual(mockData.human_total_time_spent);
-    expect(mediator.store.participants).toEqual(mockData.participants);
-    expect(mediator.store.subscribed).toEqual(mockData.subscribed);
     expect(mediator.store.timeEstimate).toEqual(mockData.time_estimate);
     expect(mediator.store.totalTimeSpent).toEqual(mockData.total_time_spent);
   });
@@ -117,19 +115,4 @@ describe('Sidebar mediator', () => {
       urlSpy.mockRestore();
     });
   });
-
-  it('toggle subscription', () => {
-    mediator.store.setSubscribedState(false);
-    mock.onPost(mediatorMockData.toggleSubscriptionEndpoint).reply(200, {});
-    const spy = jest
-      .spyOn(mediator.service, 'toggleSubscription')
-      .mockReturnValue(Promise.resolve());
-
-    return mediator.toggleSubscription().then(() => {
-      expect(spy).toHaveBeenCalled();
-      expect(mediator.store.subscribed).toEqual(true);
-
-      spy.mockRestore();
-    });
-  });
 });

spec/frontend/sidebar/sidebar_store_spec.js

@@ -16,17 +16,6 @@ const ANOTHER_ASSINEE = {
   avatar_url: 'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
 };
 
-const PARTICIPANT = {
-  id: 1,
-  state: 'active',
-  username: 'marcene',
-  name: 'Allie Will',
-  web_url: 'foo.com',
-  avatar_url: 'gravatar.com/avatar/xxx',
-};
-
-const PARTICIPANT_LIST = [PARTICIPANT, { ...PARTICIPANT, id: 2 }, { ...PARTICIPANT, id: 3 }];
-
 describe('Sidebar store', () => {
   let testContext;
 
@@ -113,28 +102,6 @@ describe('Sidebar store', () => {
     expect(testContext.store.changing).toBe(true);
   });
 
-  it('sets participants data', () => {
-    expect(testContext.store.participants.length).toEqual(0);
-
-    testContext.store.setParticipantsData({
-      participants: PARTICIPANT_LIST,
-    });
-
-    expect(testContext.store.isFetching.participants).toEqual(false);
-    expect(testContext.store.participants.length).toEqual(PARTICIPANT_LIST.length);
-  });
-
-  it('sets subcriptions data', () => {
-    expect(testContext.store.subscribed).toEqual(null);
-
-    testContext.store.setSubscriptionsData({
-      subscribed: true,
-    });
-
-    expect(testContext.store.isFetching.subscriptions).toEqual(false);
-    expect(testContext.store.subscribed).toEqual(true);
-  });
-
   it('set assigned data', () => {
     const users = {
       assignees: UsersMockHelper.createNumberRandomUsers(3),
@@ -147,11 +114,11 @@ describe('Sidebar store', () => {
   });
 
   it('sets fetching state', () => {
-    expect(testContext.store.isFetching.participants).toEqual(true);
+    expect(testContext.store.isFetching.assignees).toEqual(true);
 
-    testContext.store.setFetchingState('participants', false);
+    testContext.store.setFetchingState('assignees', false);
 
-    expect(testContext.store.isFetching.participants).toEqual(false);
+    expect(testContext.store.isFetching.assignees).toEqual(false);
   });
 
   it('sets loading state', () => {

spec/serializers/issuable_sidebar_extras_entity_spec.rb

@@ -10,11 +10,7 @@ RSpec.describe IssuableSidebarExtrasEntity do
 
   subject { described_class.new(resource, request: request).as_json }
 
-  it 'have subscribe attributes' do
-    expect(subject).to include(:participants,
-                               :project_emails_disabled,
-                               :subscribe_disabled_description,
-                               :subscribed,
-                               :assignees)
+  it 'have assignee attribute' do
+    expect(subject).to include(:assignees)
   end
 end