inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-5219] Fix Production Build (#6166)

Browse Source 
* [ADF-5219] Fix Production Build

* Fix BC

* Revert file name
This commit is contained in:
davidcanonieto 2020-09-27 11:23:13 +02:00 committed by GitHub
parent 3ba729a939
commit dea062263e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/upgrade-guide/upgrade40-41.md
View File

@ -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)"> (filterSelection)="onFilterSelected($event)">
</adf-document-list> </adf-document-list>
``` ```
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.

6
lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.spec.ts
View File

@ -21,7 +21,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { SearchService, setupTestBed, DataTableComponent, DataSorting } from '@alfresco/adf-core'; import { SearchService, setupTestBed, DataTableComponent, DataSorting } from '@alfresco/adf-core';
import { ContentTestingModule } from '../../../testing/content.testing.module'; import { ContentTestingModule } from '../../../testing/content.testing.module';
import { SimpleChange } from '@angular/core'; 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 { SEARCH_QUERY_SERVICE_TOKEN } from './../../../search/search-query-service.token';
import { DocumentListComponent } from './../document-list.component'; import { DocumentListComponent } from './../document-list.component';
import { FilterHeaderComponent } from './filter-header.component'; import { FilterHeaderComponent } from './filter-header.component';
@ -30,7 +30,7 @@ import { Pagination } from '@alfresco/js-api';
describe('FilterHeaderComponent', () => { describe('FilterHeaderComponent', () => {
let fixture: ComponentFixture<FilterHeaderComponent>; let fixture: ComponentFixture<FilterHeaderComponent>;
let component: FilterHeaderComponent; let component: FilterHeaderComponent;
let queryBuilder: SearchFilterQueryBuilderService; let queryBuilder: SearchHeaderQueryBuilderService;
const searchMock: any = { const searchMock: any = {
dataLoaded: new Subject() dataLoaded: new Subject()
@ -53,7 +53,7 @@ describe('FilterHeaderComponent', () => {
], ],
providers: [ providers: [
{ provide: SearchService, useValue: searchMock }, { provide: SearchService, useValue: searchMock },
{ provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchFilterQueryBuilderService }, { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService },
{ provide: DocumentListComponent, useValue: documentListMock }, { provide: DocumentListComponent, useValue: documentListMock },
DataTableComponent DataTableComponent
] ]

6
lib/content-services/src/lib/document-list/components/filter-header/filter-header.component.ts
View File

@ -19,7 +19,7 @@ import { Component, Inject, OnInit, OnChanges, SimpleChanges, Input, Output, Eve
import { PaginationModel, DataSorting } from '@alfresco/adf-core'; import { PaginationModel, DataSorting } from '@alfresco/adf-core';
import { DocumentListComponent } from '../document-list.component'; import { DocumentListComponent } from '../document-list.component';
import { SEARCH_QUERY_SERVICE_TOKEN } from '../../../search/search-query-service.token'; 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 { FilterSearch } from './../../../search/filter-search.interface';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators'; import { takeUntil } from 'rxjs/operators';
@ -28,7 +28,7 @@ import { NodePaging, MinimalNode } from '@alfresco/js-api';
@Component({ @Component({
selector: 'adf-filter-header', selector: 'adf-filter-header',
templateUrl: './filter-header.component.html', 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 { export class FilterHeaderComponent implements OnInit, OnChanges {
@ -48,7 +48,7 @@ export class FilterHeaderComponent implements OnInit, OnChanges {
private onDestroy$ = new Subject<boolean>(); private onDestroy$ = new Subject<boolean>();
constructor(@Inject(DocumentListComponent) private documentList: DocumentListComponent, 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(); this.isFilterServiceActive = this.searchFilterQueryBuilder.isFilterServiceActive();
} }

1
lib/content-services/src/lib/document-list/public-api.ts
View File

@ -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-role-column/library-role-column.component';
export * from './components/library-status-column/library-status-column.component'; export * from './components/library-status-column/library-status-column.component';
export * from './components/name-column/name-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'; export * from './components/trashcan-name-column/trashcan-name-column.component';
// data // data

6
lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.spec.ts
View File

@ -18,7 +18,7 @@ import { Subject } from 'rxjs';
import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ComponentFixture, TestBed } from '@angular/core/testing';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { SearchService, setupTestBed, AlfrescoApiService } from '@alfresco/adf-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 { ContentTestingModule } from '../../../testing/content.testing.module';
import { fakeNodePaging } from './../../../mock/document-list.component.mock'; import { fakeNodePaging } from './../../../mock/document-list.component.mock';
import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token';
@ -46,7 +46,7 @@ const mockCategory: SearchCategory = {
describe('SearchFilterContainerComponent', () => { describe('SearchFilterContainerComponent', () => {
let fixture: ComponentFixture<SearchFilterContainerComponent>; let fixture: ComponentFixture<SearchFilterContainerComponent>;
let component: SearchFilterContainerComponent; let component: SearchFilterContainerComponent;
let queryBuilder: SearchFilterQueryBuilderService; let queryBuilder: SearchHeaderQueryBuilderService;
let alfrescoApiService: AlfrescoApiService; let alfrescoApiService: AlfrescoApiService;
const searchMock: any = { const searchMock: any = {
@ -60,7 +60,7 @@ describe('SearchFilterContainerComponent', () => {
], ],
providers: [ providers: [
{ provide: SearchService, useValue: searchMock }, { provide: SearchService, useValue: searchMock },
{ provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchFilterQueryBuilderService } { provide: SEARCH_QUERY_SERVICE_TOKEN, useClass: SearchHeaderQueryBuilderService }
] ]
}); });

4
lib/content-services/src/lib/search/components/search-filter-container/search-filter-container.component.ts
View File

@ -30,7 +30,7 @@ import {
import { ConfigurableFocusTrapFactory, ConfigurableFocusTrap } from '@angular/cdk/a11y'; import { ConfigurableFocusTrapFactory, ConfigurableFocusTrap } from '@angular/cdk/a11y';
import { DataColumn, TranslationService } from '@alfresco/adf-core'; import { DataColumn, TranslationService } from '@alfresco/adf-core';
import { SearchWidgetContainerComponent } from '../search-widget-container/search-widget-container.component'; 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 { SearchCategory } from '../../search-category.interface';
import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token'; import { SEARCH_QUERY_SERVICE_TOKEN } from '../../search-query-service.token';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
@ -68,7 +68,7 @@ export class SearchFilterContainerComponent implements OnInit, OnDestroy {
private onDestroy$ = new Subject<boolean>(); private onDestroy$ = new Subject<boolean>();
constructor(@Inject(SEARCH_QUERY_SERVICE_TOKEN) private searchFilterQueryBuilder: SearchFilterQueryBuilderService, constructor(@Inject(SEARCH_QUERY_SERVICE_TOKEN) private searchFilterQueryBuilder: SearchHeaderQueryBuilderService,
private translationService: TranslationService, private translationService: TranslationService,
private focusTrapFactory: ConfigurableFocusTrapFactory) { private focusTrapFactory: ConfigurableFocusTrapFactory) {
} }

2
lib/content-services/src/lib/search/public-api.ts
View File

@ -27,7 +27,7 @@ export * from './search-configuration.interface';
export * from './search-query-builder.service'; export * from './search-query-builder.service';
export * from './search-range.interface'; export * from './search-range.interface';
export * from './search-query-service.token'; 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.component';
export * from './components/search-control.component'; export * from './components/search-control.component';

16
lib/content-services/src/lib/search/search-filter-query-builder.service.spec.ts → lib/content-services/src/lib/search/search-header-query-builder.service.spec.ts
View File

@ -17,9 +17,9 @@
import { SearchConfiguration } from './search-configuration.interface'; import { SearchConfiguration } from './search-configuration.interface';
import { AppConfigService } from '@alfresco/adf-core'; 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 buildConfig = (searchSettings): AppConfigService => {
const config = new AppConfigService(null); const config = new AppConfigService(null);
@ -36,7 +36,7 @@ describe('SearchFilterQueryBuilderService', () => {
filterQueries: [{ query: 'query1' }, { query: 'query2' }] filterQueries: [{ query: 'query1' }, { query: 'query2' }]
}; };
const builder = new SearchFilterQueryBuilderService( const builder = new SearchHeaderQueryBuilderService(
buildConfig(config), buildConfig(config),
null, null,
null null
@ -63,7 +63,7 @@ describe('SearchFilterQueryBuilderService', () => {
filterQueries: [{ query: 'query1' }, { query: 'query2' }] filterQueries: [{ query: 'query1' }, { query: 'query2' }]
}; };
const service = new SearchFilterQueryBuilderService( const service = new SearchHeaderQueryBuilderService(
buildConfig(config), buildConfig(config),
null, null,
null null
@ -76,7 +76,7 @@ describe('SearchFilterQueryBuilderService', () => {
}); });
it('should have empty user query by default', () => { it('should have empty user query by default', () => {
const builder = new SearchFilterQueryBuilderService( const builder = new SearchHeaderQueryBuilderService(
buildConfig({}), buildConfig({}),
null, null,
null null
@ -97,7 +97,7 @@ describe('SearchFilterQueryBuilderService', () => {
{ query: 'PARENT:"workspace://SpacesStore/fake-node-id"' } { query: 'PARENT:"workspace://SpacesStore/fake-node-id"' }
]; ];
const searchHeaderService = new SearchFilterQueryBuilderService( const searchHeaderService = new SearchHeaderQueryBuilderService(
buildConfig(config), buildConfig(config),
null, null,
null null
@ -122,7 +122,7 @@ describe('SearchFilterQueryBuilderService', () => {
filterQueries: expectedResult filterQueries: expectedResult
}; };
const searchHeaderService = new SearchFilterQueryBuilderService( const searchHeaderService = new SearchHeaderQueryBuilderService(
buildConfig(config), buildConfig(config),
null, null,
null null
@ -148,7 +148,7 @@ describe('SearchFilterQueryBuilderService', () => {
] ]
}; };
const searchHeaderService = new SearchFilterQueryBuilderService( const searchHeaderService = new SearchHeaderQueryBuilderService(
buildConfig(config), buildConfig(config),
null, null,
null null

2
lib/content-services/src/lib/search/search-filter-query-builder.service.ts → lib/content-services/src/lib/search/search-header-query-builder.service.ts
View File

@ -29,7 +29,7 @@ import { FilterSearch } from './filter-search.interface';
@Injectable({ @Injectable({
providedIn: 'root' providedIn: 'root'
}) })
export class SearchFilterQueryBuilderService extends BaseQueryBuilderService { export class SearchHeaderQueryBuilderService extends BaseQueryBuilderService {
private customSources = ['-trashcan-', '-sharedlinks-', '-sites-', '-mysites-', '-favorites-', '-recent-', '-my-']; private customSources = ['-trashcan-', '-sharedlinks-', '-sites-', '-mysites-', '-favorites-', '-recent-', '-my-'];