[#60144] primerize wp types settings form

app/components/work_packages/types/settings_component.html.erb

@@ -0,0 +1,34 @@
+<%#-- copyright
+OpenProject is an open source project management software.
+Copyright (C) the OpenProject GmbH
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License version 3.
+
+OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+Copyright (C) 2006-2013 Jean-Philippe Lang
+Copyright (C) 2010-2013 the ChiliProject Team
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+See COPYRIGHT and LICENSE files for more details.
+
+++#%>
+
+<%=
+  primer_form_with(**form_options) do |f|
+    render(WorkPackages::Types::SettingsForm.new(f))
+  end
+%>

app/components/work_packages/types/settings_component.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackages
+  module Types
+    class SettingsComponent < ApplicationComponent
+      include OpPrimer::ComponentHelpers
+      include OpTurbo::Streamable
+
+      def initialize(model, **options)
+        @copy_workflow_from = options[:copy_workflow_from].to_i
+        super
+      end
+
+      def form_options
+        {
+          url: model.new_record? ? types_path : type_path(id: model.id),
+          method: model.new_record? ? :post : :patch,
+          model:,
+          copy_workflow_from: @copy_workflow_from
+        }
+      end
+    end
+  end
+end

app/controllers/types_controller.rb

@@ -62,19 +62,17 @@ def edit
     end
   end
 
-  def create # rubocop:disable Metrics/AbcSize
+  def create
     CreateTypeService
       .new(current_user)
-      .call(permitted_type_params, copy_workflow_from: params[:copy_workflow_from]) do |call|
+      .call(permitted_type_params, copy_workflow_from: params.dig(:type, :copy_workflow_from)) do |call|
       @type = call.result
 
       call.on_success do
         redirect_to_type_tab_path(@type, t(:notice_successful_create))
       end
 
-      call.on_failure do |result|
-        flash[:error] = result.errors.full_messages.join("\n")
-        load_projects_and_types
+      call.on_failure do
         render action: :new, status: :unprocessable_entity
       end
     end

app/forms/work_packages/types/settings_form.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+#-- copyright
+# OpenProject is an open source project management software.
+# Copyright (C) the OpenProject GmbH
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License version 3.
+#
+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
+# Copyright (C) 2006-2013 Jean-Philippe Lang
+# Copyright (C) 2010-2013 the ChiliProject Team
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# See COPYRIGHT and LICENSE files for more details.
+#++
+
+module WorkPackages
+  module Types
+    class SettingsForm < ApplicationForm
+      form do |settings_form|
+        settings_form.text_field(
+          name: :name,
+          label: label(:name),
+          placeholder: I18n.t(:label_name),
+          input_width: :large,
+          required: true,
+          disabled: model.is_standard?
+        )
+
+        settings_form.color_select_list(
+          name: :color_id,
+          label: Color.model_name.human,
+          caption: I18n.t("types.edit.settings.type_color_text"),
+          input_width: :large
+        )
+
+        if show_work_flow_copy?
+          settings_form.select_list(
+            name: :copy_workflow_from,
+            label: label(:copy_workflow_from),
+            include_blank: true,
+            input_width: :large
+          ) do |other_types|
+            work_package_types.each do |type|
+              other_types.option(
+                value: type.id,
+                label: type.name,
+                selected: type.id == prefilled_copy_workflow_from
+              )
+            end
+          end
+        end
+
+        settings_form.rich_text_area(
+          name: :description,
+          label: label(:description),
+          input_width: :large,
+          rich_text_options: { showAttachments: false }
+        )
+
+        settings_form.check_box(
+          name: :is_milestone,
+          label: label(:is_milestone)
+        )
+
+        settings_form.check_box(
+          name: :is_in_roadmap,
+          label: label(:is_in_roadmap)
+        )
+
+        settings_form.check_box(
+          name: :is_default,
+          label: label(:is_default)
+        )
+
+        settings_form.submit(
+          name: :submit,
+          label: I18n.t(:button_save),
+          scheme: :primary
+        )
+      end
+
+      private
+
+      def label(attribute)
+        model.class.human_attribute_name(attribute)
+      end
+
+      def show_work_flow_copy?
+        model.new_record?
+      end
+
+      def work_package_types
+        Type.all
+      end
+
+      def prefilled_copy_workflow_from
+        @builder.options[:copy_workflow_from]
+      end
+    end
+  end
+end

app/helpers/types_helper.rb

@@ -34,9 +34,9 @@ def types_tabs
     tabs = [
       {
         name: "settings",
-        partial: "types/form/settings",
         path: edit_tab_type_path(id: @type.id, tab: :settings),
-        label: "types.edit.settings.tab"
+        label: "types.edit.settings.tab",
+        view_component: WorkPackages::Types::SettingsComponent
       },
       {
         name: "form_configuration",

app/views/types/new.html.erb

@@ -39,8 +39,10 @@ See COPYRIGHT and LICENSE files for more details.
   end
 %>
 
-<%= error_messages_for 'type' %>
-
-<%= form_for controller.type, builder: TabularFormBuilder, lang: current_language  do |f| %>
-  <%= render partial: 'types/form/settings', locals: { f: f } %>
-<% end %>
+<%=
+  render WorkPackages::Types::SettingsComponent.new(
+    @type,
+    copy_workflow_from: params.dig(:type, :copy_workflow_from),
+    params:
+  )
+%>

lib/primer/open_project/forms/color_select.html.erb

@@ -2,7 +2,7 @@
   <%= content_tag(:div, **@field_wrap_arguments) do %>
     <%= builder.hidden_field :color_id %>
     <%= angular_component_tag("opce-colors-autocompleter",
-                              class: "colors-autocomplete form--select-container -middle",
+                              class: "colors-autocomplete form--select-container",
                               data: {
                                 colors:,
                                 classes: "ng-select--primerized",

spec/controllers/types_controller_spec.rb

@@ -41,8 +41,8 @@
            is_for_all: true)
   end
   let(:custom_field_2) { create(:work_package_custom_field) }
-  let(:status_0) { create(:status) }
-  let(:status_1) { create(:status) }
+  let(:status_old) { create(:status) }
+  let(:status_new) { create(:status) }
 
   context "with an unauthorized account" do
     let(:current_user) { create(:user) }
@@ -174,16 +174,20 @@
         let!(:existing_type) { create(:type, name: "Existing type") }
         let!(:workflow) do
           create(:workflow,
-                 old_status: status_0,
-                 new_status: status_1,
+                 old_status: status_old,
+                 new_status: status_new,
                  type_id: existing_type.id)
         end
 
         let(:params) do
-          { "type" => { name: "New type",
-                        project_ids: { "1" => project.id },
-                        custom_field_ids: { "1" => custom_field_1.id, "2" => custom_field_2.id } },
-            "copy_workflow_from" => existing_type.id }
+          {
+            "type" => {
+              name: "New type",
+              project_ids: { "1" => project.id },
+              custom_field_ids: { "1" => custom_field_1.id, "2" => custom_field_2.id },
+              copy_workflow_from: existing_type.id
+            }
+          }
         end
 
         before do
@@ -218,7 +222,6 @@
 
       it { expect(response).to have_http_status(:ok) }
       it { expect(response).to render_template "edit" }
-      it { expect(response).to render_template "types/form/_settings" }
       it { expect(response.body).to have_css "input[@name='type[name]'][@value='My type']" }
       it { expect(response.body).to have_css "input[@name='type[is_milestone]'][@value='1'][@checked='checked']" }
     end