From 42472db6759f5c50c75ced8b489047a6f4e718ad Mon Sep 17 00:00:00 2001 From: Lukas Eipert Date: Tue, 11 May 2021 16:57:56 +0200 Subject: [PATCH] Remove unused weight select The weight select seems to be unused, so we can remove it safely. The last usage was removed with 303e854b0dc14d261465efd07ad06d9287dc8b4a. --- .../javascripts/pages/projects/issues/form.js | 3 - ee/app/assets/javascripts/weight_select.js | 55 ------------------- ee/app/helpers/ee/issues_helper.rb | 27 --------- 3 files changed, 85 deletions(-) delete mode 100644 ee/app/assets/javascripts/weight_select.js diff --git a/ee/app/assets/javascripts/pages/projects/issues/form.js b/ee/app/assets/javascripts/pages/projects/issues/form.js index 0373058a4c89a9..ced525da52a407 100644 --- a/ee/app/assets/javascripts/pages/projects/issues/form.js +++ b/ee/app/assets/javascripts/pages/projects/issues/form.js @@ -1,10 +1,7 @@ import initEpicsSelect from 'ee/vue_shared/components/sidebar/epics_select/epics_select_bundle'; -import WeightSelect from 'ee/weight_select'; import initForm from '~/pages/projects/issues/form'; export default () => { initEpicsSelect(); - // eslint-disable-next-line no-new - new WeightSelect(); initForm(); }; diff --git a/ee/app/assets/javascripts/weight_select.js b/ee/app/assets/javascripts/weight_select.js deleted file mode 100644 index cefa996f459320..00000000000000 --- a/ee/app/assets/javascripts/weight_select.js +++ /dev/null @@ -1,55 +0,0 @@ -/* eslint-disable no-shadow */ - -import $ from 'jquery'; -import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown'; - -function WeightSelect(els, options = {}) { - const $els = $(els || '.js-weight-select'); - - $els.each((i, dropdown) => { - const $dropdown = $(dropdown); - const $selectbox = $dropdown.closest('.selectbox'); - const $block = $selectbox.closest('.block'); - const $value = $block.find('.value'); - $block.find('.block-loading').addClass('gl-display-none'); - const fieldName = options.fieldName || $dropdown.data('fieldName'); - const inputField = $dropdown.closest('.selectbox').find(`input[name='${fieldName}']`); - - if (Object.keys(options).includes('selected')) { - inputField.val(options.selected); - } - - return initDeprecatedJQueryDropdown($dropdown, { - selectable: true, - fieldName, - toggleLabel(selected, el) { - return $(el).data('id'); - }, - hidden() { - $selectbox.hide(); - return $value.css('display', ''); - }, - id(obj, el) { - if ($(el).data('none') == null) { - return $(el).data('id'); - } - return ''; - }, - clicked(deprecatedJQueryDropdownEvt) { - const { e } = deprecatedJQueryDropdownEvt; - let selected = deprecatedJQueryDropdownEvt.selectedObj; - const inputField = $dropdown.closest('.selectbox').find(`input[name='${fieldName}']`); - - if (options.handleClick) { - e.preventDefault(); - selected = inputField.val(); - options.handleClick(selected); - } else if ($dropdown.is('.js-issuable-form-weight')) { - e.preventDefault(); - } - }, - }); - }); -} - -export default WeightSelect; diff --git a/ee/app/helpers/ee/issues_helper.rb b/ee/app/helpers/ee/issues_helper.rb index 4ef4b4618fde46..0c93a9e69903d2 100644 --- a/ee/app/helpers/ee/issues_helper.rb +++ b/ee/app/helpers/ee/issues_helper.rb @@ -4,33 +4,6 @@ module EE module IssuesHelper extend ::Gitlab::Utils::Override - def weight_dropdown_tag(issuable, opts = {}, &block) - title = issuable.weight || 'Weight' - additional_toggle_class = opts.delete(:toggle_class) - options = { - toggle_class: "js-weight-select #{additional_toggle_class}", - dropdown_class: 'dropdown-menu-selectable dropdown-menu-weight', - title: 'Select weight', - placeholder: 'Search weight', - data: { - field_name: "#{issuable.class.model_name.param_key}[weight]", - default_label: 'Weight' - } - }.deep_merge(opts) - - dropdown_tag(title, options: options) do - capture(&block) - end - end - - def weight_dropdown_label(weight) - if Issue.weight_options.include?(weight) - weight - else - h(weight.presence || 'Weight') - end - end - def issue_in_subepic?(issue, epic_id) # This helper is used if a list of issues are filtered by epic id return false if epic_id.blank? -- GitLab