diff --git a/app/forms/filters/inputs/base_filter_form.rb b/app/forms/filters/inputs/base_filter_form.rb
index b10c9e952fbf..91ec5bf89209 100644
--- a/app/forms/filters/inputs/base_filter_form.rb
+++ b/app/forms/filters/inputs/base_filter_form.rb
@@ -106,11 +106,12 @@ def add_operator(group)
         "filter-name": @filter.name
       }
     ) do |select|
-      @filter.available_operators.each do |op|
+      @filter.available_operators.each do |operator|
         select.option(
-          label: op.human_name,
-          value: op.symbol,
-          selected: op.symbol == selected_operator
+          label: operator.human_name,
+          value: operator.symbol,
+          selected: operator.symbol == selected_operator,
+          **(operator.requires_value? ? {} : { "data-no-value": true })
         )
       end
     end
diff --git a/app/forms/filters/inputs/date_form.rb b/app/forms/filters/inputs/date_form.rb
index 9ed1d93ef181..7cd2b0410cbb 100644
--- a/app/forms/filters/inputs/date_form.rb
+++ b/app/forms/filters/inputs/date_form.rb
@@ -95,7 +95,7 @@ def on_date_div(builder, filter_name, value)
       label: :singleDay,
       hidden: value.nil?,
       leading_visual: { icon: :calendar },
-      value:,
+      value: value || "",
       datepicker_options: { input_attributes: { "data-filter--filters-form-target" => "singleDay" } },
       data: { "filter-name": filter_name }
     )
diff --git a/app/models/persisted_view.rb b/app/models/persisted_view.rb
index 9646870b7842..fa7a405215a9 100644
--- a/app/models/persisted_view.rb
+++ b/app/models/persisted_view.rb
@@ -49,6 +49,7 @@ class PersistedView < ApplicationRecord
 
   scope :public_views, -> { where(public: true) }
   scope :private_views, ->(principal = User.current) { where(public: false, principal_id: principal.id) }
