From 0b09d3cf432cac6ff46b92e564faa0f397d2d30d Mon Sep 17 00:00:00 2001 From: Ashok Dongare Date: Wed, 22 Nov 2023 10:44:28 -0500 Subject: [PATCH 1/6] MAT-6385 Bonnie Test Case Coverage Drop to 98%- CMS161 (#2192) * MAT-6385 Bonnie Test Case Coverage Drop to 98%- CMS161 pull cqm-execution v4.1.4 * remove unwanted links to external repos --- .github/PULL_REQUEST_TEMPLATE.md | 1 - config/bonnie.yml | 2 +- package-lock.json | 93 +++++++++++++++++++------------- package.json | 4 +- 4 files changed, 59 insertions(+), 41 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 5a7faeca5..e8f6fe2af 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -9,7 +9,6 @@ Pull requests into Bonnie require the following. Submitter and reviewer should : - [ ] If UI changes have been made, google WAVE plug-in has been executed to ensure no 508 issues were introduced. - [ ] Tests are included and test edge cases - [ ] Tests have been run locally and pass (remember to update Gemfile when applicable) -- [ ] Test fixtures updated and documented as necessary ( see [internal wiki](https://gitlab.mitre.org/bonnie/internal-documentation/wikis/testing#test-fixtures) ) - [ ] Code coverage has not gone down and all code touched or added is covered. * In rare situations, this may not be possible or applicable to a PR. In those situations: 1. Note why this could not be done or is not applicable here: diff --git a/config/bonnie.yml b/config/bonnie.yml index 22129b32d..5a246a9de 100644 --- a/config/bonnie.yml +++ b/config/bonnie.yml @@ -1,5 +1,5 @@ defaults: &defaults - version: 5.1.4 + version: 5.1.5 enable_logging: true enable_rationale: true check_crosswalk: false diff --git a/package-lock.json b/package-lock.json index aa1c7a62f..898925ba2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,16 @@ { "name": "bonnie", - "version": "5.1.4", + "version": "5.1.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bonnie", - "version": "5.1.4", + "version": "5.1.5", "license": "Apache-2.0", "dependencies": { "browserify": "^17.0.0", - "cqm-execution": "4.1.3", + "cqm-execution": "4.1.4", "rxjs": "^7.1.0" } }, @@ -69,9 +69,12 @@ } }, "node_modules/@types/node": { - "version": "20.3.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.3.tgz", - "integrity": "sha512-wheIYdr4NYML61AjC8MKj/2jrR/kDQri/CIpVoZwldwhnIrD/j9jIU5bJ8yBKuB2VhpFV7Ab6G2XkBjv9r9Zzw==" + "version": "20.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.3.tgz", + "integrity": "sha512-nk5wXLAXGBKfrhLB0cyHGbSqopS+nz0BUgZkUQqSHSSgdee0kssp1IAqlQOu333bW+gMNs2QREx7iynm19Abxw==", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/acorn": { "version": "7.4.1", @@ -491,22 +494,22 @@ } }, "node_modules/cqm-execution": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/cqm-execution/-/cqm-execution-4.1.3.tgz", - "integrity": "sha512-umczLTop69ZPrvEkY13AhaGoCru2GY6NbdVsKrWaKnJTrqz3/8MfhqDM6MklP/qsdOUoA8a8LW9r8NywbItF6g==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/cqm-execution/-/cqm-execution-4.1.4.tgz", + "integrity": "sha512-lEPjm1osHIIFfeMKFr07rmdbBKOIV6gbHqPxBY19OoZGVodsLxvj90gz295gD64HV1tcWnsD6Ngj5+eth4tQzA==", "dependencies": { - "cqm-models": "4.1.2", + "cqm-models": "4.1.3", "lodash": "^4.17.19", "moment": "^2.29.4" } }, "node_modules/cqm-models": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/cqm-models/-/cqm-models-4.1.2.tgz", - "integrity": "sha512-CIWgQUY9jo+IlIqQ+SjsjTeLOgIghqae4BFhce5AfIReNUd2p/wDkL0GfBBPGfuaKeAFRVgkiv+6UBjYVoafNQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/cqm-models/-/cqm-models-4.1.3.tgz", + "integrity": "sha512-OMAkvU09r2z4N8UklYdw84HYEWa1nIg+cjGn+tyA6D/BFFbSb/f51sCP62yFH0oLPFfqUN3bmuuZ4bymTwTkZg==", "dependencies": { "cql-execution": "2.4.1", - "mongoose": "^5.13.15" + "mongoose": "^5.13.20" } }, "node_modules/create-ecdh": { @@ -715,9 +718,12 @@ "integrity": "sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==" }, "node_modules/emitter-component": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.1.tgz", - "integrity": "sha512-G+mpdiAySMuB7kesVRLuyvYRqDmshB7ReKEVuyBPkzQlmiDiLrt7hHHIy4Aff552bgknVN7B2/d3lzhGO5dvpQ==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.2.tgz", + "integrity": "sha512-QdXO3nXOzZB4pAjM0n6ZE+R9/+kPpECA/XSELIcc54NeYVnBqIk+4DFiBgK+8QbV3mdvTG6nedl7dTYgO+5wDw==", + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } }, "node_modules/es-abstract": { "version": "1.18.0-next.3", @@ -1334,9 +1340,9 @@ } }, "node_modules/mongoose": { - "version": "5.13.19", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.19.tgz", - "integrity": "sha512-t65+DaVfjlSfCPaPsev4YsbB2jHg4vylvkuQOBaCXkXIenXLDhE5ZNEXbChGoPUSFRUp7ihze6YenQwK3nIhPA==", + "version": "5.13.21", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.21.tgz", + "integrity": "sha512-EvSrXrCBogenxY131qKasFcT1Pj+9Pg5AXj17vQ8S1mOEArK3CpOx965u1wTIrdnQ7DjFC+SRwPxNcqUjMAVyQ==", "dependencies": { "@types/bson": "1.x || 4.0.x", "@types/mongodb": "^3.5.27", @@ -1953,6 +1959,11 @@ "undeclared-identifiers": "bin.js" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, "node_modules/url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", @@ -2077,9 +2088,12 @@ } }, "@types/node": { - "version": "20.3.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.3.3.tgz", - "integrity": "sha512-wheIYdr4NYML61AjC8MKj/2jrR/kDQri/CIpVoZwldwhnIrD/j9jIU5bJ8yBKuB2VhpFV7Ab6G2XkBjv9r9Zzw==" + "version": "20.9.3", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.9.3.tgz", + "integrity": "sha512-nk5wXLAXGBKfrhLB0cyHGbSqopS+nz0BUgZkUQqSHSSgdee0kssp1IAqlQOu333bW+gMNs2QREx7iynm19Abxw==", + "requires": { + "undici-types": "~5.26.4" + } }, "acorn": { "version": "7.4.1", @@ -2468,22 +2482,22 @@ } }, "cqm-execution": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/cqm-execution/-/cqm-execution-4.1.3.tgz", - "integrity": "sha512-umczLTop69ZPrvEkY13AhaGoCru2GY6NbdVsKrWaKnJTrqz3/8MfhqDM6MklP/qsdOUoA8a8LW9r8NywbItF6g==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/cqm-execution/-/cqm-execution-4.1.4.tgz", + "integrity": "sha512-lEPjm1osHIIFfeMKFr07rmdbBKOIV6gbHqPxBY19OoZGVodsLxvj90gz295gD64HV1tcWnsD6Ngj5+eth4tQzA==", "requires": { - "cqm-models": "4.1.2", + "cqm-models": "4.1.3", "lodash": "^4.17.19", "moment": "^2.29.4" } }, "cqm-models": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/cqm-models/-/cqm-models-4.1.2.tgz", - "integrity": "sha512-CIWgQUY9jo+IlIqQ+SjsjTeLOgIghqae4BFhce5AfIReNUd2p/wDkL0GfBBPGfuaKeAFRVgkiv+6UBjYVoafNQ==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/cqm-models/-/cqm-models-4.1.3.tgz", + "integrity": "sha512-OMAkvU09r2z4N8UklYdw84HYEWa1nIg+cjGn+tyA6D/BFFbSb/f51sCP62yFH0oLPFfqUN3bmuuZ4bymTwTkZg==", "requires": { "cql-execution": "2.4.1", - "mongoose": "^5.13.15" + "mongoose": "^5.13.20" } }, "create-ecdh": { @@ -2678,9 +2692,9 @@ } }, "emitter-component": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.1.tgz", - "integrity": "sha512-G+mpdiAySMuB7kesVRLuyvYRqDmshB7ReKEVuyBPkzQlmiDiLrt7hHHIy4Aff552bgknVN7B2/d3lzhGO5dvpQ==" + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/emitter-component/-/emitter-component-1.1.2.tgz", + "integrity": "sha512-QdXO3nXOzZB4pAjM0n6ZE+R9/+kPpECA/XSELIcc54NeYVnBqIk+4DFiBgK+8QbV3mdvTG6nedl7dTYgO+5wDw==" }, "es-abstract": { "version": "1.18.0-next.3", @@ -3179,9 +3193,9 @@ } }, "mongoose": { - "version": "5.13.19", - "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.19.tgz", - "integrity": "sha512-t65+DaVfjlSfCPaPsev4YsbB2jHg4vylvkuQOBaCXkXIenXLDhE5ZNEXbChGoPUSFRUp7ihze6YenQwK3nIhPA==", + "version": "5.13.21", + "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.13.21.tgz", + "integrity": "sha512-EvSrXrCBogenxY131qKasFcT1Pj+9Pg5AXj17vQ8S1mOEArK3CpOx965u1wTIrdnQ7DjFC+SRwPxNcqUjMAVyQ==", "requires": { "@types/bson": "1.x || 4.0.x", "@types/mongodb": "^3.5.27", @@ -3736,6 +3750,11 @@ "xtend": "^4.0.1" } }, + "undici-types": { + "version": "5.26.5", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==" + }, "url": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", diff --git a/package.json b/package.json index 1d3524c04..a0ebd1d63 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bonnie", - "version": "5.1.4", + "version": "5.1.5", "description": "A tool for testing electronic clinical quality measures", "main": "index.js", "repository": "git@github.com:MeasureAuthoringTool/bonnie.git", @@ -108,7 +108,7 @@ "scripts": {}, "dependencies": { "browserify": "^17.0.0", - "cqm-execution": "4.1.3", + "cqm-execution": "4.1.4", "rxjs": "^7.1.0" } } From 8536197045fefa3f67eb4b3d059fd40185404344 Mon Sep 17 00:00:00 2001 From: Brendan Donohue <30727645+sb-bdonohue@users.noreply.github.com> Date: Wed, 22 Nov 2023 11:21:39 -0500 Subject: [PATCH 2/6] pinning version of passenger (#2194) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4013a65f7..e9abff7dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM phusion/passenger-full +FROM phusion/passenger-full:2.5.1 ARG PASSENGER_APP_ENV=production From bc30b17ae4a7baa21515038e27606f4850414506 Mon Sep 17 00:00:00 2001 From: sb-bdonohue Date: Mon, 4 Mar 2024 10:00:02 -0500 Subject: [PATCH 3/6] bonnie docker compose --- .gitignore | 1 + docker-compose.yml | 29 +++++++++++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 docker-compose.yml diff --git a/.gitignore b/.gitignore index ab1cbe8c5..7522bc4a3 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ /coverage-frontend .DS_Store /node_modules +/bonnie-data # Ignore IDE configuration files. .idea diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..0cd61490c --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,29 @@ +version: "3" +services: + bonnie: + image: bonnie-qdm +# build: +# context: . + ports: + - "3000:80" + depends_on: + - "bonnie-mongo" + environment: + - SAML_IDP_METADATA=${SAML_IDP_METADATA} + - SAML_SP_ENTITY_ID=${SAML_SP_ENTITY_ID} + - SAML_ASSERTION_CONSUMER_SERVICE_URL=${SAML_ASSERTION_CONSUMER_SERVICE_URL} + - SAML_SP_CERT=${SAML_SP_CERT} + - SAML_SP_KEY=${SAML_SP_KEY} + - BONNIE_PATIENT_CONV_URL=${BONNIE_PATIENT_CONV_URL} + - MONGODB_URI=${MONGODB_URI} + - SECRET_KEY_BASE=${SECRET_KEY_BASE} + - PASSENGER_APP_ENV=${PASSENGER_APP_ENV} + + bonnie-mongo: + image: mongodb/mongodb-community-server:4.4.25-ubuntu2004 + restart: always + container_name: 'bonnie-mongo' + ports: + - "27017:27017" + volumes: + - ./bonnie-data/data:/data/db From d90f961a756c0b4e29bc1a5d02aeb23573a54679 Mon Sep 17 00:00:00 2001 From: Joseph Kotanchik Date: Thu, 4 Apr 2024 11:46:29 -0400 Subject: [PATCH 4/6] MAT-6896: Add decommission notice banner to login page. --- app/assets/stylesheets/landing.less | 14 ++++++++++++++ app/views/home/show.html.erb | 11 +++++++++++ 2 files changed, 25 insertions(+) diff --git a/app/assets/stylesheets/landing.less b/app/assets/stylesheets/landing.less index bd2843b5b..7a909dc5e 100644 --- a/app/assets/stylesheets/landing.less +++ b/app/assets/stylesheets/landing.less @@ -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; } diff --git a/app/views/home/show.html.erb b/app/views/home/show.html.erb index 14694eb2a..e8288b6b4 100644 --- a/app/views/home/show.html.erb +++ b/app/views/home/show.html.erb @@ -11,6 +11,17 @@ <%= render 'layouts/framebreaker' %> +
From 626d700ad464fe8bdc26b41e4d4c5bd8c481e959 Mon Sep 17 00:00:00 2001 From: Brendan Donohue <30727645+sb-bdonohue@users.noreply.github.com> Date: Mon, 8 Apr 2024 14:33:20 -0400 Subject: [PATCH 5/6] modify dockerfile to fix build issues (#2208) --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e9abff7dd..9f9ea1c7e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ @@ -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 \ From f99f87b47e82a6b84f29567b7696567ce10b68fa Mon Sep 17 00:00:00 2001 From: Joseph Kotanchik Date: Tue, 9 Apr 2024 15:10:28 -0400 Subject: [PATCH 6/6] Bump version to 5.1.6 --- config/bonnie.yml | 2 +- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/bonnie.yml b/config/bonnie.yml index 5a246a9de..6b6a59bc7 100644 --- a/config/bonnie.yml +++ b/config/bonnie.yml @@ -1,5 +1,5 @@ defaults: &defaults - version: 5.1.5 + version: 5.1.6 enable_logging: true enable_rationale: true check_crosswalk: false diff --git a/package-lock.json b/package-lock.json index 898925ba2..80b779e16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "bonnie", - "version": "5.1.5", + "version": "5.1.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "bonnie", - "version": "5.1.5", + "version": "5.1.6", "license": "Apache-2.0", "dependencies": { "browserify": "^17.0.0", diff --git a/package.json b/package.json index a0ebd1d63..4641d1b92 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bonnie", - "version": "5.1.5", + "version": "5.1.6", "description": "A tool for testing electronic clinical quality measures", "main": "index.js", "repository": "git@github.com:MeasureAuthoringTool/bonnie.git",