removing feature toggles

department-of-veterans-affairs · Sep 13, 2023 · 11dd1a7 · 11dd1a7
1 parent 35c1f4d
commit 11dd1a7
Show file tree

Hide file tree

Showing 13 changed files with 18 additions and 62 deletions.
diff --git a/app/controllers/intakes_controller.rb b/app/controllers/intakes_controller.rb
@@ -143,8 +143,6 @@ def intake_ui_hash
 
   def feature_toggle_ui_hash
     {
-      useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user),
-      rampIntake: FeatureToggle.enabled?(:ramp_intake, user: current_user),
       dateOfBirthField: FeatureToggle.enabled?(:date_of_birth_field, user: current_user),
       covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user),
       filedByVaGovHlr: FeatureToggle.enabled?(:filed_by_va_gov_hlr, user: current_user),

diff --git a/app/views/appeals/edit.html.erb b/app/views/appeals/edit.html.erb
@@ -14,9 +14,7 @@
     serverIntake: appeal.ui_hash,
     claimId: url_appeal_uuid,
     featureToggles: {
-      useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user),
       correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user),
-      covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user),
       split_appeal_workflow: FeatureToggle.enabled?(:split_appeal_workflow, user: current_user),
       cc_appeal_workflow: FeatureToggle.enabled?(:cc_appeal_workflow, user: current_user),
       vhaPreDocketAppeals: false

diff --git a/app/views/higher_level_reviews/edit.html.erb b/app/views/higher_level_reviews/edit.html.erb
@@ -9,9 +9,7 @@
     serverIntake: higher_level_review.ui_hash,
     claimId: url_claim_id,
     featureToggles: {
-      useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user),
-      correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user),
-      covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user)
+      correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user)
     }
   }) %>
 <% end %>
diff --git a/app/views/supplemental_claims/edit.html.erb b/app/views/supplemental_claims/edit.html.erb
@@ -9,9 +9,7 @@
     serverIntake: supplemental_claim.ui_hash,
     claimId: url_claim_id,
     featureToggles: {
-      useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, user: current_user),
-      correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user),
-      covidTimelinessExemption: FeatureToggle.enabled?(:covid_timeliness_exemption, user: current_user)
+      correctClaimReviews: FeatureToggle.enabled?(:correct_claim_reviews, user: current_user)
     }
   }) %>
 <% end %>