+  scope :with_children, -> { includes(:children) }
 
   scope :visible, (lambda do |principal = User.current|
     public_views.or(private_views(principal))
@@ -68,6 +69,17 @@ class << self
     attr_writer :allowed_children
   end
 
+  # Resolves a (potentially user-supplied) class name to a view class, but only
+  # if it is an allowed child of this view. Returns nil for any unknown or
+  # forbidden name.
+  #
+  # `constantize` is applied only to the developer-controlled `allowed_children`
+  # list, never to the passed-in name, so untrusted input can never resolve an
+  # arbitrary constant.
+  def self.allowed_child_class(name)
+    allowed_children.index_with(&:constantize)[name.to_s]
+  end
+
   # Returns the query of this view or, if not set, the query of the parent view.
   def effective_query
     query || parent&.effective_query
diff --git a/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb b/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb
index 9ee968a8b8a1..d2cef34cb119 100644
--- a/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb
+++ b/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb
@@ -37,6 +37,27 @@ def allowed_values
     raise NotImplementedError, "There would be too many candidates"
   end
 
+  # Tell `Filters::FilterForm`'s dispatch to render these filters with a
+  # server-side autocompleter (the candidate set is too large for an inline
+  # `<select>`). Mirrors what the legacy Angular WP filter UI does — see
+  # `filter-searchable-multiselect-value.component.html`, which renders an
+  # `op-autocompleter` against the `work_packages` resource using the
+  # `typeahead` filter for search.
+  #
+  # Subclasses that override `type` to something other than `:list` (e.g.
+  # `SearchFilter` / `SubjectOrIdFilter` use `:search`, `RelatableFilter`
+  # uses `:relation`) get an empty hash so the dispatch falls back to the
+  # appropriate non-autocomplete input.
+  def autocomplete_options
+    return {} unless type == :list
+
+    {
+      component: "opce-autocompleter",
+      resource: "work_packages",
+      searchKey: "typeahead"
+    }
+  end
+
   def value_objects
     objects = visible_scope.find(no_templated_values)
 
diff --git a/app/models/query.rb b/app/models/query.rb
index f8c2e313a1d3..939d62f94324 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -63,6 +63,7 @@ class Query < ApplicationRecord
   validate :validate_timestamps
 
   include Scopes::Scoped
+
   scopes :visible,
          :having_views
 
@@ -217,6 +218,16 @@ def find_active_filter(name)
     filters.detect { |f| f.name == name }
   end
 
+  # The manual-sort filter is added programmatically when the user drags
+  # work packages to reorder them — it has no operator/value UI of its own
+  # (type `:empty_value`), so it doesn't belong in the picker that
+  # `Filters::FilterForm` builds. Mirrors how
+  # `Queries::Filters::AvailableFilters#available_advanced_filters` already
+  # excludes the inline `name_and_identifier` quick-filter on projects.
+  def available_advanced_filters
+    super.grep_v(::Queries::WorkPackages::Filter::ManualSortFilter)
+  end
+
   def normalized_name
     name.parameterize.underscore
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8bbaec534912..dbae0f990a57 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -69,10 +69,10 @@ en:
       not_available_in_semantic_mode: "Reserved identifiers are only available in classic identifier mode."
       filter_label: "Filter identifiers"
       btn_release: "Release"
-      released_notice: "Identifier \"%{identifier}\" has been released."
+      released_notice: 'Identifier "%{identifier}" has been released.'
       dialog:
         title: "Release identifier"
-        heading: "Release \"%{identifier}\"?"
+        heading: 'Release "%{identifier}"?'
         description: "Releasing this identifier cannot be undone. External links and integrations using it will stop resolving, and the name becomes available for any new project to claim."
         checkbox_label: "I understand that this cannot be undone."
         confirm_button: "Release identifier"
@@ -1548,7 +1548,7 @@ en:
             one: "Successfully copied workflow to '%{type_name}' type."
             other: "Successfully copied workflow to %{count} types."
       new:
-        title: "Copy workflow of \"%{source_type}\""
+        title: 'Copy workflow of "%{source_type}"'
     form:
       matrix_caption: "Workflow matrix"
       matrix_caption_assignee: "Workflow matrix for assignee"
@@ -1829,7 +1829,7 @@ en:
       changeset:
         repository: "Repository"
       comment:
-        commented: "Commented"  # an object that this comment belongs to
+        commented: "Commented" # an object that this comment belongs to
       custom_action:
         actions: "Actions"
       custom_field:
@@ -2124,7 +2124,7 @@ en:
         redirect_existing_links: "Redirect existing links"
         text: "Page content"
       work_package:
-        ancestor: "Descendants of"  # used for filtering of work packages that are descendants of a given work package
+        ancestor: "Descendants of" # used for filtering of work packages that are descendants of a given work package
         begin_insertion: "Begin of the insertion"
         begin_deletion: "Begin of the deletion"
         children: "Subelements"
@@ -2142,13 +2142,14 @@ en:
           false: "working days only"
           true: "include non-working days"
         journal_internal: Internal Journal
-        notify: "Notify"  # used in custom actions
+        notify: "Notify" # used in custom actions
         parent: "Parent"
         parent_issue: "Parent"
         parent_work_package: "Parent"
         priority: "Priority"
         progress: "% Complete"
         readonly: "Read only"
+        relatable: "Relatable to"
         remaining_hours: "Remaining work"
         remaining_time: "Remaining work"
         sequence_number: "Sequence number"
@@ -4861,8 +4862,8 @@ en:
       A new user (%{email}) tried to create an account on an OpenProject environment that you manage (%{host}).
       The user cannot activate their account since the user limit has been reached.
     steps:
-      a: "Upgrade your payment plan ([here](upgrade_url))"  # here turned into a link
-      b: "Lock or delete an existing user ([here](users_url))"  # here turned into a link
+      a: "Upgrade your payment plan ([here](upgrade_url))" # here turned into a link
+      b: "Lock or delete an existing user ([here](users_url))" # here turned into a link
       label: "To allow the user to sign in you can either: "
 
   more_actions: "More functions"
diff --git a/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts b/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts
index 1f50b46707b2..80dd29e81e79 100644
--- a/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts
+++ b/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts
@@ -153,7 +153,7 @@ export default class FiltersFormController extends Controller {
     const filterName = target.getAttribute('data-filter-name');
     if (filterName) {
       const operator = this.findTargetByName(filterName, this.operatorTargets);
-      if (operator && this.noValueOperators.includes(operator.value)) {
+      if (operator && this.operatorRequiresNoValue(operator)) {
         target.setAttribute('hidden', '');
       }
     }
@@ -354,16 +354,24 @@ export default class FiltersFormController extends Controller {
     inputElement.dispatchEvent(inputEvent);
   }
 
-  private readonly noValueOperators = ['*', '!*', 't', 'w'];
   private readonly daysOperators = ['>t-', '<t-', 't-', '<t+', '>t+', 't+'];
   private readonly onDateOperator = '=d';
   private readonly betweenDatesOperator = '<>d';
 
+  // Whether the operator currently selected in `operatorElement` declares
+  // itself value-less. Driven by the `data-no-value` attribute that
+  // `Filters::Inputs::BaseFilterForm#add_operator` emits on each `<option>`
+  // whose `Operator.requires_value?` is false — keeps the symbol list in
+  // one place (Ruby) instead of duplicating it here.
+  private operatorRequiresNoValue(operatorElement:HTMLSelectElement):boolean {
+    return operatorElement.selectedOptions[0]?.hasAttribute('data-no-value') ?? false;
+  }
+
   setValueVisibility({ target, params: { filterName } }:{ target:HTMLSelectElement, params:{ filterName:string } }) {
     const selectedOperator = target.value;
     const valueContainer = this.findTargetByName(filterName, this.filterValueContainerTargets);
     if (valueContainer) {
-      if (this.noValueOperators.includes(selectedOperator)) {
+      if (this.operatorRequiresNoValue(target)) {
         valueContainer.setAttribute('hidden', '');
       } else {
         valueContainer.removeAttribute('hidden');
@@ -456,7 +464,9 @@ export default class FiltersFormController extends Controller {
       const type = filter.getAttribute('data-filter-type');
       const operator = filter.getAttribute('data-filter-operator');
       if (name && type && operator) {
-        const value = this.parseFilterValue(filter, name, type, operator) as string[]|null;
+        // Quick filters carry an operator that always requires a value
+        // (the inline search input).
+        const value = this.parseFilterValue(filter, name, type, operator, false) as string[]|null;
 
         if (value) {
           filters.push({ name, operator, value });
@@ -473,11 +483,13 @@ export default class FiltersFormController extends Controller {
     advancedFilters.forEach((filter) => {
       const filterName = filter.getAttribute('data-filter-name')!;
       const filterType = filter.getAttribute('data-filter-type');
-      const parsedOperator = this.findTargetByName(filterName, this.operatorTargets)?.value;
+      const operatorTarget = this.findTargetByName(filterName, this.operatorTargets);
+      const parsedOperator = operatorTarget?.value;
       const valueContainer = this.findTargetByName(filterName, this.filterValueContainerTargets);
 
-      if (valueContainer && filterName && filterType && parsedOperator) {
-        const parsedValue = this.parseFilterValue(valueContainer, filterName, filterType, parsedOperator) as string[]|null;
+      if (valueContainer && filterName && filterType && parsedOperator && operatorTarget) {
+        const requiresNoValue = this.operatorRequiresNoValue(operatorTarget);
+        const parsedValue = this.parseFilterValue(valueContainer, filterName, filterType, parsedOperator, requiresNoValue) as string[]|null;
 
         if (parsedValue) {
           filters.push({ name: filterName, operator: parsedOperator, value: parsedValue });
@@ -509,10 +521,9 @@ export default class FiltersFormController extends Controller {
     return value && value.length > 0 ? value.replace(/"/g, '\\"') : '';
   }
 
-  private readonly operatorsWithoutValues = ['*', '!*', 't', 'w'];
   private readonly dateFilterTypes = ['datetime_past', 'date'];
 
-  private parseFilterValue(valueContainer:HTMLElement, filterName:string, filterType:string, operator:string) {
+  private parseFilterValue(valueContainer:HTMLElement, filterName:string, filterType:string, operator:string, requiresNoValue:boolean) {
     const checkbox = valueContainer.querySelector<HTMLInputElement>('input[type="checkbox"]');
 
     if (checkbox) {
@@ -523,7 +534,7 @@ export default class FiltersFormController extends Controller {
       return (valueContainer.querySelector<HTMLInputElement>('input[name="value"]'))?.value.split(',');
     }
 
-    if (this.operatorsWithoutValues.includes(operator)) {
+    if (requiresNoValue) {
       return [];
     }
 
diff --git a/lookbook/docs/patterns/11-filter-forms.md.erb b/lookbook/docs/patterns/11-filter-forms.md.erb
index 8e757b448525..fd950f3663e5 100644
--- a/lookbook/docs/patterns/11-filter-forms.md.erb
+++ b/lookbook/docs/patterns/11-filter-forms.md.erb
@@ -130,10 +130,7 @@ form forwards it as `appendTo` to every autocompleter it renders.
 | You want…                                                | Use                       |
 |----------------------------------------------------------|---------------------------|
 | The standard OpenProject filter panel on an index page   | `Filter::FilterComponent` |
-| Filters inside a dialog or a non-filter form             | `Filters::FilterForm`     |
-| Coordination with a quick filter input in a sub-header   | `Filter::FilterComponent` (the sub-header attaches the controller) |
-| The serialized filter string in `params` on submit       | `Filters::FilterForm` + `hidden_input_name:` |
-| Autocompleter dropdowns to escape a clipping container   | `Filters::FilterForm` + `autocomplete_append_to:` |
+| Filters inside a dialog or a non-filter form             | `Filters::FilterForm` + `hidden_input_name:`   |
 
 ## Stimulus controller placement
 
@@ -164,6 +161,8 @@ default.
 with the same signature, so passing a `Query` (or any of its subclasses)
 to `FilterForm` works exactly like passing a `BaseQuery` subclass.
 
+<%= embed OpenProject::Filter::FilterFormPreview, :for_a_work_package_query, panels: %i[preview source] %>
+
 What `FilterForm` does *not* do for you on the legacy side: parsing the
 form submission back into a `Query#filters` collection. The work-package
 filter pipeline still uses its own serialization (URL `filters=[...]`
diff --git a/lookbook/previews/open_project/filter/filter_form_preview.rb b/lookbook/previews/open_project/filter/filter_form_preview.rb
index aae2b9474fc9..5f1643f7c0f7 100644
--- a/lookbook/previews/open_project/filter/filter_form_preview.rb
+++ b/lookbook/previews/open_project/filter/filter_form_preview.rb
@@ -33,12 +33,14 @@ module Filter
     # @logical_path OpenProject/Filter
     class FilterFormPreview < Lookbook::Preview
       # @display min_height 600px
+      # Using the `UserQuery` as an example.
       def default
         render_with_template(locals: { query: UserQuery.new })
       end
 
       # @display min_height 600px
       # @label With an active filter
+      # Using the `UserQuery` as an example.
       def with_active_filter
         query = UserQuery.new
         query.where(:login, "~", ["admin"])
@@ -48,6 +50,7 @@ def with_active_filter
       # @display min_height 600px
       # @label Hidden input mode
       # @param output_format [Symbol] select [json, params]
+      # Using the `UserQuery` as an example.
       # This also renders a field that shows the value of the hidden input to show the different serialization formats.
       def with_hidden_input(output_format: :json)
         render_with_template(locals: { query: UserQuery.new, output_format: output_format.to_sym })
@@ -55,9 +58,20 @@ def with_hidden_input(output_format: :json)
 
       # @display min_height 600px
       # @label Combined with other inputs
+      # Using the `UserQuery` as an example
       def combined_with_other_inputs
         render_with_template(locals: { query: UserQuery.new })
       end
+
+      # @display min_height 600px
+      # @label Work package query (legacy `Query`)
+      # Renders against the legacy work-package `Query` (the one that # predates `Queries::BaseQuery`).
+      def for_a_work_package_query
+        query = ::Query.new
+        query.add_filter(:status_id, "o", [])
+        query.add_filter(:due_date, "=d", [Date.current.end_of_year.iso8601])
+        render_with_template(locals: { query: query })
+      end
     end
   end
 end
diff --git a/lookbook/previews/open_project/filter/filter_form_preview/for_a_work_package_query.html.erb b/lookbook/previews/open_project/filter/filter_form_preview/for_a_work_package_query.html.erb
new file mode 100644
index 000000000000..8e6b01d244c9
--- /dev/null
+++ b/lookbook/previews/open_project/filter/filter_form_preview/for_a_work_package_query.html.erb
@@ -0,0 +1,17 @@
+<%# `Query` is the legacy work-package query model. `Filters::FilterForm` %>
+<%# works against it the same way it does against `Queries::BaseQuery` %>
+<%# subclasses — the only requirement is `available_advanced_filters`, %>
+<%# `filters`, and `find_active_filter(name)`, all of which `Query` %>
+<%# exposes (the last one was mirrored from `BaseQuery` to bring the %>
+<%# legacy query in line with the new form). %>
+<%= primer_form_with(url: "/foo", method: :post) do |f| %>
+  <%=
+    render(
+      Filters::FilterForm.new(
+        f,
+        query: query,
+        wrap_with_controller: true
+      )
+    )
+  %>
+<% end %>
diff --git a/modules/resource_management/app/components/resource_planner_views/configure_step/footer_component.rb b/modules/resource_management/app/components/resource_planner_views/configure_step/footer_component.rb
new file mode 100644
index 000000000000..f0ff80515ceb
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/configure_step/footer_component.rb
@@ -0,0 +1,84 @@
+# 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 ResourcePlannerViews
+  module ConfigureStep
+    class FooterComponent < ApplicationComponent
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      def initialize(submit_label: I18n.t(:button_create),
+                     dialog_id: ResourcePlannerViews::NewDialogComponent::DIALOG_ID,
+                     form_id: ResourcePlannerViews::NewDialogComponent::FORM_ID,
+                     footer_id: ResourcePlannerViews::NewDialogComponent::FOOTER_ID,
+                     cancel_href: nil)
+        super
+        @submit_label = submit_label
+        @dialog_id = dialog_id
+        @form_id = form_id
+        @footer_id = footer_id
+        @cancel_href = cancel_href
+      end
+
+      attr_reader :footer_id
+      alias_method :wrapper_key, :footer_id
+
+      def call
+        component_wrapper do
+          component_collection do |buttons|
+            buttons.with_component(cancel_button) { I18n.t(:button_cancel) }
+
+            buttons.with_component(
+              Primer::Beta::Button.new(
+                scheme: :primary,
+                form: @form_id,
+                type: :submit
+              )
+            ) { @submit_label }
+          end
+        end
+      end
+
+      private
+
+      # When a `cancel_href` is passed, Cancel becomes a link that navigates
+      # away — used by the new-planner flow so dismissing step 2 lands the
+      # user on a page that reflects the just-created planner. Without one,
+      # Cancel just dismisses the dialog (standalone "+ Add view" flow).
+      def cancel_button
+        if @cancel_href
+          Primer::Beta::Button.new(tag: :a, href: @cancel_href, mr: 1)
+        else
+          Primer::Beta::Button.new(data: { "close-dialog-id": @dialog_id }, mr: 1)
+        end
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/configure_step/form_component.html.erb b/modules/resource_management/app/components/resource_planner_views/configure_step/form_component.html.erb
new file mode 100644
index 000000000000..fa7eda10c723
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/configure_step/form_component.html.erb
@@ -0,0 +1,57 @@
+<%=
+  component_wrapper do
+    content_tag(:div, data: { controller: "show-when-value-selected" }) do
+      primer_form_with(
+        model: @view,
+        scope: :view,
+        url: @url,
+        method: @method,
+        html: {
+          data: { turbo_stream: true },
+          id: @form_id
+        }
+      ) do |f|
+        flex_layout do |body|
+          if @view.errors[:base].present?
+            body.with_row(mb: 3) do
+              render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @view.errors[:base].join("\n") }
+            end
+          end
+
+          @hidden_fields.each do |name, value|
+            body.with_row do
+              concat(hidden_field_tag(name, value))
+            end
+          end
+
+          body.with_row do
+            render(ResourcePlannerViews::Forms::ConfigureForm.new(f))
+          end
+
+          if has_filter_query?
+            body.with_row(
+              mt: 3,
+              data: {
+                target_name: "filter_mode",
+                value: "automatic",
+                "show-when-value-selected-target": "effect"
+              },
+              hidden: !initial_filter_mode_automatic?
+            ) do
+              render(
+                ::Filters::FilterForm.new(
+                  f,
+                  query: @filter_query,
+                  wrap_with_controller: true,
+                  hidden_input_name: "filters",
+                  output_format: :json,
+                  autocomplete_append_to: "##{@dialog_id}"
+                )
+              )
+            end
+          end
+        end
+      end
+    end
+  end
+%>
diff --git a/modules/resource_management/app/components/resource_planner_views/configure_step/form_component.rb b/modules/resource_management/app/components/resource_planner_views/configure_step/form_component.rb
new file mode 100644
index 000000000000..3db3e365aebe
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/configure_step/form_component.rb
@@ -0,0 +1,77 @@
+# 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 ResourcePlannerViews
+  module ConfigureStep
+    # Renders the "Configure view" form (name + filter mode). Used both for
+    # the new-view dialog (step 2) and for the future edit dialog. Callers
+    # pass the form `url`, HTTP `method`, and the model to bind to. The
+    # `form_id` lets the surrounding dialog wire its submit button to this
+    # form via `<button form="...">`. `wrapper_key` is overridable so this
+    # component can be slotted into different dialog bodies — each dialog
+    # has its own replaceable body wrapper.
+    class FormComponent < ApplicationComponent
+      include ApplicationHelper
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      def initialize(view:,
+                     url:,
+                     method: :post,
+                     hidden_fields: {},
+                     form_id: ResourcePlannerViews::NewDialogComponent::FORM_ID,
+                     dialog_id: ResourcePlannerViews::NewDialogComponent::DIALOG_ID,
+                     wrapper_key: "resource_planner_view_step_body",
+                     filter_query: nil)
+        super
+        @view = view
+        @url = url
+        @method = method
+        @hidden_fields = hidden_fields
+        @form_id = form_id
+        @dialog_id = dialog_id
+        @wrapper_key = wrapper_key
+        @filter_query = filter_query
+      end
+
+      attr_reader :wrapper_key
+
+      private
+
+      def initial_filter_mode_automatic?
+        @view.errors.empty?
+      end
+
+      def has_filter_query?
+        @filter_query.present?
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/content_component.html.erb b/modules/resource_management/app/components/resource_planner_views/content_component.html.erb
new file mode 100644
index 000000000000..fbdb9f181efb
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/content_component.html.erb
@@ -0,0 +1,40 @@
+<%#-- 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.
+
+++#%>
+
+<%= component_wrapper do %>
+  <% if inner_component %>
+    <%= render(inner_component) %>
+  <% else %>
+    <%= render(Primer::Beta::Blankslate.new) do |blankslate|
+          blankslate.with_visual_icon(icon: :people)
+          blankslate.with_heading(tag: :h2) { placeholder_heading }
+          blankslate.with_description { t("resource_management.show.placeholder") }
+        end %>
+  <% end %>
+<% end %>
diff --git a/modules/resource_management/app/components/resource_planner_views/content_component.rb b/modules/resource_management/app/components/resource_planner_views/content_component.rb
new file mode 100644
index 000000000000..5885d8fc324d
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/content_component.rb
@@ -0,0 +1,65 @@
+# 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 ResourcePlannerViews
+  # Generic, turbo-streamable wrapper around a view's rendered content. It owns
+  # the wrapper element (so the controller can replace it without knowing the
+  # view type) and dispatches to the matching per-type content component.
+  class ContentComponent < ApplicationComponent
+    include OpTurbo::Streamable
+
+    def initialize(view:, project:, resource_planner:)
+      super
+
+      @view = view
+      @project = project
+      @resource_planner = resource_planner
+    end
+
+    private
+
+    # Returns the component rendering the body for the current view type, or nil
+    # for types that don't have a dedicated content component yet.
+    def inner_component
+      case @view
+      when ResourceWorkPackageList
+        ResourcePlannerViews::WorkPackageList::ContentComponent.new(
+          view: @view,
+          project: @project,
+          resource_planner: @resource_planner
+        )
+      end
+    end
+
+    def placeholder_heading
+      @view&.name || @resource_planner.name
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/edit_dialog_component.html.erb b/modules/resource_management/app/components/resource_planner_views/edit_dialog_component.html.erb
new file mode 100644
index 000000000000..2e0940cc5709
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/edit_dialog_component.html.erb
@@ -0,0 +1,65 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+  render(
+    Primer::Alpha::Dialog.new(
+      id: DIALOG_ID,
+      title:,
+      size: :large,
+      data: { "keep-open-on-submit": true }
+    )
+  ) do |dialog|
+    dialog.with_header(variant: :large)
+
+    dialog.with_body do
+      render(
+        ResourcePlannerViews::ConfigureStep::FormComponent.new(
+          view: @view,
+          url: form_url,
+          method: :patch,
+          form_id: FORM_ID,
+          dialog_id: DIALOG_ID,
+          filter_query: @view.effective_query
+        )
+      )
+    end
+
+    dialog.with_footer do
+      render(
+        ResourcePlannerViews::ConfigureStep::FooterComponent.new(
+          submit_label: I18n.t(:button_save),
+          dialog_id: DIALOG_ID,
+          form_id: FORM_ID,
+          footer_id: FOOTER_ID
+        )
+      )
+    end
+  end
+%>
diff --git a/modules/resource_management/app/components/resource_planner_views/edit_dialog_component.rb b/modules/resource_management/app/components/resource_planner_views/edit_dialog_component.rb
new file mode 100644
index 000000000000..c19054acd92e
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/edit_dialog_component.rb
@@ -0,0 +1,61 @@
+# 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 ResourcePlannerViews
+  # Dialog for editing an existing view. Unlike the new-view flow there is no
+  # type-selection step — it opens straight on the reusable configure form,
+  # pre-filled with the view and its query.
+  class EditDialogComponent < ApplicationComponent
+    include OpTurbo::Streamable
+    include OpPrimer::ComponentHelpers
+
+    DIALOG_ID = "edit-resource-planner-view-dialog"
+    FORM_ID = "edit-resource-planner-view-form"
+    FOOTER_ID = "edit-resource-planner-view-footer"
+
+    def initialize(view:, project:, resource_planner:)
+      super
+
+      @view = view
+      @project = project
+      @resource_planner = resource_planner
+    end
+
+    private
+
+    def title
+      I18n.t("resource_management.configure_view_dialog.title")
+    end
+
+    def form_url
+      project_resource_planner_view_path(@project, @resource_planner, @view)
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/new_dialog_component.html.erb b/modules/resource_management/app/components/resource_planner_views/new_dialog_component.html.erb
new file mode 100644
index 000000000000..f3ae21844035
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/new_dialog_component.html.erb
@@ -0,0 +1,54 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+  render(
+    Primer::Alpha::Dialog.new(
+      id: DIALOG_ID,
+      title:,
+      size: :large,
+      data: { "keep-open-on-submit": true }
+    )
+  ) do |dialog|
+    dialog.with_header(variant: :large)
+
+    dialog.with_body do
+      render(
+        ResourcePlannerViews::TypeStep::FormComponent.new(
+          resource_planner: @resource_planner,
+          project: @project
+        )
+      )
+    end
+
+    dialog.with_footer do
+      render(ResourcePlannerViews::TypeStep::FooterComponent.new)
+    end
+  end
+%>
diff --git a/modules/resource_management/app/components/resource_planner_views/new_dialog_component.rb b/modules/resource_management/app/components/resource_planner_views/new_dialog_component.rb
new file mode 100644
index 000000000000..7edf5f03c96f
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/new_dialog_component.rb
@@ -0,0 +1,53 @@
+# 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 ResourcePlannerViews
+  class NewDialogComponent < ApplicationComponent
+    include OpTurbo::Streamable
+    include OpPrimer::ComponentHelpers
+
+    DIALOG_ID = "new-resource-planner-view-dialog"
+    FORM_ID = "new-resource-planner-view-form"
+    FOOTER_ID = "new-resource-planner-view-footer"
+
+    def initialize(resource_planner:, project:)
+      super
+
+      @resource_planner = resource_planner
+      @project = project
+    end
+
+    private
+
+    def title
+      I18n.t("resource_management.new_view_dialog.title")
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/type_step/footer_component.rb b/modules/resource_management/app/components/resource_planner_views/type_step/footer_component.rb
new file mode 100644
index 000000000000..7736f2d1d0c7
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/type_step/footer_component.rb
@@ -0,0 +1,63 @@
+# 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 ResourcePlannerViews
+  module TypeStep
+    class FooterComponent < ApplicationComponent
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      def wrapper_key
+        ResourcePlannerViews::NewDialogComponent::FOOTER_ID
+      end
+
+      def call
+        component_wrapper do
+          component_collection do |buttons|
+            buttons.with_component(
+              Primer::Beta::Button.new(
+                data: { "close-dialog-id": ResourcePlannerViews::NewDialogComponent::DIALOG_ID },
+                mr: 1
+              )
+            ) { I18n.t(:button_cancel) }
+
+            buttons.with_component(
+              Primer::Beta::Button.new(
+                scheme: :primary,
+                form: ResourcePlannerViews::NewDialogComponent::FORM_ID,
+                type: :submit
+              )
+            ) { I18n.t("button_next") }
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/type_step/form_component.html.erb b/modules/resource_management/app/components/resource_planner_views/type_step/form_component.html.erb
new file mode 100644
index 000000000000..b5609cafa083
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/type_step/form_component.html.erb
@@ -0,0 +1,14 @@
+<%=
+  component_wrapper do
+    primer_form_with(
+      url: new_project_resource_planner_view_path(@project, @resource_planner),
+      method: :get,
+      html: {
+        data: { turbo_stream: true },
+        id: ResourcePlannerViews::NewDialogComponent::FORM_ID
+      }
+    ) do |f|
+      render(ResourcePlannerViews::Forms::TypeSelectForm.new(f))
+    end
+  end
+%>
diff --git a/modules/resource_management/app/components/resource_planner_views/type_step/form_component.rb b/modules/resource_management/app/components/resource_planner_views/type_step/form_component.rb
new file mode 100644
index 000000000000..06163be0e9b1
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/type_step/form_component.rb
@@ -0,0 +1,49 @@
+# 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 ResourcePlannerViews
+  module TypeStep
+    class FormComponent < ApplicationComponent
+      include ApplicationHelper
+      include OpTurbo::Streamable
+      include OpPrimer::ComponentHelpers
+
+      def initialize(resource_planner:, project:)
+        super
+        @resource_planner = resource_planner
+        @project = project
+      end
+
+      def wrapper_key
+        "resource_planner_view_step_body"
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/work_package_list/content_component.html.erb b/modules/resource_management/app/components/resource_planner_views/work_package_list/content_component.html.erb
new file mode 100644
index 000000000000..d5c2a95524e8
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/work_package_list/content_component.html.erb
@@ -0,0 +1,37 @@
+<%#-- 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.
+
+++#%>
+
+<%= render(
+      ResourcePlannerViews::WorkPackageList::SubHeaderComponent.new(
+        project: @project,
+        resource_planner: @resource_planner,
+        view: @view
+      )
+    ) %>
+<%= render(ResourcePlannerViews::WorkPackageList::TableComponent.new(rows: work_packages)) %>
diff --git a/modules/resource_management/app/components/resource_planner_views/work_package_list/content_component.rb b/modules/resource_management/app/components/resource_planner_views/work_package_list/content_component.rb
new file mode 100644
index 000000000000..b8c8a2644de5
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/work_package_list/content_component.rb
@@ -0,0 +1,50 @@
+# 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 ResourcePlannerViews::WorkPackageList
+  # Renders the work package list view results (sub header + table). Dispatched
+  # to by the generic ResourcePlannerViews::ContentComponent, which owns the
+  # turbo-streamable wrapper.
+  class ContentComponent < ApplicationComponent
+    def initialize(view:, project:, resource_planner:)
+      super
+
+      @view = view
+      @project = project
+      @resource_planner = resource_planner
+    end
+
+    private
+
+    def work_packages
+      @view.effective_query&.results&.work_packages || WorkPackage.none
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/work_package_list/row_component.rb b/modules/resource_management/app/components/resource_planner_views/work_package_list/row_component.rb
new file mode 100644
index 000000000000..cd72a616470b
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/work_package_list/row_component.rb
@@ -0,0 +1,148 @@
+# 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 ResourcePlannerViews::WorkPackageList
+  class RowComponent < ::OpPrimer::BorderBoxRowComponent
+    alias_method :work_package, :model
+
+    # The type / id / status info line stacked above the linked subject.
+    def subject
+      safe_join(
+        [
+          render(WorkPackages::InfoLineComponent.new(work_package:, show_status: true)),
+          render(
+            Primer::Beta::Link.new(
+              href: helpers.url_for(controller: "/work_packages", action: "show", id: work_package),
+              font_weight: :bold,
+              underline: false
+            )
+          ) { work_package.subject }
+        ]
+      )
+    end
+
+    def priority
+      return if work_package.priority.blank?
+
+      render(
+        Primer::Beta::Text.new(
+          tag: :span,
+          classes: "__hl_inline_priority_#{work_package.priority.id} __hl_inline__small_dot"
+        )
+      ) { work_package.priority.name }
+    end
+
+    def dates
+      return if work_package.start_date.blank? && work_package.due_date.blank?
+
+      render(WorkPackages::HighlightedDateComponent.new(work_package:))
+    end
+
+    # Placeholder until allocation data is available.
+    def allocation
+      render(Primer::Beta::Text.new(color: :muted)) { allocation_placeholder }
+    end
+
+    # Placeholder until allocated members are available.
+    def allocated_members
+      render(Primer::Beta::Text.new(color: :muted)) { allocation_placeholder }
+    end
+
+    def button_links
+      [context_menu]
+    end
+
+    private
+
+    def allocation_placeholder
+      I18n.t("resource_management.work_package_list.allocation_placeholder")
+    end
+
+    # Stubbed context menu mirroring the intended actions. Each item gets its own
+    # method so it can be wired up individually later. None are functional yet.
+    def context_menu
+      render(Primer::Alpha::ActionMenu.new) do |menu|
+        menu.with_show_button(icon: "kebab-horizontal",
+                              "aria-label": t("resource_management.work_package_list.context_menu.label"),
+                              scheme: :invisible)
+
+        see_allocation_item(menu)
+        edit_total_work_item(menu)
+        add_user_group_item(menu)
+        add_filter_criteria_item(menu)
+        move_item(menu)
+        remove_item(menu)
+      end
+    end
+
+    def see_allocation_item(menu)
+      menu.with_item(label: t("resource_management.work_package_list.context_menu.see_allocation"),
+                     disabled: true) do |item|
+        item.with_leading_visual_icon(icon: :hourglass)
+      end
+    end
+
+    def edit_total_work_item(menu)
+      menu.with_item(label: t("resource_management.work_package_list.context_menu.edit_total_work"),
+                     disabled: true) do |item|
+        item.with_leading_visual_icon(icon: :pencil)
+      end
+    end
+
+    def add_user_group_item(menu)
+      menu.with_item(label: t("resource_management.work_package_list.context_menu.add_user_group"),
+                     disabled: true) do |item|
+        item.with_leading_visual_icon(icon: :"person-add")
+      end
+    end
+
+    def add_filter_criteria_item(menu)
+      menu.with_item(label: t("resource_management.work_package_list.context_menu.add_filter_criteria"),
+                     disabled: true) do |item|
+        item.with_leading_visual_icon(icon: :plus)
+      end
+    end
+
+    def move_item(menu)
+      menu.with_item(label: t("resource_management.work_package_list.context_menu.move"),
+                     disabled: true) do |item|
+        item.with_leading_visual_icon(icon: :"arrow-right")
+      end
+    end
+
+    def remove_item(menu)
+      menu.with_item(label: t("resource_management.work_package_list.context_menu.remove"),
+                     scheme: :danger,
+                     disabled: true) do |item|
+        item.with_leading_visual_icon(icon: :trash)
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/work_package_list/sub_header_component.html.erb b/modules/resource_management/app/components/resource_planner_views/work_package_list/sub_header_component.html.erb
new file mode 100644
index 000000000000..f50a881eca57
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/work_package_list/sub_header_component.html.erb
@@ -0,0 +1,88 @@
+<%#-- 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.
+
+++#%>
+
+<%=
+  render(Primer::OpenProject::SubHeader.new) do |subheader|
+    subheader.with_filter_component do
+      safe_join(
+        [
+          render(
+            Primer::Beta::IconButton.new(
+              icon: :search, scheme: :invisible, mr: 1,
+              "aria-label": t("resource_management.work_package_list.subheader.search")
+            )
+          ),
+          render(
+            Primer::Beta::IconButton.new(
+              icon: :"sort-desc", scheme: :invisible, mr: 1,
+              "aria-label": t("resource_management.work_package_list.subheader.sort")
+            )
+          ),
+          render(
+            Primer::Beta::IconButton.new(
+              icon: :"list-unordered", scheme: :invisible, mr: 2,
+              "aria-label": t("resource_management.work_package_list.subheader.hierarchy")
+            )
+          ),
+          render(Primer::Beta::Button.new(mr: 1)) do |button|
+            button.with_leading_visual_icon(icon: :tag)
+            button.with_trailing_visual_icon(icon: :"triangle-down")
+            t("resource_management.work_package_list.subheader.type")
+          end,
+          render(Primer::Beta::Button.new(mr: 1)) do |button|
+            button.with_leading_visual_icon(icon: :workflow)
+            button.with_trailing_visual_icon(icon: :"triangle-down")
+            t("resource_management.work_package_list.subheader.status")
+          end,
+          render(Primer::Beta::Button.new) do |button|
+            button.with_leading_visual_icon(icon: :filter)
+            t("resource_management.work_package_list.subheader.all_filters")
+          end
+        ]
+      )
+    end
+
+    subheader.with_action_button(
+      icon_only: true,
+      leading_icon: :gear,
+      label: t("resource_management.work_package_list.subheader.settings"),
+      tag: :a,
+      href: edit_project_resource_planner_view_path(@project, @resource_planner, @view),
+      data: { controller: "async-dialog" }
+    )
+
+    subheader.with_action_button(
+      leading_icon: :plus,
+      scheme: :primary,
+      label: t("resource_management.work_package_list.subheader.add")
+    ) do
+      t("resource_management.work_package_list.subheader.add")
+    end
+  end
+%>
diff --git a/modules/resource_management/app/components/resource_planner_views/work_package_list/sub_header_component.rb b/modules/resource_management/app/components/resource_planner_views/work_package_list/sub_header_component.rb
new file mode 100644
index 000000000000..9b18d7595949
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/work_package_list/sub_header_component.rb
@@ -0,0 +1,45 @@
+# 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 ResourcePlannerViews::WorkPackageList
+  # Visual stub of the work package list sub header. None of the controls are
+  # wired up yet; they merely reproduce the intended layout (search, sort,
+  # hierarchy, quick filters, settings and add button).
+  class SubHeaderComponent < ApplicationComponent
+    include OpPrimer::ComponentHelpers
+
+    def initialize(project:, resource_planner:, view:)
+      super
+      @project = project
+      @resource_planner = resource_planner
+      @view = view
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planner_views/work_package_list/table_component.rb b/modules/resource_management/app/components/resource_planner_views/work_package_list/table_component.rb
new file mode 100644
index 000000000000..a8ccd9495e22
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planner_views/work_package_list/table_component.rb
@@ -0,0 +1,71 @@
+# 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 ResourcePlannerViews::WorkPackageList
+  class TableComponent < ::OpPrimer::BorderBoxTableComponent
+    columns :subject, :priority, :dates, :allocation, :allocated_members
+
+    mobile_columns :subject, :priority
+
+    main_column :subject
+
+    def sortable? = false
+
+    def paginated? = false
+
+    def has_actions? = true
+
+    def mobile_title
+      I18n.t("resource_management.work_package_list.mobile_title")
+    end
+
+    def headers
+      @headers ||= [
+        [:subject, { caption: WorkPackage.human_attribute_name(:subject) }],
+        [:priority, { caption: WorkPackage.human_attribute_name(:priority) }],
+        [:dates, { caption: I18n.t("resource_management.work_package_list.columns.dates") }],
+        [:allocation, { caption: I18n.t("resource_management.work_package_list.columns.allocation") }],
+        [:allocated_members, { caption: I18n.t("resource_management.work_package_list.columns.allocated_members") }]
+      ]
+    end
+
+    def columns
+      @columns ||= headers.map(&:first)
+    end
+
+    def blank_title
+      I18n.t("resource_management.work_package_list.blank.title")
+    end
+
+    def blank_description
+      I18n.t("resource_management.work_package_list.blank.description")
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planners/footer_component.rb b/modules/resource_management/app/components/resource_planners/footer_component.rb
new file mode 100644
index 000000000000..ab043440df2a
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planners/footer_component.rb
@@ -0,0 +1,59 @@
+# 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 ResourcePlanners
+  class FooterComponent < ApplicationComponent
+    include OpTurbo::Streamable
+    include OpPrimer::ComponentHelpers
+
+    def wrapper_key
+      NewDialogComponent::FOOTER_ID
+    end
+
+    def call
+      component_wrapper do
+        component_collection do |buttons|
+          buttons.with_component(
+            Primer::Beta::Button.new(data: { close_dialog_id: NewDialogComponent::DIALOG_ID })
+          ) { I18n.t(:button_cancel) }
+
+          buttons.with_component(
+            Primer::Beta::Button.new(
+              scheme: :primary,
+              form: NewDialogComponent::FORM_ID,
+              data: { turbo: true },
+              type: :submit
+            )
+          ) { I18n.t(:button_next) }
+        end
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/components/resource_planners/new_dialog_component.html.erb b/modules/resource_management/app/components/resource_planners/new_dialog_component.html.erb
index bd76c402a331..a1b11c3a0e03 100644
--- a/modules/resource_management/app/components/resource_planners/new_dialog_component.html.erb
+++ b/modules/resource_management/app/components/resource_planners/new_dialog_component.html.erb
@@ -28,7 +28,14 @@ See COPYRIGHT and LICENSE files for more details.
 ++#%>
 
 <%=
-  render(Primer::Alpha::Dialog.new(title:, size: :medium_portrait, id: DIALOG_ID)) do |d|
+  render(
+    Primer::Alpha::Dialog.new(
+      title:,
+      size: :large,
+      id: DIALOG_ID,
+      data: { "keep-open-on-submit": true }
+    )
+  ) do |d|
     d.with_header(variant: :large)
 
     d.with_body do
@@ -41,26 +48,7 @@ See COPYRIGHT and LICENSE files for more details.
     end
 
     d.with_footer do
-      component_collection do |buttons|
-        buttons.with_component(
-          Primer::Beta::Button.new(
-            data: { close_dialog_id: DIALOG_ID }
-          )
-        ) do
-          t("button_cancel")
-        end
-
-        buttons.with_component(
-          Primer::Beta::Button.new(
-            scheme: :primary,
-            form: FORM_ID,
-            data: { turbo: true },
-            type: :submit
-          )
-        ) do
-          t("button_next")
-        end
-      end
+      render(ResourcePlanners::FooterComponent.new)
     end
   end
 %>
diff --git a/modules/resource_management/app/components/resource_planners/new_dialog_component.rb b/modules/resource_management/app/components/resource_planners/new_dialog_component.rb
index 9e092c86da91..d7b49068ae2c 100644
--- a/modules/resource_management/app/components/resource_planners/new_dialog_component.rb
+++ b/modules/resource_management/app/components/resource_planners/new_dialog_component.rb
@@ -35,6 +35,7 @@ class NewDialogComponent < ApplicationComponent
 
     DIALOG_ID = "new-resource-planner-dialog"
     FORM_ID = "new-resource-planner-form"
+    FOOTER_ID = "new-resource-planner-footer"
 
     def initialize(resource_planner:, project:)
       super
diff --git a/modules/resource_management/app/components/resource_planners/sub_views_component.rb b/modules/resource_management/app/components/resource_planners/sub_views_component.rb
new file mode 100644
index 000000000000..f445b94980f0
--- /dev/null
+++ b/modules/resource_management/app/components/resource_planners/sub_views_component.rb
@@ -0,0 +1,80 @@
+# 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 ResourcePlanners
+  class SubViewsComponent < ApplicationComponent
+    include OpTurbo::Streamable
+
+    attr_reader :resource_planner, :selected_view
+
+    def initialize(resource_planner:, selected_view: nil)
+      super
+
+      @resource_planner = resource_planner
+      @selected_view = selected_view
+    end
+
+    def call
+      component_wrapper do
+        render(Primer::Alpha::TabNav.new(label: I18n.t("resource_management.sub_views"))) do |component|
+          resource_planner.children.each { |child| add_view_tab(component, child) }
+          add_create_tab(component) if can_add_views?
+        end
+      end
+    end
+
+    private
+
+    def add_view_tab(component, child)
+      component.with_tab(
+        selected: child.id == selected_view_id,
+        href: project_resource_planner_view_path(resource_planner.project, resource_planner, child)
+      ) { child.name }
+    end
+
+    def add_create_tab(component)
+      component.with_tab(
+        href: new_project_resource_planner_view_path(resource_planner.project, resource_planner),
+        data: { controller: "async-dialog" }
+      ) do
+        render(Primer::Beta::Octicon.new(icon: :plus, size: :medium))
+      end
+    end
+
+    def selected_view_id
+      selected_view&.id || resource_planner.default_view_id
+    end
+
+    def can_add_views?
+      # TODO: Proper permission check
+      true
+    end
+  end
+end
diff --git a/modules/resource_management/app/contracts/resource_planner_views/base_contract.rb b/modules/resource_management/app/contracts/resource_planner_views/base_contract.rb
new file mode 100644
index 000000000000..baf3a4ffe239
--- /dev/null
+++ b/modules/resource_management/app/contracts/resource_planner_views/base_contract.rb
@@ -0,0 +1,55 @@
+# 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 ResourcePlannerViews
+  class BaseContract < ::ModelContract
+    def self.model
+      PersistedView
+    end
+
+    attribute :name
+
+    validate :user_allowed_to_manage_parent
+
+    private
+
+    def user_allowed_to_manage_parent
+      planner = model.parent
+      return if planner.nil?
+
+      return if planner.principal == user &&
+                user.allowed_in_project?(:view_resource_planners, planner.project)
+      return if planner.public? &&
+                user.allowed_in_project?(:manage_public_resource_planners, planner.project)
+
+      errors.add :base, :error_unauthorized
+    end
+  end
+end
diff --git a/modules/resource_management/app/contracts/resource_planner_views/create_contract.rb b/modules/resource_management/app/contracts/resource_planner_views/create_contract.rb
new file mode 100644
index 000000000000..17df80ea8648
--- /dev/null
+++ b/modules/resource_management/app/contracts/resource_planner_views/create_contract.rb
@@ -0,0 +1,47 @@
+# 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 ResourcePlannerViews
+  class CreateContract < BaseContract
+    attribute :parent
+    attribute :project
+    attribute :principal
+
+    validate :parent_must_be_resource_planner
+
+    private
+
+    def parent_must_be_resource_planner
+      return if model.parent.is_a?(ResourcePlanner)
+
+      errors.add :parent, :blank
+    end
+  end
+end
diff --git a/modules/resource_management/app/contracts/resource_planner_views/update_contract.rb b/modules/resource_management/app/contracts/resource_planner_views/update_contract.rb
new file mode 100644
index 000000000000..ce33d14489dd
--- /dev/null
+++ b/modules/resource_management/app/contracts/resource_planner_views/update_contract.rb
@@ -0,0 +1,34 @@
+# 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 ResourcePlannerViews
+  class UpdateContract < BaseContract
+  end
+end
diff --git a/modules/resource_management/app/controllers/resource_management/resource_planner_views_controller.rb b/modules/resource_management/app/controllers/resource_management/resource_planner_views_controller.rb
new file mode 100644
index 000000000000..b3b34ef34589
--- /dev/null
+++ b/modules/resource_management/app/controllers/resource_management/resource_planner_views_controller.rb
@@ -0,0 +1,190 @@
+# 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 ::ResourceManagement
+  class ResourcePlannerViewsController < BaseController
+    include OpTurbo::ComponentStream
+
+    menu_item :resource_management
+
+    before_action :find_project_by_project_id
+    before_action :authorize
+    before_action :find_resource_planner
+    before_action :find_view, only: %i[show edit update destroy]
+
+    def show; end
+
+    def new
+      if params[:view_class_name].present?
+        render_configure_step(build_view)
+      else
+        respond_with_dialog ResourcePlannerViews::NewDialogComponent.new(
+          resource_planner: @resource_planner,
+          project: @project
+        )
+      end
+    end
+
+    def edit
+      respond_with_dialog ResourcePlannerViews::EditDialogComponent.new(
+        view: @view,
+        project: @project,
+        resource_planner: @resource_planner
+      )
+    end
+
+    def create
+      view_class = allowed_view_class(params[:view_class_name])
+      return render_400(message: "Invalid view type") if view_class.nil?
+
+      call = ResourcePlannerViews::CreateService
+               .new(user: current_user, model: build_view(view_class:))
+               .call(create_params)
+
+      call.success? ? render_create_success(call.result) : render_configure_step(call.result, status: :unprocessable_entity)
+    end
+
+    def update
+      call = ResourcePlannerViews::UpdateService
+               .new(user: current_user, model: @view)
+               .call(view_params)
+
+      call.success? ? render_update_success(call.result) : render_edit_step(call.result, status: :unprocessable_entity)
+    end
+
+    def destroy; end
+
+    private
+
+    def render_configure_step(view, status: :ok)
+      update_dialog_title_via_turbo_stream(
+        ResourcePlannerViews::NewDialogComponent::DIALOG_ID,
+        new_title: I18n.t("resource_management.configure_view_dialog.title")
+      )
+      replace_via_turbo_stream(
+        component: ResourcePlannerViews::ConfigureStep::FormComponent.new(
+          view:,
+          url: project_resource_planner_views_path(@project, @resource_planner),
+          hidden_fields: { view_class_name: view.class.name },
+          dialog_id: ResourcePlannerViews::NewDialogComponent::DIALOG_ID,
+          filter_query: view.build_default_query
+        ),
+        status:
+      )
+      replace_via_turbo_stream(component: ResourcePlannerViews::ConfigureStep::FooterComponent.new)
+      respond_with_turbo_streams
+    end
+
+    # Re-renders the edit dialog's form and footer in place when the update
+    # fails validation. Mirrors render_configure_step but targets the edit
+    # dialog's form/footer ids and uses the PATCH update path.
+    def render_edit_step(view, status: :ok)
+      replace_via_turbo_stream(
+        component: ResourcePlannerViews::ConfigureStep::FormComponent.new(
+          view:,
+          url: project_resource_planner_view_path(@project, @resource_planner, view),
+          method: :patch,
+          form_id: ResourcePlannerViews::EditDialogComponent::FORM_ID,
+          dialog_id: ResourcePlannerViews::EditDialogComponent::DIALOG_ID,
+          filter_query: view.effective_query
+        ),
+        status:
+      )
+      replace_via_turbo_stream(
+        component: ResourcePlannerViews::ConfigureStep::FooterComponent.new(
+          submit_label: I18n.t(:button_save),
+          dialog_id: ResourcePlannerViews::EditDialogComponent::DIALOG_ID,
+          form_id: ResourcePlannerViews::EditDialogComponent::FORM_ID,
+          footer_id: ResourcePlannerViews::EditDialogComponent::FOOTER_ID
+        ),
+        status:
+      )
+      respond_with_turbo_streams
+    end
+
+    # On a successful update we don't navigate away: the edit dialog is closed
+    # and both the tab nav (the view's name may have changed) and the view's
+    # content are replaced in place. The generic ContentComponent knows how to
+    # render whichever view type this is.
+    def render_update_success(view)
+      # The cached children association still holds the pre-update name.
+      @resource_planner.children.reload
+
+      replace_via_turbo_stream(
+        component: ResourcePlanners::SubViewsComponent.new(
+          resource_planner: @resource_planner,
+          selected_view: view
+        )
+      )
+      replace_via_turbo_stream(
+        component: ResourcePlannerViews::ContentComponent.new(
+          view:,
+          project: @project,
+          resource_planner: @resource_planner
+        )
+      )
+      close_dialog_via_turbo_stream("##{ResourcePlannerViews::EditDialogComponent::DIALOG_ID}")
+      respond_with_turbo_streams
+    end
+
+    def build_view(view_class: allowed_view_class(params[:view_class_name]))
+      view_class.new(parent: @resource_planner, project: @project, principal: current_user)
+    end
+
+    def view_params
+      params.expect(view: %i[name]).to_h
+    end
+
+    def create_params
+      view_params.merge(parent: @resource_planner, project: @project, principal: current_user)
+    end
+
+    def render_create_success(view)
+      render turbo_stream: turbo_stream.redirect_to(
+        project_resource_planner_view_path(@project, @resource_planner, view)
+      )
+    end
+
+    def allowed_view_class(name)
+      ResourcePlanner.allowed_child_class(name)
+    end
+
+    def find_resource_planner
+      @resource_planner = ResourcePlanner
+                            .visible(current_user)
+                            .where(project: @project)
+                            .with_children
+                            .find(params.expect(:resource_planner_id))
+    end
+
+    def find_view
+      @view = @resource_planner.children.find(params.expect(:id))
+    end
+  end
+end
diff --git a/modules/resource_management/app/controllers/resource_management/resource_planners_controller.rb b/modules/resource_management/app/controllers/resource_management/resource_planners_controller.rb
index 2e7134a3dc84..648109dd9fb6 100644
--- a/modules/resource_management/app/controllers/resource_management/resource_planners_controller.rb
+++ b/modules/resource_management/app/controllers/resource_management/resource_planners_controller.rb
@@ -27,7 +27,6 @@
 #
 # See COPYRIGHT and LICENSE files for more details.
 #++
-
 module ::ResourceManagement
   class ResourcePlannersController < BaseController
     include OpTurbo::ComponentStream
@@ -46,7 +45,10 @@ def index
                              .order(:name)
     end
 
-    def show; end
+    def show
+      @view = default_view
+      render "resource_management/resource_planner_views/show"
+    end
 
     def overview; end
 
@@ -115,6 +117,7 @@ def find_resource_planner
       @resource_planner = ResourcePlanner
                             .visible(current_user)
                             .where(project: @project)
+                            .with_children
                             .find(params[:id])
     end
 
@@ -122,6 +125,11 @@ def build_resource_planner
       @resource_planner = ResourcePlanner.new(project: @project, principal: current_user)
     end
 
+    def default_view
+      children = @resource_planner.children
+      children.find { |c| c.id == @resource_planner.default_view_id } || children.first
+    end
+
     def create_params
       extra = %i[default_view_class_name favorite]
       extra << :public if can_manage_public?
@@ -144,9 +152,49 @@ def can_manage_public?
     end
 
     def render_create_success
+      view_class = chosen_default_view_class
+      return render_create_success_redirect if view_class.nil?
+
+      advance_dialog_to_configure_view(view_class)
+    end
+
+    def render_create_success_redirect
       flash[:notice] = I18n.t(:notice_successful_create)
-      # TODO: Let's check if we can do a proper turbo update here
-      redirect_to project_resource_planners_path(@project)
+      redirect_to project_resource_planner_path(@project, @resource_planner)
+    end
+
+    def advance_dialog_to_configure_view(view_class)
+      view = view_class.new(parent: @resource_planner, project: @project, principal: current_user)
+      dialog = ResourcePlanners::NewDialogComponent
+
+      update_dialog_title_via_turbo_stream(
+        dialog::DIALOG_ID,
+        new_title: I18n.t("resource_management.configure_view_dialog.title")
+      )
+      replace_via_turbo_stream(
+        component: ResourcePlannerViews::ConfigureStep::FormComponent.new(
+          view:,
+          url: project_resource_planner_views_path(@project, @resource_planner),
+          hidden_fields: { view_class_name: view_class.name },
+          form_id: dialog::FORM_ID,
+          dialog_id: dialog::DIALOG_ID,
+          wrapper_key: ResourcePlanners::FormComponent.wrapper_key,
+          filter_query: view.build_default_query
+        )
+      )
+      replace_via_turbo_stream(
+        component: ResourcePlannerViews::ConfigureStep::FooterComponent.new(
+          dialog_id: dialog::DIALOG_ID,
+          form_id: dialog::FORM_ID,
+          footer_id: dialog::FOOTER_ID,
+          cancel_href: project_resource_planners_path(@project)
+        )
+      )
+      respond_with_turbo_streams
+    end
+
+    def chosen_default_view_class
+      ResourcePlanner.allowed_child_class(params.dig(:resource_planner, :default_view_class_name))
     end
 
     def render_create_failure(call)
diff --git a/modules/resource_management/app/forms/resource_planner_views/forms/configure_form.rb b/modules/resource_management/app/forms/resource_planner_views/forms/configure_form.rb
new file mode 100644
index 000000000000..cfded4f2d829
--- /dev/null
+++ b/modules/resource_management/app/forms/resource_planner_views/forms/configure_form.rb
@@ -0,0 +1,70 @@
+# 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 ResourcePlannerViews
+  module Forms
+    class ConfigureForm < ApplicationForm
+      form do |f|
+        f.text_field(
+          name: :name,
+          label: PersistedView.human_attribute_name(:name),
+          required: true
+        )
+
+        # `filter_mode` is a UI-only toggle: "automatic" means the view is
+        # backed by a filtered query, "manual" means items are managed by
+        # hand. Both are expressed at the query level, so the value is not
+        # persisted on the view itself. The `show-when-value-selected`
+        # Stimulus controller (one level above this form) listens for
+        # changes and toggles the filter form sibling accordingly.
+        f.advanced_radio_button_group(
+          name: :filter_mode,
+          label: I18n.t("resource_management.configure_view_dialog.filter_mode.label"),
+          visually_hide_label: true,
+          scope_name_to_model: false
+        ) do |group|
+          group.radio_button(
+            value: "automatic",
+            checked: true,
+            label: I18n.t("resource_management.configure_view_dialog.filter_mode.automatic.label"),
+            caption: I18n.t("resource_management.configure_view_dialog.filter_mode.automatic.caption"),
+            data: { target_name: "filter_mode", "show-when-value-selected-target": "cause" }
+          )
+          group.radio_button(
+            value: "manual",
+            label: I18n.t("resource_management.configure_view_dialog.filter_mode.manual.label"),
+            caption: I18n.t("resource_management.configure_view_dialog.filter_mode.manual.caption"),
+            data: { target_name: "filter_mode", "show-when-value-selected-target": "cause" }
+          )
+        end
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/forms/resource_planner_views/forms/type_select_form.rb b/modules/resource_management/app/forms/resource_planner_views/forms/type_select_form.rb
new file mode 100644
index 000000000000..45e6b08def70
--- /dev/null
+++ b/modules/resource_management/app/forms/resource_planner_views/forms/type_select_form.rb
@@ -0,0 +1,54 @@
+# 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 ResourcePlannerViews
+  module Forms
+    class TypeSelectForm < ApplicationForm
+      form do |f|
+        f.advanced_radio_button_group(
+          name: :view_class_name,
+          label: I18n.t("resource_management.new_view_dialog.title"),
+          visually_hide_label: true,
+          scope_name_to_model: false
+        ) do |group|
+          ResourcePlanner.allowed_children.each_with_index do |class_name, index|
+            i18n_key = class_name.constantize.model_name.i18n_key
+            group.radio_button(
+              value: class_name,
+              label: I18n.t("resource_management.view_types.#{i18n_key}.label", default: class_name.underscore.humanize),
+              caption: I18n.t("resource_management.view_types.#{i18n_key}.caption", default: nil),
+              checked: index.zero?
+            )
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/forms/resource_planners/forms/default_view_form.rb b/modules/resource_management/app/forms/resource_planners/forms/default_view_form.rb
index 2741779e67d9..cf52d79ef80f 100644
--- a/modules/resource_management/app/forms/resource_planners/forms/default_view_form.rb
+++ b/modules/resource_management/app/forms/resource_planners/forms/default_view_form.rb
@@ -11,9 +11,10 @@ class DefaultViewForm < ApplicationForm
           input_width: :large
         ) do |select|
           ResourcePlanner.allowed_children.each do |class_name|
+            i18n_key = class_name.constantize.model_name.i18n_key
             select.option(
               value: class_name,
-              label: I18n.t("resource_management.view_types.#{class_name}", default: class_name.underscore.humanize)
+              label: I18n.t("resource_management.view_types.#{i18n_key}.label", default: class_name.underscore.humanize)
             )
           end
         end
diff --git a/modules/resource_management/app/models/resource_planner.rb b/modules/resource_management/app/models/resource_planner.rb
index 2cd618f81daf..864cad9c523c 100644
--- a/modules/resource_management/app/models/resource_planner.rb
+++ b/modules/resource_management/app/models/resource_planner.rb
@@ -29,7 +29,7 @@
 #++
 
 class ResourcePlanner < PersistedView
-  self.allowed_children = %w[UserCardView]
+  self.allowed_children = %w[UserCard ResourceWorkPackageList]
 
   # Virtual attributes used by the new-planner form. They are not persisted on
   # the planner itself: `default_view_class_name` is consumed when creating the
@@ -38,6 +38,7 @@ class ResourcePlanner < PersistedView
 
   store_attribute :options, :start_date, :date
   store_attribute :options, :end_date, :date
+  store_attribute :options, :default_view_id, :integer
 
   # resource planner cannot be nested, queries are assigned to the sub-views
   validates :parent, absence: true
diff --git a/modules/resource_management/app/models/resource_work_package_list.rb b/modules/resource_management/app/models/resource_work_package_list.rb
new file mode 100644
index 000000000000..15528d65dbe0
--- /dev/null
+++ b/modules/resource_management/app/models/resource_work_package_list.rb
@@ -0,0 +1,51 @@
+# 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.
+#++
+
+class ResourceWorkPackageList < PersistedView
+  validate :query_must_be_work_package_query
+
+  # See `UserCard#build_default_query` for context. The work-package Query
+  # uses `new_default` so the standard defaults (status filter, sort, etc.)
+  # are applied — otherwise validation would fail on missing attributes.
+  # The `::` prefix disambiguates from `ActiveRecord::AttributeMethods::Query`
+  # which is in scope inside ActiveRecord models.
+  def build_default_query
+    ::Query.new_default(project:, user: principal)
+  end
+
+  private
+
+  def query_must_be_work_package_query
+    resolved = effective_query
+    return if resolved.nil? || resolved.is_a?(::Query)
+
+    errors.add(:query, I18n.t(:must_be_work_package_query))
+  end
+end
diff --git a/app/models/user_card_view.rb b/modules/resource_management/app/models/user_card.rb
similarity index 88%
rename from app/models/user_card_view.rb
rename to modules/resource_management/app/models/user_card.rb
index f568951f75f8..fb199b9fa984 100644
--- a/app/models/user_card_view.rb
+++ b/modules/resource_management/app/models/user_card.rb
@@ -28,7 +28,7 @@
 # See COPYRIGHT and LICENSE files for more details.
 #++
 
-class UserCardView < PersistedView
+class UserCard < PersistedView
   SECONDARY_INFO = %w[role email login none].freeze
   TAG_SOURCES    = %w[groups roles none].freeze
   CARD_SIZES     = %w[compact default expanded].freeze
@@ -53,6 +53,13 @@ def results
     effective_query&.results
   end
 
+  # Returns a fresh, unsaved UserQuery suitable for this view. Used by the
+  # create flow (saved and linked to the view) and by the configure-view
+  # dialog (rendered against the FilterComponent without being saved).
+  def build_default_query
+    UserQuery.new(project:, principal:)
+  end
+
   private
 
   def query_must_be_user_query
diff --git a/modules/resource_management/app/services/resource_planner_views/create_service.rb b/modules/resource_management/app/services/resource_planner_views/create_service.rb
new file mode 100644
index 000000000000..298309e3dc35
--- /dev/null
+++ b/modules/resource_management/app/services/resource_planner_views/create_service.rb
@@ -0,0 +1,86 @@
+# 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 ResourcePlannerViews
+  class CreateService < ::BaseServices::Create
+    protected
+
+    # Same trick as ResourcePlanners::CreateService: STI sets `type` during
+    # `.new`, before the model is extended with ChangedBySystem. Treat that
+    # initial change as a system change so the contract does not flag `type`
+    # as a user-written readonly attribute.
+    def instance(_params)
+      view = model || PersistedView.new
+      view.extend(OpenProject::ChangedBySystem) unless view.is_a?(OpenProject::ChangedBySystem)
+      view.changed_by_system(view.changes)
+      view
+    end
+
+    # Saves the view together with a freshly built query of the type
+    # appropriate for the view subclass (UserQuery for UserCard, work-package
+    # Query for ResourceWorkPackageList). Both records are saved inside a
+    # transaction so a failed view validation rolls back the query as well.
+    def persist(service_result)
+      view = service_result.result
+      ApplicationRecord.transaction do
+        ensure_query!(view)
+        super
+      end
+    end
+
+    # When the parent planner has no default view yet, treat the first
+    # created child as the default. Covers both the "+" dialog (sets the
+    # default if none was picked) and the new-planner flow (the planner's
+    # `default_view_id` is intentionally unset at creation time and is
+    # filled in here once the chosen view exists).
+    def after_perform(call)
+      return call unless call.success?
+
+      view = call.result
+      planner = view.parent
+      planner.update!(default_view_id: view.id) if planner.is_a?(ResourcePlanner) && planner.default_view_id.blank?
+
+      call
+    end
+
+    private
+
+    def ensure_query!(view)
+      return if view.query.present?
+      return unless view.respond_to?(:build_default_query)
+
+      query = view.build_default_query
+      return if query.nil?
+
+      query.save!
+      view.query = query
+    end
+  end
+end
diff --git a/modules/resource_management/app/services/resource_planner_views/set_attributes_service.rb b/modules/resource_management/app/services/resource_planner_views/set_attributes_service.rb
new file mode 100644
index 000000000000..1ee363c5fb0f
--- /dev/null
+++ b/modules/resource_management/app/services/resource_planner_views/set_attributes_service.rb
@@ -0,0 +1,41 @@
+# 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 ResourcePlannerViews
+  class SetAttributesService < ::BaseServices::SetAttributes
+    private
+
+    def set_default_attributes(_params)
+      model.change_by_system do
+        model.principal ||= user
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/app/services/resource_planner_views/update_service.rb b/modules/resource_management/app/services/resource_planner_views/update_service.rb
new file mode 100644
index 000000000000..2d3446bbdf86
--- /dev/null
+++ b/modules/resource_management/app/services/resource_planner_views/update_service.rb
@@ -0,0 +1,34 @@
+# 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 ResourcePlannerViews
+  class UpdateService < ::BaseServices::Update
+  end
+end
diff --git a/modules/resource_management/app/services/resource_planners/create_service.rb b/modules/resource_management/app/services/resource_planners/create_service.rb
index ceff39c23e22..a4874e6a33d0 100644
--- a/modules/resource_management/app/services/resource_planners/create_service.rb
+++ b/modules/resource_management/app/services/resource_planners/create_service.rb
@@ -59,9 +59,9 @@ def set_attributes_params(params)
     end
 
     def after_perform(call)
-      # The initial child view will be created here using
-      # `params[:default_view_class_name]`. The view classes themselves are
-      # not yet implemented, so we only validate the value at this stage.
+      # The initial child view is created in a second dialog step by
+      # ResourcePlannerViewsController#create. That flow also sets
+      # `default_view_id` on the planner via ResourcePlannerViews::CreateService.
       call.result.add_favoriting_user(user) if call.success? && params[:favorite]
       call
     end
diff --git a/modules/resource_management/app/views/resource_management/resource_planners/show.html.erb b/modules/resource_management/app/views/resource_management/resource_planner_views/show.html.erb
similarity index 86%
rename from modules/resource_management/app/views/resource_management/resource_planners/show.html.erb
rename to modules/resource_management/app/views/resource_management/resource_planner_views/show.html.erb
index 8ca62f5a6e7a..5ba10e342268 100644
--- a/modules/resource_management/app/views/resource_management/resource_planners/show.html.erb
+++ b/modules/resource_management/app/views/resource_management/resource_planner_views/show.html.erb
@@ -40,8 +40,5 @@ See COPYRIGHT and LICENSE files for more details.
       )
     end %>
 
-<%= render(Primer::Beta::Blankslate.new) do |blankslate|
-      blankslate.with_visual_icon(icon: :people)
-      blankslate.with_heading(tag: :h2) { @resource_planner.name }
-      blankslate.with_description { t("resource_management.show.placeholder") }
-    end %>
+<%= render(ResourcePlanners::SubViewsComponent.new(resource_planner: @resource_planner, selected_view: @view)) %>
+<%= render(ResourcePlannerViews::ContentComponent.new(view: @view, project: @project, resource_planner: @resource_planner)) %>
diff --git a/modules/resource_management/config/locales/en.yml b/modules/resource_management/config/locales/en.yml
index 1eb92248fbc4..dba1a0f63de5 100644
--- a/modules/resource_management/config/locales/en.yml
+++ b/modules/resource_management/config/locales/en.yml
@@ -2,81 +2,140 @@
 en:
   activerecord:
     attributes:
-      resource_planner:
-        name: "Name"
-        start_date: "Start date"
-        end_date: "Finish date"
-        default_view_class_name: "Default view"
-        public: "Public"
-        favorite: "Favorite"
       resource_allocation:
-        entity: "Entity"
-        principal: "Assignee"
-        state: "State"
-        start_date: "Start date"
-        end_date: "Finish date"
-        allocated_time: "Allocated time"
-        user_filter: "User filter"
+        allocated_time: Allocated time
+        end_date: Finish date
+        entity: Entity
+        principal: Assignee
+        start_date: Start date
+        state: State
+        user_filter: User filter
+      resource_planner:
+        default_view_class_name: Default view
+        end_date: Finish date
+        favorite: Favorite
+        name: Name
+        public: Public
+        start_date: Start date
     errors:
       models:
-        resource_planner:
+        resource_allocation:
           attributes:
             end_date:
-              greater_than_start_date: "must be after the start date."
-        resource_allocation:
+              greater_than_start_date: must be after the start date.
+        resource_planner:
           attributes:
             end_date:
-              greater_than_start_date: "must be after the start date."
-
-  plugin_openproject_resource_management:
-    name: "OpenProject Resource Management"
-    description: "Provides resource management and capacity planning."
-
-  project_module_resource_management: "Resource management"
-  permission_view_resource_planners: "View resource planners"
-  permission_view_resource_planners_explanation: >
-    Allows users to access resource planners. It allows them to create and
-    manage their own resource planners and view public resource planners. It
-    does not allow users to view resource planners created by other users that
-    are not shared publicly.
-  permission_manage_public_resource_planners: "Manage public resource planners"
+              greater_than_start_date: must be after the start date.
+        resource_work_package_list:
+          attributes:
+            query:
+              must_be_work_package_query: must be a work package query.
+    models:
+      resource_allocation: Resource Allocation
+      resource_planner: Resource Planner
+      resource_work_package_list: Work packages list
+      user_card: User cards
+  button_next: Next
+  label_resource_management: Resource planning
+  permission_allocate_user_resources: Allocate user resources
+  permission_allocate_user_resources_explanation: >
+    Allows users to create, update, and delete resource allocations within a
+    resource planner. This includes assigning users (or user filters) to a
+    planner and adjusting the allocated time and date range.
+  permission_manage_public_resource_planners: Manage public resource planners
   permission_manage_public_resource_planners_explanation: >
     Allows users to create and manage public resource planners. It allows them
     to view, create, manage and publish their own resource planners. It does not
     allow users to view resource planners created by other users that are not
     shared publicly.
-  permission_allocate_user_resources: "Allocate user resources"
-  permission_allocate_user_resources_explanation: >
-    Allows users to create, update, and delete resource allocations within
-    a resource planner. This includes assigning users (or user filters) to
-    a planner and adjusting the allocated time and date range.
-
-  label_resource_management: "Resource planning"
-  button_next: "Save"  # TODO: This should be "Next" but we need to check the flow first
-
+  permission_view_resource_planners: View resource planners
+  permission_view_resource_planners_explanation: >
+    Allows users to access resource planners. It allows them to create and
+    manage their own resource planners and view public resource planners. It
+    does not allow users to view resource planners created by other users that
+    are not shared publicly.
+  plugin_openproject_resource_management:
+    description: Provides resource management and capacity planning.
+    name: OpenProject Resource Management
+  project_module_resource_management: Resource management
   resource_management:
-    label_resource_planner: "Resource planner"
-    label_resource_planner_plural: "Resource planners"
-    label_new_resource_planner: "New resource planner"
+    action:
+      delete: Delete
+      favorite: Add to favorites
+      make_private: Make private
+      make_public: Make public
+      unfavorite: Remove from favorites
+    blankslate:
+      desc: Create a resource planner to start planning capacity for this project.
+      title: No resource planners yet
+    configure_view_dialog:
+      filter_mode:
+        automatic:
+          caption: >-
+            An automatically-generated list that displays items that meet
+            criteria you define.
+          label: Automatically filtered
+        label: Item selection
+        manual:
+          caption: >-
+            A custom list of items you manually add and remove. Filtering is not
+            possible.
+          label: Manually hand-picked
+      title: Configure view
+    favorite_caption: >
+      Make this view a favorite to add it on the top section of the sidebar
+      menu.
+    label_new_resource_planner: New resource planner
+    label_resource_planner: Resource planner
+    label_resource_planner_plural: Resource planners
+    new_view_dialog:
+      title: Add View
     public_caption: >
       Make this view public to all members of the project. This does not affect
       the visibility of work packages which still depends on each user
       permission.
-    favorite_caption: >
-      Make this view a favorite to add it on the top section of the sidebar menu.
-    view_types:
-      UserCardView: "Users cards"
-    action:
-      favorite: "Add to favorites"
-      unfavorite: "Remove from favorites"
-      make_public: "Make public"
-      make_private: "Make private"
-      delete: "Delete"
-    sidebar:
-      public: "Public"
-      private: "Private"
-    blankslate:
-      title: "No resource planners yet"
-      desc: "Create a resource planner to start planning capacity for this project."
     show:
-      placeholder: "The detailed view for this resource planner is coming soon."
+      placeholder: The detailed view for this resource planner is coming soon.
+    sidebar:
+      private: Private
+      public: Public
+    sub_views: Views in this resource planner
+    view_types:
+      resource_work_package_list:
+        caption: >-
+          Create a view based on work packages and see its details and
+          allocation in a list
+        label: Work packages list
+      user_card:
+        caption: >-
+          Create a view based on users and see their details and allocation in a
+          list of user cards
+        label: Users card list
+    work_package_list:
+      allocation_placeholder: —
+      blank:
+        description: There are no work packages matching this view's filters yet.
+        title: No work packages to display
+      columns:
+        allocated_members: Allocated members
+        allocation: Allocation
+        dates: Dates
+      context_menu:
+        add_filter_criteria: Add filter criteria
+        add_user_group: Add user group
+        edit_total_work: Edit total work
+        label: More actions
+        move: Move
+        remove: Remove
+        see_allocation: See allocation
+      mobile_title: Work packages
+      subheader:
+        add: Add
+        all_filters: All filters
+        hierarchy: Display hierarchy
+        search: Search
+        settings: Configure view
+        sort: Sort
+        status: Status
+        type: Type
diff --git a/modules/resource_management/config/routes.rb b/modules/resource_management/config/routes.rb
index 4211f1a5005a..99cd0a29ee5e 100644
--- a/modules/resource_management/config/routes.rb
+++ b/modules/resource_management/config/routes.rb
@@ -43,6 +43,10 @@
         post :toggle_public
       end
 
+      resources :views,
+                controller: "resource_management/resource_planner_views",
+                only: %i[show new create edit update destroy]
+
       collection do
         get "menu" => "resource_management/menus#show"
       end
diff --git a/modules/resource_management/lib/open_project/resource_management/engine.rb b/modules/resource_management/lib/open_project/resource_management/engine.rb
index 52ba7d9ee084..e1da2f9c8003 100644
--- a/modules/resource_management/lib/open_project/resource_management/engine.rb
+++ b/modules/resource_management/lib/open_project/resource_management/engine.rb
@@ -56,6 +56,7 @@ class Engine < ::Rails::Engine
         permission :view_resource_planners,
                    {
                      "resource_management/resource_planners": %i[index show overview new create edit update destroy],
+                     "resource_management/resource_planner_views": %i[show new create edit update destroy],
                      "resource_management/menus": %i[show]
                    },
                    permissible_on: :project
diff --git a/modules/resource_management/spec/integration/resource_planner_nesting_spec.rb b/modules/resource_management/spec/integration/resource_planner_nesting_spec.rb
index b97227619abb..e62ec59ad5c6 100644
--- a/modules/resource_management/spec/integration/resource_planner_nesting_spec.rb
+++ b/modules/resource_management/spec/integration/resource_planner_nesting_spec.rb
@@ -7,9 +7,9 @@
   let(:owner) { create(:user, member_with_permissions: { project => %i[view_resource_planners] }) }
   let(:planner) { ResourcePlanner.create!(name: "Planner", project:, principal: owner) }
 
-  describe "UserCardView" do
+  describe "UserCard" do
     it "is allowed as a child of a ResourcePlanner" do
-      card = UserCardView.new(name: "Members", parent: planner)
+      card = UserCard.new(name: "Members", parent: planner)
 
       expect(card).to be_valid
     end
diff --git a/modules/resource_management/spec/models/resource_planner_spec.rb b/modules/resource_management/spec/models/resource_planner_spec.rb
index 4fc5665f3b11..d725ed38a0fa 100644
--- a/modules/resource_management/spec/models/resource_planner_spec.rb
+++ b/modules/resource_management/spec/models/resource_planner_spec.rb
@@ -141,4 +141,26 @@
       end
     end
   end
+
+  describe ".allowed_child_class" do
+    it "resolves an allowed child name to its class" do
+      expect(described_class.allowed_child_class("ResourceWorkPackageList")).to eq(ResourceWorkPackageList)
+      expect(described_class.allowed_child_class("UserCard")).to eq(UserCard)
+    end
+
+    it "returns nil for a real but disallowed constant" do
+      expect(described_class.allowed_child_class("User")).to be_nil
+      expect(described_class.allowed_child_class("Kernel")).to be_nil
+    end
+
+    it "returns nil for unknown, blank or nil names" do
+      expect(described_class.allowed_child_class("DoesNotExist")).to be_nil
+      expect(described_class.allowed_child_class("")).to be_nil
+      expect(described_class.allowed_child_class(nil)).to be_nil
+    end
+
+    it "is scoped per view type: a leaf view allows no children" do
+      expect(ResourceWorkPackageList.allowed_child_class("UserCard")).to be_nil
+    end
+  end
 end
diff --git a/modules/resource_management/spec/requests/resource_planner_views_spec.rb b/modules/resource_management/spec/requests/resource_planner_views_spec.rb
new file mode 100644
index 000000000000..7ba46daa856c
--- /dev/null
+++ b/modules/resource_management/spec/requests/resource_planner_views_spec.rb
@@ -0,0 +1,91 @@
+# 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.
+#++
+
+require "spec_helper"
+
+RSpec.describe "ResourcePlannerViews requests",
+               :skip_csrf,
+               type: :rails_request do
+  shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+  shared_let(:user) do
+    create(:user, member_with_permissions: { project => %i[view_resource_planners] })
+  end
+
+  let(:resource_planner) { create(:resource_planner, project:, principal: user) }
+  let(:view) do
+    ResourceWorkPackageList.create!(name: "Original", parent: resource_planner, project:, principal: user)
+  end
+
+  before { login_as user }
+
+  describe "PATCH update" do
+    subject(:perform) do
+      patch project_resource_planner_view_path(project, resource_planner, view),
+            params: { view: { name: "Renamed view" } },
+            as: :turbo_stream
+    end
+
+    it "persists the new name" do
+      perform
+
+      expect(response).to have_http_status(:ok)
+      expect(view.reload.name).to eq("Renamed view")
+    end
+
+    it "closes the dialog and replaces the tab nav and content in place" do
+      perform
+
+      # Dialog is closed via a CSS selector target (not a bare id).
+      expect(response.body).to include('action="closeDialog"')
+      expect(response.body).to include('target="#edit-resource-planner-view-dialog"')
+
+      # Tab nav and the view content are replaced rather than redirecting.
+      expect(response.body).to include('action="replace"')
+      expect(response.body).to include('target="resource-planners-sub-views-component"')
+      expect(response.body).to include('target="resource-planner-views-content-component"')
+
+      # The replaced tab nav reflects the new name.
+      expect(response.body).to include("Renamed view")
+    end
+
+    context "when another user cannot see the private planner" do
+      let(:other_user) { create(:user, member_with_permissions: { project => %i[view_resource_planners] }) }
+
+      before { login_as other_user }
+
+      it "is not found and leaves the view unchanged" do
+        perform
+
+        expect(response).to have_http_status(:not_found)
+        expect(view.reload.name).to eq("Original")
+      end
+    end
+  end
+end
diff --git a/modules/resource_management/spec/services/resource_planner_views/update_service_spec.rb b/modules/resource_management/spec/services/resource_planner_views/update_service_spec.rb
new file mode 100644
index 000000000000..28e08612949a
--- /dev/null
+++ b/modules/resource_management/spec/services/resource_planner_views/update_service_spec.rb
@@ -0,0 +1,75 @@
+# 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.
+#++
+
+require "spec_helper"
+
+RSpec.describe ResourcePlannerViews::UpdateService, type: :model do
+  shared_let(:project) { create(:project, enabled_module_names: %w[resource_management]) }
+  shared_let(:user) do
+    create(:user, member_with_permissions: { project => %i[view_resource_planners] })
+  end
+
+  let(:resource_planner) do
+    create(:resource_planner, project:, principal: user)
+  end
+  let(:view) do
+    ResourceWorkPackageList.create!(name: "Original", parent: resource_planner, project:, principal: user)
+  end
+
+  subject(:service_call) do
+    described_class.new(user:, model: view).call(name: "Updated")
+  end
+
+  it "updates the view name" do
+    expect(service_call).to be_success
+    expect(view.reload.name).to eq("Updated")
+  end
+
+  context "when the user is not allowed to manage the parent planner" do
+    let(:other_user) { create(:user) }
+
+    subject(:service_call) do
+      described_class.new(user: other_user, model: view).call(name: "Updated")
+    end
+
+    it "fails with an authorization error" do
+      expect(service_call).not_to be_success
+      expect(view.reload.name).to eq("Original")
+      expect(service_call.errors[:base]).to include(I18n.t("activerecord.errors.messages.error_unauthorized"))
+    end
+  end
+
+  it "does not re-parent the view" do
+    other_planner = create(:resource_planner, project:, principal: user)
+    described_class.new(user:, model: view).call(parent: other_planner)
+
+    expect(view.reload.parent).to eq(resource_planner)
+  end
+end
diff --git a/modules/storages/config/locales/en.yml b/modules/storages/config/locales/en.yml
index 84f45747c33c..7549b7c7022b 100644
--- a/modules/storages/config/locales/en.yml
+++ b/modules/storages/config/locales/en.yml
@@ -31,10 +31,15 @@ en:
         authentication_method: Authentication Method
         creator: Creator
         drive: Drive ID
+        file_link_origin: "File link origin ID"
         host: Host
+        linkable_to_storage: "Linkable to storage"
+        linkable_to_storage_url: "Linkable to storage URL"
         name: Name
         password: Application password
         provider_type: Provider type
+        storage: "Storage"
+        storage_url: "Storage URL"
         tenant: Directory (tenant) ID
     errors:
       messages:
@@ -72,18 +77,18 @@ en:
     errors:
       too_many_elements_created_at_once: Too many elements created at once. Expected %{max} at most, got %{actual}.
   external_file_storages: External file storages
-  permission_create_files: 'Automatically managed project folders: Create files'
+  permission_create_files: "Automatically managed project folders: Create files"
   permission_create_files_explanation: This permission is only available for Nextcloud storages
-  permission_delete_files: 'Automatically managed project folders: Delete files'
+  permission_delete_files: "Automatically managed project folders: Delete files"
   permission_delete_files_explanation: This permission is only available for Nextcloud storages
   permission_header_for_project_module_storages: Automatically managed project folders
   permission_manage_file_links: Manage file links
   permission_manage_files_in_project: Manage files in project
-  permission_read_files: 'Automatically managed project folders: Read files'
-  permission_share_files: 'Automatically managed project folders: Share files'
+  permission_read_files: "Automatically managed project folders: Read files"
+  permission_share_files: "Automatically managed project folders: Share files"
   permission_share_files_explanation: This permission is only available for Nextcloud storages
   permission_view_file_links: View file links
-  permission_write_files: 'Automatically managed project folders: Write files'
+  permission_write_files: "Automatically managed project folders: Write files"
   project_module_storages: Files
   project_storages:
     edit_project_folder:
@@ -101,25 +106,25 @@ en:
   services:
     attributes:
       nextcloud_sync_service:
-        add_user_to_group: 'Add User to Group:'
-        create_folder: 'Managed Project Folder Creation:'
-        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
-        hide_inactive_folders: 'Hide Inactive Folders Step:'
-        remote_folders: 'Read contents of the team folder:'
-        remove_user_from_group: 'Remove User from Group:'
-        rename_project_folder: 'Rename managed project Folder:'
+        add_user_to_group: "Add User to Group:"
+        create_folder: "Managed Project Folder Creation:"
+        ensure_root_folder_permissions: "Set Base Folder Permissions:"
+        hide_inactive_folders: "Hide Inactive Folders Step:"
+        remote_folders: "Read contents of the team folder:"
+        remove_user_from_group: "Remove User from Group:"
+        rename_project_folder: "Rename managed project Folder:"
       one_drive_sync_service:
-        create_folder: 'Managed Project Folder Creation:'
-        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
-        hide_inactive_folders: 'Hide Inactive Folders Step:'
-        remote_folders: 'Read contents of the drive root folder:'
-        rename_project_folder: 'Rename managed project Folder:'
+        create_folder: "Managed Project Folder Creation:"
+        ensure_root_folder_permissions: "Set Base Folder Permissions:"
+        hide_inactive_folders: "Hide Inactive Folders Step:"
+        remote_folders: "Read contents of the drive root folder:"
+        rename_project_folder: "Rename managed project Folder:"
       sharepoint_sync_service:
-        create_folder: 'Managed Project Folder Creation:'
-        ensure_root_folder_permissions: 'Set Base Folder Permissions:'
-        hide_inactive_folders: 'Hide Inactive Folders Step:'
-        remote_folders: 'Read contents of the drive root folder:'
-        rename_project_folder: 'Rename managed project Folder:'
+        create_folder: "Managed Project Folder Creation:"
+        ensure_root_folder_permissions: "Set Base Folder Permissions:"
+        hide_inactive_folders: "Hide Inactive Folders Step:"
+        remote_folders: "Read contents of the drive root folder:"
+        rename_project_folder: "Rename managed project Folder:"
     errors:
       messages:
         error: An unexpected error occurred. Please check OpenProject logs for more information or contact an administrator
@@ -135,8 +140,8 @@ en:
         nextcloud_sync_service:
           attributes:
             add_user_to_group:
-              conflict: 'The user %{user} could not be added to the %{group} group for the following reason: %{reason}'
-              failed_to_add: 'The user %{user} could not be added to the %{group} group for the following reason: %{reason}'
+              conflict: "The user %{user} could not be added to the %{group} group for the following reason: %{reason}"
+              failed_to_add: "The user %{user} could not be added to the %{group} group for the following reason: %{reason}"
             create_folder:
               conflict: The folder %{folder_name} already exists on %{parent_location}.
               not_found: "%{parent_location} wasn't found."
@@ -149,8 +154,8 @@ en:
               not_allowed: The %{username} doesn't have access to the %{group_folder} folder. Please check the folder permissions on Nextcloud.
               not_found: "%{group_folder} folder wasn't found. Please check your Nextcloud setup."
             remove_user_from_group:
-              conflict: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
-              failed_to_remove: 'The user %{user} could not be removed from the %{group} group for the following reason: %{reason}'
+              conflict: "The user %{user} could not be removed from the %{group} group for the following reason: %{reason}"
+              failed_to_remove: "The user %{user} could not be removed from the %{group} group for the following reason: %{reason}"
             rename_project_folder:
               conflict: OpenProject could not rename the project folder to %{current_path} as a folder with the same name already exists
               forbidden: OpenProject user does not have access to %{current_path} folder.
@@ -277,7 +282,7 @@ en:
         download_report: Download
         rerun_checks: Re-run all checks
         run_checks: Run checks now
-      checked: 'Last check: %{datetime}'
+      checked: "Last check: %{datetime}"
       checks:
         ampf_configuration:
           client_folder_creation: Automatic folder creation
@@ -287,7 +292,7 @@ en:
           header: Automatically managed project folders
           project_folders_exist: Project folders exist
           project_folders_linked: Project folders linked
-          team_folder_app: 'Dependency: Team Folders'
+          team_folder_app: "Dependency: Team Folders"
           team_folder_contents: Team folder content
           team_folder_presence: Team folder exists
           userless_access: Server-side request authentication
@@ -317,7 +322,7 @@ en:
         errors:
           client_id_invalid: The configured OAuth 2 client id is invalid. Please check the configuration.
           client_secret_invalid: The configured OAuth 2 client secret is invalid. Please check the configuration.
-          nc_dependency_missing: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.'
+          nc_dependency_missing: "A required dependency is missing on the file storage. Please add the following dependency: %{dependency}."
           nc_dependency_version_mismatch: The %{dependency} app version is not supported. Please update your Nextcloud server.
           nc_host_not_found: No Nextcloud server found at the configured host url. Please check the configuration.
           nc_oauth_request_not_found: The endpoint to fetch the currently connected user was not found. Please check the server logs for further information.
@@ -325,7 +330,7 @@ en:
           nc_oauth_token_missing: OpenProject cannot test the user level communication with Nextcloud as the user did not yet link their Nextcloud account.
           nc_project_folder_missing: The previously created project folder for project "%{project}" could not be found.
           nc_team_folder_not_found: The team folder could not be found.
-          nc_unexpected_files: 'Unexpected files found in the managed team folder. For example: %{sample}'
+          nc_unexpected_files: "Unexpected files found in the managed team folder. For example: %{sample}"
           nc_unlinked_project_folders: Not all project folders have been created yet (%{actual} / %{expected}). This can indicate errors during the AMPF background synchronization.
           nc_userless_access_denied: The configured app password is invalid.
           not_configured: The connection could not be validated. Please finish configuration first.
@@ -367,7 +372,7 @@ en:
       project_folders:
         subtitle: Automatically managed project folders
       since: since %{datetime}
-      synced: 'Last sync: %{datetime}'
+      synced: "Last sync: %{datetime}"
       title: Health status report
     health_email_notifications:
       description_disabled: Admins will not receive updates by email when there are important updates.
@@ -384,7 +389,7 @@ en:
       empty_project_folder_validation: Selecting a folder is mandatory to proceed.
       existing_manual_folder: You can designate an existing folder as the root folder for this project. The permissions are however not automatically managed, the administrator needs to manually ensure relevant users have access. The selected folder can be used by multiple projects.
       host: Please add the host address of your storage including the https://. It should not be longer than 255 characters.
-      managed_project_folders_application_password_caption: 'Enable automatic managed folders by copying this value from: %{provider_type_link}.'
+      managed_project_folders_application_password_caption: "Enable automatic managed folders by copying this value from: %{provider_type_link}."
       name: Give your storage a name so that users can differentiate between multiple storages.
       new_storage_html: Read our documentation on [setting up a %{provider_name} file storage](docs_url) integration for more information.
       nextcloud:
@@ -421,7 +426,7 @@ en:
         integration: SharePoint Administration / OpenProject
         oauth_configuration: Copy these values from the desired application in the %{application_link_text}.
         provider_configuration: Please make sure you have administration privileges in the %{application_link_text} or contact your Microsoft administrator before doing the setup. In the portal, you also need to register an Azure application or use an existing one for authentication.
-      type: 'Please make sure you have administration privileges in your Nextcloud instance and have the following application installed before doing the setup:'
+      type: "Please make sure you have administration privileges in your Nextcloud instance and have the following application installed before doing the setup:"
       type_link_text: "“Integration OpenProject”"
     label_active: Active
     label_add_new_storage: Add new storage
diff --git a/spec/models/user_card_view_spec.rb b/spec/models/user_card_view_spec.rb
deleted file mode 100644
index ced0168a1af5..000000000000
--- a/spec/models/user_card_view_spec.rb
+++ /dev/null
@@ -1,145 +0,0 @@
-# frozen_string_literal: true
-
-require "rails_helper"
-
-RSpec.describe UserCardView do
-  subject(:view) { described_class.new(name: "Team") }
-
-  describe "defaults" do
-    it "exposes typed defaults for every option" do
-      expect(view.secondary_info).to eq("role")
-      expect(view.show_status_badge).to be(true)
-      expect(view.show_email).to be(false)
-      expect(view.tag_source).to eq("groups")
-      expect(view.tag_limit).to eq(3)
-      expect(view.card_size).to eq("default")
-      expect(view.columns_per_row).to eq(3)
-    end
-
-    it "is valid with defaults" do
-      expect(view).to be_valid
-    end
-  end
-
-  describe "round-tripping through JSONB" do
-    it "persists and reloads options with their declared types" do
-      view.secondary_info = "email"
-      view.show_status_badge = false
-      view.show_email = true
-      view.tag_source = "roles"
-      view.tag_limit = 5
-      view.card_size = "compact"
-      view.columns_per_row = 4
-      view.save!
-
-      reloaded = described_class.find(view.id)
-      expect(reloaded.secondary_info).to eq("email")
-      expect(reloaded.show_status_badge).to be(false)
-      expect(reloaded.show_email).to be(true)
-      expect(reloaded.tag_source).to eq("roles")
-      expect(reloaded.tag_limit).to eq(5)
-      expect(reloaded.card_size).to eq("compact")
-      expect(reloaded.columns_per_row).to eq(4)
-    end
-
-    it "coerces booleans stored as strings" do
-      view.show_status_badge = "false"
-      expect(view.show_status_badge).to be(false)
-    end
-  end
-
-  describe "validations" do
-    it "rejects an unknown secondary_info" do
-      view.secondary_info = "bogus"
-      expect(view).not_to be_valid
-      expect(view.errors[:secondary_info]).to be_present
-    end
-
-    it "rejects an unknown tag_source" do
-      view.tag_source = "bogus"
-      expect(view).not_to be_valid
-      expect(view.errors[:tag_source]).to be_present
-    end
-
-    it "rejects an unknown card_size" do
-      view.card_size = "huge"
-      expect(view).not_to be_valid
-      expect(view.errors[:card_size]).to be_present
-    end
-
-    it "rejects tag_limit outside 0..10" do
-      view.tag_limit = 11
-      expect(view).not_to be_valid
-      expect(view.errors[:tag_limit]).to be_present
-    end
-
-    it "rejects columns_per_row outside 1..4" do
-      view.columns_per_row = 0
-      expect(view).not_to be_valid
-      expect(view.errors[:columns_per_row]).to be_present
-    end
-  end
-
-  describe "query compatibility" do
-    let(:user_query) { UserQuery.create!(name: "UQ") }
-    let(:other_query) { PersistedQuery.create!(name: "PQ") }
-
-    it "accepts a UserQuery" do
-      view.query = user_query
-      expect(view).to be_valid
-    end
-
-    it "rejects a non-UserQuery" do
-      view.query = other_query
-      expect(view).not_to be_valid
-      expect(view.errors[:query]).to be_present
-    end
-  end
-
-  describe "#results" do
-    # UserQuery scopes to users visible to the current user. Granting alice
-    # :view_all_principals lets her see every user without introducing an
-    # extra admin record that would pollute `contain_exactly` expectations.
-    let!(:alice)  { create(:user, firstname: "Alice", lastname: "Anderson", global_permissions: %i[view_all_principals]) }
-    let!(:bob)    { create(:user, firstname: "Bob",   lastname: "Brown") }
-    let!(:locked) { create(:locked_user, firstname: "Carol", lastname: "Clark") }
-
-    before { login_as(alice) }
-
-    it "returns nil when there is no query" do
-      expect(view.results).to be_nil
-    end
-
-    it "delegates to the effective query and respects its filters" do
-      query = UserQuery.new(name: "Active only")
-      query.where("status", "=", ["active"])
-      query.save!
-
-      view.query = query
-      expect(view.results).to contain_exactly(alice, bob)
-      expect(view.results).not_to include(locked)
-    end
-
-    it "applies a name filter and sort defined on the query" do
-      query = UserQuery.new(name: "By name")
-      query.where("name", "~", ["Brown"])
-      query.save!
-
-      view.query = query
-      expect(view.results).to contain_exactly(bob)
-    end
-
-    it "bypasses filters and returns manually-added users in their stored order" do
-      query = UserQuery.new(name: "Manual")
-      query.where("status", "=", ["active"])
-      query.save!
-
-      OrderedPersistedQueryEntity.create!(persisted_query: query, entity: bob,    position: 1)
-      OrderedPersistedQueryEntity.create!(persisted_query: query, entity: locked, position: 2)
-      OrderedPersistedQueryEntity.create!(persisted_query: query, entity: alice,  position: 3)
-
-      view.query = query
-      expect(view.results.to_a).to eq([bob, locked, alice])
-    end
-  end
-end