Skip to content

Commit 864e291

Browse files
authored
Merge pull request #2055 from bcgov/bugfix/ALCS-2370
2370: Improve error handling, properly catch upload errors
2 parents 0f7921f + cebe693 commit 864e291

File tree

124 files changed

+2606
-4819
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

124 files changed

+2606
-4819
lines changed

alcs-frontend/src/app/features/application/application.module.ts

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { appChildRoutes, ApplicationComponent } from './application.component';
1515
import { BoundaryAmendmentComponent } from './boundary-amendment/boundary-amendment.component';
1616
import { EditBoundaryAmendmentDialogComponent } from './boundary-amendment/edit-boundary-amendment-dialog/edit-boundary-amendment-dialog.component';
1717
import { DecisionModule } from './decision/decision.module';
18-
import { DocumentUploadDialogComponent } from './documents/document-upload-dialog/document-upload-dialog.component';
1918
import { DocumentsComponent } from './documents/documents.component';
2019
import { InfoRequestsComponent } from './info-requests/info-requests.component';
2120
import { InfoRequestDialogComponent } from './info-requests/info-request-dialog/info-request-dialog.component';
@@ -73,7 +72,6 @@ const routes: Routes = [
7372
ApplicantInfoComponent,
7473
LfngInfoComponent,
7574
DocumentsComponent,
76-
DocumentUploadDialogComponent,
7775
ProposalComponent,
7876
NfuProposalComponent,
7977
SubdProposalComponent,

alcs-frontend/src/app/features/application/decision/decision-v2/decision-documents/decision-documents.component.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ApplicationDecisionV2Service } from '../../../../../services/applicatio
88
import { ApplicationDecisionDocumentDto } from '../../../../../services/application/decision/application-decision-v2/application-decision.dto';
99
import { ToastService } from '../../../../../services/toast/toast.service';
1010
import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service';
11-
import { DecisionDocumentUploadDialogComponent } from '../decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component';
11+
import { DocumentUploadDialogComponent } from '../../../../../shared/document-upload-dialog/document-upload-dialog.component';
1212
import { FILE_NAME_TRUNCATE_LENGTH } from '../../../../../shared/constants';
1313

1414
@Component({
@@ -102,14 +102,16 @@ export class DecisionDocumentsComponent implements OnInit, OnDestroy {
102102
private openFileDialog(existingDocument?: ApplicationDecisionDocumentDto) {
103103
if (this.decision) {
104104
this.dialog
105-
.open(DecisionDocumentUploadDialogComponent, {
105+
.open(DocumentUploadDialogComponent, {
106106
minWidth: '600px',
107107
maxWidth: '800px',
108108
width: '70%',
109109
data: {
110110
fileId: this.fileId,
111111
decisionUuid: this.decision?.uuid,
112112
existingDocument: existingDocument,
113+
decisionService: this.decisionService,
114+
allowedVisibilityFlags: ['A', 'C', 'G', 'P'],
113115
},
114116
})
115117
.beforeClosed()

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.html

-111
This file was deleted.

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.scss

-82
This file was deleted.

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-file-upload-dialog/decision-document-upload-dialog.component.spec.ts

-49
This file was deleted.

0 commit comments

Comments
 (0)