From f2884a12797f78cb361930d7f089ee294560044a Mon Sep 17 00:00:00 2001 From: eromano Date: Fri, 4 Mar 2022 11:23:02 +0000 Subject: [PATCH] all build not sure all work Signed-off-by: eromano --- .../aspect-list-sample.component.ts | 6 +-- .../components/document-list.interface.ts | 37 +++++++++++++++++++ .../filter-header/filter-header.component.ts | 4 +- lib/core/form/components/widgets/index.ts | 1 + lib/core/form/form-base.module.ts | 4 +- lib/core/form/public-api.ts | 1 + 6 files changed, 47 insertions(+), 6 deletions(-) create mode 100644 lib/content-services/src/lib/document-list/components/document-list.interface.ts diff --git a/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts b/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts index e9f08a2d44..766cced546 100644 --- a/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts +++ b/demo-shell/src/app/components/aspect-list-sample/aspect-list-sample.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AspectListService } from '@alfresco/adf-content-services'; +import { DialogAspectListService } from '@alfresco/adf-content-services'; import { Component } from '@angular/core'; @Component({ @@ -30,14 +30,14 @@ export class AspectListSampleComponent { currentResult: string[] = []; - constructor(private aspectListService: AspectListService) { } + constructor(private dialogAspectListService: DialogAspectListService) { } showAspectForNode() { this.isShowed = !this.isShowed; } openAspectDialog() { - this.aspectListService.openAspectListDialog(this.currentNodeId).subscribe((result) => this.currentResult = Array.from(result)); + this.dialogAspectListService.openAspectListDialog(this.currentNodeId).subscribe((result) => this.currentResult = Array.from(result)); } onValueChanged(aspects) { diff --git a/lib/content-services/src/lib/document-list/components/document-list.interface.ts b/lib/content-services/src/lib/document-list/components/document-list.interface.ts new file mode 100644 index 0000000000..274500894e --- /dev/null +++ b/lib/content-services/src/lib/document-list/components/document-list.interface.ts @@ -0,0 +1,37 @@ +/*! + * @license + * Copyright 2019 Alfresco Software, Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* eslint-disable rxjs/no-subject-value */ +/* eslint-disable @typescript-eslint/naming-convention */ + +import { InjectionToken } from '@angular/core'; +import { BehaviorSubject } from 'rxjs'; +import { DataSorting, PaginationModel } from '@alfresco/adf-core'; +import { NodePaging } from '@alfresco/js-api'; + + +export interface DocumentListParentComponent { + node: NodePaging; + pagination: BehaviorSubject; + sortingSubject?: BehaviorSubject; + + reload(); +} + +export const ADF_DOCUMENT_PARENT_COMPONENT = new InjectionToken( + 'ADF_DOCUMENT_PARENT_COMPONENT', +); 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 07400f90d8..7683beb0c1 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 @@ -17,13 +17,13 @@ import { Component, Inject, OnInit, OnChanges, SimpleChanges, Input, Output, EventEmitter, OnDestroy } from '@angular/core'; 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 { SearchHeaderQueryBuilderService } from '../../../search/services/search-header-query-builder.service'; import { FilterSearch } from './../../../search/models/filter-search.interface'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; import { NodePaging, MinimalNode } from '@alfresco/js-api'; +import { ADF_DOCUMENT_PARENT_COMPONENT, DocumentListParentComponent } from '../document-list.interface'; @Component({ selector: 'adf-filter-header', @@ -47,7 +47,7 @@ export class FilterHeaderComponent implements OnInit, OnChanges, OnDestroy { isFilterServiceActive: boolean; private onDestroy$ = new Subject(); - constructor(@Inject(DocumentListComponent) private documentList: DocumentListComponent, + constructor(@Inject(ADF_DOCUMENT_PARENT_COMPONENT) private documentList: DocumentListParentComponent, @Inject(SEARCH_QUERY_SERVICE_TOKEN) private searchFilterQueryBuilder: SearchHeaderQueryBuilderService) { this.isFilterServiceActive = this.searchFilterQueryBuilder.isFilterServiceActive(); } diff --git a/lib/core/form/components/widgets/index.ts b/lib/core/form/components/widgets/index.ts index cea7070cc1..095fbe9e06 100644 --- a/lib/core/form/components/widgets/index.ts +++ b/lib/core/form/components/widgets/index.ts @@ -51,6 +51,7 @@ import { FileViewerWidgetComponent } from './file-viewer/file-viewer.widget'; export * from './widget.component'; export * from './core/index'; + // primitives export * from './unknown/unknown.widget'; export * from './text/text.widget'; diff --git a/lib/core/form/form-base.module.ts b/lib/core/form/form-base.module.ts index 81357c2f27..9e3135b189 100644 --- a/lib/core/form/form-base.module.ts +++ b/lib/core/form/form-base.module.ts @@ -77,7 +77,9 @@ import { TabsWidgetComponent } from './components/widgets/tabs/tabs.widget'; FormListComponent, FormRendererComponent, StartFormCustomButtonDirective, - ...WIDGET_DIRECTIVES + ...WIDGET_DIRECTIVES, + WidgetComponent, + TabsWidgetComponent ] }) export class FormBaseModule { diff --git a/lib/core/form/public-api.ts b/lib/core/form/public-api.ts index e911256624..ddeecd869f 100644 --- a/lib/core/form/public-api.ts +++ b/lib/core/form/public-api.ts @@ -23,6 +23,7 @@ export * from './components/form-custom-button.directive'; export * from './components/form-renderer.component'; export * from './components/widgets/index'; export * from './components/widgets/dynamic-table/dynamic-table-row.model'; +export * from './components/widgets/tabs/tabs.widget'; export * from './services/activiti-alfresco.service'; export * from './services/ecm-model.service';