Fix unknown style (#5810)

* fix unknown style * missing var * remove delete because there is already delete site * fix test
Alfresco · Jun 24, 2020 · 094f247 · 094f247
1 parent 9fd1068
commit 094f247
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 29 deletions.
diff --git a/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-excel.component.e2e.ts
@@ -73,10 +73,6 @@ describe('Viewer', () => {
             await contentServicesPage.goToDocumentList();
         });
 
-        afterAll(async () => {
-            await uploadActions.deleteFileOrFolder(excelFolderUploaded.entry.id);
-        });
-
         it('[C280008] Should be possible to open any Excel file', async () => {
             await contentServicesPage.doubleClickRow('excel');
             for (const currentFile of uploadedExcels) {

diff --git a/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-image.component.e2e.ts
@@ -83,10 +83,6 @@ describe('Viewer', () => {
             await contentServicesPage.goToDocumentList();
         });
 
-        afterAll(async () => {
-            await uploadActions.deleteFileOrFolder(imgFolderUploaded.entry.id);
-        });
-
         it('[C279966] Should be possible to open any Image supported extension', async () => {
             await contentServicesPage.doubleClickRow('images');
             for (const image of uploadedImages) {

diff --git a/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-powerpoint.component.e2e.ts
@@ -75,10 +75,6 @@ describe('Viewer', () => {
             await contentServicesPage.goToDocumentList();
         });
 
-        afterAll(async () => {
-            await uploadActions.deleteFileOrFolder(pptFolderUploaded.entry.id);
-        });
-
         it('[C280009] Should be possible to open any PowerPoint file', async () => {
             await contentServicesPage.doubleClickRow('ppt');
 

diff --git a/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-text.component.e2e.ts
@@ -73,10 +73,6 @@ describe('Viewer', () => {
             await contentServicesPage.goToDocumentList();
         });
 
-        afterAll(async () => {
-            await uploadActions.deleteFileOrFolder(textFolderUploaded.entry.id);
-        });
-
         it('[C280010] Should be possible to open any Text file', async () => {
             await contentServicesPage.doubleClickRow('text');
             for (const currentFile of uploadedTexts) {

diff --git a/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts b/e2e/core/viewer/file-extensions/viewer-word.component.e2e.ts
@@ -76,10 +76,6 @@ describe('Viewer', () => {
             await contentServicesPage.goToDocumentList();
         });
 
-        afterAll(async () => {
-            await uploadActions.deleteFileOrFolder(wordFolderUploaded.entry.id);
-        });
-
         it('[C280011] Should be possible to open any Word file', async () => {
             await contentServicesPage.doubleClickRow('word');
             for (const currentFile of uploadedWords) {

diff --git a/lib/core/styles/_index.scss b/lib/core/styles/_index.scss
@@ -21,6 +21,7 @@
 @import '../viewer/components/pdf-viewer-thumbnails.component';
 @import '../viewer/components/txt-viewer.component';
 @import '../viewer/components/img-viewer.component';
+@import '../viewer/components/unknown-format/unknown-format.component';
 @import '../form/components/form-renderer.component';
 @import '../layout/components/sidebar-action/sidebar-action-menu.component';
 @import '../layout/components/header/header.component';
@@ -58,6 +59,7 @@
     @include adf-pdf-viewer-theme($theme);
     @include adf-pdf-thumbnails-theme($theme);
     @include adf-image-viewer-theme($theme);
+    @include adf-unknown-viewer-theme($theme);
     @include adf-text-viewer-theme($theme);
     @include adf-form-renderer-theme($theme);
     @include adf-sidebar-action-menu-theme($theme);

diff --git a/lib/core/viewer/components/unknown-format/unknown-format.component.html b/lib/core/viewer/components/unknown-format/unknown-format.component.html
@@ -1,6 +1,6 @@
 <div class="adf-viewer__unknown-format-view">
     <div>
         <mat-icon class="icon">error</mat-icon>
-        <div class="label">{{ 'ADF_VIEWER.UNKNOWN_FORMAT' | translate }}</div>
+        <div class="adf-viewer__unknown-label">{{ 'ADF_VIEWER.UNKNOWN_FORMAT' | translate }}</div>
     </div>
 </div>
diff --git a/lib/core/viewer/components/unknown-format/unknown-format.component.scss b/lib/core/viewer/components/unknown-format/unknown-format.component.scss
@@ -1,8 +1,18 @@
-.adf-viewer__unknown-format-view {
-    height: 90vh;
-    text-align: center;
-    display: flex;
-    flex: 1;
-    flex-direction: column;
-    justify-content: center;
+@import '~@angular/material/theming';
+
+@mixin adf-unknown-viewer-theme($theme) {
+    $foreground: map-get($theme, foreground);
+
+    .adf-viewer__unknown-format-view {
+        height: 90vh;
+        text-align: center;
+        display: flex;
+        flex: 1;
+        flex-direction: column;
+        justify-content: center;
+
+        .adf-viewer__unknown-label {
+            color: mat-color($foreground, text);
+        }
+    }
 }
diff --git a/lib/testing/src/lib/core/pages/viewer.page.ts b/lib/testing/src/lib/core/pages/viewer.page.ts
@@ -635,7 +635,7 @@ export class ViewerPage {
     }
 
     async getUnknownFormatMessage(): Promise<string> {
-        const unknownFormatLabel = this.unknownFormat.element(by.css(`.label`));
+        const unknownFormatLabel = this.unknownFormat.element(by.css(`.adf-viewer__unknown-label`));
         return BrowserActions.getText(unknownFormatLabel);
     }
 }