Skip to content
Permalink
Browse files
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
  • Loading branch information
kilchenmann committed May 9, 2022
1 parent a2dcf7d commit 404f1f6da03e1de695bbe8a06db9e555eb0d5a92
Show file tree
Hide file tree
Showing 105 changed files with 651 additions and 1,174 deletions.
@@ -3,7 +3,7 @@ import { RouterModule, Routes } from '@angular/router';

import { AuthGuard } from './main/guard/auth.guard';
import { CookiePolicyComponent } from './main/cookie-policy/cookie-policy.component';
import { ErrorComponent } from './main/error/error.component';
import { StatusComponent } from './main/status/status.component';
import { HelpComponent } from './main/help/help.component';
import { LoginFormComponent } from './main/action/login-form/login-form.component';
import { MainComponent } from './main/main.component';
@@ -97,7 +97,7 @@ const routes: Routes = [
},
{
path: '**',
component: ErrorComponent,
component: StatusComponent,
data: { status: 404 }
}
]
@@ -181,12 +181,12 @@ const routes: Routes = [
},
{
path: 'teapot',
component: ErrorComponent,
component: StatusComponent,
data: { status: 418 }
},
{
path: '**',
component: ErrorComponent,
component: StatusComponent,
data: { status: 404 }
}
];
@@ -20,7 +20,6 @@ import { AppComponent } from './app.component';
import { ConfirmationDialogComponent } from './main/action/confirmation-dialog/confirmation-dialog.component';
import { ConfirmationMessageComponent } from './main/action/confirmation-dialog/confirmation-message/confirmation-message.component';
import { LoginFormComponent } from './main/action/login-form/login-form.component';
import { MessageComponent } from './main/action/message/message.component';
import { ProgressIndicatorComponent } from './main/action/progress-indicator/progress-indicator.component';
import { SelectedResourcesComponent } from './main/action/selected-resources/selected-resources.component';
import { SortButtonComponent } from './main/action/sort-button/sort-button.component';
@@ -35,7 +34,7 @@ import { ExistingNameDirective } from './main/directive/existing-name/existing-n
import { ExternalLinksDirective } from './main/directive/external-links.directive';
import { GndDirective } from './main/directive/gnd/gnd.directive';
import { InvalidControlScrollDirective } from './main/directive/invalid-control-scroll.directive';
import { ErrorComponent } from './main/error/error.component';

import { FooterComponent } from './main/footer/footer.component';
import { GridComponent } from './main/grid/grid.component';
import { HeaderComponent } from './main/header/header.component';
@@ -51,6 +50,7 @@ import { TruncatePipe } from './main/pipes/string-transformation/truncate.pipe';
import { TimePipe } from './main/pipes/time.pipe';
import { SelectLanguageComponent } from './main/select-language/select-language.component';
import { DatadogRumService } from './main/services/datadog-rum.service';
import { StatusComponent } from './main/status/status.component';
import { MaterialModule } from './material-module';
import { BoardComponent } from './project/board/board.component';
import { AddUserComponent } from './project/collaboration/add-user/add-user.component';
@@ -201,7 +201,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
DocumentComponent,
DragDropDirective,
EditListItemComponent,
ErrorComponent,
ExistingNameDirective,
ExpertSearchComponent,
ExternalLinksDirective,
@@ -233,7 +232,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
LoginFormComponent,
MainComponent,
MembershipComponent,
MessageComponent,
OntologyComponent,
OntologyFormComponent,
PasswordFormComponent,
@@ -282,6 +280,7 @@ export function httpLoaderFactory(httpClient: HttpClient) {
SortButtonComponent,
SpecifyPropertyValueComponent,
SplitPipe,
StatusComponent,
StillImageComponent,
StringifyStringLiteralPipe,
StringLiteralInputComponent,
@@ -3,7 +3,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import { ApiResponseData, ApiResponseError, KnoraApiConnection, LoginResponse } from '@dasch-swiss/dsp-js';
import { DspApiConnectionToken } from '../../declarations/dsp-api-tokens';
import { ErrorHandlerService } from '../../error/error-handler.service';
import { ErrorHandlerService } from '../../services/error-handler.service';
import { AuthenticationService } from '../../services/authentication.service';
import { ComponentCommunicationEventService, EmitEvent, Events } from '../../services/component-communication-event.service';
import { DatadogRumService } from '../../services/datadog-rum.service';

This file was deleted.

This file was deleted.

0 comments on commit 404f1f6

Please sign in to comment.