Refactor to remove jQuery dependency and fix bugs

Closes #3500090

Merge request reports

Loading