OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
change create button on project list to dynamic toggle
ulferts0fb0f0b8056d
diff --git a/app/components/projects/index_sub_header_component.html.erb b/app/components/projects/index_sub_header_component.html.erbindex e01a070bc30..f44b08fa48c 100644--- a/app/components/projects/index_sub_header_component.html.erb+++ b/app/components/projects/index_sub_header_component.html.erb@@ -17,18 +17,41 @@render(Projects::ProjectFilterButtonComponent.new(query: @query, disabled: @disable_buttons))end- if @current_user.allowed_globally?(:add_project)+ for_a_single_new_allowed_type do |new_type|subheader.with_action_button(tag: :a,- href: new_project_path,+ href: new_workspace_path(new_type),scheme: :primary,leading_icon: :plus,- label: I18n.t(:label_project_new),+ label: new_workspace_label(new_type),disabled: @disable_buttons,size: :medium,- data: { "test-selector": "project-new-button" }+ data: { "test-selector": "workspace-new-button" }) do- Project.model_name.human+ new_workspace_label(new_type)+ end+ end++ for_multiple_new_allowed_types do |new_types|+ subheader.with_action_menu(+ leading_icon: :plus,+ trailing_icon: :"triangle-down",+ label: I18n.t(:button_add),+ button_arguments: { scheme: :primary, "aria-label": I18n.t(:button_add) }+ ) do |menu|+ new_types.each do |new_type|+ menu.with_item(+ tag: :a,+ href: new_workspace_path(new_type),+ scheme: :default,+ leading_icon: :plus,+ label: new_workspace_label(new_type),+ disabled: @disable_buttons,+ size: :medium+ ) do |item|+ item.with_leading_visual_icon(icon: new_workspace_icon(new_type))+ end+ endendenddiff --git a/app/components/projects/index_sub_header_component.rb b/app/components/projects/index_sub_header_component.rbindex 411d2abb84f..742461c65e2 100644--- a/app/components/projects/index_sub_header_component.rb+++ b/app/components/projects/index_sub_header_component.rb@@ -70,5 +70,46 @@ module Projectsdef clear_button_id"project-filters-form-clear-button"end++ def new_workspace_path(type)+ case type+ when Project.workspace_types[:project]+ new_project_path+ when Project.workspace_types[:portfolio]+ new_portfolio_path+ end+ end++ def new_workspace_label(type)+ I18n.t(:"label_#{type}")+ end++ def new_workspace_icon(type)+ case type+ when Project.workspace_types[:project]+ :project+ when Project.workspace_types[:portfolio]+ :briefcase+ end+ end++ def allowed_new_workspace_types+ allowed_types = []+ allowed_types << Project.workspace_types[:project] if @current_user.allowed_globally?(:add_project)+ allowed_types << Project.workspace_types[:portfolio] if @current_user.allowed_globally?(:add_portfolios) && OpenProject::FeatureDecisions.portfolio_models_active?+ allowed_types+ end++ def for_a_single_new_allowed_type+ return unless allowed_new_workspace_types.length == 1++ yield allowed_new_workspace_types[0]+ end++ def for_multiple_new_allowed_types+ return unless allowed_new_workspace_types.length > 1++ yield allowed_new_workspace_types+ endendenddiff --git a/config/locales/en.yml b/config/locales/en.ymlindex 4565ab1b8ac..8f22997116c 100644--- a/config/locales/en.yml+++ b/config/locales/en.yml@@ -3240,6 +3240,7 @@ en:label_project_view_all: "View all projects"label_project_show_details: "Show project details"label_project_hide_details: "Hide project details"+ label_portfolio: "Portfolio"label_portfolio_new: "New portfolio"label_public_projects: "Public projects"label_query_new: "New query"diff --git a/spec/features/global_roles/global_create_project_spec.rb b/spec/features/global_roles/global_create_project_spec.rbindex 2e4beb09de8..93250f754ff 100644--- a/spec/features/global_roles/global_create_project_spec.rb+++ b/spec/features/global_roles/global_create_project_spec.rb@@ -85,7 +85,7 @@ RSpec.describe "Global role: Global Create project",it 'allows creating projects via the "+ Project" button' doprojects_page.visit!- projects_page.navigate_to_new_project_page_from_toolbar_items+ projects_page.create_new_workspacefill_in "Name", with: "New project name"diff --git a/spec/features/portfolios/create_spec.rb b/spec/features/portfolios/create_spec.rbindex d0b053c4211..63a1948dcf1 100644--- a/spec/features/portfolios/create_spec.rb+++ b/spec/features/portfolios/create_spec.rb@@ -40,12 +40,13 @@ RSpec.describe "Portfolios",# Role granted to creator on portfolio creation to be able to access the portfolio.shared_let(:default_project_role) { create(:project_role) }+ let(:projects_page) { Pages::Projects::Index.new }+current_user { user_with_permissions }it "can create a portfolio", with_flag: { portfolio_models: true } do- # TODO: trigger this from a button- # e.g. on the project index page- visit new_portfolio_path+ projects_page.visit!+ projects_page.create_new_workspaceexpect(page).to have_heading "New portfolio"# This should be andiff --git a/spec/features/projects/create_spec.rb b/spec/features/projects/create_spec.rbindex eacca1e92b3..ae74def7465 100644--- a/spec/features/projects/create_spec.rb+++ b/spec/features/projects/create_spec.rb@@ -46,7 +46,7 @@ RSpec.describe "Projects", "creation",context "with the button on the toolbar items" doit "can navigate to the create project page" do- projects_page.navigate_to_new_project_page_from_toolbar_items+ projects_page.create_new_workspaceexpect(page).to have_heading "New project"@@ -55,7 +55,7 @@ RSpec.describe "Projects", "creation",endit "can create a project" do- projects_page.navigate_to_new_project_page_from_toolbar_items+ projects_page.create_new_workspaceexpect(page).to have_heading "New project"@@ -69,7 +69,7 @@ RSpec.describe "Projects", "creation",endit "does not create a project with an already existing identifier" do- projects_page.navigate_to_new_project_page_from_toolbar_items+ projects_page.create_new_workspaceexpect(page).to have_heading "New project"@@ -100,7 +100,7 @@ RSpec.describe "Projects", "creation",endit "can create a project" do- projects_page.navigate_to_new_project_page_from_toolbar_items+ projects_page.create_new_workspaceexpect(page).to have_heading "New project"@@ -154,7 +154,7 @@ RSpec.describe "Projects", "creation",endit "can create a project" do- projects_page.navigate_to_new_project_page_from_toolbar_items+ projects_page.create_new_workspaceexpect(page).to have_heading "New project"diff --git a/spec/support/pages/projects/index.rb b/spec/support/pages/projects/index.rbindex 010116f6945..cdb390213ed 100644--- a/spec/support/pages/projects/index.rb+++ b/spec/support/pages/projects/index.rb@@ -267,8 +267,8 @@ module Pagesnot_protected_columns = Regexp.new("^(?!#{(columns + ['Name']).join('$|')}$).*$")- while (item = page.all(".op-draggable-autocomplete--item", text: not_protected_columns)[0])- item.find(".op-draggable-autocomplete--remove-item").click+ while (items = page.all(".op-draggable-autocomplete--item", text: not_protected_columns)[0]) # rubocop:disable Capybara/FindAllFirst+ items.find(".op-draggable-autocomplete--remove-item").clickendremaining_columns = page.all(".op-draggable-autocomplete--item").map { |i| i.text.downcase }@@ -336,8 +336,8 @@ module Pagesendend- def navigate_to_new_project_page_from_toolbar_items- page.find('[data-test-selector="project-new-button"]').click+ def create_new_workspace+ page.find('[data-test-selector="workspace-new-button"]').clickenddef save_query