Merge branch '343620-remove-frontend-code-related-to-updating-jira-issues' into 'master'

Remove editing of labels on the Jira issue details page

See merge request gitlab-org/gitlab!73668

config/feature_flags/development/jira_issue_details_edit_labels.yml

----
-name: jira_issue_details_edit_labels
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65298
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335069
-milestone: '14.1'
-type: development
-group: group::integrations
-default_enabled: false

ee/app/assets/javascripts/integrations/jira/issues_show/components/jira_issues_show_root.vue

@@ -35,7 +35,6 @@ export default {
     return {
       isLoading: true,
       isLoadingStatus: false,
-      isUpdatingLabels: false,
       isUpdatingStatus: false,
       errorMessage: null,
       issue: {},
@@ -79,23 +78,6 @@ export default {
       return `jira_note_${id}`;
     },
 
-    onIssueLabelsUpdated(labels) {
-      this.isUpdatingLabels = true;
-      updateIssue(this.issue, { labels })
-        .then((response) => {
-          this.issue.labels = response.labels;
-        })
-        .catch(() => {
-          createFlash({
-            message: s__(
-              'JiraService|Failed to update Jira issue labels. View the issue in Jira, or reload the page.',
-            ),
-          });
-        })
-        .finally(() => {
-          this.isUpdatingLabels = false;
-        });
-    },
     onIssueStatusFetch() {
       this.isLoadingStatus = true;
       fetchIssueStatuses()
@@ -156,10 +138,8 @@ export default {
             :sidebar-expanded="sidebarExpanded"
             :issue="issue"
             :is-loading-status="isLoadingStatus"
-            :is-updating-labels="isUpdatingLabels"
             :is-updating-status="isUpdatingStatus"
             :statuses="statuses"
-            @issue-labels-updated="onIssueLabelsUpdated"
             @issue-status-fetch="onIssueStatusFetch"
             @issue-status-updated="onIssueStatusUpdated"
             @sidebar-toggle="toggleSidebar"

ee/app/assets/javascripts/integrations/jira/issues_show/components/sidebar/jira_issues_sidebar_root.vue

@@ -20,9 +20,6 @@ export default {
   },
   mixins: [glFeatureFlagsMixin()],
   inject: {
-    issueLabelsPath: {
-      default: null,
-    },
     issuesListPath: {
       default: null,
     },
@@ -41,11 +38,6 @@ export default {
       required: false,
       default: false,
     },
-    isUpdatingLabels: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     isUpdatingStatus: {
       type: Boolean,
       required: false,
@@ -57,11 +49,6 @@ export default {
       default: () => [],
     },
   },
-  data() {
-    return {
-      isEditingLabels: false,
-    };
-  },
   computed: {
     assignee() {
       // Jira issues have at most 1 assignee
@@ -70,9 +57,6 @@ export default {
     reference() {
       return this.issue.references?.relative;
     },
-    canUpdateLabels() {
-      return this.glFeatures.jiraIssueDetailsEditLabels;
-    },
     canUpdateStatus() {
       return this.glFeatures.jiraIssueDetailsEditStatus;
     },
@@ -108,18 +92,6 @@ export default {
         });
       }
     },
-    onIssueLabelsClose() {
-      this.isEditingLabels = false;
-    },
-    onIssueLabelsToggle() {
-      this.expandSidebarAndOpenDropdown();
-      this.afterSidebarTransitioned(() => {
-        this.isEditingLabels = true;
-      });
-    },
-    onIssueLabelsUpdated(labels) {
-      this.$emit('issue-labels-updated', labels);
-    },
     onIssueStatusFetch() {
       this.$emit('issue-status-fetch');
     },
@@ -149,20 +121,13 @@ export default {
       @issue-field-updated="onIssueStatusUpdated"
     />
     <labels-select
-      :allow-label-edit="canUpdateLabels"
-      :allow-multiselect="true"
       :allow-scoped-labels="true"
       :selected-labels="issue.labels"
-      :labels-fetch-path="issueLabelsPath"
       :labels-filter-base-path="issuesListPath"
       :labels-filter-param="$options.labelsFilterParam"
-      :labels-select-in-progress="isUpdatingLabels"
-      :is-editing="isEditingLabels"
       variant="sidebar"
       class="block labels js-labels-block"
-      @onDropdownClose="onIssueLabelsClose"
-      @toggleCollapse="onIssueLabelsToggle"
-      @updateSelectedLabels="onIssueLabelsUpdated"
+      @toggleCollapse="expandSidebarAndOpenDropdown"
     >
       {{ __('None') }}
     </labels-select>

ee/app/assets/javascripts/integrations/jira/issues_show/jira_issues_show_bundle.js

@@ -9,12 +9,11 @@ export default function initJiraIssueShow({ mountPointSelector }) {
     return null;
   }
 
-  const { issueLabelsPath, issuesShowPath, issuesListPath } = mountPointEl.dataset;
+  const { issuesShowPath, issuesListPath } = mountPointEl.dataset;
 
   return new Vue({
     el: mountPointEl,
     provide: {
-      issueLabelsPath,
       issuesShowPath,
       issuesListPath,
       isClassicSidebar: true,

ee/app/controllers/projects/integrations/jira/issues_controller.rb

@@ -15,7 +15,6 @@ module Projects
         before_action :check_feature_enabled!
         before_action only: :show do
           push_frontend_feature_flag(:jira_issue_details_edit_status, project, default_enabled: :yaml)
-          push_frontend_feature_flag(:jira_issue_details_edit_labels, project, default_enabled: :yaml)
         end
 
         rescue_from ::Projects::Integrations::Jira::IssuesFinder::Error, with: :render_error
@@ -44,11 +43,6 @@ module Projects
           end
         end
 
-        def labels
-          # This implementation is just to mock the endpoint, to be implemented https://gitlab.com/gitlab-org/gitlab/-/issues/330778
-          render json: issue_json[:labels]
-        end
-
         private
 
         def visitor_id

ee/app/helpers/ee/integrations_helper.rb

@@ -53,7 +53,6 @@ module EE
 
     def jira_issues_show_data
       {
-        issue_labels_path: labels_project_integrations_jira_issue_path(@project, params[:id]),
         issues_show_path: project_integrations_jira_issue_path(@project, params[:id], format: :json),
         issues_list_path: project_integrations_jira_issues_path(@project)
       }

ee/app/serializers/integrations/jira_serializers/issue_entity.rb

@@ -32,7 +32,6 @@ module Integrations
       expose :labels do |jira_issue|
         jira_issue.labels.map do |name|
           {
-            id: name,
             title: name,
             name: name,
             color: '#0052CC',

ee/config/routes/project.rb

@@ -112,11 +112,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
 
         namespace :integrations do
           namespace :jira do
-            resources :issues, only: [:index, :show] do
-              member do
-                get :labels
-              end
-            end
+            resources :issues, only: [:index, :show]
           end
 
           namespace :zentao do

ee/spec/frontend/integrations/jira/issues_show/components/jira_issues_show_root_spec.js

@@ -120,22 +120,6 @@ describe('JiraIssuesShow', () => {
       await waitForPromises();
     });
 
-    it('updates issue labels on issue-labels-updated', async () => {
-      const updateIssueSpy = jest.spyOn(JiraIssuesShowApi, 'updateIssue').mockResolvedValue();
-
-      const labels = [{ id: 'ecosystem' }];
-
-      findJiraIssueSidebar().vm.$emit('issue-labels-updated', labels);
-      await wrapper.vm.$nextTick();
-
-      expect(updateIssueSpy).toHaveBeenCalledWith(expect.any(Object), { labels });
-      expect(findJiraIssueSidebar().props('isUpdatingLabels')).toBe(true);
-
-      await waitForPromises();
-
-      expect(findJiraIssueSidebar().props('isUpdatingLabels')).toBe(false);
-    });
-
     it('fetches issue statuses on issue-status-fetch', async () => {
       const fetchIssueStatusesSpy = jest
         .spyOn(JiraIssuesShowApi, 'fetchIssueStatuses')

ee/spec/helpers/ee/integrations_helper_spec.rb

@@ -102,7 +102,6 @@ RSpec.describe EE::IntegrationsHelper do
 
     it 'includes Jira issues show data' do
       is_expected.to include(
-        issue_labels_path: "/#{project.full_path}/-/integrations/jira/issues/FE-1/labels",
         issues_show_path: "/#{project.full_path}/-/integrations/jira/issues/FE-1.json",
         issues_list_path: "/#{project.full_path}/-/integrations/jira/issues"
       )

ee/spec/serializers/integrations/jira_serializers/issue_detail_entity_spec.rb

@@ -86,7 +86,6 @@ RSpec.describe Integrations::JiraSerializers::IssueDetailEntity do
       state: 'closed',
       labels: [
         {
-          id: 'backend',
           title: 'backend',
           name: 'backend',
           color: '#0052CC',

ee/spec/serializers/integrations/jira_serializers/issue_entity_spec.rb

@@ -53,7 +53,6 @@ RSpec.describe Integrations::JiraSerializers::IssueEntity do
       status: 'To Do',
       labels: [
         {
-          id: 'backend',
           title: 'backend',
           name: 'backend',
           color: '#0052CC',

locale/gitlab.pot

@@ -19586,9 +19586,6 @@ msgstr ""
 msgid "JiraService|Failed to load Jira issue. View the issue in Jira, or reload the page."
 msgstr ""
 
-msgid "JiraService|Failed to update Jira issue labels. View the issue in Jira, or reload the page."
-msgstr ""
-
 msgid "JiraService|Failed to update Jira issue status. View the issue in Jira, or reload the page."
 msgstr ""