diff --git a/demo-shell/resources/i18n/en.json b/demo-shell/resources/i18n/en.json index 647904c1b0..5d6cd0772d 100644 --- a/demo-shell/resources/i18n/en.json +++ b/demo-shell/resources/i18n/en.json @@ -287,14 +287,14 @@ "GROUP-TITLE1-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION ONE", "GROUP-TITLE2-TRANSLATION-KEY": "CUSTOM TITLE TRANSLATION TWO", "ERROR_CONTENT": { + "RETURN_BUTTON": { + "TEXT": "Back to home" + }, "507": { "TITLE": "ACS Disk full", "DESCRIPTION": "Content exceeds overall storage quota limit configured for the network or system", "SECONDARY_BUTTON": { "TEXT": "" - }, - "RETURN_BUTTON": { - "TEXT": "Back to home" } } }, diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts index 38eed6b3ed..e86432ebee 100644 --- a/demo-shell/src/app/app.module.ts +++ b/demo-shell/src/app/app.module.ts @@ -53,7 +53,6 @@ import { TaskAttachmentsComponent } from './components/process-service/task-atta import { ProcessAttachmentsComponent } from './components/process-service/process-attachments.component'; import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component'; import { DemoPermissionComponent } from './components/permissions/demo-permissions.component'; -import { ReportIssueComponent } from './components/report-issue/report-issue.component'; import { MonacoEditorModule } from 'ngx-monaco-editor'; import { ContentModule } from '@alfresco/adf-content-services'; import { InsightsModule } from '@alfresco/adf-insights'; @@ -173,7 +172,6 @@ registerLocaleData(localeSv); DemoPermissionComponent, DemoErrorComponent, FormLoadingComponent, - ReportIssueComponent, TreeViewSampleComponent, CloudLayoutComponent, AppsCloudDemoComponent, diff --git a/demo-shell/src/app/app.routes.ts b/demo-shell/src/app/app.routes.ts index 6bd5e74a23..659820096a 100644 --- a/demo-shell/src/app/app.routes.ts +++ b/demo-shell/src/app/app.routes.ts @@ -34,7 +34,6 @@ import { OverlayViewerComponent } from './components/overlay-viewer/overlay-view import { SharedLinkViewComponent } from './components/shared-link-view/shared-link-view.component'; import { FormLoadingComponent } from './components/form/form-loading.component'; import { DemoPermissionComponent } from './components/permissions/demo-permissions.component'; -import { ReportIssueComponent } from './components/report-issue/report-issue.component'; import { AppComponent } from './app.component'; import { TreeViewSampleComponent } from './components/tree-view/tree-view-sample.component'; import { AppsCloudDemoComponent } from './components/cloud/apps-cloud-demo.component'; @@ -426,10 +425,6 @@ export const appRoutes: Routes = [ component: OverlayViewerComponent, canActivate: [AuthGuardEcm] }, - { - path: 'report-issue', - component: ReportIssueComponent - }, { path: 'datatable-lazy', loadChildren: () => import('./components/lazy-loading/lazy-loading.module').then(m => m.LazyLoadingModule) diff --git a/demo-shell/src/app/components/error/demo-error.component.html b/demo-shell/src/app/components/error/demo-error.component.html index 5e2e1b9d4c..f1bafd6f8b 100644 --- a/demo-shell/src/app/components/error/demo-error.component.html +++ b/demo-shell/src/app/components/error/demo-error.component.html @@ -1,22 +1,7 @@ -
- -
- - {{ 'ERROR_CONTENT.' + errorCode + '.SECONDARY_BUTTON.TEXT' | translate | uppercase }} - - - {{ 'ERROR_CONTENT.' + errorCode + '.RETURN_BUTTON.TEXT' | translate | uppercase }} - -
- -
+ +
+ +
+ diff --git a/demo-shell/src/app/components/error/demo-error.component.scss b/demo-shell/src/app/components/error/demo-error.component.scss deleted file mode 100644 index 53ef6445b4..0000000000 --- a/demo-shell/src/app/components/error/demo-error.component.scss +++ /dev/null @@ -1,9 +0,0 @@ -.app-error-content { - - &-buttons { - display: flex; - width: 100%; - justify-content: space-evenly; - } -} - diff --git a/demo-shell/src/app/components/error/demo-error.component.ts b/demo-shell/src/app/components/error/demo-error.component.ts index e152d0f9da..7439582378 100644 --- a/demo-shell/src/app/components/error/demo-error.component.ts +++ b/demo-shell/src/app/components/error/demo-error.component.ts @@ -20,7 +20,6 @@ import { ActivatedRoute, Params, Router } from '@angular/router'; @Component({ selector: 'app-demo-error', - styleUrls: ['./demo-error.component.scss'], templateUrl: './demo-error.component.html' }) export class DemoErrorComponent implements OnInit { @@ -32,7 +31,7 @@ export class DemoErrorComponent implements OnInit { ngOnInit() { if (this.route) { - this.route.params.forEach((params: Params) => { + this.route.params.subscribe((params: Params) => { if (params['id']) { this.errorCode = params['id']; } @@ -40,10 +39,6 @@ export class DemoErrorComponent implements OnInit { } } - onReportIssue() { - this.router.navigate(['/report-issue']); - } - onReturnButton() { this.router.navigate(['/']); } diff --git a/demo-shell/src/app/components/report-issue/report-issue.component.html b/demo-shell/src/app/components/report-issue/report-issue.component.html deleted file mode 100644 index 645b1e83a4..0000000000 --- a/demo-shell/src/app/components/report-issue/report-issue.component.html +++ /dev/null @@ -1,9 +0,0 @@ -
-

Report Issue

-
- - - -
- -
diff --git a/demo-shell/src/app/components/report-issue/report-issue.component.scss b/demo-shell/src/app/components/report-issue/report-issue.component.scss deleted file mode 100644 index 226b086281..0000000000 --- a/demo-shell/src/app/components/report-issue/report-issue.component.scss +++ /dev/null @@ -1,24 +0,0 @@ -.app-report-issue { - margin: 50px 0; - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - - &-form { - - width: 50%; - min-width: 250px; - margin-bottom: 50px; - - & mat-form-field { - width: 100%; - } - - &-textarea { - background-color: white; - width: 100%; - height: 250px; - } - } -} diff --git a/demo-shell/src/app/components/report-issue/report-issue.component.ts b/demo-shell/src/app/components/report-issue/report-issue.component.ts deleted file mode 100644 index e61e5d185b..0000000000 --- a/demo-shell/src/app/components/report-issue/report-issue.component.ts +++ /dev/null @@ -1,26 +0,0 @@ -/*! - * @license - * Copyright 2019 Alfresco Software, Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Component } from '@angular/core'; - -@Component({ - templateUrl: './report-issue.component.html', - styleUrls: [`./report-issue.component.scss`] -}) -export class ReportIssueComponent { - -}