From 4f5aa2a0e5d325eaf72d4e785d7a38c211afaa21 Mon Sep 17 00:00:00 2001 From: Pablo Martinez Date: Thu, 4 Jul 2024 09:17:19 +0200 Subject: [PATCH] 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 457ddb2e39644a85c77ded32f30ce9666628326e. * [ci:force] --- projects/aca-content/assets/i18n/en.json | 3 +- .../favorite-libraries.component.html | 5 +-- .../favorite-libraries.component.spec.ts | 12 ------ .../favorites/favorites.component.html | 5 +-- .../favorites/favorites.component.spec.ts | 10 ----- .../lib/components/files/files.component.html | 8 +--- .../libraries/libraries.component.html | 5 +-- .../libraries/libraries.component.spec.ts | 12 ------ .../recent-files/recent-files.component.html | 5 +-- .../recent-files.component.spec.ts | 10 ----- .../shared-files/shared-files.component.html | 6 +-- .../shared-files.component.spec.ts | 30 ++------------- .../trashcan/trashcan.component.html | 6 +-- .../trashcan/trashcan.component.spec.ts | 10 ----- .../aca-content/src/lib/testing/test-utils.ts | 29 -------------- projects/aca-content/src/lib/ui/theme.scss | 38 ------------------- .../src/lib/ui/variables/variables.scss | 4 -- .../document-base-page.component.ts | 5 --- 18 files changed, 12 insertions(+), 191 deletions(-) delete mode 100644 projects/aca-content/src/lib/testing/test-utils.ts diff --git a/projects/aca-content/assets/i18n/en.json b/projects/aca-content/assets/i18n/en.json index 47896d3b34..de1acbfe5c 100644 --- a/projects/aca-content/assets/i18n/en.json +++ b/projects/aca-content/assets/i18n/en.json @@ -98,8 +98,7 @@ "CREATE_TOOLTIP": "Create content", "UPLOAD": "Upload", "UPLOAD_TOOLTIP": "Upload content" - }, - "SELECTED": "Selected ({{ count }})" + } }, "BROWSE": { "FILE": { diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html index f4adbbd237..c8ae1db407 100644 --- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html +++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.html @@ -1,8 +1,6 @@
-

- {{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }} -

+

{{ 'APP.BROWSE.LIBRARIES.MENU.FAVORITE_LIBRARIES.TITLE' | translate }}

@@ -21,7 +19,6 @@

[sortingMode]="'client'" (node-dblclick)="handleNodeClick($event)" [imageResolver]="imageResolver" - (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)" [isResizingEnabled]="true" [blurOnResize]="false" (name-click)="handleNodeClick($event)" diff --git a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts index 0d68a60ffa..ac86c8c0b6 100644 --- a/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts +++ b/projects/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts @@ -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; @@ -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', () => { diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.html b/projects/aca-content/src/lib/components/favorites/favorites.component.html index b3f4cfc49f..c95652f541 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.html +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.html @@ -1,8 +1,6 @@
-

- {{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.FAVORITES.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }} -

+

{{ 'APP.BROWSE.FAVORITES.TITLE' | translate }}

@@ -19,7 +17,6 @@

[sorting]="['modifiedAt', 'desc']" [sortingMode]="'client'" [imageResolver]="imageResolver" - (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)" [isResizingEnabled]="true" [blurOnResize]="false" (node-dblclick)="handleNodeClick($event)" diff --git a/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts b/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts index 36a9089412..cf77ee29dd 100644 --- a/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts +++ b/projects/aca-content/src/lib/components/favorites/favorites.component.spec.ts @@ -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; @@ -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'); - }); }); diff --git a/projects/aca-content/src/lib/components/files/files.component.html b/projects/aca-content/src/lib/components/files/files.component.html index a314631a9a..d3d377852f 100644 --- a/projects/aca-content/src/lib/components/files/files.component.html +++ b/projects/aca-content/src/lib/components/files/files.component.html @@ -1,11 +1,6 @@
- - +
@@ -36,7 +31,6 @@ [blurOnResize]="false" (node-dblclick)="handleNodeClick($event)" (name-click)="handleNodeClick($event)" - (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)" (filterSelection)="onFilterSelected($event)" (error)="onError()" > diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.html b/projects/aca-content/src/lib/components/libraries/libraries.component.html index a48cdccb33..6f74f05ec5 100644 --- a/projects/aca-content/src/lib/components/libraries/libraries.component.html +++ b/projects/aca-content/src/lib/components/libraries/libraries.component.html @@ -1,8 +1,6 @@
-

- {{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }} -

+

{{ 'APP.BROWSE.LIBRARIES.MENU.MY_LIBRARIES.TITLE' | translate }}

@@ -20,7 +18,6 @@

[sortingMode]="'client'" [imageResolver]="imageResolver" [isResizingEnabled]="true" - (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)" [blurOnResize]="false" (node-dblclick)="handleNodeClick($event)" (name-click)="handleNodeClick($event)" diff --git a/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts b/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts index 1c7f07d02c..3a2f15c2bb 100644 --- a/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts +++ b/projects/aca-content/src/lib/components/libraries/libraries.component.spec.ts @@ -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; @@ -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(); diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html index 9a7854c0a5..ef06f8ed9b 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.html +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.html @@ -1,8 +1,6 @@
-

- {{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.RECENT.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }} -

+

{{ 'APP.BROWSE.RECENT.TITLE' | translate }}

@@ -20,7 +18,6 @@

[sortingMode]="'client'" [imageResolver]="imageResolver" [isResizingEnabled]="true" - (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)" [blurOnResize]="false" (node-dblclick)="handleNodeClick($event)" (name-click)="handleNodeClick($event)" diff --git a/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts b/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts index e601f22fb4..65274c1fc7 100644 --- a/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts +++ b/projects/aca-content/src/lib/components/recent-files/recent-files.component.spec.ts @@ -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; @@ -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'); - }); }); diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html index 92756a6645..f896aacd78 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.html +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.html @@ -1,9 +1,6 @@
-

- {{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.SHARED.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }} -

- +

{{ 'APP.BROWSE.SHARED.TITLE' | translate }}

@@ -20,7 +17,6 @@

[imageResolver]="imageResolver" [sortingMode]="'client'" [isResizingEnabled]="true" - (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)" [blurOnResize]="false" (node-dblclick)="handleNodeClick($event)" (name-click)="handleNodeClick($event)" diff --git a/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts b/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts index 1b108d51d8..eb386b6f2c 100644 --- a/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts +++ b/projects/aca-content/src/lib/components/shared-files/shared-files.component.spec.ts @@ -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; 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 diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html index 50417efaf6..5e9f75849f 100644 --- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.html +++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.html @@ -1,9 +1,6 @@
-

- {{ (selectedRowItemsCount < 1 ? 'APP.BROWSE.TRASHCAN.TITLE' : 'APP.HEADER.SELECTED') | translate: { count: selectedRowItemsCount } }} -

- +

{{ 'APP.BROWSE.TRASHCAN.TITLE' | translate }}

@@ -19,7 +16,6 @@

[navigate]="false" [sortingMode]="'client'" [imageResolver]="imageResolver" - (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)" [sorting]="['archivedAt', 'desc']" [isResizingEnabled]="true" [blurOnResize]="false" diff --git a/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts b/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts index a1b15b9846..d7209c19a8 100644 --- a/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts +++ b/projects/aca-content/src/lib/components/trashcan/trashcan.component.spec.ts @@ -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; @@ -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'); - }); }); diff --git a/projects/aca-content/src/lib/testing/test-utils.ts b/projects/aca-content/src/lib/testing/test-utils.ts deleted file mode 100644 index 9dcb913e1b..0000000000 --- a/projects/aca-content/src/lib/testing/test-utils.ts +++ /dev/null @@ -1,29 +0,0 @@ -/*! - * Copyright © 2005-2024 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 . - */ - -import { ComponentFixture } from '@angular/core/testing'; - -export const getTitleElementText = (fixture: ComponentFixture): string => { - return fixture.nativeElement.querySelector('.aca-page-title').innerText.trim(); -}; diff --git a/projects/aca-content/src/lib/ui/theme.scss b/projects/aca-content/src/lib/ui/theme.scss index b3d6b477f1..0600543ee9 100644 --- a/projects/aca-content/src/lib/ui/theme.scss +++ b/projects/aca-content/src/lib/ui/theme.scss @@ -49,44 +49,6 @@ mat-toolbar.mat-toolbar.mat-toolbar-single-row { } } -.mat-checkbox-indeterminate, -.mat-checkbox-checked { - &.mat-accent { - .mat-checkbox-background { - background-color: var(--theme-blue-checkbox-color); - } - } -} - -.adf-datatable-list { - .adf-datatable-row:is(adf-datatable-row) { - &:focus { - outline: 1px solid var(--theme-blue-checkbox-color); - } - - .adf-cell-value:focus { - outline: 1px solid var(--theme-blue-checkbox-color); - } - - .adf-datatable-cell-header:focus { - outline: 1px solid var(--theme-blue-checkbox-color); - } - - .adf-datatable-link:hover { - color: var(--theme-blue-checkbox-color); - } - } - - .adf-datatable-body { - .adf-datatable-row:is(adf-datatable-row) { - &.adf-is-selected, - &.adf-is-selected:hover { - background-color: var(--theme-blue-active-table-row-color); - } - } - } -} - .adf-property-field { .adf-textitem-edit-icon.mat-icon { color: var(--theme-secondary-text); diff --git a/projects/aca-content/src/lib/ui/variables/variables.scss b/projects/aca-content/src/lib/ui/variables/variables.scss index 800e472803..aa2e77f543 100644 --- a/projects/aca-content/src/lib/ui/variables/variables.scss +++ b/projects/aca-content/src/lib/ui/variables/variables.scss @@ -25,8 +25,6 @@ $grey-background: rgba(33, 33, 33, 0.12); $grey-text-background: rgba(33, 33, 33, 0.05); $grey-hover-background: rgba(33, 33, 33, 0.24); $blue-save-button-background: #1f74db; -$blue-checkbox-background: rgb(10,96,206); -$blue-active-table-row: rgb(10,96,206, 0.24); $black-heading: #4e4c4c; $theme-dropdown-background: darken($background-color, 5%); $theme-dropdown-background-hover: darken($background-color, 10%); @@ -69,8 +67,6 @@ $defaults: ( --theme-grey-background-color: $grey-background, --theme-grey-hover-background-color: $grey-hover-background, --theme-blue-button-color: $blue-save-button-background, - --theme-blue-checkbox-color: $blue-checkbox-background, - --theme-blue-active-table-row-color: $blue-active-table-row, --theme-heading-color: $black-heading, --theme-dropdown-color: $theme-dropdown-background, --theme-dropdown-background-hover: $theme-dropdown-background-hover, diff --git a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts index 61b438431a..fe17f45c29 100644 --- a/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts +++ b/projects/aca-shared/src/lib/components/document-base-page/document-base-page.component.ts @@ -70,7 +70,6 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges { filterSorting = 'name-asc'; createActions: Array = []; isSmallScreen = false; - selectedRowItemsCount = 0; protected extensions = inject(AppExtensionService); protected content = inject(DocumentBasePageService); @@ -163,10 +162,6 @@ export abstract class PageComponent implements OnInit, OnDestroy, OnChanges { } } - onSelectedItemsCountChanged(count: number) { - this.selectedRowItemsCount = count; - } - getParentNodeId(): string { return this.node ? this.node.id : null; }