Skip to content

Upgrade bootstrap and associated dependencies, fixes #2572 #2580

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

Draft
xmunoz wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Upgrade bootstrap and associated dependencies, fixes #2572 #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0134e24
Upgrade bootstrap and associated dependencies, fixes #2572
xmunoz May 11, 2022
3ae8dcf
Updated utility class names https://getbootstrap.com/docs/5.0/migrati…
xmunoz May 11, 2022
04857d7
Bump bootstrap version in Gemfile
xmunoz May 11, 2022
d15cc95
Remove deprecated form-group
xmunoz May 11, 2022
dc8177d
Change dropdowns to conform to new layout https://getbootstrap.com/do…
xmunoz May 12, 2022
1dfa7ee
Remove styling for selector that is not referenced anywhere
xmunoz Jul 7, 2022
9209c60
add popper to the js build
xmunoz Jul 12, 2022
e28a0c7
Fix label spacing for lines
xmunoz Jul 13, 2022
a2ef670
Add data-toggle element to menu dropdowns
xmunoz Jul 13, 2022
e0cba1c
bring up to speed
colinxfleming Sep 25, 2022
1d3c7b5
resolve conflix
colinxfleming Oct 2, 2022
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
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ gem 'net-smtp', require: false # for compat reasons, required in builds
gem 'sprockets-rails'
gem 'jsbundling-rails'
gem 'cssbundling-rails'
gem 'bootstrap_form', '~> 4.5.0'
gem 'bootstrap_form', '~> 5.0.0'

# Our database is postgres
gem 'pg', '~> 1.2'
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ GEM
smart_properties
bootsnap (1.12.0)
msgpack (~> 1.2)
bootstrap_form (4.5.0)
bootstrap_form (5.0.0)
actionpack (>= 5.2)
activemodel (>= 5.2)
builder (3.2.4)
Expand Down Expand Up @@ -445,7 +445,7 @@ DEPENDENCIES
activerecord-session_store
acts_as_tenant (~> 0.5.0)
bootsnap (>= 1.4.2)
bootstrap_form (~> 4.5.0)
bootstrap_form (~> 5.0.0)
bullet
bundler-audit
byebug
Expand Down
1 change: 1 addition & 0 deletions app/javascript/application.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import './src/jquery';
import {} from 'jquery-ujs'
import './src/jquery-ui';
import './src/turbolinks';
import Popper from 'popper.js';
import * as bootstrap from "bootstrap";

// Vendor
Expand Down
1 change: 0 additions & 1 deletion app/javascript/styles/bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
@import 'bootstrap/scss/bootstrap';
// @import "rails_bootstrap_forms";

$spacer: .5rem !default;

Expand Down
8 changes: 4 additions & 4 deletions app/javascript/styles/lines.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
margin: 10px;
}

