diff --git a/.rubocop_todo/layout/argument_alignment.yml b/.rubocop_todo/layout/argument_alignment.yml index 9bc9095a6c7..ac2dcf75942 100644 --- a/.rubocop_todo/layout/argument_alignment.yml +++ b/.rubocop_todo/layout/argument_alignment.yml @@ -115,19 +115,6 @@ Layout/ArgumentAlignment: - 'ee/app/graphql/types/work_items/widgets/iteration_input_type.rb' - 'ee/app/graphql/types/work_items/widgets/iteration_type.rb' - 'ee/app/graphql/types/work_items/widgets/progress_input_type.rb' - - 'ee/app/graphql/types/work_items/widgets/requirement_legacy_filter_input_type.rb' - - 'ee/app/graphql/types/work_items/widgets/requirement_legacy_type.rb' - - 'ee/app/graphql/types/work_items/widgets/status_filter_input_type.rb' - - 'ee/app/graphql/types/work_items/widgets/status_input_type.rb' - - 'ee/app/graphql/types/work_items/widgets/weight_input_type.rb' - - 'ee/app/services/analytics/devops_adoption/enabled_namespaces/bulk_find_or_create_service.rb' - - 'ee/app/services/audit_events/streaming/event_type_filters/destroy_service.rb' - - 'ee/app/services/auto_merge/merge_train_service.rb' - - 'ee/app/services/dashboard/projects/create_service.rb' - - 'ee/app/services/dora/aggregate_metrics_service.rb' - - 'ee/app/services/ee/applications/create_service.rb' - - 'ee/app/services/ee/boards/issues/list_service.rb' - - 'ee/app/services/ee/issues/base_service.rb' - 'ee/app/services/ee/issues/clone_service.rb' - 'ee/app/services/ee/issues/move_service.rb' - 'ee/app/services/ee/keys/create_service.rb' @@ -336,19 +323,6 @@ Layout/ArgumentAlignment: - 'lib/api/entities/pull_mirror.rb' - 'lib/api/entities/release.rb' - 'lib/api/entities/resource_access_token.rb' - - 'lib/api/entities/user_basic.rb' - - 'lib/api/environments.rb' - - 'lib/api/error_tracking/client_keys.rb' - - 'lib/api/error_tracking/project_settings.rb' - - 'lib/api/events.rb' - - 'lib/api/feature_flags.rb' - - 'lib/api/files.rb' - - 'lib/api/go_proxy.rb' - - 'lib/api/group_container_repositories.rb' - - 'lib/api/group_labels.rb' - - 'lib/api/group_packages.rb' - - 'lib/api/groups.rb' - - 'lib/api/helm_packages.rb' - 'lib/api/helpers.rb' - 'lib/api/helpers/custom_attributes.rb' - 'lib/api/helpers/events_helpers.rb' diff --git a/.rubocop_todo/layout/space_in_lambda_literal.yml b/.rubocop_todo/layout/space_in_lambda_literal.yml index 85534c6eacd..0384b81adfb 100644 --- a/.rubocop_todo/layout/space_in_lambda_literal.yml +++ b/.rubocop_todo/layout/space_in_lambda_literal.yml @@ -143,21 +143,6 @@ Layout/SpaceInLambdaLiteral: - 'ee/app/serializers/vulnerabilities/feedback_entity.rb' - 'ee/app/serializers/vulnerabilities/finding_entity.rb' - 'ee/app/serializers/vulnerability_note_entity.rb' - - 'ee/lib/ee/api/entities/ci/job_request/response.rb' - - 'ee/lib/ee/api/entities/epic.rb' - - 'ee/lib/ee/api/entities/issue.rb' - - 'ee/lib/ee/api/entities/list.rb' - - 'ee/lib/ee/api/entities/member.rb' - - 'ee/lib/ee/api/entities/project_approval_rule.rb' - - 'ee/lib/ee/api/entities/vulnerability_issue_link.rb' - - 'ee/lib/ee/gitlab/background_migration/backfill_epic_cache_counts.rb' - - 'ee/lib/ee/gitlab/background_migration/delete_approval_rules_with_vulnerability.rb' - - 'ee/lib/ee/gitlab/background_migration/migrate_shared_vulnerability_scanners.rb' - - 'ee/lib/ee/gitlab/background_migration/populate_approval_merge_request_rules_with_security_orchestration.rb' - - 'ee/lib/ee/gitlab/background_migration/populate_approval_project_rules_with_security_orchestration.rb' - - 'ee/lib/ee/gitlab/background_migration/populate_resolved_on_default_branch_column.rb' - - 'ee/lib/ee/gitlab/ci/config/entry/need.rb' - - 'ee/lib/ee/gitlab/event_store.rb' - 'lib/atlassian/jira_connect/serializers/author_entity.rb' - 'lib/bulk_imports/groups/transformers/group_attributes_transformer.rb' - 'lib/container_registry/base_client.rb' diff --git a/app/assets/javascripts/content_editor/components/toolbar_table_button.vue b/app/assets/javascripts/content_editor/components/toolbar_table_button.vue index a5ac560ad42..73c1e569b48 100644 --- a/app/assets/javascripts/content_editor/components/toolbar_table_button.vue +++ b/app/assets/javascripts/content_editor/components/toolbar_table_button.vue @@ -34,12 +34,14 @@ export default { setRowsAndCols(rows, cols) { this.rows = rows; this.cols = cols; - this.maxRows = clamp(rows + 1, MIN_ROWS, MAX_ROWS); - this.maxCols = clamp(cols + 1, MIN_COLS, MAX_COLS); + this.maxRows = clamp(rows + 1, this.maxRows, MAX_ROWS); + this.maxCols = clamp(cols + 1, this.maxCols, MAX_COLS); }, resetState() { this.rows = 1; this.cols = 1; + this.maxRows = MIN_ROWS; + this.maxCols = MIN_COLS; }, insertTable() { this.tiptapEditor @@ -74,6 +76,8 @@ export default { this.setRowsAndCols(rows, cols); }, setFocus(row, col) { + this.resetState(); + this.$refs[`table-${row}-${col}`][0].$el.focus(); }, }, @@ -97,6 +101,7 @@ export default { text-sr-only :fluid-width="true" @shown="setFocus(1, 1)" + @hidden="resetState" >