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 457ddb2. * [ci:force]
Alfresco · Jul 4, 2024 · 4f5aa2a · 4f5aa2a
1 parent 457ddb2
commit 4f5aa2a
Show file tree

Hide file tree

Showing 18 changed files with 12 additions and 191 deletions.
diff --git 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
@@ -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 @@ <h1 class="aca-page-title">
         [sortingMode]="'client'"
         (node-dblclick)="handleNodeClick($event)"
         [imageResolver]="imageResolver"
-        (selectedItemsCountChanged)="onSelectedItemsCountChanged($event)"
         [isResizingEnabled]="true"
         [blurOnResize]="false"
         (name-click)="handleNodeClick($event)"

diff --git a/...ts/aca-content/src/lib/components/favorite-libraries/favorite-libraries.component.spec.ts b/...ts/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<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', () => {

diff --git 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 @@
 <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 @@ <h1 class="aca-page-title">
         [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
@@ -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');
-  });
 });
diff --git 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 @@
 <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()"
         >

diff --git 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 @@
 <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 @@ <h1 class="aca-page-title">
         [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
@@ -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();

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
@@ -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 @@ <h1 class="aca-page-title">
         [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
@@ -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');
-  });
 });
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
@@ -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 @@ <h1 class="aca-page-title">
         [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
@@ -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

diff --git 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 @@
 <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 @@ <h1 class="aca-page-title">
         [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
@@ -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');
-  });
 });
diff --git a/projects/aca-content/src/lib/testing/test-utils.ts b/projects/aca-content/src/lib/testing/test-utils.ts
diff --git 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);