Skip to content

Commit 404f1f6

Browse files
authored
refactor(message): use only one static error component (DEV-900) (#727)
* fix(resource): show progress indicator until whole resource is loaded (DEV-638) * refactor(message): delete message component * refactor(error): update error message * refactor(error): update error message * refactor(admin): use app-error instead of app-message * chore(gh): merge wrong created branch into correct one (#728) * test(error): add tests * test(user): update tests * test(user): update tests * test(user): fix user form test * refactor(error/status): rename app-error into app-status * refactor: fix typo and clean up commented code
1 parent a2dcf7d commit 404f1f6

105 files changed

Lines changed: 651 additions & 1174 deletions

File tree

Some content is hidden

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

‎src/app/app-routing.module.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router';
33

44
import { AuthGuard } from './main/guard/auth.guard';
55
import { CookiePolicyComponent } from './main/cookie-policy/cookie-policy.component';
6-
import { ErrorComponent } from './main/error/error.component';
6+
import { StatusComponent } from './main/status/status.component';
77
import { HelpComponent } from './main/help/help.component';
88
import { LoginFormComponent } from './main/action/login-form/login-form.component';
99
import { MainComponent } from './main/main.component';
@@ -97,7 +97,7 @@ const routes: Routes = [
9797
},
9898
{
9999
path: '**',
100-
component: ErrorComponent,
100+
component: StatusComponent,
101101
data: { status: 404 }
102102
}
103103
]
@@ -181,12 +181,12 @@ const routes: Routes = [
181181
},
182182
{
183183
path: 'teapot',
184-
component: ErrorComponent,
184+
component: StatusComponent,
185185
data: { status: 418 }
186186
},
187187
{
188188
path: '**',
189-
component: ErrorComponent,
189+
component: StatusComponent,
190190
data: { status: 404 }
191191
}
192192
];

‎src/app/app.module.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import { AppComponent } from './app.component';
2020
import { ConfirmationDialogComponent } from './main/action/confirmation-dialog/confirmation-dialog.component';
2121
import { ConfirmationMessageComponent } from './main/action/confirmation-dialog/confirmation-message/confirmation-message.component';
2222
import { LoginFormComponent } from './main/action/login-form/login-form.component';
23-
import { MessageComponent } from './main/action/message/message.component';
2423
import { ProgressIndicatorComponent } from './main/action/progress-indicator/progress-indicator.component';
2524
import { SelectedResourcesComponent } from './main/action/selected-resources/selected-resources.component';
2625
import { SortButtonComponent } from './main/action/sort-button/sort-button.component';
@@ -35,7 +34,7 @@ import { ExistingNameDirective } from './main/directive/existing-name/existing-n
3534
import { ExternalLinksDirective } from './main/directive/external-links.directive';
3635
import { GndDirective } from './main/directive/gnd/gnd.directive';
3736
import { InvalidControlScrollDirective } from './main/directive/invalid-control-scroll.directive';
38-
import { ErrorComponent } from './main/error/error.component';
37+
3938
import { FooterComponent } from './main/footer/footer.component';
4039
import { GridComponent } from './main/grid/grid.component';
4140
import { HeaderComponent } from './main/header/header.component';
@@ -51,6 +50,7 @@ import { TruncatePipe } from './main/pipes/string-transformation/truncate.pipe';
5150
import { TimePipe } from './main/pipes/time.pipe';
5251
import { SelectLanguageComponent } from './main/select-language/select-language.component';
5352
import { DatadogRumService } from './main/services/datadog-rum.service';
53+
import { StatusComponent } from './main/status/status.component';
5454
import { MaterialModule } from './material-module';
5555
import { BoardComponent } from './project/board/board.component';
5656
import { AddUserComponent } from './project/collaboration/add-user/add-user.component';
@@ -201,7 +201,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
201201
DocumentComponent,
202202
DragDropDirective,
203203
EditListItemComponent,
204-
ErrorComponent,
205204
ExistingNameDirective,
206205
ExpertSearchComponent,
207206
ExternalLinksDirective,
@@ -233,7 +232,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
233232
LoginFormComponent,
234233
MainComponent,
235234
MembershipComponent,
236-
MessageComponent,
237235
OntologyComponent,
238236
OntologyFormComponent,
239237
PasswordFormComponent,
@@ -282,6 +280,7 @@ export function httpLoaderFactory(httpClient: HttpClient) {
282280
SortButtonComponent,
283281
SpecifyPropertyValueComponent,
284282
SplitPipe,
283+
StatusComponent,
285284
StillImageComponent,
286285
StringifyStringLiteralPipe,
287286
StringLiteralInputComponent,

‎src/app/main/action/login-form/login-form.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
33
import { ActivatedRoute, Router } from '@angular/router';
44
import { ApiResponseData, ApiResponseError, KnoraApiConnection, LoginResponse } from '@dasch-swiss/dsp-js';
55
import { DspApiConnectionToken } from '../../declarations/dsp-api-tokens';
6-
import { ErrorHandlerService } from '../../error/error-handler.service';
6+
import { ErrorHandlerService } from '../../services/error-handler.service';
77
import { AuthenticationService } from '../../services/authentication.service';
88
import { ComponentCommunicationEventService, EmitEvent, Events } from '../../services/component-communication-event.service';
99
import { DatadogRumService } from '../../services/datadog-rum.service';

‎src/app/main/action/message/message.component.html‎

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

‎src/app/main/action/message/message.component.scss‎

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

0 commit comments

Comments
 (0)