[AAE-10777] Move in common service the real common services (#8203)

* Move in common service the real common services
remove Pagination js-api dependencies
move search-input component in content

* fix unit

* fix lint

* fix

* fix
This commit is contained in:
Eugenio Romano
2023-01-31 00:42:29 +01:00
committed by GitHub
parent 89b79c9e45
commit 4f25426c25
105 changed files with 156 additions and 381 deletions

View File

@@ -18,3 +18,4 @@
export * from './services/favorites-api.service';
export * from './services/card-view-content-update.service';
export * from './services/sites.service';
export * from './interface/search-configuration.interface';

View File

@@ -46,6 +46,7 @@ import { versionCompatibilityFactory } from './version-compatibility/version-com
import { VersionCompatibilityService } from './version-compatibility/version-compatibility.service';
import { ContentPipeModule } from './pipes/content-pipe.module';
import { NodeCommentsModule } from './node-comments/node-comments.module';
import { SearchTextModule } from './search-text/search-text-input.module';
@NgModule({
imports: [
@@ -75,7 +76,8 @@ import { NodeCommentsModule } from './node-comments/node-comments.module';
ContentTypeModule,
AspectListModule,
VersionCompatibilityModule,
NodeCommentsModule
NodeCommentsModule,
SearchTextModule
],
providers: [
{
@@ -109,7 +111,8 @@ import { NodeCommentsModule } from './node-comments/node-comments.module';
AspectListModule,
ContentTypeModule,
VersionCompatibilityModule,
NodeCommentsModule
NodeCommentsModule,
SearchTextModule
]
})
export class ContentModule {

View File

@@ -16,7 +16,7 @@
*/
import { QueryBody } from '@alfresco/js-api';
import { SearchConfigurationInterface } from '@alfresco/adf-core';
import { SearchConfigurationInterface } from '../../../common/interface/search-configuration.interface';
import { Injectable, Optional, Inject, InjectionToken } from '@angular/core';
export const SEARCH_QUERY_TOKEN = new InjectionToken<QueryProvider>('Alfresco Search Query Token');

View File

@@ -19,5 +19,3 @@ export * from './animations';
export * from './search-text-input.component';
export * from './search-trigger.directive';
export * from './search-text-input.module';
export * from './interfaces/search-configuration.interface';

View File

@@ -16,14 +16,12 @@
*/
import { ComponentFixture, TestBed, discardPeriodicTasks, fakeAsync, tick } from '@angular/core/testing';
import { CoreTestingModule } from '../testing/core.testing.module';
import { CoreTestingModule, UserPreferencesService, setupTestBed } from '@alfresco/adf-core';
import { SearchTextInputComponent } from './search-text-input.component';
import { DebugElement } from '@angular/core';
import { By } from '@angular/platform-browser';
import { Subject } from 'rxjs';
import { TranslateModule } from '@ngx-translate/core';
import { UserPreferencesService } from '../common/services/user-preferences.service';
import { setupTestBed } from '../testing/setup-test-bed';
describe('SearchTextInputComponent', () => {

View File

@@ -20,8 +20,8 @@ import { Subject, Observable, Subscription } from 'rxjs';
import { debounceTime, takeUntil, filter } from 'rxjs/operators';
import { Direction } from '@angular/cdk/bidi';
import { searchAnimation } from './animations';
import { UserPreferencesService } from '../common/services/user-preferences.service';
import { SearchTextStateEnum, SearchAnimationState, SearchAnimationDirection } from '../models/search-text-input.model';
import { UserPreferencesService } from '@alfresco/adf-core';
import { SearchTextStateEnum, SearchAnimationState, SearchAnimationDirection } from './models/search-text-input.model';
@Component({
selector: 'adf-search-text-input',

View File

@@ -17,11 +17,11 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MaterialModule } from '../material.module';
import { FormsModule } from '@angular/forms';
import { SearchTextInputComponent } from './search-text-input.component';
import { TranslateModule } from '@ngx-translate/core';
import { SearchTriggerDirective } from './search-trigger.directive';
import { MaterialModule } from '../material.module';
@NgModule({
declarations: [

View File

@@ -33,7 +33,7 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { DOCUMENT } from '@angular/common';
import { Observable, Subject, Subscription, merge, of, fromEvent } from 'rxjs';
import { filter, switchMap, takeUntil } from 'rxjs/operators';
import { SearchComponentInterface } from './interfaces/search-configuration.interface';
import { SearchComponentInterface } from '../common/interface/search-configuration.interface';
export const SEARCH_AUTOCOMPLETE_VALUE_ACCESSOR: any = {
provide: NG_VALUE_ACCESSOR,

View File

@@ -21,8 +21,7 @@ import { By } from '@angular/platform-browser';
import {
AuthenticationService,
setupTestBed,
UserPreferencesService,
SearchTextInputComponent
UserPreferencesService
} from '@alfresco/adf-core';
import { noResult, results } from '../../mock';
import { SearchControlComponent } from './search-control.component';
@@ -30,6 +29,7 @@ import { SearchService } from '../services/search.service';
import { of } from 'rxjs';
import { ContentTestingModule } from '../../testing/content.testing.module';
import { TranslateModule } from '@ngx-translate/core';
import { SearchTextInputComponent } from '../../search-text/search-text-input.component';
@Component({
template: `

View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { AuthenticationService, ThumbnailService, SearchTextInputComponent } from '@alfresco/adf-core';
import { AuthenticationService, ThumbnailService } from '@alfresco/adf-core';
import { Component, EventEmitter, Input, OnDestroy, Output,
QueryList, ViewEncapsulation, ViewChild, ViewChildren, TemplateRef, ContentChild } from '@angular/core';
import { NodeEntry } from '@alfresco/js-api';
@@ -23,6 +23,7 @@ import { Subject } from 'rxjs';
import { SearchComponent } from './search.component';
import { MatListItem } from '@angular/material/list';
import { EmptySearchResultComponent } from './empty-search-result.component';
import { SearchTextInputComponent } from '../../search-text/search-text-input.component';
@Component({
selector: 'adf-search-control',

View File

@@ -16,7 +16,7 @@
*/
import { SearchService } from '../services/search.service';
import { SearchComponentInterface } from '@alfresco/adf-core';
import { SearchComponentInterface } from '../../common/interface/search-configuration.interface';
import {
AfterContentInit,
Component,

View File

@@ -47,6 +47,7 @@ import { SearchFacetFieldComponent } from './components/search-facet-field/searc
import { SearchWidgetChipComponent } from './components/search-filter-chips/search-widget-chip/search-widget-chip.component';
import { SearchFacetChipComponent } from './components/search-filter-chips/search-facet-chip/search-facet-chip.component';
import { ResetSearchDirective } from './components/reset-search.directive';
import { SearchTextModule } from '../search-text/search-text-input.module';
@NgModule({
imports: [
@@ -54,7 +55,8 @@ import { ResetSearchDirective } from './components/reset-search.directive';
FormsModule,
ReactiveFormsModule,
MaterialModule,
CoreModule
CoreModule,
SearchTextModule
],
declarations: [
SearchComponent,

View File

@@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { QueryBody } from '@alfresco/js-api';
import { SearchConfigurationInterface } from '@alfresco/adf-core';
import { SearchConfigurationInterface } from '../../common/interface/search-configuration.interface';
@Injectable({
providedIn: 'root'

View File

@@ -41,5 +41,6 @@ export * from './lib/interfaces/index';
export * from './lib/version-compatibility/index';
export * from './lib/pipes/index';
export * from './lib/common/index';
export * from './lib/search-text/index';
export * from './lib/content.module';

View File

@@ -15,16 +15,16 @@
* limitations under the License.
*/
import { Pagination } from '@alfresco/js-api';
import { Observable } from 'rxjs';
import { IdentityGroupModel } from '../models/identity-group.model';
import { IdentityRoleModel } from '../models/identity-role.model';
import { IdentityUserModel } from '../models/identity-user.model';
import { PaginationModel } from '../../models/pagination.model';
export interface IdentityUserQueryResponse {
entries: IdentityUserModel[];
pagination: Pagination;
pagination: PaginationModel;
}
export interface IdentityUserPasswordModel {

View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { Pagination } from '@alfresco/js-api';
import { PaginationModel } from '../../models/pagination.model';
export interface IdentityGroupModel {
id?: string;
@@ -35,7 +35,7 @@ export interface IdentityGroupSearchParam {
export interface IdentityGroupQueryResponse {
entries: IdentityGroupModel[];
pagination: Pagination;
pagination: PaginationModel;
}
export interface IdentityGroupQueryCloudRequestModel {

View File

@@ -19,14 +19,14 @@ import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { throwError as observableThrowError, Observable, of } from 'rxjs';
import { catchError, map } from 'rxjs/operators';
import { Pagination } from '@alfresco/js-api';
import { PaginationModel } from '../../models/pagination.model';
import { IdentityRoleModel } from '../models/identity-role.model';
import { AppConfigService } from '../../app-config/app-config.service';
import { LogService } from '../../common/services/log.service';
export interface IdentityRoleResponseModel {
entries: IdentityRoleModel[];
pagination: Pagination;
pagination: PaginationModel;
}
@Injectable({

View File

@@ -30,7 +30,7 @@ import { Subject } from 'rxjs';
import { takeUntil } from 'rxjs/operators';
import { BaseCardView } from '../base-card-view';
import { ClipboardService } from '../../../clipboard/clipboard.service';
import { TranslationService } from '../../../services/translation.service';
import { TranslationService } from '../../../translation/translation.service';
@Component({
providers: [

View File

@@ -21,7 +21,7 @@ import { CardViewUpdateService } from '../../services/card-view-update.service';
import { BaseCardView } from '../base-card-view';
import { MatChipInputEvent } from '@angular/material/chips';
import { ClipboardService } from '../../../clipboard/clipboard.service';
import { TranslationService } from '../../../services/translation.service';
import { TranslationService } from '../../../translation/translation.service';
import { CardViewItemValidator } from '../../interfaces/card-view-item-validator.interface';
import { UntypedFormControl } from '@angular/forms';
import { debounceTime, takeUntil, filter } from 'rxjs/operators';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
import { Observable } from 'rxjs';
import { CardViewArrayItemProperties } from '../interfaces/card-view-arrayitem-properties.interface';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
import { CardViewBoolItemProperties } from '../interfaces/card-view.interfaces';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
import { CardViewDateItemProperties } from '../interfaces/card-view.interfaces';
import { LocalizedDatePipe } from '../../pipes/localized-date.pipe';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewDateItemModel } from './card-view-dateitem.model';
import { CardViewDateItemProperties } from '../interfaces/card-view.interfaces';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewTextItemModel } from './card-view-textitem.model';
import { CardViewTextItemProperties } from '../interfaces/card-view.interfaces';
import { CardViewItemFloatValidator } from '../validators/card-view.validators';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewTextItemModel } from './card-view-textitem.model';
import { CardViewTextItemProperties } from '../interfaces/card-view.interfaces';
import { CardViewItemIntValidator } from '../validators/card-view.validators';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
import { CardViewKeyValuePairsItemProperties } from '../interfaces/card-view.interfaces';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
export class CardViewMapItemModel extends CardViewBaseItemModel implements CardViewItem, DynamicComponentModel {

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
import { CardViewSelectItemProperties, CardViewSelectItemOption } from '../interfaces/card-view.interfaces';
import { Observable, of } from 'rxjs';

View File

@@ -16,7 +16,7 @@
*/
import { CardViewItem } from '../interfaces/card-view-item.interface';
import { DynamicComponentModel } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentModel } from '../../common/services/dynamic-component-mapper.service';
import { CardViewBaseItemModel } from './card-view-baseitem.model';
import { CardViewTextItemPipeProperty, CardViewTextItemProperties } from '../interfaces/card-view.interfaces';

View File

@@ -27,6 +27,7 @@ export {
SelectFilterInputComponent
} from './components/card-view.components';
export * from './interfaces/card-view.interfaces';
export * from './interfaces/card-view.interfaces';
export * from './validators/card-view.validators';
export * from './models/card-view.models';

View File

@@ -22,7 +22,7 @@ import { CardViewTextItemComponent } from '../components/card-view-textitem/card
import { CardViewSelectItemComponent } from '../components/card-view-selectitem/card-view-selectitem.component';
import { CardViewBoolItemComponent } from '../components/card-view-boolitem/card-view-boolitem.component';
import { CardViewKeyValuePairsItemComponent } from '../components/card-view-keyvaluepairsitem/card-view-keyvaluepairsitem.component';
import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../common/services/dynamic-component-mapper.service';
import { CardViewArrayItemComponent } from '../components/card-view-arrayitem/card-view-arrayitem.component';
@Injectable({

View File

@@ -20,6 +20,11 @@ export * from './services/log.service';
export * from './services/storage.service';
export * from './services/user-preferences.service';
export * from './services/language-item.interface';
export * from './services/dynamic-component-mapper.service';
export * from './services/highlight-transform.service';
export * from './services/page-title.service';
export * from './services/thumbnail.service';
export * from './services/sort-by-category.service';
export * from './models/log-levels.model';

View File

@@ -16,11 +16,11 @@
*/
import { TestBed } from '@angular/core/testing';
import { CoreTestingModule } from '../testing/core.testing.module';
import { setupTestBed } from '../testing/setup-test-bed';
import { UserPreferencesService } from '../common/services/user-preferences.service';
import { CoreTestingModule } from '../../testing/core.testing.module';
import { setupTestBed } from '../../testing/setup-test-bed';
import { UserPreferencesService } from './user-preferences.service';
import { TranslateModule } from '@ngx-translate/core';
import { CoreModule } from '../core.module';
import { CoreModule } from '../../core.module';
describe('DirectionalityConfigService', () => {
let userPreferencesService: UserPreferencesService;

View File

@@ -17,7 +17,7 @@
import { Injectable, Inject, Renderer2, RendererFactory2 } from '@angular/core';
import { Directionality, Direction } from '@angular/cdk/bidi';
import { UserPreferencesService } from '../common/services/user-preferences.service';
import { UserPreferencesService } from './user-preferences.service';
import { DOCUMENT } from '@angular/common';
@Injectable({

View File

@@ -16,7 +16,8 @@
*/
import { Type } from '@angular/core';
import { getType } from './get-type';
const getType = (type: any): any => () => type;
export interface DynamicComponentModel { type: string }
export type DynamicComponentResolveFunction = (model: DynamicComponentModel) => Type<any>;

View File

@@ -17,8 +17,8 @@
import { Injectable } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { AppConfigService } from '../app-config/app-config.service';
import { TranslationService } from './translation.service';
import { AppConfigService } from '../../app-config/app-config.service';
import { TranslationService } from '../../translation/translation.service';
@Injectable({
providedIn: 'root'

View File

@@ -17,8 +17,8 @@
import { TestBed } from '@angular/core/testing';
import { ThumbnailService } from './thumbnail.service';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreTestingModule } from '../testing/core.testing.module';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreTestingModule } from '../../testing/core.testing.module';
import { TranslateModule } from '@ngx-translate/core';
describe('ThumbnailService', () => {

View File

@@ -19,7 +19,7 @@
import { Injectable } from '@angular/core';
import { MatIconRegistry } from '@angular/material/icon';
import { DomSanitizer } from '@angular/platform-browser';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { ContentApi, NodeEntry } from '@alfresco/js-api';
const DEFAULT_ICON = './assets/images/ft_ic_miscellaneous.svg';

View File

@@ -47,15 +47,14 @@ import { DownloadZipDialogModule } from './dialogs/download-zip/download-zip.dia
import { PipeModule } from './pipes/pipe.module';
import { AlfrescoApiService } from './services/alfresco-api.service';
import { TranslationService } from './services/translation.service';
import { TranslationService } from './translation/translation.service';
import { startupServiceFactory } from './services/startup-service-factory';
import { SortingPickerModule } from './sorting-picker/sorting-picker.module';
import { IconModule } from './icon/icon.module';
import { TranslateLoaderService } from './services/translate-loader.service';
import { TranslateLoaderService } from './translation/translate-loader.service';
import { ExtensionsModule } from '@alfresco/adf-extensions';
import { directionalityConfigFactory } from './services/directionality-config-factory';
import { DirectionalityConfigService } from './services/directionality-config.service';
import { SearchTextModule } from './search-text/search-text-input.module';
import { directionalityConfigFactory } from './common/services/directionality-config-factory';
import { DirectionalityConfigService } from './common/services/directionality-config.service';
import { AlfrescoJsClientsModule } from '@alfresco/adf-core/api';
import { AuthenticationInterceptor, Authentication } from '@alfresco/adf-core/auth';
import { LegacyApiClientModule } from './api-factories/legacy-api-client.module';
@@ -95,7 +94,6 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
IconModule,
SortingPickerModule,
NotificationHistoryModule,
SearchTextModule,
BlankPageModule,
LegacyApiClientModule,
AlfrescoJsClientsModule,
@@ -136,7 +134,6 @@ import { MAT_SNACK_BAR_DEFAULT_OPTIONS } from '@angular/material/snack-bar';
SortingPickerModule,
IconModule,
NotificationHistoryModule,
SearchTextModule,
BlankPageModule,
RichTextEditorModule
]

View File

@@ -18,7 +18,7 @@
import { Component, ViewChildren } from '@angular/core';
import { ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { HighlightTransformService } from '../services/highlight-transform.service';
import { HighlightTransformService } from '../common/services/highlight-transform.service';
import { HighlightDirective } from './highlight.directive';
import { setupTestBed } from '../testing/setup-test-bed';
import { CoreTestingModule } from '../testing/core.testing.module';

View File

@@ -18,7 +18,7 @@
/* eslint-disable @angular-eslint/no-input-rename */
import { Directive, ElementRef, Input, Renderer2, AfterViewChecked } from '@angular/core';
import { HighlightTransformService, HighlightTransformResult } from '../services/highlight-transform.service';
import { HighlightTransformService, HighlightTransformResult } from '../common/services/highlight-transform.service';
@Directive({
selector: '[adf-highlight]'

View File

@@ -17,5 +17,4 @@
export * from './base.event';
export * from './base-ui.event';
export * from './folder-created.event';
export * from './file.event';

View File

@@ -23,7 +23,7 @@ import { CheckboxWidgetComponent } from './checkbox.widget';
import { setupTestBed } from '../../../../testing/setup-test-bed';
import { FormBaseModule } from '../../../form-base.module';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { TranslateLoaderService } from '../../../../services/translate-loader.service';
import { TranslateLoaderService } from '../../../../translation/translate-loader.service';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { CoreTestingModule } from '../../../../testing';
import { MatTooltipModule } from '@angular/material/tooltip';

View File

@@ -24,9 +24,7 @@ import { FormFieldModel } from './form-field.model';
import { FormOutcomeModel } from './form-outcome.model';
import { FormModel } from './form.model';
import { TabModel } from './tab.model';
import { fakeMetadataForm, fakeViewerForm } from '../../mock/form.mock';
import { Node } from '@alfresco/js-api';
import { UploadWidgetContentLinkModel } from './upload-widget-content-link.model';
import { fakeMetadataForm } from '../../mock/form.mock';
import { CoreTestingModule, setupTestBed } from '../../../../testing';
describe('FormModel', () => {
@@ -609,37 +607,4 @@ describe('FormModel', () => {
});
});
describe('setNodeIdValueForViewersLinkedToUploadWidget', () => {
const fakeNodeWithProperties: Node = {
id: 'fake-properties',
name: 'fake-properties-name',
content: {
mimeType: 'application/pdf'
},
properties: {
'pfx:property_one': 'testValue',
'pfx:property_two': true
}
} as Node;
let form: FormModel;
it('should set the node id to the viewers linked to the upload widget in the event', () => {
form = new FormModel(fakeMetadataForm);
const uploadWidgetContentLinkModel = new UploadWidgetContentLinkModel(fakeNodeWithProperties, 'content_form_nodes');
form.setNodeIdValueForViewersLinkedToUploadWidget(uploadWidgetContentLinkModel);
expect(form.values['cmfb85b2a7295ba41209750bca176ccaf9a']).toBe(fakeNodeWithProperties.id);
});
it('should not set the node id to the viewers when they are not linked', () => {
form = new FormModel(fakeViewerForm);
const uploadWidgetContentLinkModel = new UploadWidgetContentLinkModel(fakeNodeWithProperties, 'upload_widget');
form.setNodeIdValueForViewersLinkedToUploadWidget(uploadWidgetContentLinkModel);
expect(form.values['cmfb85b2a7295ba41209750bca176ccaf9a']).toBeNull();
});
});
});

View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../services/dynamic-component-mapper.service';
import { DynamicComponentMapper, DynamicComponentResolveFunction, DynamicComponentResolver } from '../../common/services/dynamic-component-mapper.service';
import { Injectable, Type } from '@angular/core';
import * as widgets from '../components/widgets';

View File

@@ -21,7 +21,7 @@ import { LanguageMenuComponent } from './language-menu.component';
import { CoreTestingModule } from '../testing/core.testing.module';
import { UserPreferencesService } from '../common/services/user-preferences.service';
import { TranslateModule } from '@ngx-translate/core';
import { LanguageService } from '../services/language.service';
import { LanguageService } from './service/language.service';
describe('LanguageMenuComponent', () => {

View File

@@ -21,7 +21,7 @@ import { CoreStoryModule } from '../testing/core.story.module';
import { LanguageMenuModule } from './language-menu.module';
import { LanguageMenuComponent } from './language-menu.component';
import { LanguageService } from '../services/language.service';
import { LanguageService } from './service/language.service';
import { LanguageServiceMock } from '../mock/language.service.mock';
export default {

View File

@@ -16,7 +16,7 @@
*/
import { Component, EventEmitter, Output } from '@angular/core';
import { LanguageService } from '../services/language.service';
import { LanguageService } from './service/language.service';
import { Observable } from 'rxjs';
import { LanguageItem } from '../common/services/language-item.interface';

View File

@@ -21,7 +21,7 @@ import { CoreStoryModule } from '../testing/core.story.module';
import { LanguageMenuModule } from './language-menu.module';
import { LanguagePickerComponent } from './language-picker.component';
import { LanguageService } from '../services/language.service';
import { LanguageService } from './service/language.service';
import { LanguageServiceMock } from '../mock/language.service.mock';
export default {

View File

@@ -15,6 +15,8 @@
* limitations under the License.
*/
export * from './service/language.service';
export * from './language-menu.component';
export * from './language-menu.module';
export * from './language-picker.component';

View File

@@ -16,7 +16,7 @@
*/
import { Observable } from 'rxjs';
import { LanguageItem } from '../common/services/language-item.interface';
import { LanguageItem } from '../../common/services/language-item.interface';
export interface LanguageServiceInterface {

View File

@@ -18,9 +18,9 @@
import { LanguageServiceInterface } from './language.service.interface';
import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { AppConfigService, AppConfigValues } from '../app-config/app-config.service';
import { LanguageItem } from '../common/services/language-item.interface';
import { UserPreferencesService } from '../common/services/user-preferences.service';
import { AppConfigService, AppConfigValues } from '../../app-config/app-config.service';
import { LanguageItem } from '../../common/services/language-item.interface';
import { UserPreferencesService } from '../../common/services/user-preferences.service';
@Injectable({providedIn: 'root'})
export class LanguageService implements LanguageServiceInterface {

View File

@@ -23,7 +23,7 @@ import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } fro
import { Router, ActivatedRoute, Params } from '@angular/router';
import { AuthenticationService } from '../../auth/services/authentication.service';
import { OauthConfigModel } from '../../auth/models/oauth-config.model';
import { TranslationService } from '../../services/translation.service';
import { TranslationService } from '../../translation/translation.service';
import { UserPreferencesService } from '../../common/services/user-preferences.service';
import { AlfrescoApiService } from '../../services/alfresco-api.service';

View File

@@ -15,7 +15,7 @@
* limitations under the License.
*/
import { LanguageServiceInterface } from '../services/language.service.interface';
import { LanguageServiceInterface } from '../language-menu/service/language.service.interface';
import { Injectable } from '@angular/core';
import { BehaviorSubject } from 'rxjs';
import { LanguageItem } from '../common/services/language-item.interface';

View File

@@ -17,7 +17,7 @@
import { EventEmitter, Injectable } from '@angular/core';
import { Observable, of } from 'rxjs';
import { TranslationService } from '../services/translation.service';
import { TranslationService } from '../translation/translation.service';
export interface LangChangeEvent {
lang: string;

View File

@@ -27,7 +27,6 @@ export * from './request-pagination.model';
export * from './decimal-number.model';
export * from './bpm-user.model';
export * from './ecm-user.model';
export * from './search-text-input.model';
export * from './node-metadata.model';
export * from './application-access.model';
export * from './user-access.model';

View File

@@ -22,7 +22,7 @@ import { MatMenuTrigger, MenuPositionX, MenuPositionY } from '@angular/material/
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
import { StorageService } from '../../common/services/storage.service';
import { Pagination } from '@alfresco/js-api';
import { PaginationModel } from '../../models/pagination.model';
@Component({
selector: 'adf-notification-history',
@@ -53,7 +53,7 @@ export class NotificationHistoryComponent implements OnDestroy, OnInit, AfterVie
onDestroy$ = new Subject<boolean>();
notifications: NotificationModel[] = [];
paginatedNotifications = [];
pagination: Pagination;
pagination: PaginationModel;
constructor(
private notificationService: NotificationService,

View File

@@ -22,7 +22,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing';
import { MatSnackBar, MatSnackBarConfig, MatSnackBarModule } from '@angular/material/snack-bar';
import { NotificationService } from './notification.service';
import { TranslationService } from '../../services/translation.service';
import { TranslationService } from '../../translation/translation.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { CoreTestingModule } from '../../testing/core.testing.module';
import { TranslateModule } from '@ngx-translate/core';

View File

@@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { MatSnackBar, MatSnackBarRef, MatSnackBarConfig } from '@angular/material/snack-bar';
import { TranslationService } from '../../services/translation.service';
import { TranslationService } from '../../translation/translation.service';
import { Subject } from 'rxjs';
import { NotificationModel } from '../models/notification.model';
import { info, warning, error } from '../helpers/notification.factory';

View File

@@ -16,7 +16,7 @@
*/
import { Pipe, PipeTransform } from '@angular/core';
import { TranslationService } from '../services/translation.service';
import { TranslationService } from '../translation/translation.service';
@Pipe({
name: 'adfFileSize',

View File

@@ -16,7 +16,7 @@
*/
import { Pipe, PipeTransform } from '@angular/core';
import { TranslationService } from '../services/translation.service';
import { TranslationService } from '../translation/translation.service';
@Pipe({
name: 'adfLocalizedRole'

View File

@@ -16,7 +16,7 @@
*/
import { Pipe, PipeTransform } from '@angular/core';
import { ThumbnailService } from '../services/thumbnail.service';
import { ThumbnailService } from '../common/services/thumbnail.service';
@Pipe({
name: 'adfMimeTypeIcon'

View File

@@ -16,7 +16,7 @@
*/
import { Pipe, PipeTransform } from '@angular/core';
import { HighlightTransformService, HighlightTransformResult } from '../services/highlight-transform.service';
import { HighlightTransformService, HighlightTransformResult } from '../common/services/highlight-transform.service';
@Pipe({
name: 'highlight'

View File

@@ -1,196 +0,0 @@
/*!
* @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.
*/
import { Meta, moduleMetadata, Story } from '@storybook/angular';
import { CoreStoryModule } from '../testing/core.story.module';
import { SearchTextInputComponent } from './search-text-input.component';
import { SearchTextModule } from './search-text-input.module';
export default {
component: SearchTextInputComponent,
title: 'Core/Search Text Input/Search Text Input',
decorators: [
moduleMetadata({
imports: [CoreStoryModule, SearchTextModule]
})
],
argTypes: {
autocomplete: {
control: 'boolean',
description: 'Toggles auto-completion of the search input field.',
defaultValue: false,
table: {
type: { summary: 'boolean' },
defaultValue: { summary: 'false' }
}
},
expandable: {
control: 'boolean',
description: 'Toggles whether to use an expanding search control. If false, a regular input is used.',
defaultValue: true,
table: {
type: { summary: 'boolean' },
defaultValue: { summary: 'true' }
}
},
inputType: {
control: 'radio',
options: ['date', 'month', 'number', 'search', 'text', 'time'],
description: 'Type of the input field to render, e.g. "search" or "text" (default).',
defaultValue: 'text',
table: {
category: 'HTML input attributes',
type: { summary: 'string' },
defaultValue: { summary: 'text' }
}
},
liveSearchEnabled: {
control: 'boolean',
description: 'Toggles "find-as-you-type" suggestions for possible matches.',
defaultValue: true,
table: {
type: { summary: 'boolean' },
defaultValue: { summary: 'true' }
}
},
searchAutocomplete: {
control: 'boolean',
description: 'Trigger autocomplete results on input change.',
defaultValue: false,
table: {
type: { summary: 'boolean' },
defaultValue: { summary: 'false' }
}
},
searchTerm: {
control: 'text',
description: 'Search term preselected.',
defaultValue: '',
table: {
category: 'HTML input attributes',
type: { summary: 'string' },
defaultValue: { summary: '' }
}
},
debounceTime: {
control: 'number',
description: 'Debounce time in milliseconds.',
defaultValue: 0,
table: {
type: { summary: 'number' },
defaultValue: { summary: '0' }
}
},
focusListener: {
control: 'object',
description: 'Listener for results-list events (focus, blur and focusout).',
table: {
type: { summary: 'Observable<FocusEvent>' }
}
},
collapseOnSubmit: {
control: 'boolean',
description: 'Collapse search bar on submit.',
defaultValue: true,
table: {
type: { summary: 'boolean' },
defaultValue: { summary: 'true' }
}
},
defaultState: {
control: 'inline-radio',
options: ['collapsed', 'expanded'],
description: 'Default state.',
defaultValue: 'collapsed',
table: {
type: { summary: 'string' },
defaultValue: { summary: 'collapsed' }
}
},
collapseOnBlur: {
control: 'boolean',
description: 'Collapse search bar on blur.',
defaultValue: true,
table: {
type: { summary: 'boolean' },
defaultValue: { summary: 'true' }
}
},
showClearButton: {
control: 'boolean',
description: 'Toggles whether to show a clear button that closes the search.',
defaultValue: false,
table: {
type: { summary: 'boolean' },
defaultValue: { summary: 'false' }
}
},
placeholder: {
control: 'text',
description: 'Placeholder text to show in the input field.',
defaultValue: '',
table: {
category: 'HTML input attributes',
type: { summary: 'string' },
defaultValue: { summary: '' }
}
},
hintLabel: {
control: 'text',
description: 'Hint label.',
defaultValue: '',
table: {
category: 'HTML input attributes',
type: { summary: 'string' },
defaultValue: { summary: '' }
}
},
searchChange: {
action: 'searchChange',
description: 'Emitted when the search term is changed. The search term is provided in the "value" property of the returned object. If the term is less than three characters in length then it is truncated to an empty string.',
table: { category: 'Actions' }
},
submit: {
action: 'submit',
description: 'Emitted when the search is submitted by pressing the ENTER key.',
table: { category: 'Actions' }
},
selectResult: {
action: 'selectResult',
description: 'Emitted when the result list is selected.',
table: { category: 'Actions' }
},
reset: {
action: 'reset',
description: 'Emitted when the result list is reset.',
table: { category: 'Actions' }
},
searchVisibility: {
action: 'searchVisibility',
description: 'Emitted when the search visibility changes. True when the search is active, false when it is inactive.',
table: { category: 'Actions' }
}
}
} as Meta;
const template: Story<SearchTextInputComponent> = (args: SearchTextInputComponent) => ({
props: args
});
export const searchTextInput = template.bind({});
searchTextInput.parameters = { layout: 'centered' };

View File

@@ -19,7 +19,6 @@ import { Injectable } from '@angular/core';
import { DomSanitizer } from '@angular/platform-browser';
import { ContentApi, MinimalNode, Node, NodeEntry, NodesApi } from '@alfresco/js-api';
import { Observable, Subject, from, throwError } from 'rxjs';
import { FolderCreatedEvent } from '../events/folder-created.event';
import { AlfrescoApiService } from './alfresco-api.service';
import { AuthenticationService } from '../auth/services/authentication.service';
import { LogService } from '../common/services/log.service';
@@ -27,7 +26,14 @@ import { catchError } from 'rxjs/operators';
import { PermissionsEnum } from '../models/permissions.enum';
import { AllowableOperationsEnum } from '../models/allowable-operations.enum';
import { DownloadService } from './download.service';
import { ThumbnailService } from './thumbnail.service';
import { ThumbnailService } from '../common/services/thumbnail.service';
export interface FolderCreatedEvent {
name: string;
relativePath?: string;
parentId?: string;
node?: NodeEntry;
}
@Injectable({
providedIn: 'root'

View File

@@ -17,27 +17,16 @@
export * from './alfresco-api.service';
export * from './content.service';
export * from './page-title.service';
export * from './renditions.service';
export * from './translation.service';
export * from './translate-loader.service';
export * from './thumbnail.service';
export * from './upload.service';
export * from './dynamic-component-mapper.service';
export * from './highlight-transform.service';
export * from './deleted-nodes-api.service';
export * from './nodes-api.service';
export * from './people-content.service';
export * from './people-process.service';
export * from './discovery-api.service';
export * from './external-alfresco-api.service';
export * from './download-zip.service';
export * from './automation.service';
export * from './automation.service';
export * from './download.service';
export * from './bpm-user.service';
export * from './ecm-user.service';
export * from './language.service';
export * from './sort-by-category.service';
export * from './user-access.service';
export * from './user-info-resolver.service';

View File

@@ -18,7 +18,7 @@
import { TestBed, ComponentFixture } from '@angular/core/testing';
import { CoreTestingModule } from '../../testing/core.testing.module';
import { ErrorContentComponent } from './error-content.component';
import { TranslationService } from '../../services/translation.service';
import { TranslationService } from '../../translation/translation.service';
import { setupTestBed } from '../../testing/setup-test-bed';
import { ActivatedRoute } from '@angular/router';
import { of } from 'rxjs';

View File

@@ -23,7 +23,7 @@ import {
OnInit
} from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { TranslationService } from '../../services/translation.service';
import { TranslationService } from '../../translation/translation.service';
@Component({
selector: 'adf-error-content',
templateUrl: './error-content.component.html',

View File

@@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
import { AppConfigService } from '../app-config/app-config.service';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { StorageService } from '../common/services/storage.service';
import { UserPreferencesService } from '../common/services/user-preferences.service';
import { DemoForm } from '../mock/form/demo-form.mock';

View File

@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
import { CoreModule } from '../core.module';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core';
import { TRANSLATION_PROVIDER } from '../services/translation.service';
import { TRANSLATION_PROVIDER } from '../translation/translation.service';
@NgModule({
imports: [

View File

@@ -24,14 +24,14 @@ import { AlfrescoApiService } from '../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { AppConfigService } from '../app-config/app-config.service';
import { AppConfigServiceMock } from '../common/mock/app-config.service.mock';
import { TranslationService } from '../services/translation.service';
import { TranslationService } from '../translation/translation.service';
import { TranslationMock } from '../mock/translation.service.mock';
import { DatePipe } from '@angular/common';
import { CookieService } from '../common/services/cookie.service';
import { CookieServiceMock } from '../mock/cookie.service.mock';
import { HttpClientModule } from '@angular/common/http';
import { directionalityConfigFactory } from '../services/directionality-config-factory';
import { DirectionalityConfigService } from '../services/directionality-config.service';
import { directionalityConfigFactory } from '../common/services/directionality-config-factory';
import { DirectionalityConfigService } from '../common/services/directionality-config.service';
@NgModule({
imports: [

View File

@@ -17,3 +17,4 @@
export * from './setup-test-bed';
export * from './core.testing.module';
export * from './automation.service';

View File

@@ -15,4 +15,4 @@
* limitations under the License.
*/
export const getType = (type: any): any => () => type;
export * from './public-api';

View File

@@ -15,13 +15,5 @@
* limitations under the License.
*/
import { NodeEntry } from '@alfresco/js-api';
export interface FolderCreatedEvent {
name: string;
relativePath?: string;
parentId?: string;
node?: NodeEntry;
}
export * from './translation.service';
export * from './translate-loader.service';

View File

@@ -24,7 +24,7 @@ import { TranslateLoaderService } from './translate-loader.service';
import { TRANSLATION_PROVIDER, TranslationService } from './translation.service';
import { AppConfigService } from '../app-config/app-config.service';
import { AppConfigServiceMock } from '../common/mock/app-config.service.mock';
import { AlfrescoApiService } from './alfresco-api.service';
import { AlfrescoApiService } from '../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
declare let jasmine: any;

View File

@@ -21,7 +21,7 @@ import { AlfrescoApiService } from '../../services/alfresco-api.service';
import { LogService } from '../../common/services/log.service';
import { Subject } from 'rxjs';
import { Track } from '../models/viewer.model';
import { TranslationService } from '../../services/translation.service';
import { TranslationService } from '../../translation/translation.service';
@Injectable({
providedIn: 'root'

View File

@@ -41,10 +41,10 @@ export * from './lib/clipboard/index';
export * from './lib/dialogs/index';
export * from './lib/icon/index';
export * from './lib/notifications/index';
export * from './lib/search-text/index';
export * from './lib/blank-page/index';
export * from './lib/rich-text-editor/index';
export * from './lib/snackbar-content/index';
export * from './lib/translation/index';
export * from './lib/common/utils/index';
export * from './lib/interface/index';

View File

@@ -24,6 +24,8 @@ export * from './services/task.service';
export * from './services/task-form.service';
export * from './services/process-definition.service';
export * from './services/activiti-alfresco.service';
export * from './services/external-alfresco-api.service';
export * from './process-form-rendering.service';
export * from './events/validate-dynamic-table-row.event';

View File

@@ -17,9 +17,15 @@
import { Component, Inject, ViewEncapsulation, ViewChild } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
import { ExternalAlfrescoApiService, AlfrescoApiService, LoginDialogPanelComponent, TranslationService, AuthenticationService } from '@alfresco/adf-core';
import {
AlfrescoApiService,
LoginDialogPanelComponent,
TranslationService,
AuthenticationService
} from '@alfresco/adf-core';
import { AttachFileWidgetDialogComponentData } from './attach-file-widget-dialog-component.interface';
import { DocumentListService, SitesService, SearchService } from '@alfresco/adf-content-services';
import { ExternalAlfrescoApiService } from '../../services/external-alfresco-api.service';
import { Node } from '@alfresco/js-api';
@Component({