mirror of
https://github.com/Alfresco/alfresco-content-app.git
synced 2025-07-24 17:31:52 +00:00
Revert "[ACS-8113] UX bug - Checkbox selections checked state should be Hyland blue not green- edit summary (#3908)" (#3918)
* Revert "[ACS-8113] UX bug - Checkbox selections checked state should be Hyland blue not green- edit summary (#3908)"
This reverts commit 457ddb2e39
.
* [ci:force]
This commit is contained in:
@@ -1,8 +1,6 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">
|
||||
{{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }}
|
||||
</h1>
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE' | translate }}</h1>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
@@ -21,7 +19,6 @@
|
||||
[sortingMode]="'client'"
|
||||
(node-dblclick)="handleNodeClick($event)"
|
||||
[imageResolver]="imageResolver"
|
||||
(selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
|
||||
[isResizingEnabled]="true"
|
||||
[blurOnResize]="false"
|
||||
(name-click)="handleNodeClick($event)"
|
||||
|
@@ -33,7 +33,6 @@ import { RouterEffects } from '@alfresco/aca-shared/store';
|
||||
import { of, throwError } from 'rxjs';
|
||||
import { LibraryEffects } from '../../store/effects';
|
||||
import { NodeEntry } from '@alfresco/js-api';
|
||||
import { getTitleElementText } from '../../testing/test-utils';
|
||||
|
||||
describe('FavoriteLibrariesComponent', () => {
|
||||
let fixture: ComponentFixture<FavoriteLibrariesComponent>;
|
||||
@@ -100,17 +99,6 @@ describe('FavoriteLibrariesComponent', () => {
|
||||
expect(component.pagination).toBe(null);
|
||||
expect(component.isLoading).toBe(false);
|
||||
});
|
||||
|
||||
it('should set title based on selectedRowItemsCount', () => {
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(getTitleElementText(fixture)).toBe('APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE');
|
||||
|
||||
component.selectedRowItemsCount = 5;
|
||||
fixture.detectChanges();
|
||||
|
||||
expect(getTitleElementText(fixture)).toBe('APP.HEADER.SELECTED');
|
||||
});
|
||||
});
|
||||
|
||||
describe('Node navigation', () => {
|
||||
|
@@ -1,8 +1,6 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">
|
||||
{{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.FAVORITES.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }}
|
||||
</h1>
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.FAVORITES.TITLE' | translate }}</h1>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
@@ -19,7 +17,6 @@
|
||||
[sorting]="['modifiedAt', 'desc']"
|
||||
[sortingMode]="'client'"
|
||||
[imageResolver]="imageResolver"
|
||||
(selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
|
||||
[isResizingEnabled]="true"
|
||||
[blurOnResize]="false"
|
||||
(node-dblclick)="handleNodeClick($event)"
|
||||
|
@@ -29,7 +29,6 @@ import { BehaviorSubject, of, Subject } from 'rxjs';
|
||||
import { FavoritesComponent } from './favorites.component';
|
||||
import { AppTestingModule } from '../../testing/app-testing.module';
|
||||
import { AppService, ContentApiService } from '@alfresco/aca-shared';
|
||||
import { getTitleElementText } from '../../testing/test-utils';
|
||||
|
||||
describe('FavoritesComponent', () => {
|
||||
let fixture: ComponentFixture<FavoritesComponent>;
|
||||
@@ -130,13 +129,4 @@ describe('FavoritesComponent', () => {
|
||||
location: 'favorites'
|
||||
});
|
||||
});
|
||||
|
||||
it('should set title based on selectedRowItemsCount', () => {
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.BROWSE.FAVORITES.TITLE');
|
||||
|
||||
component.selectedRowItemsCount = 5;
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.HEADER.SELECTED');
|
||||
});
|
||||
});
|
||||
|
@@ -1,11 +1,6 @@
|
||||
<aca-page-layout [hasError]="!isValidPath">
|
||||
<div class="aca-page-layout-header">
|
||||
<adf-breadcrumb [root]="title"
|
||||
[folderNode]="node"
|
||||
[selectedRowItemsCount]="selectedRowItemsCount"
|
||||
[maxItems]="isSmallScreen ? 1 : 0"
|
||||
(navigate)="onBreadcrumbNavigate($event)">
|
||||
</adf-breadcrumb>
|
||||
<adf-breadcrumb [root]="title" [folderNode]="node" [maxItems]="isSmallScreen ? 1 : 0" (navigate)="onBreadcrumbNavigate($event)"> </adf-breadcrumb>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
@@ -36,7 +31,6 @@
|
||||
[blurOnResize]="false"
|
||||
(node-dblclick)="handleNodeClick($event)"
|
||||
(name-click)="handleNodeClick($event)"
|
||||
(selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
|
||||
(filterSelection)="onFilterSelected($event)"
|
||||
(error)="onError()"
|
||||
>
|
||||
|
@@ -1,8 +1,6 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">
|
||||
{{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }}
|
||||
</h1>
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' | translate }}</h1>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
@@ -20,7 +18,6 @@
|
||||
[sortingMode]="'client'"
|
||||
[imageResolver]="imageResolver"
|
||||
[isResizingEnabled]="true"
|
||||
(selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
|
||||
[blurOnResize]="false"
|
||||
(node-dblclick)="handleNodeClick($event)"
|
||||
(name-click)="handleNodeClick($event)"
|
||||
|
@@ -30,7 +30,6 @@ import { AppTestingModule } from '../../testing/app-testing.module';
|
||||
import { EffectsModule } from '@ngrx/effects';
|
||||
import { LibraryEffects } from '../../store/effects';
|
||||
import { ContentApiService } from '@alfresco/aca-shared';
|
||||
import { getTitleElementText } from '../../testing/test-utils';
|
||||
|
||||
describe('LibrariesComponent', () => {
|
||||
let fixture: ComponentFixture<LibrariesComponent>;
|
||||
@@ -68,17 +67,6 @@ describe('LibrariesComponent', () => {
|
||||
spyOn(sitesApi, 'listSiteMembershipsForPerson').and.returnValue(Promise.resolve({}));
|
||||
});
|
||||
|
||||
describe('Initialization', () => {
|
||||
it('should set title to MY_LIBRARIES.TITLE based on selectedRowItemsCount', () => {
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE');
|
||||
|
||||
component.selectedRowItemsCount = 2;
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.HEADER.SELECTED');
|
||||
});
|
||||
});
|
||||
|
||||
describe('Node navigation', () => {
|
||||
it('does not navigate when id is not passed', () => {
|
||||
spyOn(router, 'navigate').and.stub();
|
||||
|
@@ -1,8 +1,6 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">
|
||||
{{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.RECENT.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }}
|
||||
</h1>
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.RECENT.TITLE' | translate }}</h1>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
@@ -20,7 +18,6 @@
|
||||
[sortingMode]="'client'"
|
||||
[imageResolver]="imageResolver"
|
||||
[isResizingEnabled]="true"
|
||||
(selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
|
||||
[blurOnResize]="false"
|
||||
(node-dblclick)="handleNodeClick($event)"
|
||||
(name-click)="handleNodeClick($event)"
|
||||
|
@@ -29,7 +29,6 @@ import { AppTestingModule } from '../../testing/app-testing.module';
|
||||
import { Router } from '@angular/router';
|
||||
import { NodePaging, SearchApi } from '@alfresco/js-api';
|
||||
import { of } from 'rxjs';
|
||||
import { getTitleElementText } from '../../testing/test-utils';
|
||||
|
||||
describe('RecentFilesComponent', () => {
|
||||
let fixture: ComponentFixture<RecentFilesComponent>;
|
||||
@@ -100,13 +99,4 @@ describe('RecentFilesComponent', () => {
|
||||
location: 'recent-files'
|
||||
});
|
||||
});
|
||||
|
||||
it('should set title based on selectedRowItemsCount', () => {
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.BROWSE.RECENT.TITLE');
|
||||
|
||||
component.selectedRowItemsCount = 5;
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.HEADER.SELECTED');
|
||||
});
|
||||
});
|
||||
|
@@ -1,9 +1,6 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">
|
||||
{{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.SHARED.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }}
|
||||
</h1>
|
||||
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.SHARED.TITLE' | translate }}</h1>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
@@ -20,7 +17,6 @@
|
||||
[imageResolver]="imageResolver"
|
||||
[sortingMode]="'client'"
|
||||
[isResizingEnabled]="true"
|
||||
(selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
|
||||
[blurOnResize]="false"
|
||||
(node-dblclick)="handleNodeClick($event)"
|
||||
(name-click)="handleNodeClick($event)"
|
||||
|
@@ -26,28 +26,15 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
|
||||
import { CustomResourcesService } from '@alfresco/adf-content-services';
|
||||
import { SharedFilesComponent } from './shared-files.component';
|
||||
import { AppTestingModule } from '../../testing/app-testing.module';
|
||||
import { Router } from '@angular/router';
|
||||
import { BehaviorSubject, of, Subject } from 'rxjs';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { SharedLinkPaging } from '@alfresco/js-api';
|
||||
import { AppService } from '@alfresco/aca-shared';
|
||||
import { getTitleElementText } from '../../testing/test-utils';
|
||||
import { ActivatedRoute, Router } from '@angular/router';
|
||||
|
||||
describe('SharedFilesComponent', () => {
|
||||
let fixture: ComponentFixture<SharedFilesComponent>;
|
||||
let page: SharedLinkPaging;
|
||||
let component: SharedFilesComponent;
|
||||
const routerMock = {
|
||||
routerState: { root: '' },
|
||||
url: 'shared-files'
|
||||
};
|
||||
const route = {
|
||||
snapshot: {
|
||||
data: {
|
||||
sortingPreferenceKey: ''
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const appServiceMock = {
|
||||
appNavNarMode$: new BehaviorSubject('collapsed'),
|
||||
@@ -58,10 +45,11 @@ describe('SharedFilesComponent', () => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [AppTestingModule, SharedFilesComponent],
|
||||
providers: [
|
||||
{ provide: ActivatedRoute, useValue: route },
|
||||
{
|
||||
provide: Router,
|
||||
useValue: routerMock
|
||||
useValue: {
|
||||
url: 'shared-files'
|
||||
}
|
||||
},
|
||||
{
|
||||
provide: AppService,
|
||||
@@ -80,16 +68,6 @@ describe('SharedFilesComponent', () => {
|
||||
const customResourcesService = TestBed.inject(CustomResourcesService);
|
||||
spyOn(customResourcesService, 'loadSharedLinks').and.returnValue(of(page));
|
||||
fixture = TestBed.createComponent(SharedFilesComponent);
|
||||
component = fixture.componentInstance;
|
||||
});
|
||||
|
||||
it('should set title based on selectedRowItemsCount', () => {
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.BROWSE.SHARED.TITLE');
|
||||
|
||||
component.selectedRowItemsCount = 5;
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.HEADER.SELECTED');
|
||||
});
|
||||
|
||||
// TODO: needs better testing strategy
|
||||
|
@@ -1,9 +1,6 @@
|
||||
<aca-page-layout>
|
||||
<div class="aca-page-layout-header">
|
||||
<h1 class="aca-page-title">
|
||||
{{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.TRASHCAN.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }}
|
||||
</h1>
|
||||
|
||||
<h1 class="aca-page-title">{{ 'APP.BROWSE.TRASHCAN.TITLE' | translate }}</h1>
|
||||
<aca-toolbar [items]="actions"></aca-toolbar>
|
||||
</div>
|
||||
|
||||
@@ -19,7 +16,6 @@
|
||||
[navigate]="false"
|
||||
[sortingMode]="'client'"
|
||||
[imageResolver]="imageResolver"
|
||||
(selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
|
||||
[sorting]="['archivedAt', 'desc']"
|
||||
[isResizingEnabled]="true"
|
||||
[blurOnResize]="false"
|
||||
|
@@ -26,7 +26,6 @@ import { TestBed, ComponentFixture } from '@angular/core/testing';
|
||||
import { AlfrescoApiService } from '@alfresco/adf-core';
|
||||
import { TrashcanComponent } from './trashcan.component';
|
||||
import { AppTestingModule } from '../../testing/app-testing.module';
|
||||
import { getTitleElementText } from '../../testing/test-utils';
|
||||
|
||||
describe('TrashcanComponent', () => {
|
||||
let fixture: ComponentFixture<TrashcanComponent>;
|
||||
@@ -55,13 +54,4 @@ describe('TrashcanComponent', () => {
|
||||
await fixture.whenStable();
|
||||
expect(fixture.nativeElement.querySelector('adf-document-list')).not.toBeNull();
|
||||
});
|
||||
|
||||
it('should set title based on selectedRowItemsCount', () => {
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.BROWSE.TRASHCAN.TITLE');
|
||||
|
||||
component.selectedRowItemsCount = 5;
|
||||
fixture.detectChanges();
|
||||
expect(getTitleElementText(fixture)).toBe('APP.HEADER.SELECTED');
|
||||
});
|
||||
});
|
||||
|
Reference in New Issue
Block a user