Skip to content

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

[65336] Missing breadcrumb in remaining pages (#19405)

Behrokh Satarnejad56abad9b2257
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index eeded83c887..f1181becdf6 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -49,7 +49,7 @@ class SearchController < ApplicationController
provision_gon
- render layout: layout_non_or_no_menu
+ render "index", locals: { menu_name: project_or_global_menu }
end
private
diff --git a/app/views/work_packages/bulk/edit.html.erb b/app/views/work_packages/bulk/edit.html.erb
index b6a6d423e8f..a7f2b2303f7 100644
--- a/app/views/work_packages/bulk/edit.html.erb
+++ b/app/views/work_packages/bulk/edit.html.erb
@@ -29,7 +29,16 @@ See COPYRIGHT and LICENSE files for more details.
<% html_title t(:label_bulk_edit_selected_work_packages) %>
-<h2><%= t(:label_bulk_edit_selected_work_packages) %></h2>
+<%=
+ render Primer::OpenProject::PageHeader.new do |header|
+ header.with_title { t(:label_bulk_edit_selected_work_packages) }
+ header.with_breadcrumbs(
+ [*([href: project_overview_path(@project.id), text: @project.name] if @project),
+ { href: (@project ? project_work_packages_path(@project) : work_packages_path), text: t(:label_work_package_plural) },
+ t(:label_bulk_edit_selected_work_packages)]
+ )
+ end
+%>
<ul>
<% @work_packages.each do |wp| %>
<li>
diff --git a/app/views/work_packages/moves/new.html.erb b/app/views/work_packages/moves/new.html.erb
index b473bda16ad..75739dd2441 100644
--- a/app/views/work_packages/moves/new.html.erb
+++ b/app/views/work_packages/moves/new.html.erb
@@ -29,7 +29,20 @@ See COPYRIGHT and LICENSE files for more details.
<% html_title @copy ? t(:button_duplicate) : t(:button_move), t("activerecord.models.work_package") %>
-<h2><%= @copy ? t(:button_duplicate) : t(:button_move) %></h2>
+<% single_wp = @work_packages.size == 1 ? @work_packages.first : nil %>
+
+<%=
+ render Primer::OpenProject::PageHeader.new do |header|
+ header.with_title { @copy ? t(:button_copy) : t(:button_move) }
+ header.with_breadcrumbs(
+ [*([href: project_overview_path(@project.id), text: @project.name] if @project),
+ { href: project_work_packages_path(@project), text: t(:label_work_package_plural) },
+ *(single_wp ? [{ href: work_package_path(single_wp), text: single_wp.subject }] : []),
+ @copy ? t(:button_copy) : t(:button_move)]
+ )
+ end
+%>
+
<ul>
<% @work_packages.each do |work_package| -%>
<li>
@@ -162,8 +175,8 @@ See COPYRIGHT and LICENSE files for more details.
<%= styled_label_tag :budget_id, Budget.model_name.human %>
<%= styled_select_tag(
"budget_id", (@target_project == @project ? content_tag("option", t(:label_no_change_option), value: "") : "") +
- content_tag("option", t(:label_none), value: "none") +
- options_from_collection_for_select(@target_project.budgets, :id, :subject)
+ content_tag("option", t(:label_none), value: "none") +
+ options_from_collection_for_select(@target_project.budgets, :id, :subject)
) %>
</div>
</div>
diff --git a/frontend/src/app/core/global_search/title/global-search-title.component.html b/frontend/src/app/core/global_search/title/global-search-title.component.html
index 4bd2f3db36b..f14e3bdbe61 100644
--- a/frontend/src/app/core/global_search/title/global-search-title.component.html
+++ b/frontend/src/app/core/global_search/title/global-search-title.component.html
@@ -1,3 +1,6 @@
+<op-breadcrumbs
+ [items]="breadcrumbItems()"
+></op-breadcrumbs>
<div class="toolbar-container">
<div class="toolbar">
<div class="title-container">
diff --git a/frontend/src/app/core/global_search/title/global-search-title.component.ts b/frontend/src/app/core/global_search/title/global-search-title.component.ts
index 3477233e9b3..01f1529897d 100644
--- a/frontend/src/app/core/global_search/title/global-search-title.component.ts
+++ b/frontend/src/app/core/global_search/title/global-search-title.component.ts
@@ -41,6 +41,8 @@ import { GlobalSearchService } from 'core-app/core/global_search/services/global
import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator';
import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin';
+import { PathHelperService } from 'core-app/core/path-helper/path-helper.service';
+import { OpTitleService } from 'core-app/core/html/op-title.service';
@Component({
selector: 'opce-global-search-title',
@@ -71,6 +73,8 @@ export class GlobalSearchTitleComponent extends UntilDestroyedMixin implements O
readonly globalSearchService:GlobalSearchService,
readonly I18n:I18nService,
readonly injector:Injector,
+ protected readonly pathHelper:PathHelperService,
+ protected readonly titleService:OpTitleService,
) {
super();
}
@@ -95,6 +99,23 @@ export class GlobalSearchTitleComponent extends UntilDestroyedMixin implements O
});
}
+ breadcrumbItems() {
+ const items = [];
+ items.push({
+ href: this.pathHelper.homePath(),
+ text: this.titleService.appTitle,
+ });
+ if (this.currentProjectService?.identifier) {
+ items.push({
+ href: this.pathHelper.projectPath(this.currentProjectService.identifier),
+ text: this.currentProjectService.name,
+ });
+ }
+ items.push(this.searchTitle);
+
+ return items;
+ }
+
private projectText(scope:string):string {
const currentProjectName = this.currentProjectService.name ? this.currentProjectService.name : '';
diff --git a/frontend/src/app/features/work-packages/components/wp-copy/wp-copy-full-view.component.ts b/frontend/src/app/features/work-packages/components/wp-copy/wp-copy-full-view.component.ts
index 175fb7b300a..0ec5249e8f5 100644
--- a/frontend/src/app/features/work-packages/components/wp-copy/wp-copy-full-view.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-copy/wp-copy-full-view.component.ts
@@ -37,4 +37,29 @@ import { WorkPackageCopyController } from 'core-app/features/work-packages/compo
})
export class WorkPackageCopyFullViewComponent extends WorkPackageCopyController {
public successState = 'work-packages.show';
+
+ breadcrumbItems() {
+ const items = [];
+ items.push({
+ href: this.pathHelper.homePath(),
+ text: this.titleService.appTitle,
+ });
+ if (this.currentProjectService?.identifier) {
+ items.push({
+ href: this.pathHelper.projectPath(this.currentProjectService.identifier),
+ text: this.currentProjectService.name,
+ });
+ }
+ items.push({
+ href: this.pathHelper.workPackagesPath(this.currentProjectService.identifier as string),
+ text: this.I18n.t('js.label_work_package_plural'),
+ });
+ items.push({
+ href: this.pathHelper.projectWorkPackagePath(this.currentProjectService.identifier as string, this.stateParams.copiedFromWorkPackageId as string),
+ text: this.newWorkPackage.subject,
+ });
+ items.push(I18n.t('js.button_duplicate'));
+
+ return items;
+ }
}
diff --git a/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts b/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts
index ad9be787f91..6f8b99e4dc5 100644
--- a/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-new/wp-create.component.ts
@@ -57,6 +57,7 @@ import { OpTitleService } from 'core-app/core/html/op-title.service';
import { WorkPackageCreateService } from './wp-create.service';
import { HalError } from 'core-app/features/hal/services/hal-error';
import idFromLink from 'core-app/features/hal/helpers/id-from-link';
+import { CurrentProjectService } from 'core-app/core/current-project/current-project.service';
@Directive()
export class WorkPackageCreateComponent extends UntilDestroyedMixin implements OnInit {
@@ -97,7 +98,9 @@ export class WorkPackageCreateComponent extends UntilDestroyedMixin implements O
protected readonly wpTableFilters:WorkPackageViewFiltersService,
protected readonly pathHelper:PathHelperService,
protected readonly apiV3Service:ApiV3Service,
- protected readonly cdRef:ChangeDetectorRef) {
+ protected readonly currentProjectService:CurrentProjectService,
+ protected readonly cdRef:ChangeDetectorRef,
+ ) {
super();
}
diff --git a/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.component.ts b/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.component.ts
index 346263fe27c..622ae734af1 100644
--- a/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.component.ts
+++ b/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.component.ts
@@ -37,4 +37,25 @@ import { ChangeDetectionStrategy, Component } from '@angular/core';
})
export class WorkPackageNewFullViewComponent extends WorkPackageCreateComponent {
public successState = this.$state.current.data.successState as string;
+
+ breadcrumbItems() {
+ const items = [];
+ items.push({
+ href: this.pathHelper.homePath(),
+ text: this.titleService.appTitle,
+ });
+ if (this.currentProjectService?.identifier) {
+ items.push({
+ href: this.pathHelper.projectPath(this.currentProjectService.identifier),
+ text: this.currentProjectService.name,
+ });
+ }
+ items.push({
+ href: this.pathHelper.workPackagesPath(this.currentProjectService.identifier as string),
+ text: this.I18n.t('js.label_work_package_plural'),
+ });
+ items.push(I18n.t('js.label_create_work_package'));
+
+ return items;
+ }
}
diff --git a/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.html b/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.html
index 235c38a6dcb..835ef796a29 100644
--- a/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.html
+++ b/frontend/src/app/features/work-packages/components/wp-new/wp-new-full-view.html
@@ -1,6 +1,9 @@
<div
class="work-package--new-state work-packages--new work-packages--show-view toolbar-container"
*ngIf="newWorkPackage">
+ <op-breadcrumbs
+ [items]="breadcrumbItems()"
+ ></op-breadcrumbs>
<edit-form [resource]="newWorkPackage"
[skippedFields]="['status', 'type']"
[inEditMode]="true"
diff --git a/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts b/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts
index 1a75ebe9581..0bf8de119b5 100644
--- a/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts
+++ b/frontend/src/app/shared/components/breadcrumbs/op-breadcrumbs.component.ts
@@ -45,7 +45,7 @@ export type BreadcrumbItem =
})
export class OpBreadcrumbsComponent {
@Input() items:BreadcrumbItem[] = [];
- @Input() lastItemSection:string | null = null;
+ @Input() lastItemSection?:string | null = null;
constructor(
readonly I18n:I18nService,
diff --git a/modules/meeting/spec/features/meetings_search_spec.rb b/modules/meeting/spec/features/meetings_search_spec.rb
index a8f96b18584..23d32e4f4eb 100644
--- a/modules/meeting/spec/features/meetings_search_spec.rb
+++ b/modules/meeting/spec/features/meetings_search_spec.rb
@@ -50,7 +50,7 @@ RSpec.describe "Meeting search", :js do
select_autocomplete(page.find(".top-menu-search--input"),
query: "Meeting",
select_text: "In this project ↵",
- wait_dropdown_open: false)
+ wait_dropdown_open: true)
page.find('[data-qa-tab-id="meetings"]').click
expect(page.find_by_id("search-results")).to have_text(meeting.title)
@@ -60,7 +60,7 @@ RSpec.describe "Meeting search", :js do
select_autocomplete(page.find(".top-menu-search--input"),
query: agenda_item.title,
select_text: "In this project ↵",
- wait_dropdown_open: false)
+ wait_dropdown_open: true)
page.find('[data-qa-tab-id="meetings"]').click
expect(page.find_by_id("search-results")).to have_text(meeting.title)
@@ -70,7 +70,7 @@ RSpec.describe "Meeting search", :js do
select_autocomplete(page.find(".top-menu-search--input"),
query: agenda_item.notes,
select_text: "In this project ↵",
- wait_dropdown_open: false)
+ wait_dropdown_open: true)
page.find('[data-qa-tab-id="meetings"]').click
expect(page.find_by_id("search-results")).to have_text(meeting.title)
diff --git a/modules/team_planner/spec/support/pages/team_planner.rb b/modules/team_planner/spec/support/pages/team_planner.rb
index 63751740896..13c2747d646 100644
--- a/modules/team_planner/spec/support/pages/team_planner.rb
+++ b/modules/team_planner/spec/support/pages/team_planner.rb
@@ -203,6 +203,7 @@ module Pages
select_autocomplete(find('[data-test-selector="project_id"]'),
query: project,
results_selector: "body",
+ wait_dropdown_open: true,
wait_for_fetched_options: false)
end
@@ -249,6 +250,7 @@ module Pages
def select_user_to_add(name)
select_autocomplete page.find('[data-test-selector="tp-add-assignee"]'),
query: name,
+ wait_dropdown_open: false,
results_selector: "body"
end
diff --git a/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb b/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb
index b397329600f..4672a8bc50c 100644
--- a/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb
+++ b/spec/support/components/autocompleter/ng_select_autocomplete_helpers.rb
@@ -5,7 +5,7 @@ module Components::Autocompleter
def search_autocomplete(element, query:, results_selector: nil, wait_dropdown_open: true, wait_for_fetched_options: true)
SeleniumHubWaiter.wait unless using_cuprite?
# Open the element
- element.click
+ page.execute_script("arguments[0].click();", element.native)
# Wait for dropdown to open
ng_find_dropdown(element, results_selector:) if wait_dropdown_open