Skip to content

Commit cf0b02c

Browse files
HDingerHDinger
authored
[DREAM-717] Highlighting of search term is sometimes off (#23961)
* Change highlighting mode for the project selector to let the server handle the highlighting * Bump primer to 0.89.0
2 parents 3cbf0be + 5db7675 commit cf0b02c

30 files changed

Lines changed: 309 additions & 62 deletions

File tree

‎Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,5 +433,5 @@ end
433433
source "https://rubygems.org", cooldown: 0 do
434434
gem "openproject-octicons", "~>19.35.0"
435435
gem "openproject-octicons_helper", "~>19.35.0"
436-
gem "openproject-primer_view_components", "~>0.88.0"
436+
gem "openproject-primer_view_components", "~>0.89.0"
437437
end

‎Gemfile.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -909,7 +909,7 @@ GEM
909909
actionview
910910
openproject-octicons (= 19.35.0)
911911
railties
912-
openproject-primer_view_components (0.88.0)
912+
openproject-primer_view_components (0.89.0)
913913
actionview (>= 7.2.0)
914914
activesupport (>= 7.2.0)
915915
openproject-octicons (>= 19.34.0)
@@ -1688,7 +1688,7 @@ DEPENDENCIES
16881688
openproject-octicons (~> 19.35.0)!
16891689
openproject-octicons_helper (~> 19.35.0)!
16901690
openproject-openid_connect!
1691-
openproject-primer_view_components (~> 0.88.0)!
1691+
openproject-primer_view_components (~> 0.89.0)!
16921692
openproject-recaptcha!
16931693
openproject-reporting!
16941694
openproject-resource_management!
@@ -2070,7 +2070,7 @@ CHECKSUMS
20702070
openproject-octicons (19.35.0) sha256=a5033550d0961b4a8cb0993512a899716d633e17c2b5147bc6a9ed74f3952b38
20712071
openproject-octicons_helper (19.35.0) sha256=c32d142a4bb7fda739b16768aa8846fd88ffc1750509d8056f516056e8767361
20722072
openproject-openid_connect (1.0.0)
2073-
openproject-primer_view_components (0.88.0) sha256=be97f5e96258a738c4d95abbcb2909ed570dbb151d42a5a253c3d1de9c171e35
2073+
openproject-primer_view_components (0.89.0) sha256=de73dac8c53f39efbc0aa639eff0de2d84cb90ad6778be4a71eff72be2830d17
20742074
openproject-recaptcha (1.0.0)
20752075
openproject-reporting (1.0.0)
20762076
openproject-resource_management (1.0.0)

‎app/components/admin/settings/project_reserved_identifiers/sub_header_component.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
++#
3030
%>
3131

32-
<%= render(Primer::OpenProject::SubHeader.new(data: sub_header_data_attributes)) do |subheader| %>
32+
<%= render(Primer::OpenProject::SubHeader.new(collapsed_search: false, data: sub_header_data_attributes)) do |subheader| %>
3333
<% subheader.with_filter_input(
3434
name: "name",
3535
label: t("admin.reserved_identifiers.filter_label"),

‎app/components/filter/filter_button_component.html.erb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
<%= component_wrapper tag: "turbo-frame" do %>
22
<%= render(
33
Primer::Beta::Button.new(
4-
scheme: :secondary,
4+
scheme: :invisible,
55
disabled:,
66
data: { "filter--filters-form-target": "filterFormToggle",
77
action: "filter--filters-form#toggleDisplayFilters" },
88
test_selector: "filter-component-toggle"
99
)
1010
) do |button| %>
1111
<% button.with_trailing_visual_counter(count: filters_count, test_selector: "filters-button-counter") %>
12-
<%= t(:label_filter) %>
12+
<% button.with_leading_visual_icon(icon: :filter) %>
13+
<%= t(:button_all_filters) %>
1314
<% end %>
1415
<% end %>

‎app/components/header/projects/filterable_tree_view_component.html.erb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ See COPYRIGHT and LICENSE files for more details.
3131
<%= render(
3232
Primer::OpenProject::FilterableTreeView.new(
3333
src: tree_src,
34+
show_search_highlighting: false,
3435
include_sub_items_check_box_arguments: { hidden: true },
3536
filter_mode_control_arguments: logged? ? {} : { hidden: true },
3637
filter_input_arguments: { autofocus: true,

‎app/components/header/projects/node_component.html.erb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ See COPYRIGHT and LICENSE files for more details.
5757
node: child_node,
5858
current_project_id: @current_project_id,
5959
favorited_ids: @favorited_ids,
60-
jump: @jump
60+
jump: @jump,
61+
query_terms: @query_terms
6162
) %>
6263
<% end %>
6364
<% end %>

‎app/components/header/projects/node_component.rb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@
3131
module Header
3232
module Projects
3333
class NodeComponent < ApplicationComponent
34-
def initialize(component:, node:, current_project_id:, favorited_ids:, jump:)
34+
def initialize(component:, node:, current_project_id:, favorited_ids:, jump:, query_terms: [])
3535
super()
3636
@component = component
3737
@node = node
3838
@current_project_id = current_project_id
3939
@favorited_ids = favorited_ids
4040
@jump = jump
41+
@query_terms = query_terms
4142
end
4243

4344
private
@@ -54,7 +55,7 @@ def href
5455
end
5556

5657
def label
57-
helpers.project_node_label(project, favorited: favorited?)
58+
helpers.project_node_label(project, favorited: favorited?, query_terms: @query_terms)
5859
end
5960
end
6061
end

‎app/components/members/index_sub_header_component.html.erb‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
<%= render(Primer::OpenProject::SubHeader.new) do |subheader|
2-
subheader.with_filter_button(
3-
id: "filter-member-button",
4-
class: "toggle-member-filter-link",
5-
data: filter_button_data_attributes
6-
) do
7-
I18n.t(:description_filter)
8-
end
2+
subheader.with_filter_button(
3+
id: "filter-member-button",
4+
class: "toggle-member-filter-link",
5+
data: filter_button_data_attributes,
6+
scheme: :secondary # Remove once there is a search in the SubHeader
7+
) do
8+
I18n.t(:button_all_filters)
9+
end
910

10-
if authorize_for(:members, :new)
11-
subheader.with_action_button(
12-
scheme: :primary,
13-
leading_icon: :plus,
14-
label: t(:button_add_member),
15-
id: "add-member-button",
16-
data: add_button_data_attributes
17-
) do
18-
t("activerecord.models.member")
19-
end
20-
end
11+
if authorize_for(:members, :new)
12+
subheader.with_action_button(
13+
scheme: :primary,
14+
leading_icon: :plus,
15+
label: t(:button_add_member),
16+
id: "add-member-button",
17+
data: add_button_data_attributes
18+
) do
19+
t("activerecord.models.member")
20+
end
21+
end
2122

22-
subheader.with_bottom_pane_component do
23-
render ::Members::UserFilterComponent.new(params, **@members_filter_options)
24-
end
25-
end %>
23+
subheader.with_bottom_pane_component do
24+
render ::Members::UserFilterComponent.new(params, **@members_filter_options)
25+
end
26+
end %>

‎app/components/projects/settings/life_cycle/index_component.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<%=
22
flex_layout(data: wrapper_data_attributes) do |flex|
33
flex.with_row do
4-
render(Primer::OpenProject::SubHeader.new) do |subheader|
4+
render(Primer::OpenProject::SubHeader.new(collapsed_search: false)) do |subheader|
55
subheader.with_filter_input(
66
name: "border-box-filter",
77
label: t("projects.settings.life_cycle.filter.label"),

‎app/components/projects/settings/project_custom_field_sections/index_component.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
component_wrapper(data: wrapper_data_attributes) do
33
flex_layout do |flex|
44
flex.with_row do
5-
render(Primer::OpenProject::SubHeader.new) do |subheader|
5+
render(Primer::OpenProject::SubHeader.new(collapsed_search: false)) do |subheader|
66
subheader.with_filter_input(
77
name: "border-box-filter",
88
label: t("projects.settings.project_custom_fields.filter.label"),

0 commit comments

Comments
 (0)