Skip to content

Commit b1743c2

Browse files
cleanup
1 parent ce029c0 commit b1743c2

11 files changed

+5
-129
lines changed

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/dog-trainer/step-dt-photograph-of-yourself-renew.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
1010
<app-step-section [title]="title">
1111
<app-form-photograph-of-yourself-update
1212
[form]="form"
13-
serviceTypeLabel="certificate"
1413
[serviceTypeCode]="serviceTypeDogTrainer"
1514
[originalPhotoOfYourselfExpired]="originalPhotoOfYourselfExpired"
1615
[photographOfYourself]="photographOfYourself"

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/dog-trainer/step-dt-photograph-of-yourself.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
1414
<app-form-photograph-of-yourself
1515
[serviceTypeCode]="serviceTypeDogTrainer"
1616
[form]="form"
17-
serviceTypeLabel="certificate"
1817
(fileUploaded)="onFileChanged()"
1918
(fileRemoved)="onFileChanged()"
2019
></app-form-photograph-of-yourself>

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/gdsd-team/step-team-photograph-of-yourself-renew.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
1010
<app-step-section [title]="title">
1111
<app-form-photograph-of-yourself-update
1212
[form]="form"
13-
serviceTypeLabel="certificate"
1413
[serviceTypeCode]="serviceTypeGdsdTeam"
1514
[originalPhotoOfYourselfExpired]="originalPhotoOfYourselfExpired"
1615
[photographOfYourself]="photographOfYourself"

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/gdsd-team/step-team-photograph-of-yourself.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { FormPhotographOfYourselfComponent } from '@app/shared/components/form-p
1515
<app-form-photograph-of-yourself
1616
[serviceTypeCode]="serviceTypeGdsdTeam"
1717
[form]="form"
18-
serviceTypeLabel="certificate"
1918
(fileUploaded)="onFileUploaded($event)"
2019
(fileRemoved)="onFileRemoved()"
2120
></app-form-photograph-of-yourself>

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-photograph-of-yourself-renew.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import { LicenceChildStepperStepComponent } from '@app/core/services/util.servic
1010
<app-step-section [title]="title">
1111
<app-form-photograph-of-yourself-update
1212
[form]="form"
13-
serviceTypeLabel="certificate"
1413
[serviceTypeCode]="serviceTypeGdsdTeam"
1514
[originalPhotoOfYourselfExpired]="originalPhotoOfYourselfExpired"
1615
[photographOfYourself]="photographOfYourself"

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/components/retired-dog/step-rd-photograph-of-yourself.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import { FormPhotographOfYourselfComponent } from '@app/shared/components/form-p
1515
<app-form-photograph-of-yourself
1616
[serviceTypeCode]="serviceTypeGdsdTeam"
1717
[form]="form"
18-
serviceTypeLabel="certificate"
1918
(fileUploaded)="onFileUploaded($event)"
2019
(fileRemoved)="onFileRemoved()"
2120
></app-form-photograph-of-yourself>

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/core/interceptors/error.interceptor.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { Router } from '@angular/router';
55
import { AppRoutes } from '@app/app.routes';
66
import { Observable, throwError } from 'rxjs';
77
import { catchError } from 'rxjs/operators';
8-
import { BizLicensingService, LoginService, PermitService, SecurityWorkerLicensingService } from 'src/app/api/services';
8+
import { LoginService } from 'src/app/api/services';
99
import { DialogOopsComponent, DialogOopsOptions } from 'src/app/shared/components/dialog-oops.component';
1010
import { AuthProcessService } from '../services/auth-process.service';
1111

@@ -28,16 +28,6 @@ export class ErrorInterceptor implements HttpInterceptor {
2828
return throwError(() => errorResponse);
2929
}
3030

31-
// Certain 404s will be handled in the component
32-
if (
33-
errorResponse.status == 403 &&
34-
(errorResponse.url?.includes(SecurityWorkerLicensingService.ApiWorkerLicenceApplicationsPostPath) ||
35-
errorResponse.url?.includes(PermitService.ApiPermitApplicationsPostPath) ||
36-
errorResponse.url?.includes(BizLicensingService.ApiBusinessLicenceApplicationPostPath))
37-
) {
38-
return throwError(() => errorResponse);
39-
}
40-
4131
if (errorResponse.status == 400 && errorResponse.url?.includes(LoginService.ApiBizLoginGetPath)) {
4232
this.router.navigate([AppRoutes.ACCESS_DENIED], { state: { errorMessage: errorResponse.error?.message } });
4333
return throwError(() => errorResponse);

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/shared/components/dropdown-overlay.component.ts

Lines changed: 0 additions & 104 deletions
This file was deleted.

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/shared/components/form-photograph-of-yourself-update.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ import { OptionsPipe } from '../pipes/options.pipe';
5959
</div>
6060
6161
<app-alert type="danger" icon="dangerous" *ngIf="showPhotoOfYourselfExpired">
62-
We require a new photo every 5 years. Please provide a new photo for your {{ serviceTypeLabel }}.
62+
We require a new photo every 5 years. Please provide a new photo for your certificate.
6363
</app-alert>
6464
6565
<app-file-upload
@@ -91,11 +91,10 @@ import { OptionsPipe } from '../pipes/options.pipe';
9191
export class FormPhotographOfYourselfUpdateComponent implements OnInit, LicenceChildStepperStepComponent {
9292
booleanTypeCodes = BooleanTypeCode;
9393
accept = ['.jpeg', '.jpg', '.tif', '.tiff', '.png'].join(', ');
94-
serviceTypeDesc = 'licence';
94+
serviceTypeDesc = 'certificate';
9595
showPhotoOfYourselfExpired = false;
9696

9797
@Input() form!: FormGroup;
98-
@Input() serviceTypeLabel = 'licence'; // licence or permit
9998
@Input() originalPhotoOfYourselfExpired = false;
10099
@Input() photographOfYourself: string | ArrayBuffer | null = null;
101100
@Input() serviceTypeCode!: ServiceTypeCode;

src/Spd.Presentation.GuideDogServiceDog/ClientApp/src/app/shared/components/form-photograph-of-yourself.component.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import { OptionsPipe } from '../pipes/options.pipe';
2929
</div>
3030
3131
<app-alert type="danger" icon="dangerous" *ngIf="originalPhotoOfYourselfExpired">
32-
We require a new photo every 5 years. Please provide a new photo for your {{ serviceTypeLabel }}.
32+
We require a new photo every 5 years. Please provide a new photo for your certificate.
3333
</app-alert>
3434
3535
<app-file-upload
@@ -59,10 +59,9 @@ import { OptionsPipe } from '../pipes/options.pipe';
5959
})
6060
export class FormPhotographOfYourselfComponent implements OnInit, LicenceChildStepperStepComponent {
6161
accept = ['.jpeg', '.jpg', '.tif', '.tiff', '.png'].join(', ');
62-
serviceTypeDesc = 'licence';
62+
serviceTypeDesc = 'certificate';
6363

6464
@Input() form!: FormGroup;
65-
@Input() serviceTypeLabel = 'licence'; // licence or permit or certificate
6665
@Input() originalPhotoOfYourselfExpired = false;
6766
@Input() serviceTypeCode!: ServiceTypeCode;
6867

0 commit comments

Comments
 (0)