diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index a6c9ae6fbd72d720fb6eaf97cd2b91efa1097ee3..24d95aeef02992b6b37b470ab3163e3d6cf5e41e 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -92,8 +92,6 @@ export default { 'app/assets/javascripts/feature_flags/components/feature_flags_table.vue', 'app/assets/javascripts/feature_flags/components/form.vue', 'app/assets/javascripts/feature_flags/components/strategies/gitlab_user_list.vue', - 'app/assets/javascripts/gitlab_pages/components/deployment.vue', - 'app/assets/javascripts/gitlab_pages/components/deployments.vue', 'app/assets/javascripts/google_cloud/gcp_regions/list.vue', 'app/assets/javascripts/groups/components/group_item.vue', 'app/assets/javascripts/groups/components/invite_members_banner.vue', @@ -146,7 +144,6 @@ export default { 'app/assets/javascripts/notes/components/comment_type_dropdown.vue', 'app/assets/javascripts/notes/components/diff_discussion_header.vue', 'app/assets/javascripts/notes/components/discussion_actions.vue', - 'app/assets/javascripts/notes/components/discussion_counter.vue', 'app/assets/javascripts/notes/components/discussion_filter.vue', 'app/assets/javascripts/notes/components/multiline_comment_form.vue', 'app/assets/javascripts/notes/components/note_actions.vue', @@ -253,15 +250,8 @@ export default { 'app/assets/javascripts/token_access/components/token_permissions.vue', 'app/assets/javascripts/usage_quotas/components/search_and_sort_bar/search_and_sort_bar.vue', 'app/assets/javascripts/user_lists/components/user_lists.vue', - 'app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue', 'app/assets/javascripts/vue_merge_request_widget/components/checks/message.vue', 'app/assets/javascripts/vue_merge_request_widget/components/deployment/deployment_actions.vue', - 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue', - 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_migrate_jenkins.vue', - 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline.vue', - 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue', - 'app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue', - 'app/assets/javascripts/vue_merge_request_widget/components/state_container.vue', 'app/assets/javascripts/vue_merge_request_widget/components/widget/action_buttons.vue', 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue', 'app/assets/javascripts/vue_merge_request_widget/widgets/accessibility/index.vue', @@ -270,7 +260,6 @@ export default { 'app/assets/javascripts/work_items/components/create_work_item.vue', 'app/assets/javascripts/work_items/components/work_item_detail.vue', 'app/assets/javascripts/work_items/components/work_item_development/work_item_create_branch_merge_request_modal.vue', - 'app/assets/javascripts/work_items/components/work_item_development/work_item_development_mr_item.vue', 'app/assets/javascripts/work_items/components/work_item_links/work_item_children_wrapper.vue', 'app/assets/javascripts/work_items/components/work_item_links/work_item_groups_listbox.vue', 'app/assets/javascripts/work_items/components/work_item_links/work_item_link_child.vue', @@ -335,7 +324,6 @@ export default { 'ee/app/assets/javascripts/compliance_dashboard/components/violations_report/report.vue', 'ee/app/assets/javascripts/dependencies/components/app.vue', 'ee/app/assets/javascripts/dependencies/components/dependency_project_count.vue', - 'ee/app/assets/javascripts/dependencies/components/filtered_search/dependencies_filtered_search.vue', 'ee/app/assets/javascripts/environments_dashboard/components/dashboard/dashboard.vue', 'ee/app/assets/javascripts/environments_dashboard/components/dashboard/environment.vue', 'ee/app/assets/javascripts/epic/components/epic_header.vue', diff --git a/app/assets/javascripts/pages/projects/merge_requests/init_checkout_modal.js b/app/assets/javascripts/pages/projects/merge_requests/init_checkout_modal.js index 10a11797028a5cc592c1e9f0362710eb4b74297a..8ff6a4df1bdbaa51ce458887e691f4d0a17dfb33 100644 --- a/app/assets/javascripts/pages/projects/merge_requests/init_checkout_modal.js +++ b/app/assets/javascripts/pages/projects/merge_requests/init_checkout_modal.js @@ -7,26 +7,17 @@ export default () => { if (!modalEl) return false; - const { - canMerge, - isFork, - sourceBranch, - sourceProjectPath, - targetBranch, - sourceProjectDefaultUrl, - reviewingDocsPath, - } = modalEl.dataset; + const { isFork, sourceBranch, sourceProjectPath, sourceProjectDefaultUrl, reviewingDocsPath } = + modalEl.dataset; return new Vue({ el: modalEl, render(h) { return h(MrWidgetHowToMergeModal, { props: { - canMerge: parseBoolean(canMerge), isFork: parseBoolean(isFork), sourceBranch, sourceProjectPath, - targetBranch, sourceProjectDefaultUrl, reviewingDocsPath, }, diff --git a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue index 64122af7aaeea2198e961dbf1ac98041b318de42..8d1a731500f592c9d5f3194971b60914bf5a354b 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/approvals/approvals.vue @@ -5,7 +5,6 @@ import csrf from '~/lib/utils/csrf'; import { STATUS_MERGED } from '~/issues/constants'; import { BV_SHOW_MODAL } from '~/lib/utils/constants'; import { HTTP_STATUS_UNAUTHORIZED } from '~/lib/utils/http_status'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { s__, __, n__, sprintf } from '~/locale'; import { getIdFromGraphQLId } from '~/graphql_shared/utils'; import approvalsMixin from '../../mixins/approvals'; @@ -26,7 +25,7 @@ export default { GlForm, }, csrf, - mixins: [approvalsMixin, glFeatureFlagsMixin()], + mixins: [approvalsMixin], props: { mr: { type: Object, @@ -41,11 +40,6 @@ export default { required: false, default: null, }, - approveDefault: { - type: Function, - required: false, - default: null, - }, modalId: { type: String, required: false, @@ -76,16 +70,12 @@ export default { return { hasApprovalAuthError: false, isApproving: false, - userPermissions: {}, }; }, computed: { isLoading() { return this.$apollo.queries.approvals.loading || !this.approvals; }, - isBasic() { - return this.mr.approvalsWidgetType === 'base'; - }, isApproved() { return this.hasAllApprovals; }, @@ -217,10 +207,6 @@ export default { ), ); }, - approveWithSamlAuth() { - // Intentionally direct to SAML Identity Provider for renewed authorization even if SSO session exists - this.$refs.form.$el.submit(); - }, approveWithAuth(data) { this.updateApproval( () => this.service.approveMergeRequestWithAuth(data), @@ -273,7 +259,6 @@ export default {
[], }, - // This prop needs to be camelCase, html attributes are case insensive - // https://vuejs.org/v2/guide/components.html#camelCase-vs-kebab-case - hasCi: { - type: Boolean, - required: false, - }, ciStatus: { type: String, required: false, }, - pipelineMustSucceed: { - type: Boolean, - required: false, - }, sourceBranchLink: { type: String, required: false, @@ -113,11 +99,6 @@ export default { type: String, required: true, }, - mergeStrategy: { - type: String, - required: false, - default: '', - }, retargeted: { type: Boolean, required: false, @@ -159,15 +140,9 @@ export default { hasArtifacts() { return Boolean(this.pipeline?.details?.artifacts?.length); }, - hasStages() { - return this.pipeline?.details?.stages?.length > 0; - }, hasCommitInfo() { return this.pipeline.commit && Object.keys(this.pipeline.commit).length > 0; }, - isMergeRequestPipeline() { - return Boolean(this.pipeline.flags && this.pipeline.flags.merge_request_pipeline); - }, showSourceBranch() { return Boolean(this.pipeline.ref.branch); }, diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue index 2f34fe974d26d67113a25fcc184f7373bdcff0fd..2e6a5f42e17a099e8cbf063c14283ff99d42bbee 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_pipeline_container.vue @@ -1,7 +1,5 @@