From 52a0ebb52d6d85cc47d4353645beb6af20955a62 Mon Sep 17 00:00:00 2001 From: Ashok Date: Mon, 13 Jan 2020 16:04:21 -0500 Subject: [PATCH 01/20] update cqm-reports, cqm-models and cqm-parsers version for BONNIEMAT-608 Calculation issue in CMS145 --- Gemfile | 9 +++++---- Gemfile.lock | 46 ++++++++++++++++++++++++++++------------------ package.json | 2 +- yarn.lock | 21 +++++++++------------ 4 files changed, 43 insertions(+), 35 deletions(-) diff --git a/Gemfile b/Gemfile index 7137a7f0d..69a550402 100644 --- a/Gemfile +++ b/Gemfile @@ -13,11 +13,12 @@ gem 'less-rails' # We want non-digest versions of our assets for font-awesome gem "non-stupid-digest-assets" -gem 'cqm-models', '~> 3.0.0' -# gem 'cqm-parsers', '~> 0.2.1' -gem 'cqm-reports', '~> 3.0.0.pre.alpha.1' +gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models', :branch => 'cql-change-BONNIEMAT-608' +#gem 'cqm-parsers', '~> 0.2.1' +gem 'cqm-reports', git: 'https://github.com/projecttacoma/cqm-reports', :branch => 'BONNIEMAT-608-closedintervals' -gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'bonnie_version' +gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'BONNIEMAT-608-closedinterval' +#gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'bonnie_version' # gem 'cqm-models', :git => 'https://github.com/projecttacoma/cqm-models', :branch => 'master' # gem 'cqm-reports', :git => 'https://github.com/projecttacoma/cqm-reports', :branch => 'master' diff --git a/Gemfile.lock b/Gemfile.lock index 491185ee3..06238cf6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,15 +6,21 @@ GIT apipie-rails (0.3.6) json +GIT + remote: https://github.com/projecttacoma/cqm-models + revision: 1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b + branch: cql-change-BONNIEMAT-608 + specs: + cqm-models (3.0.0) + GIT remote: https://github.com/projecttacoma/cqm-parsers - revision: fec648a9a3350490814059f099f9afce12c2ae84 - branch: bonnie_version + revision: 67467477cfe118fe089b29eea7aa71a20e4144d8 + branch: BONNIEMAT-608-closedinterval specs: cqm-parsers (0.2.1.1) activesupport (~> 4.2.0) builder (~> 3.1) - cqm-models (~> 3.0.0) erubis (~> 2.7.0) highline (~> 1.7.0) log4r (~> 1.1.10) @@ -29,6 +35,21 @@ GIT uuid (~> 2.3.7) zip-zip (~> 0.3) +GIT + remote: https://github.com/projecttacoma/cqm-reports + revision: 105902621616294a8735a0af6f08b44262ce288e + branch: BONNIEMAT-608-closedintervals + specs: + cqm-reports (3.0.0.pre.alpha.2) + erubis (~> 2.7) + log4r (~> 1.1) + memoist (~> 0.9) + mongoid-tree (> 2.0) + mustache + nokogiri (~> 1.10) + uuid (~> 2.3) + zip-zip (~> 0.3) + GIT remote: https://github.com/randym/axlsx revision: c593a08b2a929dac7aa8dc418b55e26b4c49dc34 @@ -132,17 +153,6 @@ GEM colorize (0.8.1) commonjs (0.2.7) concurrent-ruby (1.1.5) - cqm-models (3.0.0) - cqm-reports (3.0.0.pre.alpha.1) - cqm-models (~> 3.0.0) - erubis (~> 2.7) - log4r (~> 1.1) - memoist (~> 0.9) - mongoid-tree (> 2.0) - mustache - nokogiri (~> 1.10) - uuid (~> 2.3) - zip-zip (~> 0.3) crack (0.4.3) safe_yaml (~> 1.0.0) crass (1.0.5) @@ -165,7 +175,7 @@ GEM ffi (>= 1.3.0) eventmachine (1.2.7) execjs (2.7.0) - ffi (1.11.1) + ffi (1.11.3) foreman (0.85.0) thor (~> 0.19.1) globalid (0.4.2) @@ -225,7 +235,7 @@ GEM mongoid-tree (2.0.1) mongoid (>= 4.0, < 6.0) multi_json (1.13.1) - mustache (1.1.0) + mustache (1.1.1) net-scp (2.0.0) net-ssh (>= 2.6.5, < 6.0.0) net-ssh (5.2.0) @@ -388,9 +398,9 @@ DEPENDENCIES codecov coffee-rails colorize - cqm-models (~> 3.0.0) + cqm-models! cqm-parsers! - cqm-reports (~> 3.0.0.pre.alpha.1) + cqm-reports! devise doorkeeper (~> 4.4.0) doorkeeper-mongodb (~> 4.1.0) diff --git a/package.json b/package.json index 875844a1c..951183afb 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,6 @@ "scripts": {}, "dependencies": { "browserify": "^16.2.3", - "cqm-execution": "^3.0.0" + "cqm-execution": "https://github.com/projecttacoma/cqm-execution.git#5b0ec1262d4c7c7b5e775b34f274dea74c63392d" } } diff --git a/yarn.lock b/yarn.lock index c8f52c82f..60789dd9c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -326,29 +326,26 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cql-execution@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/cql-execution/-/cql-execution-1.4.0.tgz#610d3b63d50c7cba9ec3f35f145b3def4c15caa4" - integrity sha512-4d5VTeUWjG/oXKSfI1scJKGSeZ5afhIeHqWUav+V9jyZL1KOFhLoUm9VDa1Fu1IGKQDDMyACxAuInBVdlfd5XA== +"cql-execution@https://github.com/cqframework/cql-execution.git#2f9eff20d13f20689ba0808620a6ffd7809b7a2f": + version "1.4.1" + resolved "https://github.com/cqframework/cql-execution.git#2f9eff20d13f20689ba0808620a6ffd7809b7a2f" dependencies: moment "^2.20.1" ucum "0.0.7" -cqm-execution@^3.0.0: +"cqm-execution@https://github.com/projecttacoma/cqm-execution.git#5b0ec1262d4c7c7b5e775b34f274dea74c63392d": version "3.0.0" - resolved "https://registry.yarnpkg.com/cqm-execution/-/cqm-execution-3.0.0.tgz#ecb113c54d6dd1f1e534e22a3d961462b9432036" - integrity sha512-p5y05ykXSqilWpMa2MRi/3VUHMmUSR/IjvdOlMnJ1Y9JLgG/nYsoEz1lezMwxH5CwXpArhQSE8Tefjy2QaPVvQ== + resolved "https://github.com/projecttacoma/cqm-execution.git#5b0ec1262d4c7c7b5e775b34f274dea74c63392d" dependencies: - cqm-models "3.0.0" + cqm-models "https://github.com/projecttacoma/cqm-models.git#1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b" lodash "^4.17.5" moment "^2.21.0" -cqm-models@3.0.0: +"cqm-models@https://github.com/projecttacoma/cqm-models.git#1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b": version "3.0.0" - resolved "https://registry.yarnpkg.com/cqm-models/-/cqm-models-3.0.0.tgz#0e2a86c1a4e08ad0a89a2dbb05875ff0e8e92929" - integrity sha512-dgzTytpVacvckDXrkuqlSBl+nJ3bJfXMXVWP1kWoCSNBCVODVt1Xth1/bBLw81Ac8pi0EI9okG+xzlAimaA6rw== + resolved "https://github.com/projecttacoma/cqm-models.git#1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b" dependencies: - cql-execution "1.4.0" + cql-execution "https://github.com/cqframework/cql-execution.git#2f9eff20d13f20689ba0808620a6ffd7809b7a2f" mongoose "^5.4.14" create-ecdh@^4.0.0: From ab99e9e17c827fd4a4d1c19da8f585efa51c69f1 Mon Sep 17 00:00:00 2001 From: Ashok Date: Wed, 15 Jan 2020 14:53:39 -0500 Subject: [PATCH 02/20] update cqm-reports, cqm-models and cqm-parsers version for BONNIEMAT-608 Calculation issue in CMS145 --- Gemfile.lock | 4 ++-- package.json | 2 +- yarn.lock | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 06238cf6c..671501e43 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,14 +8,14 @@ GIT GIT remote: https://github.com/projecttacoma/cqm-models - revision: 1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b + revision: 95bd8d238a8b12f1414dfb5fd0b16880d4f2783f branch: cql-change-BONNIEMAT-608 specs: cqm-models (3.0.0) GIT remote: https://github.com/projecttacoma/cqm-parsers - revision: 67467477cfe118fe089b29eea7aa71a20e4144d8 + revision: ed54bc514a9aa88807429912322096a791cf18b1 branch: BONNIEMAT-608-closedinterval specs: cqm-parsers (0.2.1.1) diff --git a/package.json b/package.json index 951183afb..b85266356 100644 --- a/package.json +++ b/package.json @@ -108,6 +108,6 @@ "scripts": {}, "dependencies": { "browserify": "^16.2.3", - "cqm-execution": "https://github.com/projecttacoma/cqm-execution.git#5b0ec1262d4c7c7b5e775b34f274dea74c63392d" + "cqm-execution": "https://github.com/projecttacoma/cqm-execution.git#c54bf619a33265f3a7c6d3741f6a2317879a7403" } } diff --git a/yarn.lock b/yarn.lock index 60789dd9c..8bc9db1e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -333,17 +333,17 @@ core-util-is@~1.0.0: moment "^2.20.1" ucum "0.0.7" -"cqm-execution@https://github.com/projecttacoma/cqm-execution.git#5b0ec1262d4c7c7b5e775b34f274dea74c63392d": +"cqm-execution@https://github.com/projecttacoma/cqm-execution.git#c54bf619a33265f3a7c6d3741f6a2317879a7403": version "3.0.0" - resolved "https://github.com/projecttacoma/cqm-execution.git#5b0ec1262d4c7c7b5e775b34f274dea74c63392d" + resolved "https://github.com/projecttacoma/cqm-execution.git#c54bf619a33265f3a7c6d3741f6a2317879a7403" dependencies: - cqm-models "https://github.com/projecttacoma/cqm-models.git#1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b" + cqm-models "https://github.com/projecttacoma/cqm-models.git#95bd8d238a8b12f1414dfb5fd0b16880d4f2783f" lodash "^4.17.5" moment "^2.21.0" -"cqm-models@https://github.com/projecttacoma/cqm-models.git#1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b": +"cqm-models@https://github.com/projecttacoma/cqm-models.git#95bd8d238a8b12f1414dfb5fd0b16880d4f2783f": version "3.0.0" - resolved "https://github.com/projecttacoma/cqm-models.git#1c6eddf8f0c51fde342d88ea8e7cafec6885ea2b" + resolved "https://github.com/projecttacoma/cqm-models.git#95bd8d238a8b12f1414dfb5fd0b16880d4f2783f" dependencies: cql-execution "https://github.com/cqframework/cql-execution.git#2f9eff20d13f20689ba0808620a6ffd7809b7a2f" mongoose "^5.4.14" From 78cc9345c4d8c7af64875123034a018ed98b8533 Mon Sep 17 00:00:00 2001 From: Ashok Dongare Date: Wed, 15 Jan 2020 15:34:34 -0500 Subject: [PATCH 03/20] linting issues --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 69a550402..9a0b58943 100644 --- a/Gemfile +++ b/Gemfile @@ -14,11 +14,11 @@ gem 'less-rails' gem "non-stupid-digest-assets" gem 'cqm-models', git: 'https://github.com/projecttacoma/cqm-models', :branch => 'cql-change-BONNIEMAT-608' -#gem 'cqm-parsers', '~> 0.2.1' +# gem 'cqm-parsers', '~> 0.2.1' gem 'cqm-reports', git: 'https://github.com/projecttacoma/cqm-reports', :branch => 'BONNIEMAT-608-closedintervals' gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'BONNIEMAT-608-closedinterval' -#gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'bonnie_version' +# gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'bonnie_version' # gem 'cqm-models', :git => 'https://github.com/projecttacoma/cqm-models', :branch => 'master' # gem 'cqm-reports', :git => 'https://github.com/projecttacoma/cqm-reports', :branch => 'master' From f0e56588bd5896f1fae2e1fef47f0afa5ce921e6 Mon Sep 17 00:00:00 2001 From: Ashok Dongare Date: Thu, 13 Feb 2020 10:49:21 -0500 Subject: [PATCH 04/20] BONNIEMAT-614 issue with multiple observation parser change --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 7137a7f0d..74c23ab35 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'cqm-models', '~> 3.0.0' # gem 'cqm-parsers', '~> 0.2.1' gem 'cqm-reports', '~> 3.0.0.pre.alpha.1' -gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'bonnie_version' +gem 'cqm-parsers', :git => 'https://github.com/projecttacoma/cqm-parsers', :branch => 'BONNIEMAT-614' # gem 'cqm-models', :git => 'https://github.com/projecttacoma/cqm-models', :branch => 'master' # gem 'cqm-reports', :git => 'https://github.com/projecttacoma/cqm-reports', :branch => 'master' diff --git a/Gemfile.lock b/Gemfile.lock index 491185ee3..6df9138d0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,8 +8,8 @@ GIT GIT remote: https://github.com/projecttacoma/cqm-parsers - revision: fec648a9a3350490814059f099f9afce12c2ae84 - branch: bonnie_version + revision: 15868bf4b2f5f7db8968562e52253903274f5ffc + branch: BONNIEMAT-614 specs: cqm-parsers (0.2.1.1) activesupport (~> 4.2.0) @@ -165,7 +165,7 @@ GEM ffi (>= 1.3.0) eventmachine (1.2.7) execjs (2.7.0) - ffi (1.11.1) + ffi (1.12.2) foreman (0.85.0) thor (~> 0.19.1) globalid (0.4.2) From bc70be5e5e1e9b549fdfdc9a3eacb967875a8376 Mon Sep 17 00:00:00 2001 From: Ashok Dongare Date: Thu, 13 Feb 2020 12:40:53 -0500 Subject: [PATCH 05/20] BONNIEMAT-614 testa --- .../input_views/code_selection_view_spec.js.coffee | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee b/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee index 5992f2708..d0aa36e77 100644 --- a/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee +++ b/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee @@ -41,7 +41,7 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> $('button[data-call-method="removeCode"]')[0].click() # the default code should still exist, along with 1 code for the other sdc - expect($('button[data-call-method="removeCode"]').length).toEqual(2) + expect($('button[data-call-method="removeCode"]').length).toEqual(3) it "displays correct text for a code on the UI", -> expect($('.existing-values:first').text().includes('SNOMED-CT')).toBe true @@ -53,25 +53,25 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> expect($('.existing-values:first').text().includes('3109008')).toBe true it "duplicate codes not added to the patient", -> - expect($('.existing-values:first')[0].childElementCount).toEqual(2) + expect($('.existing-values:first')[0].childElementCount).toEqual(3) @addCode('SNOMED-CT', '3109008') @addCode('SNOMED-CT', '19694002') # Code that already exists on the patient @addCode('ICD-10-CM', 'F34.1') # Code that already exists on the patient - expect($('.existing-values:first')[0].childElementCount).toEqual(3) + expect($('.existing-values:first')[0].childElementCount).toEqual(4) expect(@diagnosis_element.dataElementCodes.length).toEqual(3) it "can add and remove custom codes properly", -> @addCustomCode('SPAM', 'EGGS') @addCustomCode('BOSTON', 'POPS') @addCustomCode('FOO', 'BAR') - expect($('.existing-values:first')[0].childElementCount).toEqual(5) + expect($('.existing-values:first')[0].childElementCount).toEqual(6) $('button[data-call-method="removeCode"]')[2].click() $('button[data-call-method="removeCode"]')[3].click() expect($('.existing-values:first')[0].childElementCount).toEqual(3) it "adds default code back after removing original default codes and custom code", -> @addCustomCode('SPAM', 'EGGS') - expect($('.existing-values:first')[0].childElementCount).toEqual(3) + expect($('.existing-values:first')[0].childElementCount).toEqual(4) $('button[data-call-method="removeCode"]')[0].click() $('button[data-call-method="removeCode"]')[0].click() expect($('.existing-values:first')[0].childElementCount).toEqual(1) @@ -89,7 +89,7 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> @addCustomCode('SPAM', 'EGGS') @addCustomCode('BOSTON', 'POPS') @addCustomCode('FOO', 'BAR') - expect($('.existing-values:first')[0].childElementCount).toEqual(6) + expect($('.existing-values:first')[0].childElementCount).toEqual(7) expect(@diagnosis_element.dataElementCodes.length).toEqual(6) $('button[data-call-method="removeCode"]')[0].click() $('button[data-call-method="removeCode"]')[0].click() @@ -106,7 +106,7 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> @addCustomCode('SPAM', 'EGGS') @addCustomCode('BOSTON', 'POPS') @addCustomCode('FOO', 'BAR') - expect($('.existing-values:first')[0].childElementCount).toEqual(6) + expect($('.existing-values:first')[0].childElementCount).toEqual(7) $('button[data-call-method="removeCode"]')[5].click() $('button[data-call-method="removeCode"]')[4].click() $('button[data-call-method="removeCode"]')[3].click() From af85c8ba75a4f3e4443a0b45831387de0a26b494 Mon Sep 17 00:00:00 2001 From: Ashok Dongare Date: Thu, 13 Feb 2020 13:50:47 -0500 Subject: [PATCH 06/20] BONNIEMAT-614 test revert --- .../code_selection_view_spec.js.coffee | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee b/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee index d0aa36e77..0380dd316 100644 --- a/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee +++ b/spec/javascripts/patient_builder_tests/input_views/code_selection_view_spec.js.coffee @@ -36,12 +36,12 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> expect(editCodeSelectionView.codeSystems.includes("ICD-10-CM")).toBe true it "selects default code after deletion", -> - # delete the 2 codes on the first sdc +# delete the 2 codes on the first sdc $('button[data-call-method="removeCode"]')[0].click() $('button[data-call-method="removeCode"]')[0].click() # the default code should still exist, along with 1 code for the other sdc - expect($('button[data-call-method="removeCode"]').length).toEqual(3) + expect($('button[data-call-method="removeCode"]').length).toEqual(2) it "displays correct text for a code on the UI", -> expect($('.existing-values:first').text().includes('SNOMED-CT')).toBe true @@ -53,25 +53,25 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> expect($('.existing-values:first').text().includes('3109008')).toBe true it "duplicate codes not added to the patient", -> - expect($('.existing-values:first')[0].childElementCount).toEqual(3) + expect($('.existing-values:first')[0].childElementCount).toEqual(2) @addCode('SNOMED-CT', '3109008') @addCode('SNOMED-CT', '19694002') # Code that already exists on the patient @addCode('ICD-10-CM', 'F34.1') # Code that already exists on the patient - expect($('.existing-values:first')[0].childElementCount).toEqual(4) + expect($('.existing-values:first')[0].childElementCount).toEqual(3) expect(@diagnosis_element.dataElementCodes.length).toEqual(3) it "can add and remove custom codes properly", -> @addCustomCode('SPAM', 'EGGS') @addCustomCode('BOSTON', 'POPS') @addCustomCode('FOO', 'BAR') - expect($('.existing-values:first')[0].childElementCount).toEqual(6) + expect($('.existing-values:first')[0].childElementCount).toEqual(5) $('button[data-call-method="removeCode"]')[2].click() $('button[data-call-method="removeCode"]')[3].click() expect($('.existing-values:first')[0].childElementCount).toEqual(3) it "adds default code back after removing original default codes and custom code", -> @addCustomCode('SPAM', 'EGGS') - expect($('.existing-values:first')[0].childElementCount).toEqual(4) + expect($('.existing-values:first')[0].childElementCount).toEqual(3) $('button[data-call-method="removeCode"]')[0].click() $('button[data-call-method="removeCode"]')[0].click() expect($('.existing-values:first')[0].childElementCount).toEqual(1) @@ -89,7 +89,7 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> @addCustomCode('SPAM', 'EGGS') @addCustomCode('BOSTON', 'POPS') @addCustomCode('FOO', 'BAR') - expect($('.existing-values:first')[0].childElementCount).toEqual(7) + expect($('.existing-values:first')[0].childElementCount).toEqual(6) expect(@diagnosis_element.dataElementCodes.length).toEqual(6) $('button[data-call-method="removeCode"]')[0].click() $('button[data-call-method="removeCode"]')[0].click() @@ -106,7 +106,7 @@ describe 'EditCodeDisplayView/EditCodeSelectionView', -> @addCustomCode('SPAM', 'EGGS') @addCustomCode('BOSTON', 'POPS') @addCustomCode('FOO', 'BAR') - expect($('.existing-values:first')[0].childElementCount).toEqual(7) + expect($('.existing-values:first')[0].childElementCount).toEqual(6) $('button[data-call-method="removeCode"]')[5].click() $('button[data-call-method="removeCode"]')[4].click() $('button[data-call-method="removeCode"]')[3].click() From 15b0d38994e9841b48c1bf5a631d5e0d64045e41 Mon Sep 17 00:00:00 2001 From: Matthew Gifford Date: Thu, 8 Oct 2020 08:56:34 -0700 Subject: [PATCH 07/20] Revert "Revert "[MAT-1757] Replace VSAC Username/Password UI with API Key (#1526)"" This reverts commit d1f21c46a0f9306267056f85d91da2a8d35d25b0. --- Gemfile.lock | 2 +- .../templates/import/import_measure.hbs | 10 +-- .../views/import_measure_view.js.coffee | 17 ++--- app/controllers/measures_controller.rb | 8 +-- app/helpers/measure_helper.rb | 6 +- lib/tasks/vsac.rake | 5 +- .../api_v1/measures_controller_test.rb | 34 +++++----- .../measures_controller_composite_test.rb | 18 +++--- test/functional/measures_controller_test.rb | 64 +++++++++---------- test/vcr_setup.rb | 10 ++- 10 files changed, 79 insertions(+), 95 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index b99b686d8..2a1fee834 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/projecttacoma/cqm-parsers.git - revision: 5b6d682e925e096443a0379609db995169c00382 + revision: b890b31066f6e6a657c35d610497e2ddf5e75a82 branch: bonnie_version specs: cqm-parsers (0.2.1.1) diff --git a/app/assets/javascripts/templates/import/import_measure.hbs b/app/assets/javascripts/templates/import/import_measure.hbs index 84b92e236..233a7a579 100644 --- a/app/assets/javascripts/templates/import/import_measure.hbs +++ b/app/assets/javascripts/templates/import/import_measure.hbs @@ -40,15 +40,9 @@ -