Raymond/APPEALS-28937

MAC_M1.md

@@ -118,7 +118,7 @@ OpenSSL
 ---
 1. Download openssl@1.1 and openssl@3 from this [link](https://boozallen.sharepoint.com/teams/VABID/appeals/Documents/Forms/AllItems.aspx?id=%2Fteams%2FVABID%2Fappeals%2FDocuments%2FDevelopment%2FDeveloper%20Setup%20Resources%2FM1%20Mac%20Developer%20Setup&viewid=8a8eaf3e%2D2c12%2D4c87%2Db95f%2D4eab3428febd)
 2. Open “Finder” and find the two folders under “Downloads”
-3. Extract the `.tar.gz` files
+3. Extract the `.tar.gz` or `.zip` archives
 4. In each of the extracted folders:
     1. Navigate to the `/usr/local/homebrew/Cellar` subfolder
     2. Copy the openssl folder to your local machine's `/usr/local/homebrew/Cellar` folder
@@ -168,22 +168,26 @@ Run dev setup scripts in Caseflow repo
 1. Open a **Rosetta** terminal and navigate to /usr/local, run the command ```sudo spctl --global-disable```
 2. In the **Rosetta** terminal, install pyenv and the required python2 version:
     1. `brew install pyenv`
-    2. `pyenv install 2.7.18`
-    3. In the caseflow directory, run `pyenv local 2.7.18` to set the version
+    2. `pyenv rehash`
+    3. `pyenv install 2.7.18`
+    4. In the caseflow directory, run `pyenv local 2.7.18` to set the version
 3. In the **Rosetta** terminal navigate to caseflow folder:
-    1. set ```RUBY_CONFIGURE_OPTS="--with-openssl-dir=/usr/local/homebrew/Cellar/openssl@1.1"```
-    2. run `rbenv install 2.7.3`
-    3. run `gem install pg:1.1.4 -- --with-pg-config=/Applications/Postgres.app/Contents/Versions/latest/bin/pg_config`
-    4. Install v8@3.15 by doing the following (these steps assume that vi/vim is the default editor):
+    1. set ```export RUBY_CONFIGURE_OPTS="--with-openssl-dir=/usr/local/homebrew/Cellar/openssl@1.1"```
+    2. run `rbenv install $(cat .ruby-version)`
+    3. run `rbenv rehash`
+    4. run `gem install bundler -v $(grep -A 1 "BUNDLED WITH" Gemfile.lock | tail -n 1)`
+    5. run `gem install pg:1.1.4 -- --with-pg-config=/Applications/Postgres.app/Contents/Versions/latest/bin/pg_config`
+    6. Install v8@3.15 by doing the following (these steps assume that vi/vim is the default editor):
         1. run `brew edit v8@3.15`
         2. go to line 21 in the editor by typing `:21`
       Note: the line being removed is `disable! date: "2023-06-19", because: "depends on Python 2 to build"`
         3. delete the line by pressing `d` twice
         4. save and quit by typing `:x`
-    5. Configure build opts for gem `therubyracer`:
+        5. run `HOMEBREW_NO_INSTALL_FROM_API=1 brew install v8@3.15`
+    7. Configure build opts for gem `therubyracer`:
         1. `bundle config build.libv8 --with-system-v8`
         2. `bundle config build.therubyracer --with-v8-dir=$(brew --prefix v8@3.15)`
-    6. run ```./scripts/dev_env_setup_step2.sh```
+    8. run ```./scripts/dev_env_setup_step2.sh```
   If you get a permission error while running gem install or bundle install, **do not run using sudo.**
   Set the permissions back to you for every directory under /.rbenv
       * Enter command: `sudo chown -R <your name under /Users> /Users/<your name>/.rbenv`

app/controllers/application_controller.rb

@@ -380,11 +380,6 @@ def feedback_url
   end
   helper_method :feedback_url
 
-  def efolder_express_url
-    Rails.application.config.efolder_url.to_s
-  end
-  helper_method :efolder_express_url
-
   def help_url
     {
       "certification" => certification_help_path,

app/models/end_product_establishment.rb

@@ -210,10 +210,7 @@ def sync!
     contentions unless result.status_type_code == EndProduct::STATUSES.key("Canceled")
 
     transaction do
-      update!(
-        synced_status: result.status_type_code,
-        last_synced_at: Time.zone.now
-      )
+      update!(synced_status: result.status_type_code)
       status_cancelled? ? handle_cancelled_ep! : sync_source!
       close_request_issues_with_no_decision!
     end
@@ -224,6 +221,11 @@ def sync!
   rescue StandardError => error
     Raven.extra_context(end_product_establishment_id: id)
     raise error
+  ensure
+    # Always update last_synced_at to ensure that SyncReviewsJob does not immediately re-enqueue
+    # End Product Establishments that fail to sync with BGS into the EndProductSyncJob.
+    # This will allow for other End Product Establishments to sync first before re-attempting.
+    update!(last_synced_at: Time.zone.now)
   end
 
   def fetch_dispositions_from_vbms

app/views/reader/appeal/index.html.erb

@@ -7,7 +7,6 @@
     applicationUrls: application_urls,
     page: "DecisionReviewer",
     feedbackUrl: feedback_url,
-    efolderExpressUrl: efolder_express_url,
     featureToggles: {
       interfaceVersion2: FeatureToggle.enabled?(:interface_version_2, user: current_user),
       windowSlider: FeatureToggle.enabled?(:window_slider, user: current_user),

client/app/reader/DecisionReviewer.jsx

@@ -92,7 +92,6 @@ export class DecisionReviewer extends React.PureComponent {
       annotations={this.props.annotations}
       vacolsId={vacolsId}>
       <PdfListView
-        efolderExpressUrl={this.props.efolderExpressUrl}
         showPdf={this.showPdf(props.history, vacolsId)}
         sortBy={this.state.sortBy}
         selectedLabels={this.state.selectedLabels}
@@ -174,7 +173,6 @@ DecisionReviewer.propTypes = {
   dropdownUrls: PropTypes.array,
   featureToggles: PropTypes.any,
   feedbackUrl: PropTypes.any,
-  efolderExpressUrl: PropTypes.any,
   isPlacingAnnotation: PropTypes.any,
   onScrollToComment: PropTypes.func,
   setCategoryFilter: PropTypes.func,

client/app/reader/DocumentList/DocumentListActions.js

@@ -182,9 +182,8 @@ export const setViewingDocumentsOrComments = (documentsOrComments) => ({
   }
 });
 
-export const onReceiveManifests = (manifestVbmsFetchedAt) => ({
+export const onReceiveManifests = (manifestVbmsFetchedAt, manifestVvaFetchedAt) => ({
   type: Constants.RECEIVE_MANIFESTS,
-  payload: {
-    manifestVbmsFetchedAt
-  }
+  payload: { manifestVbmsFetchedAt,
+    manifestVvaFetchedAt }
 });

client/app/reader/DocumentList/DocumentListReducer.js

@@ -54,7 +54,8 @@ const initialState = {
       category: false
     }
   },
-  manifestVbmsFetchedAt: null
+  manifestVbmsFetchedAt: null,
+  manifestVvaFetchedAt: null
 };
 
 const documentListReducer = (state = initialState, action = {}) => {
@@ -180,6 +181,9 @@ const documentListReducer = (state = initialState, action = {}) => {
     return update(state, {
       manifestVbmsFetchedAt: {
         $set: action.payload.manifestVbmsFetchedAt
+      },
+      manifestVvaFetchedAt: {
+        $set: action.payload.manifestVvaFetchedAt
       }
     });
   case Constants.UPDATE_FILTERED_RESULTS:

client/app/reader/LastRetrievalAlert.jsx

@@ -1,7 +1,6 @@
 import _ from 'lodash';
 import moment from 'moment';
 import React from 'react';
-import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
 import Alert from '../components/Alert';
 import { css } from 'glamor';
@@ -16,33 +15,34 @@ class LastRetrievalAlert extends React.PureComponent {
 
   render() {
 
-    // Check that document manifests have been recieved from VBMS -- red banner
-    if (!this.props.manifestVbmsFetchedAt) {
+    // Check that document manifests have been recieved from VVA and VBMS
+    if (!this.props.manifestVbmsFetchedAt || !this.props.manifestVvaFetchedAt) {
       return <div {...alertStyling}>
         <Alert title="Error" type="error">
-          Some of {this.props.appeal.veteran_full_name}'s documents are unavailable at the moment due to
-          a loading error from their eFolder. As a result, you may be viewing a partial list of eFolder documents.
+          Some of {this.props.appeal.veteran_full_name}'s documents are not available at the moment due to
+          a loading error from VBMS or VVA. As a result, you may be viewing a partial list of claims folder documents.
           <br />
-          Please visit <a href={this.props.efolderExpressUrl} target="_blank" rel="noopener noreferrer"> eFolder Express </a> to fetch the
-          latest list of documents or submit a support ticket to sync their eFolder with Reader.
+          <br />
+          Please refresh your browser at a later point to view a complete list of documents in the claims
+          folder.
         </Alert>
       </div>;
     }
 
     const staleCacheTime = moment().subtract(CACHE_TIMEOUT_HOURS, 'h'),
-      vbmsManifestTimestamp = moment(this.props.manifestVbmsFetchedAt, 'MM/DD/YY HH:mma Z');
+      vbmsManifestTimestamp = moment(this.props.manifestVbmsFetchedAt, 'MM/DD/YY HH:mma Z'),
+      vvaManifestTimestamp = moment(this.props.manifestVvaFetchedAt, 'MM/DD/YY HH:mma Z');
 
-    // Check that manifest results are fresh -- yellow banner
-    if (vbmsManifestTimestamp.isBefore(staleCacheTime)) {
+    // Check that manifest results are fresh
+    if (vbmsManifestTimestamp.isBefore(staleCacheTime) || vvaManifestTimestamp.isBefore(staleCacheTime)) {
       const now = moment(),
-        vbmsDiff = now.diff(vbmsManifestTimestamp, 'hours');
+        vbmsDiff = now.diff(vbmsManifestTimestamp, 'hours'),
+        vvaDiff = now.diff(vvaManifestTimestamp, 'hours');
 
       return <div {...alertStyling}>
         <Alert title="Warning" type="warning">
-          Reader last synced the list of documents with {this.props.appeal.veteran_full_name}'s eFolder
-          {vbmsDiff} hours ago. If you'd like to view documents in Reader uploaded to their eFolder since
-          the last sync, please visit <a href={this.props.efolderExpressUrl} target="_blank" rel="noopener noreferrer"> eFolder Express </a>
-          to fetch the latest list of documents or submit a support ticket to sync their eFolder with Reader.
+          We last synced with VBMS and VVA {Math.max(vbmsDiff, vvaDiff)} hours ago. If you'd like to check for new
+          documents, refresh the page.
         </Alert>
       </div>;
     }
@@ -51,12 +51,6 @@ class LastRetrievalAlert extends React.PureComponent {
   }
 }
 
-LastRetrievalAlert.propTypes = {
-  manifestVbmsFetchedAt: PropTypes.string,
-  efolderExpressUrl: PropTypes.string,
-  appeal: PropTypes.object,
-};
-
 export default connect(
-  (state) => _.pick(state.documentList, 'manifestVbmsFetchedAt')
+  (state) => _.pick(state.documentList, ['manifestVvaFetchedAt', 'manifestVbmsFetchedAt'])
 )(LastRetrievalAlert);

client/app/reader/LastRetrievalInfo.jsx

@@ -7,15 +7,22 @@ class UnconnectedLastRetrievalInfo extends React.PureComponent {
     return [
       this.props.manifestVbmsFetchedAt ?
         <div id="vbms-manifest-retrieved-at" key="vbms">
-          Last synced with {this.props.appeal.veteran_full_name}'s eFolder: {this.props.manifestVbmsFetchedAt.slice(0, -5)}
+          Last VBMS retrieval: {this.props.manifestVbmsFetchedAt.slice(0, -5)}
         </div> :
         <div className="cf-red-text" key="vbms">
-          Unable to display eFolder documents at this time
+          Unable to display VBMS documents at this time
+        </div>,
+      this.props.manifestVvaFetchedAt ?
+        <div id="vva-manifest-retrieved-at" key="vva">
+          Last VVA retrieval: {this.props.manifestVvaFetchedAt.slice(0, -5)}
+        </div> :
+        <div className="cf-red-text" key="vva">
+          Unable to display VVA documents at this time
         </div>
     ];
   }
 }
 
 export default connect(
-  (state) => _.pick(state.documentList, 'manifestVbmsFetchedAt')
+  (state) => _.pick(state.documentList, ['manifestVvaFetchedAt', 'manifestVbmsFetchedAt'])
 )(UnconnectedLastRetrievalInfo);

client/app/reader/PdfListView.jsx

@@ -68,15 +68,15 @@ export class PdfListView extends React.Component {
       <AppSegment filledBackground>
         <div className="section--document-list">
           <ClaimsFolderDetails appeal={this.props.appeal} documents={this.props.documents} />
-          <LastRetrievalAlert efolderExpressUrl={this.props.efolderExpressUrl} appeal={this.props.appeal} />
+          <LastRetrievalAlert appeal={this.props.appeal} />
           <DocumentListHeader
             documents={this.props.documents}
             noDocuments={noDocuments}
           />
           {tableView}
         </div>
       </AppSegment>
-      <LastRetrievalInfo appeal={this.props.appeal} />
+      <LastRetrievalInfo />
     </div>;
   }
 }
@@ -108,8 +108,6 @@ export default connect(
 
 PdfListView.propTypes = {
   documents: PropTypes.arrayOf(PropTypes.object).isRequired,
-  efolderExpressUrl: PropTypes.string,
   onJumpToComment: PropTypes.func,
-  sortBy: PropTypes.string,
-  appeal: PropTypes.object,
+  sortBy: PropTypes.string
 };

client/test/app/intake/components/CancelIntakeModal.test.js

@@ -0,0 +1,100 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import { Provider } from 'react-redux';
+import userEvent from '@testing-library/user-event';
+import { createStore, applyMiddleware } from 'redux';
+import thunk from 'redux-thunk';
+import rootReducer from 'app/queue/reducers';
+import CancelIntakeModal from 'app/intake/components/CancelIntakeModal';
+import { CANCELLATION_REASONS } from 'app/intake/constants';
+
+jest.mock('redux', () => ({
+  ...jest.requireActual('redux'),
+  bindActionCreators: () => jest.fn().mockImplementation(() => Promise.resolve(true)),
+}));
+
+describe('CancelIntakeModal', () => {
+  const defaultProps = {
+    closeHandler: () => {},
+    intakeId: '123 change?',
+    clearClaimant: jest.fn().mockImplementation(() => Promise.resolve(true)),
+    clearPoa: jest.fn().mockImplementation(() => Promise.resolve(true)),
+    submitCancel: jest.fn().mockImplementation(() => Promise.resolve(true))
+  };
+  const buttonText = 'Cancel intake';
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const store = createStore(rootReducer, applyMiddleware(thunk));
+
+  const setup = (props) =>
+    render(
+      <Provider store={store}>
+        <CancelIntakeModal
+          {...props}
+        />
+      </Provider>
+    );
+
+  it('renders correctly', () => {
+    const modal = setup(defaultProps);
+
+    expect(modal).toMatchSnapshot();
+  });
+
+  it('displays cancellation options', () => {
+    const modal = setup(defaultProps);
+
+    Object.values(CANCELLATION_REASONS).map((reason) => (
+      expect(modal.getByText(reason.name)).toBeInTheDocument()
+    ));
+  });
+
+  it('should show other reason input when other is selected', async () => {
+    const modal = setup(defaultProps);
+
+    await userEvent.click(screen.getByText('Other'));
+
+    expect(modal.getByText('Tell us more about your situation.')).toBeInTheDocument();
+  });
+
+  describe('cancel button', () => {
+    it('is disabled until "Other" is selected and the text input is filled out', async () => {
+      const modal = setup(defaultProps);
+
+      expect(modal.getByText(buttonText)).toBeDisabled();
+
+      await userEvent.click(modal.getByText('Other'));
+
+      expect(modal.getByText('Tell us more about your situation.')).toBeInTheDocument();
+      expect(modal.getByText(buttonText)).toBeDisabled();
+
+      await userEvent.type(modal.getByRole('textbox'), 'Test');
+
+      expect(modal.getByText(buttonText)).not.toBeDisabled();
+    });
+
+    it('is disabled until value (that is not "Other") is selected', async () => {
+      const modal = setup(defaultProps);
+
+      expect(modal.getByText(buttonText)).toBeDisabled();
+
+      await userEvent.click(modal.getByText('System error'));
+      expect(modal.getByText(buttonText)).not.toBeDisabled();
+    });
+  });
+
+  it('should call the appropiate functions when Cancel intake is clicked', async () => {
+    const modal = setup(defaultProps);
+
+    await userEvent.click(modal.getByText('System error'));
+    expect(modal.getByText(buttonText)).not.toBeDisabled();
+
+    await userEvent.click(modal.getByText('Cancel intake'));
+    expect(defaultProps.clearClaimant).toHaveBeenCalled();
+    expect(defaultProps.clearPoa).toHaveBeenCalled();
+    expect(defaultProps.submitCancel).toHaveBeenCalled();
+  });
+});