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

@@ -104,7 +104,6 @@ export default {
     size="lg"
     modal-id="work-item-detail-modal"
     header-class="gl-p-0 gl-pb-2!"
-    body-class="gl-pb-6!"
     @hide="closeModal"
   >
     <gl-alert v-if="error" variant="danger" @dismiss="error = false">

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

@@ -19,8 +19,10 @@ export default {
 </script>
 
 <template>
-  <div v-if="hasIssueWeightsFeature" class="gl-mb-5">
-    <span class="gl-display-inline-block gl-font-weight-bold gl-w-15">{{ __('Weight') }}</span>
-    {{ weightText }}
+  <div v-if="hasIssueWeightsFeature" class="gl-mb-5 form-row">
+    <span class="gl-font-weight-bold col-lg-2 col-3 gl-overflow-wrap-break">{{
+      __('Weight')
+    }}</span>
+    <span class="gl-ml-5">{{ weightText }}</span>
   </div>
 </template>

app/assets/javascripts/work_items/constants.js

@@ -13,7 +13,7 @@ export const i18n = {
   updateError: s__('WorkItem|Something went wrong while updating the work item. Please try again.'),
 };
 
-export const DEFAULT_MODAL_TYPE = 'Task';
+export const TASK_TYPE_NAME = 'Task';
 
 export const WIDGET_TYPE_ASSIGNEE = 'ASSIGNEES';
 export const WIDGET_TYPE_DESCRIPTION = 'DESCRIPTION';

app/assets/javascripts/work_items/graphql/create_work_item_from_task.mutation.graphql

+#import "./work_item.fragment.graphql"
+
 mutation workItemCreateFromTask($input: WorkItemCreateFromTaskInput!) {
   workItemCreateFromTask(input: $input) {
     workItem {
-      id
-      descriptionHtml
+      ...WorkItem
+    }
+    newWorkItem {
+      ...WorkItem
     }
     errors
   }

app/assets/javascripts/work_items/graphql/provider.js

@@ -70,9 +70,7 @@ export const resolvers = {
         const assigneesWidget = draftData.workItem.mockWidgets.find(
           (widget) => widget.type === WIDGET_TYPE_ASSIGNEE,
         );
-        assigneesWidget.nodes = assigneesWidget.nodes.filter((assignee) =>
-          input.assigneeIds.includes(assignee.id),
-        );
+        assigneesWidget.nodes = [...input.assignees];
       });
 
       cache.writeQuery({

app/assets/javascripts/work_items/graphql/typedefs.graphql

@@ -23,7 +23,7 @@ extend type WorkItem {
 
 type LocalWorkItemAssigneesInput {
   id: WorkItemID!
-  assigneeIds: [ID!]
+  assignees: [UserCore!]
 }
 
 type LocalWorkItemPayload {

app/assets/javascripts/work_items/pages/create_work_item.vue

@@ -6,7 +6,6 @@ import workItemQuery from '../graphql/work_item.query.graphql';
 import createWorkItemMutation from '../graphql/create_work_item.mutation.graphql';
 import createWorkItemFromTaskMutation from '../graphql/create_work_item_from_task.mutation.graphql';
 import projectWorkItemTypesQuery from '../graphql/project_work_item_types.query.graphql';
-import { DEFAULT_MODAL_TYPE } from '../constants';
 
 import ItemTitle from '../components/item_title.vue';
 
@@ -24,11 +23,6 @@ export default {
   },
   inject: ['fullPath'],
   props: {
-    isModal: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     initialTitle: {
       type: String,
       required: false,
@@ -78,13 +72,6 @@ export default {
           text: node.name,
         }));
       },
-      result() {
-        if (!this.selectedWorkItemType && this.isModal) {
-          this.selectedWorkItemType = this.formOptions.find(
-            (options) => options.text === DEFAULT_MODAL_TYPE,
-          )?.value;
-        }
-      },
       error() {
         this.error = this.$options.fetchTypesErrorText;
       },
@@ -104,11 +91,7 @@ export default {
   methods: {
     async createWorkItem() {
       this.loading = true;
-      if (this.isModal) {
-        await this.createWorkItemFromTask();
-      } else {
-        await this.createStandaloneWorkItem();
-      }
+      await this.createStandaloneWorkItem();
       this.loading = false;
     },
     async createStandaloneWorkItem() {
@@ -174,11 +157,7 @@ export default {
       this.title = title;
     },
     handleCancelClick() {
-      if (!this.isModal) {
-        this.$router.go(-1);
-        return;
-      }
-      this.$emit('closeModal');
+      this.$router.go(-1);
     },
   },
 };
@@ -187,7 +166,7 @@ export default {
 <template>
   <form @submit.prevent="createWorkItem">
     <gl-alert v-if="error" variant="danger" @dismiss="error = null">{{ error }}</gl-alert>
-    <div :class="{ 'gl-px-5': isModal }" data-testid="content">
+    <div data-testid="content">
       <item-title :title="initialTitle" data-testid="title-input" @title-input="handleTitleInput" />
       <div>
         <gl-loading-icon
@@ -203,14 +182,11 @@ export default {
         />
       </div>
     </div>
-    <div
-      class="gl-bg-gray-10 gl-py-5 gl-px-6 gl-mt-4"
-      :class="{ 'gl-display-flex gl-justify-content-end': isModal }"
-    >
+    <div class="gl-bg-gray-10 gl-py-5 gl-px-6 gl-mt-4">
       <gl-button
         variant="confirm"
         :disabled="isButtonDisabled"
-        :class="{ 'gl-mr-3': !isModal }"
+        class="gl-mr-3"
         :loading="loading"
         data-testid="create-button"
         type="submit"
@@ -221,7 +197,6 @@ export default {
         type="button"
         data-testid="cancel-button"
         class="gl-order-n1"
-        :class="{ 'gl-mr-3': isModal }"
         @click="handleCancelClick"
       >
         {{ __('Cancel') }}

app/assets/stylesheets/_page_specific_files.scss

@@ -32,3 +32,4 @@
 @import './pages/storage_quota';
 @import './pages/tree';
 @import './pages/users';
+@import './pages/work_items';

app/assets/stylesheets/framework/icons.scss

@@ -67,6 +67,7 @@
 }
 
 .user-avatar-link {
+  display: flow-root;
   text-decoration: none;
 }
 

app/assets/stylesheets/pages/notes.scss

@@ -70,41 +70,6 @@ $system-note-svg-size: 16px;
     }
   }
 
-  .replies-toggle {
-    background-color: $gray-light;
-    padding: $gl-padding-8 $gl-padding;
-    border-top: 1px solid $gray-100;
-    border-bottom: 1px solid $gray-100;
-
-    .collapse-replies-btn:hover {
-      color: $blue-600;
-    }
-
-    &.collapsed {
-      color: $gl-text-color-secondary;
-      border-radius: 0 0 $border-radius-default $border-radius-default;
-
-      img {
-        margin: -2px 4px 0 0;
-      }
-
-      .author-link {
-        color: $gl-text-color;
-      }
-    }
-
-    .user-avatar-link {
-      &:last-child img {
-        margin-right: $gl-padding-8;
-      }
-    }
-
-    .btn-link {
-      border: 0;
-      vertical-align: baseline;
-    }
-  }
-
   .discussion-toggle-replies {
     border-top: 0;
     border-radius: 4px 4px 0 0;

app/assets/stylesheets/pages/work_items.scss

+.gl-token-selector-token-container {
+  display: flex;
+  align-items: center;
+}

app/assets/stylesheets/utilities.scss

@@ -253,11 +253,6 @@ $gl-line-height-42: px-to-rem(42px);
   max-width: 50%;
 }
 
-// Will be moved to @gitlab/ui in https://gitlab.com/gitlab-org/gitlab-ui/-/merge_requests/2894
-.gl-form-lg {
-  max-width: 320px;
-}
-
 /**
   Note: ::-webkit-scrollbar is a non-standard rule only
   supported by webkit browsers.

app/controllers/import/fogbugz_controller.rb

@@ -17,12 +17,12 @@ def callback
       res = Gitlab::FogbugzImport::Client.new(import_params.to_h.symbolize_keys)
     rescue StandardError
       # If the URI is invalid various errors can occur
-      return redirect_to new_import_fogbugz_path, alert: _('Could not connect to FogBugz, check your URL')
+      return redirect_to new_import_fogbugz_path(namespace_id: params[:namespace_id]), alert: _('Could not connect to FogBugz, check your URL')
     end
     session[:fogbugz_token] = res.get_token
     session[:fogbugz_uri] = params[:uri]
 
-    redirect_to new_user_map_import_fogbugz_path
+    redirect_to new_user_map_import_fogbugz_path(namespace_id: params[:namespace_id])
   end
 
   def new_user_map
@@ -41,12 +41,12 @@ def create_user_map
 
     flash[:notice] = _('The user map has been saved. Continue by selecting the projects you want to import.')
 
-    redirect_to status_import_fogbugz_path
+    redirect_to status_import_fogbugz_path(namespace_id: params[:namespace_id])
   end
 
   def status
     unless client.valid?
-      return redirect_to new_import_fogbugz_path
+      return redirect_to new_import_fogbugz_path(namespace_id: params[:namespace_id])
     end
 
     super
@@ -106,7 +106,7 @@ def user_map
   end
 
   def fogbugz_unauthorized(exception)
-    redirect_to new_import_fogbugz_path, alert: exception.message
+    redirect_to new_import_fogbugz_path(namespace_id: params[:namespace_id]), alert: exception.message
   end
 
   def import_params

app/graphql/mutations/concerns/mutations/work_items/update_arguments.rb

@@ -15,6 +15,9 @@ module UpdateArguments
         argument :title, GraphQL::Types::String,
                  required: false,
                  description: copy_field_description(Types::WorkItemType, :title)
+        argument :description_widget, ::Types::WorkItems::Widgets::DescriptionInputType,
+                 required: false,
+                 description: 'Input for description widget.'
       end
     end
   end

app/graphql/mutations/work_items/update.rb

@@ -24,11 +24,13 @@ def resolve(id:, **attributes)
         end
 
         spam_params = ::Spam::SpamParams.new_from_request(request: context[:request])
+        widget_params = extract_widget_params(work_item, attributes)
 
         ::WorkItems::UpdateService.new(
           project: work_item.project,
           current_user: current_user,
           params: attributes,
+          widget_params: widget_params,
           spam_params: spam_params
         ).execute(work_item)
 
@@ -45,6 +47,16 @@ def resolve(id:, **attributes)
       def find_object(id:)
         GitlabSchema.find_by_gid(id)
       end
+
+      def extract_widget_params(work_item, attributes)
+        # Get the list of widgets for the work item's type to extract only the supported attributes
+        widget_keys = work_item.work_item_type.widgets.map(&:api_symbol)
+        widget_params = attributes.extract!(*widget_keys)
+
+        # Cannot use prepare to use `.to_h` on each input due to
+        # https://gitlab.com/gitlab-org/gitlab/-/merge_requests/87472#note_945199865
+        widget_params.transform_values { |values| values.to_h }
+      end
     end
   end
 end

app/graphql/mutations/work_items/update_widgets.rb

@@ -2,6 +2,7 @@
 
 module Mutations
   module WorkItems
+    # TODO: Deprecate in favor of using WorkItemUpdate. See https://gitlab.com/gitlab-org/gitlab/-/issues/366300
     class UpdateWidgets < BaseMutation
       graphql_name 'WorkItemUpdateWidgets'
       description "Updates the attributes of a work item's widgets by global ID." \

app/graphql/resolvers/todo_resolver.rb

@@ -2,68 +2,16 @@
 
 module Resolvers
   class TodoResolver < BaseResolver
-    type Types::TodoType.connection_type, null: true
+    description 'Retrieve a single to-do item'
 
-    alias_method :target, :object
+    type Types::TodoType, null: true
 
-    argument :action, [Types::TodoActionEnum],
-             required: false,
-             description: 'Action to be filtered.'
+    argument :id, Types::GlobalIDType[Todo],
+             required: true,
+             description: 'ID of the to-do item.'
 
-    argument :author_id, [GraphQL::Types::ID],
-             required: false,
-             description: 'ID of an author.'
-
-    argument :project_id, [GraphQL::Types::ID],
-             required: false,
-             description: 'ID of a project.'
-
-    argument :group_id, [GraphQL::Types::ID],
-             required: false,
-             description: 'ID of a group.'
-
-    argument :state, [Types::TodoStateEnum],
-             required: false,
-             description: 'State of the todo.'
-
-    argument :type, [Types::TodoTargetEnum],
-             required: false,
-             description: 'Type of the todo.'
-
-    before_connection_authorization do |nodes, current_user|
-      Preloaders::UserMaxAccessLevelInProjectsPreloader.new(
-        nodes.map(&:project).compact,
-        current_user
-      ).execute
-    end
-
-    def resolve(**args)
-      return Todo.none unless current_user.present? && target.present?
-      return Todo.none if target.is_a?(User) && target != current_user
-
-      TodosFinder.new(current_user, todo_finder_params(args)).execute.with_entity_associations
-    end
-
-    private
-
-    def todo_finder_params(args)
-      {
-        state: args[:state],
-        type: args[:type],
-        group_id: args[:group_id],
-        author_id: args[:author_id],
-        action_id: args[:action],
-        project_id: args[:project_id]
-      }.merge(target_params)
-    end
-
-    def target_params
-      return {} unless TodosFinder::TODO_TYPES.include?(target.class.name)
-
-      {
-        type: target.class.name,
-        target_id: target.id
-      }
+    def resolve(id:)
+      GitlabSchema.find_by_gid(id)
     end
   end
 end

app/graphql/resolvers/todos_resolver.rb

+# frozen_string_literal: true
+
+module Resolvers
+  class TodosResolver < BaseResolver
+    type Types::TodoType.connection_type, null: true
+
+    alias_method :target, :object
+
+    argument :action, [Types::TodoActionEnum],
+             required: false,
+             description: 'Action to be filtered.'
+
+    argument :author_id, [GraphQL::Types::ID],
+             required: false,
+             description: 'ID of an author.'
+
+    argument :project_id, [GraphQL::Types::ID],
+             required: false,
+             description: 'ID of a project.'
+
+    argument :group_id, [GraphQL::Types::ID],
+             required: false,
+             description: 'ID of a group.'
+
+    argument :state, [Types::TodoStateEnum],
+             required: false,
+             description: 'State of the todo.'
+
+    argument :type, [Types::TodoTargetEnum],
+             required: false,
+             description: 'Type of the todo.'
+
+    before_connection_authorization do |nodes, current_user|
+      Preloaders::UserMaxAccessLevelInProjectsPreloader.new(
+        nodes.map(&:project).compact,
+        current_user
+      ).execute
+    end
+
+    def resolve(**args)
+      return Todo.none unless current_user.present? && target.present?
+      return Todo.none if target.is_a?(User) && target != current_user
+
+      TodosFinder.new(current_user, todo_finder_params(args)).execute.with_entity_associations
+    end
+
+    private
+
+    def todo_finder_params(args)
+      {
+        state: args[:state],
+        type: args[:type],
+        group_id: args[:group_id],
+        author_id: args[:author_id],
+        action_id: args[:action],
+        project_id: args[:project_id]
+      }.merge(target_params)
+    end
+
+    def target_params
+      return {} unless TodosFinder::TODO_TYPES.include?(target.class.name)
+
+      {
+        type: target.class.name,
+        target_id: target.id
+      }
+    end
+  end
+end

app/graphql/types/alert_management/alert_type.rb

@@ -116,7 +116,7 @@ class AlertType < BaseObject
             null: true,
             description: 'Runbook for the alert as defined in alert details.'
 
-      field :todos, description: 'To-do items of the current user for the alert.', resolver: Resolvers::TodoResolver
+      field :todos, description: 'To-do items of the current user for the alert.', resolver: Resolvers::TodosResolver
 
       field :details_url,
             GraphQL::Types::String,

app/graphql/types/query_type.rb

@@ -136,6 +136,10 @@ class QueryType < ::Types::BaseObject
           null: true,
           resolver: Resolvers::BoardListResolver
 
+    field :todo,
+          null: true,
+          resolver: Resolvers::TodoResolver
+
     field :topics, Types::Projects::TopicType.connection_type,
           null: true,
           resolver: Resolvers::TopicsResolver,