From a62c617cad9d3894b3d8eb20fb6f71b30a53329f Mon Sep 17 00:00:00 2001 From: Vito Albano Date: Mon, 19 Feb 2024 15:53:44 +0000 Subject: [PATCH] Rebased to the latest --- .../content-node-selector.component.spec.ts | 2 ++ .../content-type-dialog.component.spec.ts | 2 +- ...-chip-autocomplete-input.component.spec.ts | 6 +++--- .../tree/components/tree.component.spec.ts | 18 ++++-------------- .../card-view-arrayitem.component.html | 10 +++++----- .../dynamic-chip-list.component.html | 4 ++-- .../dynamic-chip-list.component.spec.ts | 2 +- lib/process-services-cloud/package.json | 4 ++-- package.json | 19 +++++++++++-------- 9 files changed, 31 insertions(+), 36 deletions(-) diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts index c7d5e76c54..2a2f606acc 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.component.spec.ts @@ -122,6 +122,8 @@ describe('ContentNodeSelectorComponent', () => { fixture.destroy(); }); + const getTabInfoButton = () => fixture.debugElement.query(By.css('[data-automation-id="adf-content-node-selector-disabled-tab-info-icon"]')); + const enableLocalUpload = () => { component.data.showLocalUploadButton = true; component.hasAllowableOperations = true; diff --git a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts index 7501ec25ae..bb4febe24a 100644 --- a/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts +++ b/lib/content-services/src/lib/content-type/content-type-dialog.component.spec.ts @@ -21,11 +21,11 @@ import { of, Subject } from 'rxjs'; import { ContentTestingModule } from '../testing/content.testing.module'; import { ContentTypeDialogComponent } from './content-type-dialog.component'; import { ContentTypeDialogComponentData } from './content-type-metadata.interface'; -import { TypeEntry } from '@alfresco/js-api'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; import { MatTableHarness } from '@angular/material/table/testing'; +import { ContentTypeService } from './content-type.service'; const elementCustom: TypeEntry = { entry: { diff --git a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts index 1eb317d865..64d6f9ae2e 100644 --- a/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-chip-autocomplete-input/search-chip-autocomplete-input.component.spec.ts @@ -24,7 +24,7 @@ import { SearchChipAutocompleteInputComponent } from './search-chip-autocomplete import { DebugElement } from '@angular/core'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; -import { MatChipHarness, MatChipListHarness } from '@angular/material/chips/testing'; +import { MatChipHarness, MatChipGridHarness } from '@angular/material/chips/testing'; import { MatAutocompleteHarness } from '@angular/material/autocomplete/testing'; import { MatOptionHarness } from '@angular/material/core/testing'; @@ -89,8 +89,8 @@ describe('SearchChipAutocompleteInputComponent', () => { * @returns list of chips */ async function getChipList(): Promise { - const harness = await loader.getHarness(MatChipListHarness); - return harness.getChips(); + const harness = await loader.getHarness(MatChipGridHarness); + return harness.getRows(); } /** diff --git a/lib/content-services/src/lib/tree/components/tree.component.spec.ts b/lib/content-services/src/lib/tree/components/tree.component.spec.ts index 9fa18a2332..546c47f01e 100644 --- a/lib/content-services/src/lib/tree/components/tree.component.spec.ts +++ b/lib/content-services/src/lib/tree/components/tree.component.spec.ts @@ -17,7 +17,7 @@ import { TreeComponent } from './tree.component'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AlfrescoApiService, AlfrescoApiServiceMock, ContextMenuDirective, ContextMenuModule, IconModule, TranslationMock, TranslationService, UserPreferencesService } from '@alfresco/adf-core'; +import { ContextMenuDirective, CoreTestingModule, UserPreferencesService } from '@alfresco/adf-core'; import { MatTreeModule } from '@angular/material/tree'; import { TreeNode, TreeNodeType } from '../models/tree-node.interface'; import { @@ -67,24 +67,14 @@ describe('TreeComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [ - TranslateModule.forRoot(), - HttpClientModule, - NoopAnimationsModule, - MatTreeModule, - MatIconModule, - MatMenuModule, - MatProgressSpinnerModule, - MatCheckboxModule, - IconModule, - ContextMenuModule + CoreTestingModule, + MatTreeModule ], declarations: [ TreeComponent ], providers: [ - { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, - { provide: TreeService, useClass: TreeServiceMock }, - { provide: TranslationService, useClass: TranslationMock } + { provide: TreeService, useClass: TreeServiceMock } ] }); diff --git a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html index 8e4d56cb66..980b39d854 100644 --- a/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html +++ b/lib/core/src/lib/card-view/components/card-view-arrayitem/card-view-arrayitem.component.html @@ -2,19 +2,19 @@
- + {{item.icon}} {{item?.value}} - {{items.length - displayCount()}} {{'CORE.CARDVIEW.MORE' | translate}} + {{items.length - displayCount}} {{'CORE.CARDVIEW.MORE' | translate}} @@ -32,7 +32,7 @@ {{item.icon}} {{item?.value}} diff --git a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html index 0a8c5dc55f..8c5b76a2ce 100644 --- a/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html +++ b/lib/core/src/lib/dynamic-chip-list/dynamic-chip-list.component.html @@ -4,7 +4,7 @@ [class.adf-dynamic-chip-list-button-in-next-line]="moveLoadMoreButtonToNextRow" [class.adf-dynamic-chip-list-paginated]="paginationData" #nodeListContainer> - @@ -21,7 +21,7 @@ cancel - +