diff --git a/client/app/admin/reducers/featureToggle.js b/client/app/admin/reducers/featureToggle.js
@@ -2,15 +2,9 @@ import { update } from '../../util/ReducerUtil';
 
 const updateFromServerFeatures = (state, featureToggles) => {
   return update(state, {
-    useAmaActivationDate: {
-      $set: Boolean(featureToggles.useAmaActivationDate)
-    },
     correctClaimReviews: {
       $set: Boolean(featureToggles.correctClaimReviews)
     },
-    covidTimelinessExemption: {
-      $set: Boolean(featureToggles.covidTimelinessExemption)
-    },
     filedByVaGovHlr: {
       $set: Boolean(featureToggles.filedByVaGovHlr)
     },
@@ -29,7 +23,6 @@ const updateFromServerFeatures = (state, featureToggles) => {
 export const mapDataToFeatureToggle = (data = { featureToggles: {} }) =>
   updateFromServerFeatures(
     {
-      useAmaActivationDate: false,
       correctClaimReviews: false,
       filedByVaGovHlr: false,
       updatedIntakeForms: false,

diff --git a/client/app/intake/components/AddIssueManager.jsx b/client/app/intake/components/AddIssueManager.jsx
@@ -308,14 +308,7 @@ class AddIssueManager extends React.Component {
   };
 
   requiresTimelyRules = () => {
-    const { covidTimelinessExemption } = this.props.featureToggles;
-
-    if (covidTimelinessExemption) {
-      return this.requiresUntimelyExemptionWithCovid();
-    }
-
     return this.requiresUntimelyExemption();
-
   }
 
   render() {

diff --git a/client/app/intake/components/UntimelyExemptionModal.jsx b/client/app/intake/components/UntimelyExemptionModal.jsx
@@ -47,8 +47,6 @@ export const UntimelyExemptionModal = ({
   onSkip,
   skipText = 'None of these match, see more options'
 }) => {
-  const { covidTimelinessExemption } = useSelector((state) => state.featureToggles);
-
   const [state, setState] = useState({
     untimelyExemption: '',
     untimelyExemptionNotes: '',
@@ -80,18 +78,18 @@ export const UntimelyExemptionModal = ({
     const vacolsIssueIneligible = issue.vacolsId && !issue.eligibleForSocOptIn;
     const requestIssueUntimely = !issue.timely && !(formType === 'supplemental_claim');
 
-    if (covidTimelinessExemption) {
-      if (vacolsIssueIneligible && requestIssueUntimely) {
-        errorMsg = COPY.INTAKE_REQUEST_ISSUE_AND_LEGACY_ISSUE_UNTIMELY;
-      } else if (vacolsIssueIneligible) {
-        errorMsg = COPY.INTAKE_LEGACY_ISSUE_UNTIMELY;
-      } else if (requestIssueUntimely) {
-        errorMsg = COPY.INTAKE_REQUEST_ISSUE_UNTIMELY;
-      }
-
-    } else {
-      errorMsg = COPY.INTAKE_REQUEST_ISSUE_UNTIMELY;
-    }
+    // if (covidTimelinessExemption) {
+    //   if (vacolsIssueIneligible && requestIssueUntimely) {
+    //     errorMsg = COPY.INTAKE_REQUEST_ISSUE_AND_LEGACY_ISSUE_UNTIMELY;
+    //   } else if (vacolsIssueIneligible) {
+    //     errorMsg = COPY.INTAKE_LEGACY_ISSUE_UNTIMELY;
+    //   } else if (requestIssueUntimely) {
+    //     errorMsg = COPY.INTAKE_REQUEST_ISSUE_UNTIMELY;
+    //   }
+
+    // } else {
+    //   errorMsg = COPY.INTAKE_REQUEST_ISSUE_UNTIMELY;
+    // }
 
     return errorMsg;
   };
@@ -127,15 +125,6 @@ export const UntimelyExemptionModal = ({
 
         {state.untimelyExemption === 'true' && (
           <>
-            {covidTimelinessExemption && (
-              <Checkbox
-                name="untimelyExemptionCovid"
-                label="This request is related to COVID-19"
-                onChange={(val) => setState({ ...state, untimelyExemptionCovid: val })}
-                value={state.untimelyExemptionCovid}
-              />
-            )}
-
             <TextField
               name="Notes"
               optional

diff --git a/client/app/intake/pages/addIssues.jsx b/client/app/intake/pages/addIssues.jsx
@@ -212,7 +212,7 @@ class AddIssuesPage extends React.Component {
     } = this.props;
     const intakeData = intakeForms[formType];
     const appealInfo = intakeForms.appeal;
-    const { useAmaActivationDate, hlrScUnrecognizedClaimants } = featureToggles;
+    const { hlrScUnrecognizedClaimants } = featureToggles;
     const hasClearedEp = intakeData && (intakeData.hasClearedRatingEp || intakeData.hasClearedNonratingEp);
 
     if (this.willRedirect(intakeData, hasClearedEp)) {
@@ -238,7 +238,7 @@ class AddIssuesPage extends React.Component {
         (issue) => VBMS_BENEFIT_TYPES.includes(issue.benefitType) || issue.ratingIssueReferenceId
       );
 
-    const issues = formatAddedIssues(intakeData.addedIssues, useAmaActivationDate);
+    const issues = formatAddedIssues(intakeData.addedIssues);
     const issuesPendingWithdrawal = issues.filter((issue) => issue.withdrawalPending);
     const issuesBySection = formatIssuesBySection(issues);
 

diff --git a/client/app/intake/pages/formGenerator.stories.js b/client/app/intake/pages/formGenerator.stories.js
@@ -64,12 +64,10 @@ const defaultArgs = {
   schema: reviewAppealSchema,
   featureToggles: {
     correctClaimReviews: false,
-    covidTimelinessExemption: true,
     eduPreDocketAppeals: true,
     filedByVaGovHlr: true,
     updatedAppealForm: true,
     updatedIntakeForms: true,
-    useAmaActivationDate: true,
     vhaClaimReviewEstablishment: true,
   },
 };

diff --git a/client/app/intake/pages/review.jsx b/client/app/intake/pages/review.jsx
@@ -79,7 +79,7 @@ const Review = (props) => {
   const formProps = useForm(
     {
       resolver: yupResolver(schemaMappings(props.featureToggles)[props.formType]),
-      context: { selectedForm: props.formType, useAmaActivationDate: props.featureToggles.useAmaActivationDate },
+      context: { selectedForm: props.formType },
       mode: 'onSubmit',
       reValidateMode: 'onSubmit'
     }

diff --git a/client/app/intake/pages/selectForm.jsx b/client/app/intake/pages/selectForm.jsx
@@ -21,8 +21,7 @@ class SelectForm extends React.PureComponent {
   render() {
     const { formType, featureToggles, userCanIntakeAppeals } = this.props;
     const unreadMessages = this.props.unreadMessages;
-    const rampEnabled = featureToggles.rampIntake;
-    const enabledFormTypes = rampEnabled ? FORM_TYPES : _.pickBy(FORM_TYPES, { category: 'decisionReview' });
+    const enabledFormTypes = _.pickBy(FORM_TYPES, { category: 'decisionReview' });
     const appealPermissionError = !userCanIntakeAppeals && formType === FORM_TYPES.APPEAL.key;
 
     const radioOptions = _.map(enabledFormTypes, (form) => ({

diff --git a/client/app/intake/reducers/featureToggles.js b/client/app/intake/reducers/featureToggles.js
@@ -2,15 +2,9 @@ import { update } from '../../util/ReducerUtil';
 
 const updateFromServerFeatures = (state, featureToggles) => {
   return update(state, {
-    useAmaActivationDate: {
-      $set: Boolean(featureToggles.useAmaActivationDate)
-    },
     correctClaimReviews: {
       $set: Boolean(featureToggles.correctClaimReviews)
     },
-    covidTimelinessExemption: {
-      $set: Boolean(featureToggles.covidTimelinessExemption)
-    },
     filedByVaGovHlr: {
       $set: Boolean(featureToggles.filedByVaGovHlr)
     },
@@ -35,7 +29,6 @@ const updateFromServerFeatures = (state, featureToggles) => {
 export const mapDataToFeatureToggle = (data = { featureToggles: {} }) =>
   updateFromServerFeatures(
     {
-      useAmaActivationDate: false,
       correctClaimReviews: false,
       filedByVaGovHlr: false,
       updatedIntakeForms: false,

diff --git a/client/test/app/intake/testData.js b/client/test/app/intake/testData.js
@@ -872,7 +872,6 @@ export const sample1 = {
     },
     claimId: '7dccd357-009c-4744-b986-4c46ad7c029e',
     featureToggles: {
-      useAmaActivationDate: true,
       correctClaimReviews: true,
     },
     addIssuesModalVisible: false,