Merge pull request #5243 from flexion/10291-design-debt

10291: Remove close link and cancel upload button from FileUploadProgressModal
ustaxcourt · Aug 14, 2024 · db7b3bb · db7b3bb
2 parents 98ddfa1 + fe4df9a
commit db7b3bb
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 64 deletions.
diff --git a/web-client/src/presenter/actions/cancelUploadsAction.test.ts b/web-client/src/presenter/actions/cancelUploadsAction.test.ts
diff --git a/web-client/src/presenter/actions/cancelUploadsAction.ts b/web-client/src/presenter/actions/cancelUploadsAction.ts
diff --git a/web-client/src/presenter/computeds/fileUploadStatusHelper.ts b/web-client/src/presenter/computeds/fileUploadStatusHelper.ts
@@ -15,9 +15,6 @@ export const fileUploadStatusHelper = (get: Get): any => {
   );
   const shouldThrottle = !get(state.fileUploadProgress.noThrottle); // results WILL be throttled unless explicitly set to false
 
-  const isCancelable = !!(
-    Number.isFinite(timeRemaining) && percentComplete < 100
-  );
   let statusMessage;
 
   if (percentComplete === 100) {
@@ -39,7 +36,6 @@ export const fileUploadStatusHelper = (get: Get): any => {
   }
 
   return {
-    isCancelable,
     isHavingSystemIssues,
     statusMessage: shouldThrottle
       ? throttledStatus(statusMessage)

diff --git a/web-client/src/presenter/presenter.ts b/web-client/src/presenter/presenter.ts
@@ -42,7 +42,6 @@ import { canEditContactInformationSequence } from './sequences/canEditContactInf
 import { cancelAddDraftDocumentSequence } from './sequences/cancelAddDraftDocumentSequence';
 import { cancelAddStatisticSequence } from './sequences/cancelAddStatisticSequence';
 import { cancelAndNavigateToCorrespondenceSequence } from './sequences/cancelAndNavigateToCorrespondenceSequence';
-import { cancelFileUploadSequence } from './sequences/cancelFileUploadSequence';
 import { cancelRemovePetitionerSequence } from './sequences/cancelRemovePetitionerSequence';
 import { caseDetailPrimaryTabChangeSequence } from './sequences/caseDetailPrimaryTabChangeSequence';
 import { caseInventoryReportLoadMoreSequence } from './sequences/caseInventoryReportLoadMoreSequence';
@@ -663,7 +662,6 @@ export const presenterSequences = {
   cancelAddStatisticSequence: cancelAddStatisticSequence as unknown as Function,
   cancelAndNavigateToCorrespondenceSequence:
     cancelAndNavigateToCorrespondenceSequence as unknown as Function,
-  cancelFileUploadSequence: cancelFileUploadSequence as unknown as Function,
   cancelRemovePetitionerSequence:
     cancelRemovePetitionerSequence as unknown as Function,
   caseDetailPrimaryTabChangeSequence:

diff --git a/web-client/src/presenter/sequences/cancelFileUploadSequence.ts b/web-client/src/presenter/sequences/cancelFileUploadSequence.ts
diff --git a/web-client/src/views/DocketEntryQc.tsx b/web-client/src/views/DocketEntryQc.tsx
@@ -4,7 +4,6 @@ import { CreateMessageModalDialog } from './Messages/CreateMessageModalDialog';
 import { DocumentDisplayIframe } from './DocumentDisplayIframe';
 import { ErrorNotification } from './ErrorNotification';
 import { FileUploadErrorModal } from './FileUploadErrorModal';
-import { FileUploadStatusModal } from './FileUploadStatusModal';
 import { FormCancelModalDialog } from './FormCancelModalDialog';
 import { Hint } from '../ustc-ui/Hint/Hint';
 import { PrimaryDocumentForm } from './EditDocketEntry/PrimaryDocumentForm';
@@ -125,7 +124,6 @@ export const DocketEntryQc = connect(
             onConfirmSequence={completeDocketEntryQCAndSendMessageSequence}
           />
         )}
-        {showModal === 'FileUploadStatusModal' && <FileUploadStatusModal />}
         {showModal === 'FileUploadErrorModal' && (
           <FileUploadErrorModal
             confirmSequence={completeDocketEntryQCSequence}

diff --git a/web-client/src/views/FileUploadStatusModal.tsx b/web-client/src/views/FileUploadStatusModal.tsx
@@ -1,25 +1,22 @@
-import { Button } from '../ustc-ui/Button/Button';
 import { Focus } from '../ustc-ui/Focus/Focus';
 import { ModalDialog } from './ModalDialog';
 import { ProgressBar } from '../ustc-ui/ProgressBar/ProgressBar';
 import { connect } from '@web-client/presenter/shared.cerebral';
-import { sequences } from '@web-client/presenter/app.cerebral';
 import { state } from '@web-client/presenter/app.cerebral';
 import React from 'react';
 
 export const FileUploadStatusModal = connect(
   {
-    cancelUploadSequence: sequences.cancelFileUploadSequence,
     helper: state.fileUploadStatusHelper,
     percentComplete: state.fileUploadProgress.percentComplete,
   },
-  function FileUploadStatusModal({
-    cancelUploadSequence,
-    helper,
-    percentComplete,
-  }) {
+  function FileUploadStatusModal({ helper, percentComplete }) {
     return (
-      <ModalDialog className="file-upload-status-modal" showButtons={false}>
+      <ModalDialog
+        className="file-upload-status-modal"
+        closeLink={false}
+        showButtons={false}
+      >
         <Focus>
           <ProgressBar
             aria-labelledby="progress-description"
@@ -42,19 +39,6 @@ export const FileUploadStatusModal = connect(
             />
           </div>
           {helper.isHavingSystemIssues && <div>Still processing...</div>}
-          {helper.isCancelable && (
-            <div className="cancel">
-              <Button
-                link
-                onClick={e => {
-                  e.stopPropagation();
-                  cancelUploadSequence();
-                }}
-              >
-                Cancel Upload
-              </Button>
-            </div>
-          )}
         </div>
       </ModalDialog>
     );