Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename from CaseflowDistribution to CaseDistribution #20428

Merged
merged 13 commits into from
Jan 5, 2024
2 changes: 1 addition & 1 deletion app/views/case_distribution_levers/index.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% content_for :full_page_content do %>
<%= react_component("CaseflowDistribution", props: {
<%= react_component("CaseDistribution", props: {
userDisplayName: current_user.display_name,
dropdownUrls: dropdown_urls,
applicationUrls: application_urls,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useState, useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import { useSelector } from 'react-redux';
import PropTypes from 'prop-types';
import { css } from 'glamor';
import cx from 'classnames';
Expand All @@ -8,9 +8,9 @@ import NumberField from 'app/components/NumberField';
import TextField from 'app/components/TextField';
import COPY from '../../../COPY';
import ACD_LEVERS from '../../../constants/ACD_LEVERS';
import { ACTIONS } from '../reducers/Levers/leversActionTypes.js';
import { ACTIONS } from '../reducers/levers/leversActionTypes';
import leverInputValidation from './LeverInputValidation';
import { checkIfOtherChangesExist } from '../utils.js';
import { checkIfOtherChangesExist } from '../utils';

const AffinityDays = (props) => {
const { leverStore, isAdmin } = props;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React, { useEffect, useState } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import PropTypes, { object } from 'prop-types';
import { ACTIONS } from 'app/caseflowDistribution/reducers/Levers/leversActionTypes';
import { useSelector } from 'react-redux';
import PropTypes from 'prop-types';
// import { ACTIONS } from 'app/caseDistribution/reducers/levers/leversActionTypes';
import { css } from 'glamor';
import styles from 'app/styles/caseDistribution/InteractableLevers.module.scss';
import NumberField from 'app/components/NumberField';
import leverInputValidation from './LeverInputValidation';
import COPY from '../../../COPY';
import ACD_LEVERS from '../../../constants/ACD_LEVERS';
import { checkIfOtherChangesExist } from '../utils.js';
import { checkIfOtherChangesExist } from '../utils';

const BatchSize = (props) => {
const { isAdmin } = props;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
anchorJumpLinkStyling } from 'app/queue/StickyNavContentArea';
import COPY from '../../../COPY';

const CaseflowDistributionContent = ({
const CaseDistributionContent = ({
levers,
formattedHistory,
isAdmin,
Expand Down Expand Up @@ -66,7 +66,7 @@ const CaseflowDistributionContent = ({
);
};

CaseflowDistributionContent.propTypes = {
CaseDistributionContent.propTypes = {
levers: PropTypes.object.isRequired,
saveChanges: PropTypes.func.isRequired,
formattedHistory: PropTypes.array.isRequired,
Expand All @@ -75,4 +75,4 @@ CaseflowDistributionContent.propTypes = {
sectionTitles: PropTypes.array.isRequired,
};

export default CaseflowDistributionContent;
export default CaseDistributionContent;
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import React, { useState, useEffect } from 'react';
import { useSelector, useDispatch } from 'react-redux';
import PropTypes, { object } from 'prop-types';
import { useSelector } from 'react-redux';
import PropTypes from 'prop-types';
import { css } from 'glamor';
import cx from 'classnames';
import styles from 'app/styles/caseDistribution/InteractableLevers.module.scss';
import { ACTIONS } from 'app/caseflowDistribution/reducers/Levers/leversActionTypes';
// import { ACTIONS } from 'app/caseDistribution/reducers/levers/leversActionTypes';
import ToggleSwitch from 'app/components/ToggleSwitch/ToggleSwitch';
import NumberField from 'app/components/NumberField';
import leverInputValidation from './LeverInputValidation';
import COPY from '../../../COPY';
import ACD_LEVERS from '../../../constants/ACD_LEVERS';
import { checkIfOtherChangesExist } from '../utils.js';
import { checkIfOtherChangesExist } from '../utils';

const DocketTimeGoals = (props) => {
const { isAdmin, sectionTitles } = props;
Expand All @@ -28,6 +28,10 @@ const DocketTimeGoals = (props) => {
const storeTimeLevers = useSelector((state) => state.caseDistributionLevers.levers.docket_time_goal);
const storeDistributionLevers = useSelector(
(state) => state.caseDistributionLevers.levers.docket_distribution_prior);
const initialTimeLevers = useSelector((state) => state.caseDistributionLevers.initialLevers.docket_time_goal);
const initialDistributionLevers = useSelector(
(state) => state.caseDistributionLevers.initialLevers.docket_distribution_prior);

const [docketDistributionLevers, setDistributionLever] = useState(storeDistributionLevers);
const [docketTimeGoalLevers, setTimeGoalLever] = useState(storeTimeLevers);
const [errorMessagesList, setErrorMessages] = useState(errorMessages);
Expand All @@ -46,8 +50,8 @@ const DocketTimeGoals = (props) => {
const levers = docketDistributionLevers.map((lever, i) => {
if (index === i) {

// let initialLever = leverStore.getState().initial_levers.find((original) => original.item === lever.item);
let validationResponse = leverInputValidation(lever, event, errorMessagesList, lever);
let initialLever = initialDistributionLevers.find((original) => original.item === lever.item);
let validationResponse = leverInputValidation(lever, event, errorMessagesList, initialLever);

if (validationResponse.statement === ACD_LEVERS.DUPLICATE) {

Expand Down Expand Up @@ -108,6 +112,7 @@ const DocketTimeGoals = (props) => {
if (leverType === 'TimeGoal') {
const levers = docketTimeGoalLevers.map((lever, i) => {
if (index === i) {
let initialLever = initialTimeLevers.find((original) => original.item === lever.item);
let validationResponse = leverInputValidation(lever, event, errorMessagesList, initialLever);

if (validationResponse.statement === ACD_LEVERS.DUPLICATE) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes, { object } from 'prop-types';
import PropTypes from 'prop-types';
import BatchSize from './BatchSize';
import DocketTimeGoals from './DocketTimeGoals';
import AffinityDays from './AffinityDays';
Expand All @@ -12,7 +12,7 @@ const InteractableLeverWrapper = ({ levers, leverStore, isAdmin, sectionTitles }
<div>
<ExclusionTable isAdmin={isAdmin} />
<BatchSize isAdmin={isAdmin} />
<AffinityDays leverList={levers.affinityLevers} leverStore={leverStore} isAdmin={isAdmin}/>
<AffinityDays leverList={levers.affinityLevers} leverStore={leverStore} isAdmin={isAdmin} />
<DocketTimeGoals
leverList={levers.docketLeversObject}
leverStore={leverStore}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

import React from 'react';
import PropTypes from 'prop-types';
import { ACTIONS } from 'app/caseflowDistribution/reducers/Levers/leversActionTypes';
import { ACTIONS } from 'app/caseDistribution/reducers/levers/leversActionTypes';
import Button from 'app/components/Button';

const cancelLeverChanges = (leverStore) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react';
import PropTypes from 'prop-types';
import { ACTIONS } from 'app/caseflowDistribution/reducers/Levers/leversActionTypes';
import { ACTIONS } from 'app/caseDistribution/reducers/levers/leversActionTypes';
import ApiUtil from '../../util/ApiUtil';
import Modal from 'app/components/Modal';
import Button from 'app/components/Button';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import PropTypes, { object } from 'prop-types';
import PropTypes from 'prop-types';
import StaticLever from './StaticLever';
import styles from 'app/styles/caseDistribution/StaticLevers.module.scss';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ import AppFrame from '../components/AppFrame';
import AppSegment from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/AppSegment';
import { LOGO_COLORS } from '../constants/AppConstants';
import Footer from '@department-of-veterans-affairs/caseflow-frontend-toolkit/components/Footer';
import leversReducer from './reducers/Levers/leversReducer';
import leversReducer from './reducers/levers/leversReducer';
import CaseSearchLink from '../components/CaseSearchLink';
import BannerDisplay from './components/BannerDisplay';
import ACD_LEVERS from '../../constants/ACD_LEVERS';
import DISTRIBUTION from '../../constants/DISTRIBUTION';

import CaseflowDistributionApp from './pages/CaseflowDistributionApp';
import CaseDistributionApp from './pages/CaseDistributionApp';
import { createStore } from 'redux';
import rootReducer from '../caseflowDistribution/reducers/root';
import rootReducer from '../caseDistribution/reducers/root';

class CaseflowDistribution extends React.PureComponent {
class CaseDistribution extends React.PureComponent {

render() {
const preloadedState = {
Expand All @@ -30,7 +30,7 @@ class CaseflowDistribution extends React.PureComponent {

const leverStore = createStore(leversReducer, preloadedState);
const Router = this.props.router || BrowserRouter;
const appName = 'Caseflow Distribution';
const appName = 'Case Distribution';

const staticLevers = [
DISTRIBUTION.maximum_direct_review_proportion,
Expand Down Expand Up @@ -144,10 +144,10 @@ class CaseflowDistribution extends React.PureComponent {
<PageRoute
exact
path={['/acd-controls', '/case-distribution-controls']}
title="CaseflowDistribution | Caseflow"
title="Case Distribution | Caseflow"
component={() => {
return (
<CaseflowDistributionApp
<CaseDistributionApp
acdLeversForStore={this.props.acdLeversForStore}
acd_levers={leversList}
acd_history={this.props.acd_history}
Expand All @@ -174,4 +174,4 @@ class CaseflowDistribution extends React.PureComponent {
}
}

export default CaseflowDistribution;
export default CaseDistribution;
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import PropTypes from 'prop-types';
import CaseflowDistributionContent from '../components/CaseflowDistributionContent';
import CaseDistributionContent from '../components/CaseDistributionContent';
import { connect } from 'react-redux';
import { bindActionCreators } from 'redux';
import {
initialLoad
} from '../reducers/Levers/leversActions';
} from '../reducers/levers/leversActions';

class CaseflowDistributionApp extends React.PureComponent {
class CaseDistributionApp extends React.PureComponent {
constructor(props) {
super(props);
this.props.initialLoad(this.props.acdLeversForStore);
Expand All @@ -17,7 +17,7 @@ class CaseflowDistributionApp extends React.PureComponent {
return (
<div>
<div> {/* Wrapper*/}
<CaseflowDistributionContent
<CaseDistributionContent
levers = {this.props.acd_levers}
saveChanges = {() => {}}
formattedHistory={this.props.acd_history}
Expand All @@ -32,7 +32,7 @@ class CaseflowDistributionApp extends React.PureComponent {
}
}

CaseflowDistributionApp.propTypes = {
CaseDistributionApp.propTypes = {
acd_levers: PropTypes.object,
acd_history: PropTypes.array,
user_is_an_acd_admin: PropTypes.bool,
Expand All @@ -55,4 +55,4 @@ const mapDispatchToProps = (dispatch) => (
export default connect(
mapStateToProps,
mapDispatchToProps
)(CaseflowDistributionApp);
)(CaseDistributionApp);
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ACTIONS } from '../Levers/leversActionTypes';
import {ACTIONS } from '../levers/leversActionTypes';
import { update } from '../../../util/ReducerUtil';

export const initialState = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { timeFunction } from '../../util/PerfDebug';
import { combineReducers } from 'redux';
import leversReducer from './Levers/leversReducer';
import leversReducer from './levers/leversReducer';

const rootReducer = combineReducers({
caseDistributionLevers: leversReducer
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import leverStore from './reducers/Levers/leversReducer';
import leverStore from './reducers/levers/leversReducer';

export const checkIfOtherChangesExist = (currentLever) => {
const leversWithChangesList = leverStore.getState().levers.filter(
Expand Down
6 changes: 3 additions & 3 deletions client/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ import Inbox from 'app/inbox';
import Explain from 'app/explain';
import MPISearch from 'app/mpi/MPISearch';
import Admin from 'app/admin';
import CaseflowDistribution from 'app/caseflowDistribution';
import CaseDistribution from 'app/caseDistribution';
import uuid from 'uuid';

const COMPONENTS = {
Expand Down Expand Up @@ -93,7 +93,7 @@ const COMPONENTS = {
Explain,
MPISearch,
Admin,
CaseflowDistribution
CaseDistribution
};

const componentWrapper = (component) => (props, railsContext, domNodeId) => {
Expand Down Expand Up @@ -178,7 +178,7 @@ const componentWrapper = (component) => (props, railsContext, domNodeId) => {
'./explain/index',
'./mpi/MPISearch',
'./admin/index',
'./caseflowDistribution/index'
'./caseDistribution/index'
],
() => renderApp(component)
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
import AffinityDays from 'app/caseflowDistribution/components/AffinityDays';
import AffinityDays from 'app/caseDistribution/components/AffinityDays';
import { levers } from 'test/data/adminCaseDistributionLevers';

jest.mock('app/styles/caseDistribution/InteractableLevers.module.scss', () => '');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
import BatchSize from 'app/caseflowDistribution/components/BatchSize';
import BatchSize from 'app/caseDistribution/components/BatchSize';
import { levers } from 'test/data/adminCaseDistributionLevers';

jest.mock('app/styles/caseDistribution/InteractableLevers.module.scss', () => '');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import CaseflowDistributionContent from 'app/caseflowDistribution/components/CaseflowDistributionContent';
import CaseDistributionContent from 'app/caseDistribution/components/CaseDistributionContent';
import { formattedHistory, formattedLevers } from 'test/data/formattedCaseDistributionData';
import { createStore } from 'redux';
import leversReducer from 'app/caseflowDistribution/reducers/Levers/leversReducer';
import leversReducer from 'app/caseDistribution/reducers/levers/leversReducer';

jest.mock('app/styles/caseDistribution/InteractableLevers.module.scss', () => '');
jest.mock('app/styles/caseDistribution/StaticLevers.module.scss', () => '');
jest.mock('app/styles/caseDistribution/LeverHistory.module.scss', () => '');
jest.mock('app/styles/caseDistribution/ExclusionTable.module.scss', () => '');

describe('CaseflowDistributionContent', () => {
describe('CaseDistributionContent', () => {

afterEach(() => {
jest.clearAllMocks();
});

const setup = (testProps) =>
render(
<CaseflowDistributionContent {...testProps} />
<CaseDistributionContent {...testProps} />
);

it('renders the "CaseflowDistributionContent Component" with the data imported', () => {
it('renders the "CaseDistributionContent Component" with the data imported', () => {
const preloadedState = {
levers: JSON.parse(JSON.stringify(formattedLevers)),
initial_levers: JSON.parse(JSON.stringify(formattedLevers))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { render, fireEvent } from '@testing-library/react';
import DocketTimeGoals from 'app/caseflowDistribution/components/DocketTimeGoals';
import DocketTimeGoals from 'app/caseDistribution/components/DocketTimeGoals';
import { levers } from 'test/data/adminCaseDistributionLevers';

jest.mock('app/styles/caseDistribution/InteractableLevers.module.scss', () => '');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import React from 'react';
import { render } from '@testing-library/react';
import { createStore } from '@reduxjs/toolkit';
import LeverButtonsWrapper from './LeverButtonsWrapper';
import leversReducer from '../reducers/Levers/leversReducer';
import { ACTIONS } from 'app/caseflowDistribution/reducers/Levers/leversActionTypes';
import LeverButtonsWrapper from 'app/caseDistribution/components/LeverButtonsWrapper';
import leversReducer from '../reducers/levers/leversReducer';
import { ACTIONS } from 'app/caseDistribution/reducers/levers/leversActionTypes';
import * as leverData from 'test/data/adminCaseDistributionLevers';

describe('LeverButtonsWrapper', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import LeverHistory from 'app/caseflowDistribution/components/LeverHistory';
import LeverHistory from 'app/caseDistribution/components/LeverHistory';

jest.mock('app/styles/caseDistribution/LeverHistory.module.scss', () => '');
describe('LeverHistory', () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { render, screen, fireEvent } from '@testing-library/react';
import { leverSaveButton } from 'app/caseflowDistribution/components/LeverModal';
import { leverSaveButton } from 'app/caseDistribution/components/LeverModal';
import { createStore } from '@reduxjs/toolkit';
import COPY from 'COPY';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import { shallow } from 'enzyme';
import StaticLever from 'app/caseflowDistribution/components/StaticLever';
import StaticLever from 'app/caseDistribution/components/StaticLever';

jest.mock('app/styles/caseDistribution/StaticLevers.module.scss', () => '');
describe('StaticLever', () => {
Expand Down
Loading
Loading