Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve "Adding bookmark without bookmark counter raises an error" #3215

Merged
merged 6 commits into from
Jul 22, 2024
Merged

Resolve "Adding bookmark without bookmark counter raises an error" #3215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
703d99d
Verify bookmark counter has been rendered before raising count
mamrey Jun 25, 2024
7983a7b
Address rubocop
mamrey Jun 25, 2024
3cf5512
Merge remote-tracking branch 'origin/main' into prevent_checkbox_subm…
cgalarza Jul 16, 2024
46a4f7d
Not using get keyword method definition
cgalarza Jul 22, 2024
46d28fe
Merge remote-tracking branch 'origin/main' into prevent_checkbox_subm…
cgalarza Jul 22, 2024
b3a868b
Fixing specs
cgalarza Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/javascript/blacklight/checkbox_submit.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default class CheckboxSubmit {
this.labelTarget.removeAttribute('disabled')
this.checkboxTarget.removeAttribute('disabled')
this.updateStateFor(!this.checked)
document.querySelector('[data-role=bookmark-counter]').innerHTML = json.bookmarks.count
if (this.bookmarkCounter()) this.bookmarkCounter().innerHTML = json.bookmarks.count
}).catch((error) => {
this.handleError(error)
})
Expand All @@ -63,6 +63,10 @@ export default class CheckboxSubmit {
return this.form.querySelector('[data-checkboxsubmit-target="span"]')
}

bookmarkCounter() {
return document.querySelector('[data-role="bookmark-counter"]')
}

handleError() {
alert("Unable to save the bookmark at this time.")
}
Expand Down
13 changes: 13 additions & 0 deletions spec/features/bookmarks_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,19 @@
end
end

describe "when bookmark counter is not rendered" do
before do
allow(CatalogController).to receive(:render_bookmarks_control?).and_return(false)
end

it 'adds bookmark without raising an alert', :js do
visit solr_document_path('2007020969')
check 'Bookmark'
visit bookmarks_path
expect(page).to have_css('input[type="checkbox"][checked]')
end
end

it "clears bookmarks" do
visit solr_document_path('2007020969')
click_on 'Bookmark'
Expand Down
Loading