Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/layout/first_hash_element_indentation.yml

@@ -3091,7 +3091,6 @@ RSpec/FeatureCategory:
     - 'spec/models/ci/build_trace_chunks/redis_spec.rb'
     - 'spec/models/ci/group_spec.rb'
     - 'spec/models/ci/instance_variable_spec.rb'
-    - 'spec/models/ci/persistent_ref_spec.rb'
     - 'spec/models/ci/pipeline_schedule_variable_spec.rb'
     - 'spec/models/ci/resource_spec.rb'
     - 'spec/models/ci/unit_test_failure_spec.rb'

.rubocop_todo/rspec/feature_category.yml

@@ -1 +1 @@
-6a69fdde9d24d290cc33e48d7062a57da2f0c508
+1365200de8ffffff9a46f274e58fbd3956d16638

GITALY_SERVER_VERSION

@@ -1,6 +1,8 @@
 import { sortBy, cloneDeep, find, inRange } from 'lodash';
 import {
   TYPENAME_BOARD,
+  TYPENAME_CUSTOM_FIELD,
+  TYPENAME_CUSTOM_FIELD_SELECT_OPTION,
   TYPENAME_ITERATION,
   TYPENAME_MILESTONE,
   TYPENAME_USER,
@@ -311,8 +313,10 @@ const parseFilters = (filters) => {
  * @param {Object} objParam.filterInfo - data on filters such as how to transform filter value, if filter can be negated, etc.
  * @param {Object} objParam.filterFields - data on what filters are available for given issuableType (based on GraphQL schema)
  */
-export const filterVariables = ({ filters, issuableType, filterInfo, filterFields }) =>
-  parseFilters(filters)
+export const filterVariables = ({ filters, issuableType, filterInfo, filterFields, options }) => {
+  const customFields = new Map();
+
+  return parseFilters(filters)
     .map(([k, v, negated]) => {
       // for legacy reasons, some filters need to be renamed to correct GraphQL fields.
       const remapAvailable = filterInfo[k]?.remap;
@@ -321,6 +325,10 @@ export const filterVariables = ({ filters, issuableType, filterInfo, filterField
       return [remappedKey, v, negated];
     })
     .filter(([k, , negated]) => {
+      if (k.startsWith('custom-field') && options.hasCustomFieldsFeature) {
+        return true;
+      }
+
       // remove unsupported filters (+ check if the filters support negation)
       const supported = filterFields[issuableType].includes(k);
       if (supported) {
@@ -336,6 +344,32 @@ export const filterVariables = ({ filters, issuableType, filterInfo, filterField
 
       return [k, newVal, negated];
     })
+    .map(([k, v, negated]) => {
+      let newK = k;
+      let newV = v;
+      if (k.startsWith('custom-field') && options.hasCustomFieldsFeature) {
+        let customFieldId = k.replace('custom-field[', '').replace(']', '');
+        customFieldId = convertToGraphQLId(TYPENAME_CUSTOM_FIELD, customFieldId);
+
+        const existingSelectedOptions = customFields.has(customFieldId)
+          ? customFields.get(customFieldId)
+          : [];
+
+        const selectedOptionIds = [...existingSelectedOptions];
+        selectedOptionIds.push(convertToGraphQLId(TYPENAME_CUSTOM_FIELD_SELECT_OPTION, v));
+        customFields.set(customFieldId, selectedOptionIds);
+
+        newV = [
+          {
+            customFieldId,
+            selectedOptionIds,
+          },
+        ];
+        newK = 'customField';
+      }
+
+      return [newK, newV, negated];
+    })
     .reduce(
       (acc, [k, v, negated]) => {
         return negated
@@ -353,6 +387,7 @@ export const filterVariables = ({ filters, issuableType, filterInfo, filterField
       },
       { not: {} },
     );
+};
 
 // EE-specific feature. Find the implementation in the `ee/`-folder
 export function transformBoardConfig() {

app/assets/javascripts/boards/boards_util.js

@@ -34,6 +34,7 @@ export default {
     'isGroupBoard',
     'issuableType',
     'boardType',
+    'hasCustomFieldsFeature',
   ],
   data() {
     return {
@@ -121,6 +122,7 @@ export default {
         issuableType: this.issuableType,
         filterInfo: FiltersInfo,
         filterFields: FilterFields,
+        options: { hasCustomFieldsFeature: this.hasCustomFieldsFeature },
       });
     },
     isShowingEpicSwimlanesLocalStorageKey() {

app/assets/javascripts/boards/components/board_app.vue

@@ -23,12 +23,14 @@ import {
 import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 import { AssigneeFilterType, GroupByParamType } from 'ee_else_ce/boards/constants';
 
+const customFieldRegex = /custom-field\[([0-9]+)\]/g;
+
 export default {
   i18n: {
     search: __('Search'),
   },
   components: { FilteredSearch },
-  inject: ['initialFilterParams'],
+  inject: ['initialFilterParams', 'hasCustomFieldsFeature'],
   props: {
     isSwimlanesOn: {
       type: Boolean,
@@ -73,9 +75,21 @@ export default {
         releaseTag,
         confidential,
         healthStatus,
+        ...otherValues
       } = this.filterParams;
       const filteredSearchValue = [];
 
+      if (this.hasCustomFieldsFeature) {
+        for (const [key, value] of Object.entries(otherValues)) {
+          if (key.match(customFieldRegex)) {
+            filteredSearchValue.push({
+              type: key,
+              value: { data: value, operator: '=' },
+            });
+          }
+        }
+      }
+
       if (authorUsername) {
         filteredSearchValue.push({
           type: TOKEN_TYPE_AUTHOR,
@@ -281,10 +295,20 @@ export default {
         releaseTag,
         confidential,
         healthStatus,
+        ...otherValues
       } = this.filterParams;
       let iteration = iterationId;
       let cadence = iterationCadenceId;
       let notParams = {};
+      const customFieldParams = {};
+
+      if (this.hasCustomFieldsFeature) {
+        Object.entries(otherValues).forEach(([key, value]) => {
+          if (key.match(customFieldRegex)) {
+            customFieldParams[key] = value;
+          }
+        });
+      }
 
       if (Object.prototype.hasOwnProperty.call(this.filterParams, 'not')) {
         notParams = pickBy(
@@ -311,6 +335,7 @@ export default {
 
       return mapValues(
         {
+          ...customFieldParams,
           ...notParams,
           author_username: authorUsername,
           'label_name[]': labelName,
@@ -441,6 +466,9 @@ export default {
             filterParams.healthStatus = filter.value.data;
             break;
           default:
+            if (this.hasCustomFieldsFeature && filter.type.match(customFieldRegex)) {
+              filterParams[filter.type] = filter.value.data;
+            }
             break;
         }
       });

app/assets/javascripts/boards/components/board_filtered_search.vue

@@ -69,6 +69,7 @@ function mountBoardApp(el) {
     wiGroupPath,
     wiCanAdminLabel,
     wiNewCommentTemplatePaths,
+    hasCustomFieldsFeature,
   } = el.dataset;
 
   const rawFilterParams = queryToObject(window.location.search, { gatherArrays: true });
@@ -141,6 +142,7 @@ function mountBoardApp(el) {
       hasSubepicsFeature: parseBoolean(el.dataset.subEpicsFeatureAvailable),
       hasLinkedItemsEpicsFeature: parseBoolean(el.dataset.hasLinkedItemsEpicsFeature),
       hasOkrsFeature: parseBoolean(el.dataset.hasOkrsFeature),
+      hasCustomFieldsFeature: parseBoolean(hasCustomFieldsFeature),
       commentTemplatePaths: JSON.parse(wiNewCommentTemplatePaths),
     },
     render: (createComponent) => createComponent(BoardApp),

app/assets/javascripts/boards/index.js

@@ -41,6 +41,8 @@ export const TYPE_ORGANIZATION = 'Organizations::Organization';
 export const TYPE_USERS_SAVED_REPLY = 'Users::SavedReply';
 export const TYPE_WORKSPACE = 'RemoteDevelopment::Workspace';
 export const TYPE_COMPLIANCE_FRAMEWORK = 'ComplianceManagement::Framework';
+export const TYPENAME_CUSTOM_FIELD = 'Issuables::CustomField';
+export const TYPENAME_CUSTOM_FIELD_SELECT_OPTION = 'Issuables::CustomFieldSelectOption';
 
 export const QUERY_PARAM_START_CURSOR = 'start_cursor';
 export const QUERY_PARAM_END_CURSOR = 'end_cursor';

app/assets/javascripts/graphql_shared/constants.js

@@ -107,6 +107,11 @@ export default {
       required: false,
       default: () => ({}),
     },
+    noResetButton: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -123,7 +128,7 @@ export default {
       return `work-item-dropdown-listbox-value-${this.dropdownName}`;
     },
     resetButton() {
-      return this.resetButtonLabel || __('Clear');
+      return this.noResetButton ? null : this.resetButtonLabel || __('Clear');
     },
     toggleText() {
       return !this.toggleDropdownText && !this.hasValue

app/assets/javascripts/work_items/components/shared/work_item_sidebar_dropdown_widget.vue

@@ -13,6 +13,7 @@ import {
   WIDGET_TYPE_ITERATION,
   WIDGET_TYPE_LABELS,
   WIDGET_TYPE_MILESTONE,
+  WIDGET_TYPE_STATUS,
   WIDGET_TYPE_PARTICIPANTS,
   WIDGET_TYPE_PROGRESS,
   WIDGET_TYPE_START_AND_DUE_DATE,
@@ -54,6 +55,7 @@ export default {
     WorkItemColor: () => import('ee_component/work_items/components/work_item_color.vue'),
     WorkItemCustomFields: () =>
       import('ee_component/work_items/components/work_item_custom_fields.vue'),
+    WorkItemStatus: () => import('ee_component/work_items/components/work_item_status.vue'),
   },
   mixins: [glFeatureFlagMixin()],
   inject: ['hasSubepicsFeature'],
@@ -183,6 +185,9 @@ export default {
     workItemColor() {
       return this.isWidgetPresent(WIDGET_TYPE_COLOR);
     },
+    workItemStatus() {
+      return this.isWidgetPresent(WIDGET_TYPE_STATUS);
+    },
     workItemAuthor() {
       return this.workItem?.author;
     },
@@ -198,6 +203,9 @@ export default {
     showWorkItemCustomFields() {
       return this.glFeatures.customFieldsFeature && this.customFields;
     },
+    showWorkItemStatus() {
+      return this.glFeatures.workItemStatusFeatureFlag;
+    },
   },
   methods: {
     isWidgetPresent(type, workItem = this.workItem) {
@@ -209,6 +217,16 @@ export default {
 
 <template>
   <div class="work-item-attributes-wrapper">
+    <work-item-status
+      v-if="showWorkItemStatus"
+      class="work-item-attributes-item"
+      :can-update="canUpdateMetadata"
+      :work-item-id="workItem.id"
+      :work-item-iid="workItem.iid"
+      :work-item-type="workItemType"
+      :full-path="fullPath"
+      @error="$emit('error', $event)"
+    />
     <work-item-assignees
       v-if="workItemAssignees"
       class="js-assignee work-item-attributes-item"

app/assets/javascripts/work_items/components/work_item_attributes_wrapper.vue

@@ -24,6 +24,7 @@ export const WIDGET_TYPE_PROGRESS = 'PROGRESS';
 export const WIDGET_TYPE_HIERARCHY = 'HIERARCHY';
 export const WIDGET_TYPE_MILESTONE = 'MILESTONE';
 export const WIDGET_TYPE_ITERATION = 'ITERATION';
+export const WIDGET_TYPE_STATUS = 'STATUS';
 export const WIDGET_TYPE_NOTES = 'NOTES';
 export const WIDGET_TYPE_HEALTH_STATUS = 'HEALTH_STATUS';
 export const WIDGET_TYPE_LINKED_ITEMS = 'LINKED_ITEMS';

app/assets/javascripts/work_items/constants.js

@@ -8,10 +8,12 @@ def preview_markdown
       container: resource_parent,
       current_user: current_user,
       params: markdown_service_params
-    ).execute
+    ).execute do |text|
+      view_context.markdown(text, markdown_context_params)
+    end
 
     render json: {
-      body: view_context.markdown(result[:text], markdown_context_params),
+      body: result[:rendered_html],
       references: {
         users: result[:users],
         suggestions: SuggestionSerializer.new.represent_diff(result[:suggestions]),

app/controllers/concerns/preview_markdown.rb

@@ -16,6 +16,7 @@ class WorkItemsController < Groups::ApplicationController
       push_force_frontend_feature_flag(:glql_load_on_click, !!group&.glql_load_on_click_feature_flag_enabled?)
       push_force_frontend_feature_flag(:continue_indented_text, !!group&.continue_indented_text_feature_flag_enabled?)
       push_frontend_feature_flag(:issues_list_drawer, group)
+      push_frontend_feature_flag(:work_item_status_feature_flag, group&.root_ancestor)
     end
     before_action :handle_new_work_item_path, only: [:show]
 

app/controllers/groups/work_items_controller.rb

@@ -39,6 +39,7 @@ class GroupsController < Groups::ApplicationController
     push_force_frontend_feature_flag(:work_items_alpha, group.work_items_alpha_feature_flag_enabled?)
     push_frontend_feature_flag(:issues_grid_view)
     push_frontend_feature_flag(:issues_list_drawer, group)
+    push_frontend_feature_flag(:work_item_status_feature_flag, group&.root_ancestor)
     push_force_frontend_feature_flag(:namespace_level_work_items, group.namespace_work_items_enabled?)
   end
 

app/controllers/groups_controller.rb

@@ -56,6 +56,7 @@ class Projects::IssuesController < Projects::ApplicationController
     push_force_frontend_feature_flag(:work_items_beta, !!project&.work_items_beta_feature_flag_enabled?)
     push_force_frontend_feature_flag(:work_items_alpha, !!project&.work_items_alpha_feature_flag_enabled?)
     push_frontend_feature_flag(:work_item_view_for_issues, project&.group)
+    push_frontend_feature_flag(:work_item_status_feature_flag, project&.root_ancestor)
   end
 
   before_action only: [:index, :show] do

app/controllers/projects/issues_controller.rb

@@ -155,10 +155,13 @@ def prepare_notes_for_rendering(notes)
 
   def render_draft_note(note)
     params = { target_id: merge_request.iid, target_type: 'MergeRequest', text: note.note }
-    result = PreviewMarkdownService.new(container: @project, current_user: current_user, params: params).execute
-    markdown_params = { markdown_engine: result[:markdown_engine], issuable_reference_expansion_enabled: true }
+    result = PreviewMarkdownService.new(container: @project, current_user: current_user, params: params)
+      .execute do |text|
+      markdown_params = { issuable_reference_expansion_enabled: true }
+      view_context.markdown(text, markdown_params)
+    end
 
-    note.rendered_note = view_context.markdown(result[:text], markdown_params)
+    note.rendered_note = result[:rendered_html]
     note.users_referenced = result[:users]
     note.commands_changes = view_context.markdown(result[:commands])
 

app/controllers/projects/merge_requests/drafts_controller.rb

@@ -15,6 +15,7 @@ class Projects::WorkItemsController < Projects::ApplicationController
     push_force_frontend_feature_flag(:glql_integration, !!project&.glql_integration_feature_flag_enabled?)
     push_force_frontend_feature_flag(:glql_load_on_click, !!project&.glql_load_on_click_feature_flag_enabled?)
     push_force_frontend_feature_flag(:continue_indented_text, !!project&.continue_indented_text_feature_flag_enabled?)
+    push_frontend_feature_flag(:work_item_status_feature_flag, project&.root_ancestor)
     push_frontend_feature_flag(:namespace_level_work_items, project&.group)
     push_frontend_feature_flag(:work_item_planning_view, project&.group)
   end

app/controllers/projects/work_items_controller.rb

@@ -29,6 +29,7 @@ def create
     rescue StandardError => e
       Gitlab::ErrorTracking
         .track_exception(e, pipeline_id: pipeline.id)
+      false
     end
 
     def delete