label {
font-size: $font-size-medium;
.form-check-label {
margin-left: 2em;
}

.form-check-label {
@extend .ml-8;
label {
font-size: $font-size-medium;
}
}
2 changes: 1 addition & 1 deletion app/views/accountants/_search_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
include_blank: t('accountants.search_all_clinics'),
class: 'search_form_input accountant' %>

<%= f.button title: t('common.search'), class: 'btn btn-primary ml-4' do %>
<%= f.button title: t('common.search'), class: 'btn btn-primary ms-4' do %>
<i class="fas fa-search"></i>
<% end %>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/accountants/index.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h1 class='border-bottom title'>
<%= t 'accountants.title' %>

<div id="accountants-pagination" class="float-right">
<div id="accountants-pagination" class="float-start">
<small>
<span class='pagination-entries'>
<%= page_entries_info @patients, entry_name: t('common.patient').downcase %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/clinicfinders/_search_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<h4 class="clinic-finder-expand patient-section-title">
<%= t('clinic_locator.title') %>
<small><%= t('clinic_locator.experimental_note') %></small>
<i class='fas fa-plus-circle float-right'></i>
<i class='fas fa-plus-circle float-end'></i>
</h4>
</div>

Expand Down
2 changes: 1 addition & 1 deletion app/views/dashboards/_search_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
placeholder: t('dashboard.search.input_placeholder'),
hide_label: true,
class: 'search_form_input' %>
<%= p.button class: 'btn btn-primary ml-5',
<%= p.button class: 'btn btn-primary ms-5',
title: t('common.search'),
aria: { label: t('common.search') } do %>
<i class="fas fa-search"></i>
Expand Down
2 changes: 1 addition & 1 deletion app/views/dashboards/_table_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
<% if table_type == 'call_list' && current_user.call_list_entries.count.nonzero? %>
<%= link_to t('dashboard.table_content.clear_call_list'),
clear_current_user_call_list_path,
class: "float-right text-danger",
class: "float-end text-danger",
data: { confirm: t('dashboard.table_content.clear_call_list_confirm') },
method: :patch,
remote: true %>
Expand Down
26 changes: 13 additions & 13 deletions app/views/layouts/_navigation_links.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@

<% if current_user.admin? || current_user.data_volunteer? %>
<div class="dropdown">
<button href="#" data-toggle="dropdown" class="btn dropdown-toggle navbar-text" id="admin-dropdown" aria-haspopup="true" aria-expanded="false">
<button class="btn dropdown-toggle navbar-text" type="button" id="admin-dropdown" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<%= t('navigation.admin_tools.label') %>
</button>

<div class="dropdown-menu" aria-labelledby="admin-dropdown">
<ul class="dropdown-menu" aria-labelledby="admin-dropdown">
<% if current_user.admin? %>
<%= link_to t('navigation.admin_tools.user_management'), users_path, class: 'dropdown-item' %>
<%= link_to t('navigation.admin_tools.clinic_management'), clinics_path, class: 'dropdown-item' %>
<%= link_to t('navigation.admin_tools.config_management'), configs_path, class: 'dropdown-item' %>
<li><%= link_to t('navigation.admin_tools.user_management'), users_path, class: 'dropdown-item' %></li>
<li><%= link_to t('navigation.admin_tools.clinic_management'), clinics_path, class: 'dropdown-item' %></li>
<li><%= link_to t('navigation.admin_tools.config_management'), configs_path, class: 'dropdown-item' %></li>
<% end %>
<%= link_to t('navigation.admin_tools.accounting'), accountants_path, class: 'dropdown-item' %>
<%= link_to t('navigation.admin_tools.export'), patients_path(format: :csv), class: 'dropdown-item' %>
</div>
<li><%= link_to t('navigation.admin_tools.accounting'), accountants_path, class: 'dropdown-item' %></li>
<li><%= link_to t('navigation.admin_tools.export'), patients_path(format: :csv), class: 'dropdown-item' %></li>
</ul>
</div>
<% end %>

<div class="dropdown">
<button href="#" data-toggle="dropdown" class="btn dropdown-toggle navbar-text" id="user-dropdown" aria-haspopup="true" aria-expanded="false">
<button class="btn dropdown-toggle navbar-text" type="button" data-toggle="dropdown" id="user-dropdown" aria-haspopup="true" aria-expanded="false">
<%= current_user.name %>
</button>

<div class="dropdown-menu" aria-labelledby="admin-dropdown">
<%= link_to t('navigation.user_tools.profile'), edit_user_registration_path, class: 'dropdown-item' %>
<%= link_to t('navigation.user_tools.sign_out'), destroy_user_session_path, method: 'delete', class: 'dropdown-item' %>
</div>
<ul class="dropdown-menu" aria-labelledby="user-dropdown">
<li><%= link_to t('navigation.user_tools.profile'), edit_user_registration_path, class: 'dropdown-item' %></li>
<li><%= link_to t('navigation.user_tools.sign_out'), destroy_user_session_path, method: 'delete', class: 'dropdown-item' %></li>
</ul>
</div>
2 changes: 1 addition & 1 deletion app/views/patients/_abortion_information.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
autocomplete: 'off',
prepend: '$' %>

<div class="info-form-left form-group outstanding-balance-ctn d-none">
<div class="info-form-left outstanding-balance-ctn d-none">
<label class="col-form-label"><%= t('patient.abortion_information.cost_section.outstanding_balance') %></label>
<div id="outstanding-balance"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/patients/_call_log.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div id="call_log_content">
<h2 class="mt-5">
<%= t('patient.call_log.title') %>
<small class="float-right">
<small class="float-end">
<%= link_to t('patient.call_log.record_new_call'),
new_patient_call_path(@patient),
class: "call_button call-#{@patient.primary_phone_display}",
Expand Down
2 changes: 1 addition & 1 deletion app/views/patients/_notes.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<% end %>

<%= bootstrap_form_with model: patient,
html: { id: 'shared-flag-form', class: 'text-right text-danger edit_patient' },
html: { id: 'shared-flag-form', class: 'text-end text-danger edit_patient' },
local: false do |f| %>
<div class="col">
<%= f.form_group :shared_flag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/patients/_patient_information.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
autocomplete: 'off' %>

<fieldset>
<legend class="font-weight-bold" id="special_circumstances_label">
<legend class="fw-bold" id="special_circumstances_label">
<%= t 'patient.information.special_circumstances.title' %>
</legend>

Expand Down
4 changes: 2 additions & 2 deletions app/views/patients/_pledge.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@

<div class="modal-footer">
<div class="col">
<button type="button" class="btn btn-outline-secondary js-btn-step float-left" style="color:red;" data-dismiss="modal"><%= t('common.no') %></button>
<button type="button" class="btn btn-outline-secondary js-btn-step float-start" style="color:red;" data-dismiss="modal"><%= t('common.no') %></button>
</div>

<div class="col">
Expand All @@ -91,7 +91,7 @@
method: 'patch',
class: 'edit_patient' do |f| %>
<%= f.hidden_field :pledge_sent, value: false %>
<%= f.submit t('common.yes'), class: "btn btn-success js-btn-step float-right", id: 'cancel-pledge-submit'%>
<%= f.submit t('common.yes'), class: "btn btn-success js-btn-step float-end", id: 'cancel-pledge-submit'%>
<% end %>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/patients/data_entry.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<%= f.check_box :resolved_without_fund, label: t('patient.status.key.resolved', fund: current_tenant.name) %>

<fieldset class="mt-5">
<legend class="font-weight-bold" id="special_circumstances_label">
<legend class="fw-bold" id="special_circumstances_label">
<%= t 'patient.information.special_circumstances.title' %>
</legend>

Expand Down
4 changes: 2 additions & 2 deletions app/views/users/_search_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<%= bootstrap_form_with url: users_search_path,
local: false,
layout: :inline,
html: { class: 'float-right' } do |p| %>
html: { class: 'float-end' } do |p| %>
<%= p.text_field :search,
placeholder: t('user.search.text_field'),
skip_label: true,
id: 'search_field',
class: 'search_form_input' %>
<%= p.submit t('user.search.button'),
id: 'search_button',
class: 'btn btn-primary ml-2' %>
class: 'btn btn-primary ms-2' %>
<% end %>
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"dependencies": {
"@fortawesome/fontawesome-free": "6.2.0",
"@popperjs/core": "2.11.6",
"bootstrap": "4.6.2",
"@popperjs/core": "^2.11.5",
"bootstrap": "5.0.1",
"esbuild": "0.15.10",
"jquery": "3.6.1",
"jquery-ujs": "1.2.3",
"jquery-ujs": "^1.2.3",
"popper.js": "1.16.1",
"sass": "1.55.0",
"set-value": "4.1.0",
Expand All @@ -32,9 +32,9 @@
"kind-of": "^6.0.3",
"lodash": "^4.17.12",
"node-forge": "^1.0.0",
"popperjs/core": "^2.11.5",
"serialize-javascript": "^6.0.0",
"yargs-parser": "^21.0.0",
"popper.js": "1.16.1",
"webpack": "4.46.0",
"y18n": "^5.0.0",
"is-svg": "^4.2.2"
Expand Down
39 changes: 19 additions & 20 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ __metadata:
linkType: hard

"@humanwhocodes/config-array@npm:^0.10.5":
version: 0.10.5
resolution: "@humanwhocodes/config-array@npm:0.10.5"
version: 0.10.7
resolution: "@humanwhocodes/config-array@npm:0.10.7"
dependencies:
"@humanwhocodes/object-schema": ^1.2.1
debug: ^4.1.1
minimatch: ^3.0.4
checksum: af4fa2633c57414be22ddba0a072cc611ef9a07104542fa24bde918a0153b89b6e08ca6a20ccc9079de6079e219e2406e38414d1b662db8bb59a3ba9d6eee6e3
checksum: 009d64be8d5bd098ff04e10af79e34f5633245250581fca032fac12a8667b2df8e7d169e69c05bff4d83ea3dd3c7d2d0e05ea9b94d89a7d092e26530caf6f8a3
languageName: node
linkType: hard

Expand Down Expand Up @@ -147,10 +147,10 @@ __metadata:
languageName: node
linkType: hard

"@popperjs/core@npm:2.11.6":
version: 2.11.6
resolution: "@popperjs/core@npm:2.11.6"
checksum: 47fb328cec1924559d759b48235c78574f2d71a8a6c4c03edb6de5d7074078371633b91e39bbf3f901b32aa8af9b9d8f82834856d2f5737a23475036b16817f0
"@popperjs/core@npm:^2.11.5":
version: 2.11.5
resolution: "@popperjs/core@npm:2.11.5"
checksum: fd7f9dca3fb716d7426332b6ee283f88d2724c0ab342fb678865a640bad403dfb9eeebd8204a406986162f7e2b33394f104320008b74d0e9066d7322f70ea35d
languageName: node
linkType: hard

Expand Down Expand Up @@ -914,13 +914,12 @@ __metadata:
languageName: node
linkType: hard

"bootstrap@npm:4.6.2":
version: 4.6.2
resolution: "bootstrap@npm:4.6.2"
"bootstrap@npm:5.0.1":
version: 5.0.1
resolution: "bootstrap@npm:5.0.1"
peerDependencies:
jquery: 1.9.1 - 3
popper.js: ^1.16.1
checksum: 3f4e7768ff7d618c49d4bf4f02aa54a9bfb679d4eecb0f3854fa4af1a17b9114b147009c435946432cdd1572efffc71d88ec385c55943a12fa66253cde0876b0
"@popperjs/core": ^2.9.2
checksum: 1889c64f71d935ff98632b959dc7f411c7d7b5ea59f9cc91063403c3ec5a880af3275348495f6cc5b04acf87bf6284cbc992f6b41df249d5b5e16a42b81fae2b
languageName: node
linkType: hard

Expand Down Expand Up @@ -2674,15 +2673,15 @@ __metadata:
linkType: hard

"fast-glob@npm:^3.2.9":
version: 3.2.11
resolution: "fast-glob@npm:3.2.11"
version: 3.2.12
resolution: "fast-glob@npm:3.2.12"
dependencies:
"@nodelib/fs.stat": ^2.0.2
"@nodelib/fs.walk": ^1.2.3
glob-parent: ^5.1.2
merge2: ^1.3.0
micromatch: ^4.0.4
checksum: f473105324a7780a20c06de842e15ddbb41d3cb7e71d1e4fe6e8373204f22245d54f5ab9e2061e6a1c613047345954d29b022e0e76f5c28b1df9858179a0e6d7
checksum: 0b1990f6ce831c7e28c4d505edcdaad8e27e88ab9fa65eedadb730438cfc7cde4910d6c975d6b7b8dc8a73da4773702ebcfcd6e3518e73938bb1383badfe01c2
languageName: node
linkType: hard

Expand Down Expand Up @@ -4056,7 +4055,7 @@ __metadata:
languageName: node
linkType: hard

"jquery-ujs@npm:1.2.3":
"jquery-ujs@npm:^1.2.3":
version: 1.2.3
resolution: "jquery-ujs@npm:1.2.3"
peerDependencies:
Expand Down Expand Up @@ -5827,15 +5826,15 @@ __metadata:
resolution: "root-workspace-0b6124@workspace:."
dependencies:
"@fortawesome/fontawesome-free": 6.2.0
"@popperjs/core": 2.11.6
"@popperjs/core": ^2.11.5
all-contributors-cli: 6.22.0
bootstrap: 4.6.2
bootstrap: 5.0.1
esbuild: 0.15.10
eslint: 8.24.0
eslint-config-airbnb-base: 15.0.0
eslint-plugin-import: 2.26.0
jquery: 3.6.1
jquery-ujs: 1.2.3
jquery-ujs: ^1.2.3
popper.js: 1.16.1
sass: 1.55.0
set-value: 4.1.0
Expand Down