Skip to content

Commit

Permalink
removing feature toggle: useAmaActivationDate
Browse files Browse the repository at this point in the history
  • Loading branch information
pamatyatake2 committed Sep 14, 2023
1 parent 663342f commit 1c6bfba
Show file tree
Hide file tree
Showing 12 changed files with 8 additions and 51 deletions.
1 change: 0 additions & 1 deletion app/controllers/intakes_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,6 @@ def intake_ui_hash

def feature_toggle_ui_hash
{
useAmaActivationDate: FeatureToggle.enabled?(:use_ama_activation_date, 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),
Expand Down
1 change: 0 additions & 1 deletion app/views/appeals/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
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),
Expand Down
1 change: 0 additions & 1 deletion app/views/higher_level_reviews/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
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)
}
Expand Down
1 change: 0 additions & 1 deletion app/views/supplemental_claims/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
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)
}
Expand Down
3 changes: 0 additions & 3 deletions client/app/admin/reducers/featureToggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import { update } from '../../util/ReducerUtil';

const updateFromServerFeatures = (state, featureToggles) => {
return update(state, {
useAmaActivationDate: {
$set: Boolean(featureToggles.useAmaActivationDate)
},
correctClaimReviews: {
$set: Boolean(featureToggles.correctClaimReviews)
},
Expand Down
4 changes: 2 additions & 2 deletions client/app/intake/pages/addIssues.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand All @@ -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);

Expand Down
1 change: 0 additions & 1 deletion client/app/intake/pages/formGenerator.stories.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ const defaultArgs = {
filedByVaGovHlr: true,
updatedAppealForm: true,
updatedIntakeForms: true,
useAmaActivationDate: true,
vhaClaimReviewEstablishment: true,
},
};
Expand Down
2 changes: 1 addition & 1 deletion client/app/intake/pages/review.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
Expand Down
4 changes: 0 additions & 4 deletions client/app/intake/reducers/featureToggles.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ import { update } from '../../util/ReducerUtil';

const updateFromServerFeatures = (state, featureToggles) => {
return update(state, {
useAmaActivationDate: {
$set: Boolean(featureToggles.useAmaActivationDate)
},
correctClaimReviews: {
$set: Boolean(featureToggles.correctClaimReviews)
},
Expand Down Expand Up @@ -35,7 +32,6 @@ const updateFromServerFeatures = (state, featureToggles) => {
export const mapDataToFeatureToggle = (data = { featureToggles: {} }) =>
updateFromServerFeatures(
{
useAmaActivationDate: false,
correctClaimReviews: false,
filedByVaGovHlr: false,
updatedIntakeForms: false,
Expand Down
4 changes: 2 additions & 2 deletions client/app/intake/util/issues.js
Original file line number Diff line number Diff line change
Expand Up @@ -348,8 +348,8 @@ export const formatIssuesBySection = (issues) => {
);
};

export const formatAddedIssues = (issues = [], useAmaActivationDate = false) => {
const amaActivationDate = new Date(useAmaActivationDate ? DATES.AMA_ACTIVATION : DATES.AMA_ACTIVATION_TEST);
export const formatAddedIssues = (issues = []) => {
const amaActivationDate = new Date(DATES.AMA_ACTIVATION_TEST);

return issues.map((issue, index) => {
if (issue.isUnidentified || issue.verifiedUnidentifiedIssue) {
Expand Down
36 changes: 3 additions & 33 deletions client/test/app/intake/pages/review.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { reviewAppealSchema } from 'app/intake/pages/appeal/review';
import DATES from '../../../../constants/DATES';
import { subDays, addDays } from 'date-fns';

const assertValidSchema = async (schema, testSchema, useAmaActivationDate, isValid) => {
const assertValidSchema = async (schema, testSchema, isValid) => {

await schema
.isValid(testSchema, { context: { useAmaActivationDate } })
Expand Down Expand Up @@ -35,48 +35,18 @@ describe('schema', () => {
validSchema['original-hearing-request-type'] = null;
await assertValidSchema(reviewAppealSchema, validSchema, true, true);
});

it('hearing type is valid', async () => {
const validSchema = validReviewAppealData;

await assertValidSchema(reviewAppealSchema, validSchema, true, true);
});

describe('homelessness-type', () => {
it(' field is valid', async () => {
await assertValidSchema(reviewAppealSchema, validReviewAppealData, true, true);
});
});

});
describe('useAmaActivationDate', () => {
// eslint-disable-next-line jest/expect-expect
it('is valid after feb 19, 2019', async () => {
await assertValidSchema(reviewAppealSchema, validReviewAppealData, true, true);
});
// eslint-disable-next-line jest/expect-expect
it('is invalid before feb 19, 2019', async () => {
const invalidSchema = validReviewAppealData;

invalidSchema['receipt-date'] = BEFORE_AMA_DATE;
await assertValidSchema(reviewAppealSchema, invalidSchema, true, false);
});
});

describe('!useAmaActivationDate', () => {
// eslint-disable-next-line jest/expect-expect
it('is valid after nov 1, 2017', async () => {
const validSchema = validReviewAppealData;

validSchema['receipt-date'] = AFTER_AMA_TEST_DATE;
await assertValidSchema(reviewAppealSchema, validReviewAppealData, false, true);
});
// eslint-disable-next-line jest/expect-expect
it('is invalid before nov 1, 2017', async () => {
const invalidSchema = validReviewAppealData;

invalidSchema['receipt-date'] = BEFORE_AMA_TEST_DATE;
await assertValidSchema(reviewAppealSchema, invalidSchema, false, false);
});
});
});
1 change: 0 additions & 1 deletion client/test/app/intake/testData.js
Original file line number Diff line number Diff line change
Expand Up @@ -872,7 +872,6 @@ export const sample1 = {
},
claimId: '7dccd357-009c-4744-b986-4c46ad7c029e',
featureToggles: {
useAmaActivationDate: true,
correctClaimReviews: true,
},
addIssuesModalVisible: false,
Expand Down

0 comments on commit 1c6bfba

Please sign in to comment.