mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2026-09-09 18:02:54 +00:00
[ACS-9106] Remove double checkbox (#5291)
* [ACS-9106] Remove double checkbox * [ACS-9106] Add unit test for multiselect * [ACS-9106] Fix unit test code * [ACS-9106] Fix description of unit test * [ACS-9106] change the name of multiselect and add it to search component * [ACS-9106] Remove thumbnail component * [ACS-9106] Add thumbnail entry for search-results * [ACS-9106] Add action-menu above the icon * [ACS-9106] Add action-menu at correct place * [ACS-9106] Remove the logic of manually assigning column header * [ACS-9106] Remove ununsed class
This commit is contained in:
Shivangi Shree
-10
@@ -1,10 +0,0 @@
|
||||
<mat-icon class="adf-datatable-selected" *ngIf="isSelected" svgIcon="selected" />
|
||||
<ng-container *ngIf="!isSelected">
|
||||
<ng-container *ngIf="isIcon; else image">
|
||||
<mat-icon>{{thumbnailUrl}}</mat-icon>
|
||||
</ng-container>
|
||||
<ng-template #image>
|
||||
<img [src]="thumbnailUrl" [alt]="tooltip" [title]="tooltip" />
|
||||
</ng-template>
|
||||
</ng-container>
|
||||
|
||||
-9
@@ -1,9 +0,0 @@
|
||||
@use '@angular/material' as mat;
|
||||
|
||||
aca-custom-thumbnail-column {
|
||||
@include mat.icon-overrides(
|
||||
(
|
||||
color: var(--theme-accent-color)
|
||||
)
|
||||
);
|
||||
}
|
||||
-112
@@ -1,112 +0,0 @@
|
||||
/*!
|
||||
* Copyright © 2005-2025 Hyland Software, Inc. and its affiliates. All rights reserved.
|
||||
*
|
||||
* Alfresco Example Content Application
|
||||
*
|
||||
* This file is part of the Alfresco Example Content Application.
|
||||
* If the software was purchased under a paid Alfresco license, the terms of
|
||||
* the paid license agreement will prevail. Otherwise, the software is
|
||||
* provided under the following open source license terms:
|
||||
*
|
||||
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { ThumbnailColumnComponent } from './thumbnail-column.component';
|
||||
import { TranslationService } from '@alfresco/adf-core';
|
||||
|
||||
describe('ThumbnailColumnComponent', () => {
|
||||
let component: ThumbnailColumnComponent;
|
||||
let fixture: ComponentFixture<ThumbnailColumnComponent>;
|
||||
let translationServiceMock: any;
|
||||
|
||||
beforeEach(() => {
|
||||
translationServiceMock = {
|
||||
instant: jasmine.createSpy('instant').and.returnValue('Locked by')
|
||||
};
|
||||
|
||||
TestBed.configureTestingModule({
|
||||
imports: [ThumbnailColumnComponent],
|
||||
providers: [{ provide: TranslationService, useValue: translationServiceMock }]
|
||||
});
|
||||
|
||||
fixture = TestBed.createComponent(ThumbnailColumnComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should update thumbnailUrl and tooltip on context change', () => {
|
||||
const context = {
|
||||
row: { isSelected: true, node: { entry: { properties: { 'cm:lockOwner': { displayName: 'John Doe' } } } } },
|
||||
data: { getValue: () => 'material-icons://icon_name' },
|
||||
col: {}
|
||||
};
|
||||
|
||||
component.ngOnChanges({ context: { currentValue: context, previousValue: null, firstChange: true, isFirstChange: () => true } });
|
||||
|
||||
expect(component.isIcon).toBeTrue();
|
||||
expect(component.thumbnailUrl).toBe('icon_name');
|
||||
expect(component.tooltip).toBe('Locked by John Doe');
|
||||
});
|
||||
|
||||
it('should handle non-icon thumbnails', () => {
|
||||
const context = {
|
||||
row: { isSelected: true, node: { entry: { properties: { 'cm:lockOwner': { displayName: 'John Doe' } } } } },
|
||||
data: { getValue: () => 'https://example.com/thumbnail.jpg' },
|
||||
col: {}
|
||||
};
|
||||
|
||||
component.ngOnChanges({ context: { currentValue: context, previousValue: null, firstChange: true, isFirstChange: () => true } });
|
||||
|
||||
expect(component.isIcon).toBeFalse();
|
||||
expect(component.thumbnailUrl).toBe('https://example.com/thumbnail.jpg');
|
||||
expect(component.tooltip).toBe('Locked by John Doe');
|
||||
});
|
||||
|
||||
it('should clear thumbnailUrl and tooltip if context is null', () => {
|
||||
component.ngOnChanges({ context: { currentValue: null, previousValue: {}, firstChange: false, isFirstChange: () => false } });
|
||||
|
||||
expect(component.thumbnailUrl).toBeNull();
|
||||
expect(component.tooltip).toBeNull();
|
||||
});
|
||||
|
||||
it('should return correct thumbnail from getThumbnail', () => {
|
||||
const context = {
|
||||
data: { getValue: () => 'thumbnail_url' },
|
||||
row: {},
|
||||
col: {}
|
||||
};
|
||||
|
||||
const thumbnail = component['getThumbnail'](context);
|
||||
expect(thumbnail).toBe('thumbnail_url');
|
||||
});
|
||||
|
||||
it('should return correct tooltip from getToolTip', () => {
|
||||
const context = {
|
||||
row: { node: { entry: { properties: { 'cm:lockOwner': { displayName: 'John Doe' } } } } }
|
||||
};
|
||||
|
||||
const tooltip = component.getToolTip(context);
|
||||
expect(tooltip).toBe('Locked by John Doe');
|
||||
});
|
||||
|
||||
it('should return empty tooltip if lockOwner is not present', () => {
|
||||
const context = {
|
||||
row: { node: { entry: { properties: {} } } }
|
||||
};
|
||||
|
||||
const tooltip = component.getToolTip(context);
|
||||
expect(tooltip).toBe('');
|
||||
});
|
||||
});
|
||||
-80
@@ -1,80 +0,0 @@
|
||||
/*!
|
||||
* Copyright © 2005-2025 Hyland Software, Inc. and its affiliates. All rights reserved.
|
||||
*
|
||||
* Alfresco Example Content Application
|
||||
*
|
||||
* This file is part of the Alfresco Example Content Application.
|
||||
* If the software was purchased under a paid Alfresco license, the terms of
|
||||
* the paid license agreement will prevail. Otherwise, the software is
|
||||
* provided under the following open source license terms:
|
||||
*
|
||||
* The Alfresco Example Content Application is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* The Alfresco Example Content Application is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* from Hyland Software. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { Component, inject, Input, OnChanges, SimpleChanges, ViewEncapsulation } from '@angular/core';
|
||||
import { TranslationService } from '@alfresco/adf-core';
|
||||
import { NgIf } from '@angular/common';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
|
||||
@Component({
|
||||
imports: [NgIf, MatIconModule],
|
||||
selector: 'aca-custom-thumbnail-column',
|
||||
templateUrl: './thumbnail-column.component.html',
|
||||
styleUrls: ['./thumbnail-column.component.scss'],
|
||||
encapsulation: ViewEncapsulation.None
|
||||
})
|
||||
export class ThumbnailColumnComponent implements OnChanges {
|
||||
private readonly translation = inject(TranslationService);
|
||||
|
||||
@Input()
|
||||
context: any;
|
||||
|
||||
public thumbnailUrl?: string;
|
||||
public tooltip?: string;
|
||||
public isIcon = false;
|
||||
|
||||
get isSelected(): boolean {
|
||||
return !!this.context?.row?.isSelected;
|
||||
}
|
||||
|
||||
ngOnChanges(changes: SimpleChanges): void {
|
||||
if (changes.context) {
|
||||
const context = changes.context.currentValue;
|
||||
|
||||
if (context) {
|
||||
const icon = this.getThumbnail(context);
|
||||
if (icon?.startsWith('material-icons://')) {
|
||||
this.isIcon = true;
|
||||
this.thumbnailUrl = icon.replace('material-icons://', '');
|
||||
} else {
|
||||
this.isIcon = false;
|
||||
this.thumbnailUrl = icon;
|
||||
}
|
||||
this.tooltip = this.getToolTip(context);
|
||||
} else {
|
||||
this.thumbnailUrl = null;
|
||||
this.tooltip = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
getThumbnail({ data, row, col }): string {
|
||||
return data.getValue(row, col);
|
||||
}
|
||||
|
||||
getToolTip({ row }): string {
|
||||
const displayName = row.node?.entry?.properties?.['cm:lockOwner']?.displayName;
|
||||
return displayName ? `${this.translation.instant('APP.LOCKED_BY')} ${displayName}` : '';
|
||||
}
|
||||
}
|
||||
-5
@@ -110,17 +110,12 @@
|
||||
[sr-title]="'ADF-DOCUMENT-LIST.LAYOUT.THUMBNAIL'"
|
||||
[sortable]="false"
|
||||
>
|
||||
<ng-template let-context>
|
||||
<aca-custom-thumbnail-column [context]="context" />
|
||||
</ng-template>
|
||||
|
||||
<adf-data-column-header>
|
||||
<ng-template>
|
||||
<aca-search-action-menu (sortingSelected)="onSearchSortingUpdate($event)" />
|
||||
</ng-template>
|
||||
</adf-data-column-header>
|
||||
</data-column>
|
||||
|
||||
<ng-container *ngFor="let column of columns; trackBy: trackByColumnId">
|
||||
<ng-container *ngIf="column.template && !(column.desktopOnly && isSmallScreen)">
|
||||
<data-column
|
||||
|
||||
-2
@@ -70,7 +70,6 @@ import { MatProgressBarModule } from '@angular/material/progress-bar';
|
||||
import { MatDividerModule } from '@angular/material/divider';
|
||||
import { MatButtonModule } from '@angular/material/button';
|
||||
import { DocumentListDirective } from '../../../directives/document-list.directive';
|
||||
import { ThumbnailColumnComponent } from '../../dl-custom-components/thumbnail-column/thumbnail-column.component';
|
||||
import { SearchActionMenuComponent } from '../search-action-menu/search-action-menu.component';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { DocumentListPresetRef, DynamicColumnComponent } from '@alfresco/adf-extensions';
|
||||
@@ -94,7 +93,6 @@ import { SavedSearchesContextService } from '../../../services/saved-searches-co
|
||||
MatMenuModule,
|
||||
DocumentListDirective,
|
||||
ContextActionsDirective,
|
||||
ThumbnailColumnComponent,
|
||||
SearchActionMenuComponent,
|
||||
PaginationComponent,
|
||||
MatIconModule,
|
||||
|
||||
Reference in New Issue
Block a user