From dea062263e714b1fa865d5d6c49d18a622d147a2 Mon Sep 17 00:00:00 2001 From: davidcanonieto Date: Sun, 27 Sep 2020 11:23:13 +0200 Subject: [PATCH] [ADF-5219] Fix Production Build (#6166) * [ADF-5219] Fix Production Build * Fix BC * Revert file name --- docs/upgrade-guide/upgrade40-41.md | 1 - .../filter-header.component.spec.ts | 6 +++--- .../filter-header/filter-header.component.ts | 6 +++--- .../src/lib/document-list/public-api.ts | 1 + .../search-filter-container.component.spec.ts | 6 +++--- .../search-filter-container.component.ts | 4 ++-- .../src/lib/search/public-api.ts | 2 +- ... search-header-query-builder.service.spec.ts} | 16 ++++++++-------- ...ts => search-header-query-builder.service.ts} | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) rename lib/content-services/src/lib/search/{search-filter-query-builder.service.spec.ts => search-header-query-builder.service.spec.ts} (90%) rename lib/content-services/src/lib/search/{search-filter-query-builder.service.ts => search-header-query-builder.service.ts} (98%) diff --git a/docs/upgrade-guide/upgrade40-41.md b/docs/upgrade-guide/upgrade40-41.md index 2151ed9bc8..199921fb3c 100644 --- a/docs/upgrade-guide/upgrade40-41.md +++ b/docs/upgrade-guide/upgrade40-41.md @@ -59,4 +59,3 @@ This is all you'll need to set it up in your app. Alternatively, you can also pa (filterSelection)="onFilterSelected($event)"> ``` -Notice that for this feature in ADF 4.0 to work you also needed to overwrite the `SearchFilterQueryBuilderService` with `SEARCH_QUERY_SERVICE_TOKEN` at an app level to make it work. That is no longer the case with the new version. The component will handle everything for you. diff --git a/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts b/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts index ab7f774d50..26755732fa 100644 --- a/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts +++ b/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts @@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core'; import { SearchService, setupTestBed, DataTableComponent, DataSorting } from '@alfresco/adf-core'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { SimpleChange } from '@angular/core'; -import { SearchFilterQueryBuilderService } from './../../../search/search-filter-query-builder.service'; +import { SearchHeaderQueryBuilderService } from './../../../search/search-header-query-builder.service'; import { SEARCH_QUERY_SERVICE_TOKEN } from './../../../search/search-query-service.token'; import { DocumentListComponent } from './../document-list.component'; import { FilterHeaderComponent } from './filter-header.component'; @@ -30,7 +30,7 @@ import { Pagination } from '@alfresco/js-api'; describe('FilterHeaderComponent', () => { let fixture: ComponentFixture; let component: FilterHeaderComponent; - let queryBuilder: SearchFilterQueryBuilderService; + let queryBuilder: SearchHeaderQueryBuilderService; const searchMock: any = { dataLoaded: new Subject() @@ -53,7 +53,7 @@ describe('FilterHeaderComponent', () => { ], providers: [ { provide: SearchService, useValue: searchMock }, - { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchFilterQueryBuilderService }, + { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService }, { provide: DocumentListComponent, useValue: documentListMock }, DataTableComponent ] diff --git a/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.ts b/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.ts index a2a6d07cf7..e0c7eefd16 100644 --- a/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.ts +++ b/lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.ts @@ -19,7 +19,7 @@ import { Component, Inject, OnInit, OnChanges, SimpleChanges, Input, Output, Eve import { PaginationModel, DataSorting } from '@alfresco/adf-core'; import { DocumentListComponent } from '../document-list.component'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../../search/search-query-service.token'; -import { SearchFilterQueryBuilderService } from '../../../search/search-filter-query-builder.service'; +import { SearchHeaderQueryBuilderService } from '../../../search/search-header-query-builder.service'; import { FilterSearch } from './../../../search/filter-search.interface'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; @@ -28,7 +28,7 @@ import { NodePaging, MinimalNode } from '@alfresco/js-api'; @Component({ selector: 'adf-filter-header', templateUrl: './filter-header.component.html', - providers: [{ provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchFilterQueryBuilderService}] + providers: [{ provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService}] }) export class FilterHeaderComponent implements OnInit, OnChanges { @@ -48,7 +48,7 @@ export class FilterHeaderComponent implements OnInit, OnChanges { private onDestroy$ = new Subject(); constructor(@Inject(DocumentListComponent) private documentList: DocumentListComponent, - @Inject(SEARCH_QUERY_SERVICE_TOKEN) private searchFilterQueryBuilder: SearchFilterQueryBuilderService) { + @Inject(SEARCH_QUERY_SERVICE_TOKEN) private searchFilterQueryBuilder: SearchHeaderQueryBuilderService) { this.isFilterServiceActive = this.searchFilterQueryBuilder.isFilterServiceActive(); } diff --git a/lib/content-services/src/lib/document-list/public-api.ts b/lib/content-services/src/lib/document-list/public-api.ts index 32c84aa338..aa6f90591f 100644 --- a/lib/content-services/src/lib/document-list/public-api.ts +++ b/lib/content-services/src/lib/document-list/public-api.ts @@ -23,6 +23,7 @@ export * from './components/library-name-column/library-name-column.component'; export * from './components/library-role-column/library-role-column.component'; export * from './components/library-status-column/library-status-column.component'; export * from './components/name-column/name-column.component'; +export * from './components/filter-header/filter-header.component'; export * from './components/trashcan-name-column/trashcan-name-column.component'; // data diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts index 2775d52956..17a1467ffe 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts @@ -18,7 +18,7 @@ import { Subject } from 'rxjs'; import { ComponentFixture, TestBed } from '@angular/core/testing'; import { TranslateModule } from '@ngx-translate/core'; import { SearchService, setupTestBed, AlfrescoApiService } from '@alfresco/adf-core'; -import { SearchFilterQueryBuilderService } from '../../search-filter-query-builder.service'; +import { SearchHeaderQueryBuilderService } from '../../search-header-query-builder.service'; import { ContentTestingModule } from '../../../testing/content.testing.module'; import { fakeNodePaging } from './../../../mock/document-list.component.mock'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; @@ -46,7 +46,7 @@ const mockCategory: SearchCategory = { describe('SearchFilterContainerComponent', () => { let fixture: ComponentFixture; let component: SearchFilterContainerComponent; - let queryBuilder: SearchFilterQueryBuilderService; + let queryBuilder: SearchHeaderQueryBuilderService; let alfrescoApiService: AlfrescoApiService; const searchMock: any = { @@ -60,7 +60,7 @@ describe('SearchFilterContainerComponent', () => { ], providers: [ { provide: SearchService, useValue: searchMock }, - { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchFilterQueryBuilderService } + { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService } ] }); diff --git a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts index 43f27d29c3..9c34874f2e 100644 --- a/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts +++ b/lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts @@ -30,7 +30,7 @@ import { import { ConfigurableFocusTrapFactory, ConfigurableFocusTrap } from '@angular/cdk/a11y'; import { DataColumn, TranslationService } from '@alfresco/adf-core'; import { SearchWidgetContainerComponent } from '../search-widget-container/search-widget-container.component'; -import { SearchFilterQueryBuilderService } from '../../search-filter-query-builder.service'; +import { SearchHeaderQueryBuilderService } from '../../search-header-query-builder.service'; import { SearchCategory } from '../../search-category.interface'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; import { Subject } from 'rxjs'; @@ -68,7 +68,7 @@ export class SearchFilterContainerComponent implements OnInit, OnDestroy { private onDestroy$ = new Subject(); - constructor(@Inject(SEARCH_QUERY_SERVICE_TOKEN) private searchFilterQueryBuilder: SearchFilterQueryBuilderService, + constructor(@Inject(SEARCH_QUERY_SERVICE_TOKEN) private searchFilterQueryBuilder: SearchHeaderQueryBuilderService, private translationService: TranslationService, private focusTrapFactory: ConfigurableFocusTrapFactory) { } diff --git a/lib/content-services/src/lib/search/public-api.ts b/lib/content-services/src/lib/search/public-api.ts index a3ff78868b..48584538b8 100644 --- a/lib/content-services/src/lib/search/public-api.ts +++ b/lib/content-services/src/lib/search/public-api.ts @@ -27,7 +27,7 @@ export * from './search-configuration.interface'; export * from './search-query-builder.service'; export * from './search-range.interface'; export * from './search-query-service.token'; -export * from './search-filter-query-builder.service'; +export * from './search-header-query-builder.service'; export * from './components/search.component'; export * from './components/search-control.component'; diff --git a/lib/content-services/src/lib/search/search-filter-query-builder.service.spec.ts b/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts similarity index 90% rename from lib/content-services/src/lib/search/search-filter-query-builder.service.spec.ts rename to lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts index 4d8b5e972f..14f7dc6664 100644 --- a/lib/content-services/src/lib/search/search-filter-query-builder.service.spec.ts +++ b/lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts @@ -17,9 +17,9 @@ import { SearchConfiguration } from './search-configuration.interface'; import { AppConfigService } from '@alfresco/adf-core'; -import { SearchFilterQueryBuilderService } from './search-filter-query-builder.service'; +import { SearchHeaderQueryBuilderService } from './search-header-query-builder.service'; -describe('SearchFilterQueryBuilderService', () => { +describe('SearchHeaderQueryBuilderService', () => { const buildConfig = (searchSettings): AppConfigService => { const config = new AppConfigService(null); @@ -36,7 +36,7 @@ describe('SearchFilterQueryBuilderService', () => { filterQueries: [{ query: 'query1' }, { query: 'query2' }] }; - const builder = new SearchFilterQueryBuilderService( + const builder = new SearchHeaderQueryBuilderService( buildConfig(config), null, null @@ -63,7 +63,7 @@ describe('SearchFilterQueryBuilderService', () => { filterQueries: [{ query: 'query1' }, { query: 'query2' }] }; - const service = new SearchFilterQueryBuilderService( + const service = new SearchHeaderQueryBuilderService( buildConfig(config), null, null @@ -76,7 +76,7 @@ describe('SearchFilterQueryBuilderService', () => { }); it('should have empty user query by default', () => { - const builder = new SearchFilterQueryBuilderService( + const builder = new SearchHeaderQueryBuilderService( buildConfig({}), null, null @@ -97,7 +97,7 @@ describe('SearchFilterQueryBuilderService', () => { { query: 'PARENT:"workspace://SpacesStore/fake-node-id"' } ]; - const searchHeaderService = new SearchFilterQueryBuilderService( + const searchHeaderService = new SearchHeaderQueryBuilderService( buildConfig(config), null, null @@ -122,7 +122,7 @@ describe('SearchFilterQueryBuilderService', () => { filterQueries: expectedResult }; - const searchHeaderService = new SearchFilterQueryBuilderService( + const searchHeaderService = new SearchHeaderQueryBuilderService( buildConfig(config), null, null @@ -148,7 +148,7 @@ describe('SearchFilterQueryBuilderService', () => { ] }; - const searchHeaderService = new SearchFilterQueryBuilderService( + const searchHeaderService = new SearchHeaderQueryBuilderService( buildConfig(config), null, null diff --git a/lib/content-services/src/lib/search/search-filter-query-builder.service.ts b/lib/content-services/src/lib/search/search-header-query-builder.service.ts similarity index 98% rename from lib/content-services/src/lib/search/search-filter-query-builder.service.ts rename to lib/content-services/src/lib/search/search-header-query-builder.service.ts index 70d4829edf..43986dae0d 100644 --- a/lib/content-services/src/lib/search/search-filter-query-builder.service.ts +++ b/lib/content-services/src/lib/search/search-header-query-builder.service.ts @@ -29,7 +29,7 @@ import { FilterSearch } from './filter-search.interface'; @Injectable({ providedIn: 'root' }) -export class SearchFilterQueryBuilderService extends BaseQueryBuilderService { +export class SearchHeaderQueryBuilderService extends BaseQueryBuilderService { private customSources = ['-trashcan-', '-sharedlinks-', '-sites-', '-mysites-', '-favorites-', '-recent-', '-my-'];