inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-8227: remove internal mime type icon pipe (#10142)

Browse Source
This commit is contained in:
Denys Vuika
2024-09-10 10:07:18 -04:00
committed by GitHub
parent b1260e06ea
commit b1abe2c8a6
16 changed files with 31 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/content-services/src/lib/viewer/components/alfresco-viewer.component.html
View File

@@ -20,7 +20,6 @@
[hideInfoButton]="hideInfoButton"
[fileName]="fileName"
[mimeType]="mimeType"
[originalMimeType]="originalMimeType"
[urlFile]="urlFileContent"
[tracks]="tracks"
[readOnly]="readOnly"

6
lib/content-services/src/lib/viewer/components/alfresco-viewer.component.spec.ts
View File

@@ -455,8 +455,8 @@ describe('AlfrescoViewerComponent', () => {
//
});
describe('originalMimeType', () => {
it('should set originalMimeType based on nodeData content', async () => {
describe('mimeType', () => {
it('should set mime type based on nodeData content', async () => {
const defaultNode: Node = {
id: 'mock-id',
name: 'Mock Node',
@@ -488,7 +488,7 @@ describe('AlfrescoViewerComponent', () => {
} as Node);
await fixture.whenStable();
expect(component.originalMimeType).toEqual('application/msWord');
expect(component.mimeType).toEqual('application/msWord');
});
});

7
lib/content-services/src/lib/viewer/components/alfresco-viewer.component.ts
View File

@@ -211,7 +211,6 @@ export class AlfrescoViewerComponent implements OnChanges, OnInit, OnDestroy {
urlFileContent: string;
fileName: string;
mimeType: string;
originalMimeType: string;
nodeEntry: NodeEntry;
tracks: Track[] = [];
readOnly: boolean = true;
@@ -344,8 +343,10 @@ export class AlfrescoViewerComponent implements OnChanges, OnInit, OnDestroy {
}
if (nodeRendition) {
urlFileContent = nodeRendition.url;
mimeType = nodeRendition.mimeType;
this.originalMimeType = nodeData?.content?.mimeType;
const nodeMimeType = nodeData?.content?.mimeType;
const renditionMimeType = nodeRendition.mimeType;
mimeType = nodeMimeType || renditionMimeType;
}
} else if (viewerType === 'media') {
this.tracks = await this.renditionService.generateMediaTracksRendition(this.nodeId);

1
lib/core/src/lib/i18n/en.json
View File

@@ -436,6 +436,7 @@
"WAIT": "Wait"
},
"ARIA": {
"MIME_TYPE_ICON": "File type icon",
"PREVIOUS_PAGE": "Previous page",
"NEXT_PAGE": "Next page",
"ZOOM_IN": "Zoom in",

31
lib/core/src/lib/pipes/mime-type-icon.pipe.ts
View File

@@ -1,31 +0,0 @@
/*!
* @license
* Copyright © 2005-2024 Hyland Software, Inc. and its affiliates. All rights reserved.
*
* 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 { Pipe, PipeTransform } from '@angular/core';
import { ThumbnailService } from '../common/services/thumbnail.service';
@Pipe({
name: 'adfMimeTypeIcon',
standalone: true
})
export class MimeTypeIconPipe implements PipeTransform {
constructor(private thumbnailService: ThumbnailService) {}
transform(text: string): string {
return this.thumbnailService.getMimeTypeIcon(text);
}
}

2
lib/core/src/lib/pipes/pipe.module.ts
View File

@@ -18,7 +18,6 @@
import { NgModule } from '@angular/core';
import { FileSizePipe } from './file-size.pipe';
import { MimeTypeIconPipe } from './mime-type-icon.pipe';
import { HighlightPipe } from './text-highlight.pipe';
import { TimeAgoPipe } from './time-ago.pipe';
import { InitialUsernamePipe } from './user-initial.pipe';
@@ -38,7 +37,6 @@ export const CORE_PIPES = [
TimeAgoPipe,
FileSizePipe,
HighlightPipe,
MimeTypeIconPipe,
FullNamePipe,
FormatSpacePipe,
FileTypePipe,

1
lib/core/src/lib/pipes/public-api.ts
View File

@@ -21,7 +21,6 @@ export * from './file-type.pipe';
export * from './format-space.pipe';
export * from './full-name.pipe';
export * from './localized-date.pipe';
export * from './mime-type-icon.pipe';
export * from './multi-value.pipe';
export * from './text-highlight.pipe';
export * from './time-ago.pipe';

4
lib/core/src/lib/viewer/components/viewer.component.html
View File

@@ -43,8 +43,8 @@
<mat-icon>navigate_before</mat-icon>
</button>
<img class="adf-viewer__mimeicon"
[alt]="originalMimeType || mimeType"
[src]="(originalMimeType || mimeType) | adfMimeTypeIcon"
[alt]="'ADF_VIEWER.ARIA.MIME_TYPE_ICON' | translate"
[src]="mimeTypeIconUrl"
data-automation-id="adf-file-thumbnail">
<span class="adf-viewer__display-name"
id="adf-viewer-display-name">{{ fileName }}</span>

2
lib/core/src/lib/viewer/components/viewer.component.scss
View File

@@ -28,6 +28,8 @@
vertical-align: middle;
height: 18px;
width: 18px;
margin-left: 4px;
margin-right: 4px;
}
&-toolbar {

32
lib/core/src/lib/viewer/components/viewer.component.spec.ts
View File

@@ -99,38 +99,6 @@ describe('ViewerComponent', () => {
});
});
describe('originalMimeType', () => {
const getMimeTypeIconElement = () => fixture.nativeElement.querySelector('.adf-viewer__mimeicon');
it('should set alt attribute to originalMimeType when originalMimeType is provided', () => {
component.originalMimeType = 'image/png';
fixture.detectChanges();
const altAttribute: string = getMimeTypeIconElement().getAttribute('alt');
expect(altAttribute).toBe('image/png');
});
it('should set src attribute based on originalMimeType when originalMimeType is provided', () => {
component.originalMimeType = 'image';
fixture.detectChanges();
const srcAttribute: string = getMimeTypeIconElement().getAttribute('src');
expect(srcAttribute).toContain('image');
});
it('should set alt attribute to mimeType when originalMimeType is not provided', () => {
component.mimeType = 'application/pdf';
fixture.detectChanges();
const altAttribute: string = getMimeTypeIconElement().getAttribute('alt');
expect(altAttribute).toBe('application/pdf');
});
it('should set src attribute based on mimeType when originalMimeType is not provided', () => {
component.mimeType = 'image';
fixture.detectChanges();
const srcAttribute: string = getMimeTypeIconElement().getAttribute('src');
expect(srcAttribute).toContain('image');
});
});
describe('File Name Test', () => {
it('should fileName be set by urlFile input if the fileName is not provided as Input', () => {
component.fileName = '';

20
lib/core/src/lib/viewer/components/viewer.component.ts
View File

@@ -23,6 +23,7 @@ import {
ElementRef,
EventEmitter,
HostListener,
inject,
Input,
OnChanges,
OnDestroy,
@@ -52,7 +53,8 @@ import { ViewerSidebarComponent } from './viewer-sidebar.component';
import { ViewerToolbarComponent } from './viewer-toolbar.component';
import { ViewerToolbarActionsComponent } from './viewer-toolbar-actions.component';
import { ViewerToolbarCustomActionsComponent } from './viewer-toolbar-custom-actions.component';
import { MimeTypeIconPipe } from '../../pipes';
import { IconComponent } from '../../icon';
import { ThumbnailService } from '../../common';
const DEFAULT_NON_PREVIEW_CONFIG = {
enableDownloadPrompt: false,
@@ -84,11 +86,13 @@ const DEFAULT_NON_PREVIEW_CONFIG = {
ViewerSidebarComponent,
ViewerToolbarActionsComponent,
ViewerToolbarCustomActionsComponent,
MimeTypeIconPipe
IconComponent
],
providers: [ViewUtilService]
})
export class ViewerComponent<T> implements OnDestroy, OnInit, OnChanges {
private thumbnailService = inject(ThumbnailService);
@ContentChild(ViewerToolbarComponent)
toolbar: ViewerToolbarComponent;
@@ -208,10 +212,6 @@ export class ViewerComponent<T> implements OnDestroy, OnInit, OnChanges {
@Input()
mimeType: string;
/** Overload originalMimeType*/
@Input()
originalMimeType: string;
/**
* Context object available for binding by the local sidebarRightTemplate with let declarations.
*/
@@ -291,6 +291,7 @@ export class ViewerComponent<T> implements OnDestroy, OnInit, OnChanges {
private isDialogVisible: boolean = false;
public downloadPromptTimer: number;
public downloadPromptReminderTimer: number;
public mimeTypeIconUrl: string;
constructor(
private el: ElementRef,
@@ -300,15 +301,20 @@ export class ViewerComponent<T> implements OnDestroy, OnInit, OnChanges {
) {}
ngOnChanges(changes: SimpleChanges) {
const { blobFile, urlFile } = changes;
const { blobFile, urlFile, mimeType } = changes;
if (blobFile?.currentValue) {
this.mimeType = blobFile.currentValue.type;
this.mimeTypeIconUrl = this.thumbnailService.getMimeTypeIcon(blobFile.currentValue.type);
}
if (urlFile?.currentValue) {
this.fileName ||= this.viewUtilsService.getFilenameFromUrl(urlFile.currentValue);
}
if (mimeType?.currentValue) {
this.mimeTypeIconUrl = this.thumbnailService.getMimeTypeIcon(mimeType.currentValue);
}
}
ngOnInit(): void {