Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(message): use only one static error component (DEV-900) #727

Merged
merged 10 commits into from May 9, 2022
8 changes: 4 additions & 4 deletions src/app/app-routing.module.ts
Expand Up @@ -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';
Expand Down Expand Up @@ -97,7 +97,7 @@ const routes: Routes = [
},
{
path: '**',
component: ErrorComponent,
component: StatusComponent,
data: { status: 404 }
}
]
Expand Down Expand Up @@ -181,12 +181,12 @@ const routes: Routes = [
},
{
path: 'teapot',
component: ErrorComponent,
component: StatusComponent,
data: { status: 418 }
},
{
path: '**',
component: ErrorComponent,
component: StatusComponent,
data: { status: 404 }
}
];
Expand Down
7 changes: 3 additions & 4 deletions src/app/app.module.ts
Expand Up @@ -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';
Expand All @@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -201,7 +201,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
DocumentComponent,
DragDropDirective,
EditListItemComponent,
ErrorComponent,
ExistingNameDirective,
ExpertSearchComponent,
ExternalLinksDirective,
Expand Down Expand Up @@ -233,7 +232,6 @@ export function httpLoaderFactory(httpClient: HttpClient) {
LoginFormComponent,
MainComponent,
MembershipComponent,
MessageComponent,
OntologyComponent,
OntologyFormComponent,
PasswordFormComponent,
Expand Down Expand Up @@ -282,6 +280,7 @@ export function httpLoaderFactory(httpClient: HttpClient) {
SortButtonComponent,
SpecifyPropertyValueComponent,
SplitPipe,
StatusComponent,
StillImageComponent,
StringifyStringLiteralPipe,
StringLiteralInputComponent,
Expand Down
2 changes: 1 addition & 1 deletion src/app/main/action/login-form/login-form.component.ts
Expand Up @@ -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';
Expand Down
61 changes: 0 additions & 61 deletions src/app/main/action/message/message.component.html

This file was deleted.

110 changes: 0 additions & 110 deletions src/app/main/action/message/message.component.scss

This file was deleted.