Skip to content
This repository has been archived by the owner on Jun 28, 2024. It is now read-only.

Stage Prior 4.3.2 to TEST #2213

Merged
merged 5 commits into from
Apr 9, 2024
Merged

Stage Prior 4.3.2 to TEST #2213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5d2c60
MAT-6896: Add decommission notice banner to login page.
jkotanchik-SB Apr 4, 2024
fdbf857
Merge pull request #2205 from MeasureAuthoringTool/feature/mat-6896-d…
jkotanchik-SB Apr 4, 2024
a2559f0
modify dockerfile to fix build issues (#2209)
sb-bdonohue Apr 8, 2024
865411e
Merge remote-tracking branch 'origin/prior-staging' into bonnie-prior
jkotanchik-SB Apr 9, 2024
a6d15f8
Bump prior version to 4.3.2
jkotanchik-SB Apr 9, 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: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM phusion/passenger-full
FROM phusion/passenger-full:2.5.1

ARG PASSENGER_APP_ENV=production

Expand All @@ -9,7 +9,6 @@ ADD bonnie.conf /etc/nginx/sites-enabled/bonnie.conf

COPY --chown=app:app . /home/app/bonnie

RUN bash -lc "rvm install ruby-${RUBY_VERSION} && rvm --default use ruby-${RUBY_VERSION}"

RUN rm -f /etc/service/nginx/down \
&& rm -f /etc/nginx/sites-enabled/default \
Expand All @@ -20,6 +19,9 @@ RUN rm -f /etc/service/nginx/down \
&& apt-get install shared-mime-info -y

RUN su - app -c "cd /home/app/bonnie \
&& rvm autolibs disable \
&& rvm install ruby-${RUBY_VERSION} \
&& rvm --default use ruby-${RUBY_VERSION} \
&& curl -O https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem \
&& gem install bundler -v 2.1.4 \
&& bundle install \
Expand Down
14 changes: 14 additions & 0 deletions app/assets/stylesheets/landing.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
.decommissioning-banner {
display: flex;
align-items: center;
padding: 2rem;
background-color: white;
margin-left: 13%;
margin-right: 6%;
> div {
flex-direction: column;
text-align: left;
padding-left: 30px;
}
}

.container {
padding: 1em;
}
Expand Down
11 changes: 11 additions & 0 deletions app/views/home/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,17 @@
<%= render 'layouts/framebreaker' %>
</head>
<body>
<div role="alert" class="decommissioning-banner">
<svg xmlns="http://www.w3.org/2000/svg" width="40" height="40" fill="orange" class="bi bi-exclamation-triangle" viewBox="0 0 16 16">
<path d="M7.938 2.016A.13.13 0 0 1 8.002 2a.13.13 0 0 1 .063.016.15.15 0 0 1 .054.057l6.857 11.667c.036.06.035.124.002.183a.2.2 0 0 1-.054.06.1.1 0 0 1-.066.017H1.146a.1.1 0 0 1-.066-.017.2.2 0 0 1-.054-.06.18.18 0 0 1 .002-.183L7.884 2.073a.15.15 0 0 1 .054-.057m1.044-.45a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767z"/>
<path d="M7.002 12a1 1 0 1 1 2 0 1 1 0 0 1-2 0M7.1 5.995a.905.905 0 1 1 1.8 0l-.35 3.507a.552.552 0 0 1-1.1 0z"/>
</svg>
<div>
<h4>Bonnie will no longer be accessible after June 28, 2024.</h4>
<p>Please begin to transfer and test your measure(s) in <a href="https://www.emeasuretool.cms.gov/madie-mvp">MADiE</a> and contact the <a href="https://oncprojectracking.healthit.gov/support/projects/BONNIE">Help Desk</a> if you encounter any issues.</p>
<p>See <a href="https://www.emeasuretool.cms.gov/news-alerts/mat-and-bonnie-migration-action-needed">this communication from CMS</a> for more information.</p>
</div>
</div>
<div class="landing-masthead">
<div class="container">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion config/bonnie.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
defaults: &defaults
version: 4.3.1
version: 4.3.2
enable_logging: true
enable_rationale: true
check_crosswalk: false
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bonnie",
"version": "4.3.1",
"version": "4.3.2",
"description": "A tool for testing electronic clinical quality measures",
"main": "index.js",
"repository": "[email protected]:MeasureAuthoringTool/bonnie.git",
Expand Down
Loading