diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java b/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java index ec2c2e18c6..60af04c543 100644 --- a/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java +++ b/backend/src/main/java/gov/cdc/usds/simplereport/api/model/filerow/TestResultRow.java @@ -462,7 +462,7 @@ private boolean validDiseaseTestPerformedLoinc(String testPerformedCode) { return false; } String disease = diseaseSpecificLoincMap.get(testPerformedCode); - return disease != null && (!RSV_NAME.equals(disease) || featureFlagsConfig.isRsvEnabled()); + return disease != null; } private boolean validModelTestPerformedCombination( diff --git a/backend/src/main/java/gov/cdc/usds/simplereport/config/FeatureFlagsConfig.java b/backend/src/main/java/gov/cdc/usds/simplereport/config/FeatureFlagsConfig.java index 1685cc3403..ce66ee3854 100644 --- a/backend/src/main/java/gov/cdc/usds/simplereport/config/FeatureFlagsConfig.java +++ b/backend/src/main/java/gov/cdc/usds/simplereport/config/FeatureFlagsConfig.java @@ -25,7 +25,6 @@ public class FeatureFlagsConfig { private final FeatureFlagRepository _repo; private boolean hivEnabled; - private boolean rsvEnabled; private boolean singleEntryRsvEnabled; private boolean agnosticEnabled; private boolean agnosticBulkUploadEnabled; @@ -40,7 +39,6 @@ private void loadFeatureFlagsFromDB() { private void flagMapping(String flagName, Boolean flagValue) { switch (flagName) { case "hivEnabled" -> setHivEnabled(flagValue); - case "rsvEnabled" -> setRsvEnabled(flagValue); case "singleEntryRsvEnabled" -> setSingleEntryRsvEnabled(flagValue); case "agnosticEnabled" -> setAgnosticEnabled(flagValue); case "agnosticBulkUploadEnabled" -> setAgnosticBulkUploadEnabled(flagValue); diff --git a/backend/src/main/resources/application-azure-prod.yaml b/backend/src/main/resources/application-azure-prod.yaml index eff9d729b1..cc21958c1a 100644 --- a/backend/src/main/resources/application-azure-prod.yaml +++ b/backend/src/main/resources/application-azure-prod.yaml @@ -24,7 +24,6 @@ twilio: from-number: "+14045312484" features: hivEnabled: false - rsvEnabled: false singleEntryRsvEnabled: false agnosticEnabled: false testCardRefactorEnabled: false diff --git a/backend/src/main/resources/application.yaml b/backend/src/main/resources/application.yaml index 14bcbc2cad..268b97bc85 100644 --- a/backend/src/main/resources/application.yaml +++ b/backend/src/main/resources/application.yaml @@ -150,7 +150,6 @@ datahub: fhir-enabled: true features: hivEnabled: true - rsvEnabled: true singleEntryRsvEnabled: true agnosticEnabled: true testCardRefactorEnabled: true diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/api/featureflags/FeatureFlagsControllerTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/api/featureflags/FeatureFlagsControllerTest.java index 019b7cb143..79298e8c47 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/api/featureflags/FeatureFlagsControllerTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/api/featureflags/FeatureFlagsControllerTest.java @@ -14,7 +14,6 @@ class FeatureFlagsControllerTest { @BeforeEach void setup() { - _mockFeatureFlagConfig.setRsvEnabled(true); this.featureFlagsController = new FeatureFlagsController(); ReflectionTestUtils.setField( this.featureFlagsController, "featureFlags", _mockFeatureFlagConfig); diff --git a/backend/src/test/java/gov/cdc/usds/simplereport/validators/FileValidatorTest.java b/backend/src/test/java/gov/cdc/usds/simplereport/validators/FileValidatorTest.java index 2e65e2e264..db7ec42e11 100644 --- a/backend/src/test/java/gov/cdc/usds/simplereport/validators/FileValidatorTest.java +++ b/backend/src/test/java/gov/cdc/usds/simplereport/validators/FileValidatorTest.java @@ -305,7 +305,6 @@ void testResults_validFile_fluOnly() { @Test void testResults_validFile_rsvOnly() { // GIVEN - when(featureFlagsConfig.isRsvEnabled()).thenReturn(true); InputStream input = loadCsv("testResultUpload/test-results-upload-valid-rsv-only.csv"); // WHEN List errors = testResultFileValidator.validate(input); @@ -313,19 +312,6 @@ void testResults_validFile_rsvOnly() { assertThat(errors).isEmpty(); } - @Test - void testResults_validFile_rsvDisabled() { - // GIVEN - when(featureFlagsConfig.isRsvEnabled()).thenReturn(false); - InputStream input = loadCsv("testResultUpload/test-results-upload-valid-rsv-only.csv"); - // WHEN - List errors = testResultFileValidator.validate(input); - // THEN - assertThat(errors).hasSize(1); - assertThat(errors.get(0).getMessage()) - .isEqualTo("Invalid equipment_model_name and test_performed_code combination"); - } - @Test void testResultsFile_invalidHeaders() { // GIVEN diff --git a/frontend/src/app/supportAdmin/DeviceType/ManageDeviceTypeFormContainer.tsx b/frontend/src/app/supportAdmin/DeviceType/ManageDeviceTypeFormContainer.tsx index 7fb3fd05ae..daa33027b0 100644 --- a/frontend/src/app/supportAdmin/DeviceType/ManageDeviceTypeFormContainer.tsx +++ b/frontend/src/app/supportAdmin/DeviceType/ManageDeviceTypeFormContainer.tsx @@ -1,6 +1,5 @@ import { useState } from "react"; import { Navigate } from "react-router-dom"; -import { useFeature } from "flagged"; import { DeviceType, @@ -20,7 +19,6 @@ import DeviceForm from "./DeviceForm"; const ManageDeviceTypeFormContainer = () => { useDocumentTitle(editDevicePageTitle); - const rsvEnabled = useFeature("rsvEnabled"); const [submitted, setSubmitted] = useState(false); const [activeFacility] = useSelectedFacility(); @@ -81,10 +79,6 @@ const ManageDeviceTypeFormContainer = () => { }) ); - const supportedDiseaseOptions = rsvEnabled - ? supportedDiseaseData - : supportedDiseaseData.filter((d) => d.label !== "RSV"); - const devices = Array.from( deviceTypeResults.deviceTypes.map( (devicesTypes) => devicesTypes as DeviceType @@ -96,7 +90,7 @@ const ManageDeviceTypeFormContainer = () => { formTitle={editDevicePageTitle} saveDeviceType={updateDevice} swabOptions={swabOptions} - supportedDiseaseOptions={supportedDiseaseOptions} + supportedDiseaseOptions={supportedDiseaseData} deviceOptions={devices} /> );