mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
Single naming convention for core services (#1363)
* remove temporary file from repo * fix: alfresco-api.service * new: auth.service.ts - new auth.service.ts implementation - deprecation warning for AlfrescoAuthenticationService - fix ‘clean-build’ typo - extra vscode settings for ‘.d.ts’ files * use AuthService internally * new: content.service.ts - deprecation warning for AlfrescoContentService - use new ContentService internally * new: settings.service.ts - new SettingsService - deprecation warning for AlfrescoSettingsService - using new SettingsService internally * new: translate.service and translate-loader.service - custom TranslateLoader becomes AlfrescoTranslateLoader - custom TranslateService becomes AlfrescoTranslateService - deprecation notices for old service and loader implementations * fix: document list * fix: search * fix: tag also fixes #1364 * fix: activiti form * fix: activiti tasklist, improve unit tests * fix: activiti processlist, unit tests improvements * fix: diagram component * fix: analytics component * fix: upload component - fix numerous issues with unit tests (hidden by ‘any’ type) - test improvements * fix: webscript * fix: userinfo unit tests * code fixes * fix 'beforeAll' issue * tasklist unit testing improvements * fix: form unit tests * fix: unit tests
This commit is contained in:
committed by
Maurizio Vitale
parent
92fc7d1df3
commit
facafbd55c
@@ -23,10 +23,10 @@ import { result, results, folderResult, noResult, errorJson } from './../assets/
|
||||
import { AlfrescoSearchService } from '../services/alfresco-search.service';
|
||||
import {
|
||||
AlfrescoApiService,
|
||||
AlfrescoSettingsService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AlfrescoTranslationService,
|
||||
SettingsService,
|
||||
AuthService,
|
||||
ContentService,
|
||||
AlfrescoTranslateService,
|
||||
CoreModule
|
||||
} from 'ng2-alfresco-core';
|
||||
|
||||
@@ -48,12 +48,12 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
|
||||
],
|
||||
declarations: [ AlfrescoSearchAutocompleteComponent ], // declare the test component
|
||||
providers: [
|
||||
{provide: AlfrescoTranslationService, useClass: TranslationMock},
|
||||
{provide: AlfrescoTranslateService, useClass: TranslationMock},
|
||||
AlfrescoThumbnailService,
|
||||
AlfrescoSettingsService,
|
||||
SettingsService,
|
||||
AlfrescoApiService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AuthService,
|
||||
ContentService,
|
||||
AlfrescoSearchService
|
||||
]
|
||||
}).compileComponents().then(() => {
|
||||
@@ -64,7 +64,7 @@ describe('AlfrescoSearchAutocompleteComponent', () => {
|
||||
}));
|
||||
|
||||
it('should setup i18n folder', () => {
|
||||
let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
|
||||
let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
|
||||
spyOn(translationService, 'addTranslationFolder');
|
||||
fixture.detectChanges();
|
||||
expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
|
@@ -16,10 +16,10 @@
|
||||
*/
|
||||
|
||||
import { Component, ElementRef, EventEmitter, Input, OnInit, OnChanges, Output, ViewChild } from '@angular/core';
|
||||
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
|
||||
import { MinimalNodeEntity } from 'alfresco-js-api';
|
||||
import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
|
||||
import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service';
|
||||
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
|
||||
import { MinimalNodeEntity } from 'alfresco-js-api';
|
||||
|
||||
@Component({
|
||||
moduleId: module.id,
|
||||
@@ -70,14 +70,14 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
|
||||
|
||||
baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
|
||||
|
||||
constructor(private alfrescoSearchService: AlfrescoSearchService,
|
||||
private translate: AlfrescoTranslationService,
|
||||
private alfrescoThumbnailService: AlfrescoThumbnailService) {
|
||||
constructor(private searchService: AlfrescoSearchService,
|
||||
private translateService: AlfrescoTranslateService,
|
||||
private thumbnailService: AlfrescoThumbnailService) {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
if (this.translate) {
|
||||
this.translate.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
if (this.translateService) {
|
||||
this.translateService.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,7 +102,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
|
||||
orderBy: this.resultSort
|
||||
};
|
||||
if (searchTerm !== null && searchTerm !== '') {
|
||||
this.alfrescoSearchService
|
||||
this.searchService
|
||||
.getNodeQueryResults(searchTerm, searchOpts)
|
||||
.subscribe(
|
||||
results => {
|
||||
@@ -126,7 +126,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
|
||||
*/
|
||||
getMimeTypeIcon(node: MinimalNodeEntity): string {
|
||||
if (node.entry.content && node.entry.content.mimeType) {
|
||||
let icon = this.alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType);
|
||||
let icon = this.thumbnailService.getMimeTypeIcon(node.entry.content.mimeType);
|
||||
return this.resolveIconPath(icon);
|
||||
} else if (node.entry.isFolder) {
|
||||
return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`;
|
||||
@@ -144,7 +144,7 @@ export class AlfrescoSearchAutocompleteComponent implements OnInit, OnChanges {
|
||||
*/
|
||||
getMimeTypeKey(node: MinimalNodeEntity): string {
|
||||
if (node.entry.content && node.entry.content.mimeType) {
|
||||
return 'SEARCH.ICONS.' + this.alfrescoThumbnailService.getMimeTypeKey(node.entry.content.mimeType);
|
||||
return 'SEARCH.ICONS.' + this.thumbnailService.getMimeTypeKey(node.entry.content.mimeType);
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
|
@@ -22,11 +22,11 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi
|
||||
import { TranslationMock } from './../assets/translation.service.mock';
|
||||
import { result } from './../assets/alfresco-search.component.mock';
|
||||
import {
|
||||
AlfrescoSettingsService,
|
||||
SettingsService,
|
||||
AlfrescoApiService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AlfrescoTranslationService,
|
||||
AuthService,
|
||||
ContentService,
|
||||
AlfrescoTranslateService,
|
||||
CoreModule
|
||||
} from 'ng2-alfresco-core';
|
||||
import { AlfrescoSearchService } from '../services/alfresco-search.service';
|
||||
@@ -49,12 +49,12 @@ describe('AlfrescoSearchControlComponent', () => {
|
||||
AlfrescoSearchAutocompleteComponent
|
||||
],
|
||||
providers: [
|
||||
{provide: AlfrescoTranslationService, useClass: TranslationMock},
|
||||
{provide: AlfrescoTranslateService, useClass: TranslationMock},
|
||||
AlfrescoThumbnailService,
|
||||
AlfrescoSettingsService,
|
||||
SettingsService,
|
||||
AlfrescoApiService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AuthService,
|
||||
ContentService,
|
||||
AlfrescoSearchService
|
||||
]
|
||||
}).compileComponents().then(() => {
|
||||
@@ -65,7 +65,7 @@ describe('AlfrescoSearchControlComponent', () => {
|
||||
}));
|
||||
|
||||
it('should setup i18n folder', () => {
|
||||
let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
|
||||
let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
|
||||
spyOn(translationService, 'addTranslationFolder');
|
||||
fixture.detectChanges();
|
||||
expect(translationService.addTranslationFolder)
|
||||
|
@@ -17,10 +17,10 @@
|
||||
|
||||
import { FormControl, Validators } from '@angular/forms';
|
||||
import { Component, Input, Output, OnInit, OnDestroy, ElementRef, EventEmitter, ViewChild } from '@angular/core';
|
||||
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
|
||||
import { Observable, Subject } from 'rxjs/Rx';
|
||||
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
|
||||
import { AlfrescoSearchAutocompleteComponent } from './alfresco-search-autocomplete.component';
|
||||
import { SearchTermValidator } from './../forms/search-term-validator';
|
||||
import { Observable, Subject } from 'rxjs/Rx';
|
||||
|
||||
@Component({
|
||||
moduleId: module.id,
|
||||
@@ -86,7 +86,7 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy {
|
||||
|
||||
private focusSubject = new Subject<FocusEvent>();
|
||||
|
||||
constructor(private translate: AlfrescoTranslationService) {
|
||||
constructor(private translateService: AlfrescoTranslateService) {
|
||||
|
||||
this.searchControl = new FormControl(
|
||||
this.searchTerm,
|
||||
@@ -103,7 +103,7 @@ export class AlfrescoSearchControlComponent implements OnInit, OnDestroy {
|
||||
|
||||
this.setupFocusEventHandlers();
|
||||
|
||||
this.translate.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
this.translateService.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
}
|
||||
|
||||
ngOnDestroy(): void {
|
||||
|
@@ -25,11 +25,11 @@ import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.servi
|
||||
import { TranslationMock } from './../assets/translation.service.mock';
|
||||
import { AlfrescoSearchService } from '../services/alfresco-search.service';
|
||||
import {
|
||||
AlfrescoSettingsService,
|
||||
SettingsService,
|
||||
AlfrescoApiService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AlfrescoTranslationService,
|
||||
AuthService,
|
||||
ContentService,
|
||||
AlfrescoTranslateService,
|
||||
CoreModule,
|
||||
StorageService
|
||||
} from 'ng2-alfresco-core';
|
||||
@@ -107,12 +107,12 @@ describe('AlfrescoSearchComponent', () => {
|
||||
declarations: [ AlfrescoSearchComponent ], // declare the test component
|
||||
providers: [
|
||||
AlfrescoSearchService,
|
||||
{provide: AlfrescoTranslationService, useClass: TranslationMock},
|
||||
{provide: AlfrescoTranslateService, useClass: TranslationMock},
|
||||
AlfrescoThumbnailService,
|
||||
AlfrescoSettingsService,
|
||||
SettingsService,
|
||||
AlfrescoApiService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AuthService,
|
||||
ContentService,
|
||||
StorageService
|
||||
]
|
||||
}).compileComponents().then(() => {
|
||||
@@ -140,8 +140,8 @@ describe('AlfrescoSearchComponent', () => {
|
||||
it('should have a null search term if no query param provided via RouteParams', () => {
|
||||
let injector = ReflectiveInjector.resolveAndCreate([
|
||||
AlfrescoSearchService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoSettingsService,
|
||||
AuthService,
|
||||
SettingsService,
|
||||
AlfrescoApiService,
|
||||
StorageService,
|
||||
{ provide: ActivatedRoute, useValue: { params: Observable.from([{}]) } }
|
||||
@@ -152,7 +152,7 @@ describe('AlfrescoSearchComponent', () => {
|
||||
});
|
||||
|
||||
it('should setup i18n folder', () => {
|
||||
let translationService = fixture.debugElement.injector.get(AlfrescoTranslationService);
|
||||
let translationService = fixture.debugElement.injector.get(AlfrescoTranslateService);
|
||||
spyOn(translationService, 'addTranslationFolder');
|
||||
fixture.detectChanges();
|
||||
expect(translationService.addTranslationFolder).toHaveBeenCalledWith('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
|
@@ -19,7 +19,7 @@ import { Component, EventEmitter, Input, Output, Optional, OnChanges, SimpleChan
|
||||
import { ActivatedRoute, Params } from '@angular/router';
|
||||
import { AlfrescoSearchService, SearchOptions } from './../services/alfresco-search.service';
|
||||
import { AlfrescoThumbnailService } from './../services/alfresco-thumbnail.service';
|
||||
import { AlfrescoTranslationService } from 'ng2-alfresco-core';
|
||||
import { AlfrescoTranslateService } from 'ng2-alfresco-core';
|
||||
import { MinimalNodeEntity } from 'alfresco-js-api';
|
||||
|
||||
@Component({
|
||||
@@ -65,15 +65,15 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
|
||||
|
||||
baseComponentPath: string = module.id.replace('/components/alfresco-search.component.js', '');
|
||||
|
||||
constructor(private alfrescoSearchService: AlfrescoSearchService,
|
||||
private translate: AlfrescoTranslationService,
|
||||
private _alfrescoThumbnailService: AlfrescoThumbnailService,
|
||||
constructor(private searchService: AlfrescoSearchService,
|
||||
private translateService: AlfrescoTranslateService,
|
||||
private thumbnailService: AlfrescoThumbnailService,
|
||||
@Optional() private route: ActivatedRoute) {
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
if (this.translate !== null) {
|
||||
this.translate.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
ngOnInit() {
|
||||
if (this.translateService !== null) {
|
||||
this.translateService.addTranslationFolder('ng2-alfresco-search', 'node_modules/ng2-alfresco-search/src');
|
||||
}
|
||||
if (this.route) {
|
||||
this.route.params.forEach((params: Params) => {
|
||||
@@ -85,7 +85,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
ngOnChanges(changes: SimpleChanges): void {
|
||||
ngOnChanges(changes: SimpleChanges) {
|
||||
if (changes['searchTerm']) {
|
||||
this.searchTerm = changes['searchTerm'].currentValue;
|
||||
this.displaySearchResults(this.searchTerm);
|
||||
@@ -99,7 +99,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
|
||||
*/
|
||||
getMimeTypeIcon(node: any): string {
|
||||
if (node.entry.content && node.entry.content.mimeType) {
|
||||
let icon = this._alfrescoThumbnailService.getMimeTypeIcon(node.entry.content.mimeType);
|
||||
let icon = this.thumbnailService.getMimeTypeIcon(node.entry.content.mimeType);
|
||||
return this.resolveIconPath(icon);
|
||||
} else if (node.entry.isFolder) {
|
||||
return `${this.baseComponentPath}/../assets/images/ft_ic_folder.svg`;
|
||||
@@ -117,7 +117,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
|
||||
*/
|
||||
getMimeTypeKey(node: any): string {
|
||||
if (node.entry.content && node.entry.content.mimeType) {
|
||||
return 'SEARCH.ICONS.' + this._alfrescoThumbnailService.getMimeTypeKey(node.entry.content.mimeType);
|
||||
return 'SEARCH.ICONS.' + this.thumbnailService.getMimeTypeKey(node.entry.content.mimeType);
|
||||
} else {
|
||||
return '';
|
||||
}
|
||||
@@ -127,8 +127,8 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
|
||||
* Loads and displays search results
|
||||
* @param searchTerm Search query entered by user
|
||||
*/
|
||||
private displaySearchResults(searchTerm): void {
|
||||
if (searchTerm && this.alfrescoSearchService) {
|
||||
private displaySearchResults(searchTerm) {
|
||||
if (searchTerm && this.searchService) {
|
||||
let searchOpts: SearchOptions = {
|
||||
include: ['path'],
|
||||
rootNodeId: this.rootNodeId,
|
||||
@@ -136,7 +136,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
|
||||
maxItems: this.maxResults,
|
||||
orderBy: this.resultSort
|
||||
};
|
||||
this.alfrescoSearchService
|
||||
this.searchService
|
||||
.getNodeQueryResults(searchTerm, searchOpts)
|
||||
.subscribe(
|
||||
results => {
|
||||
@@ -153,7 +153,7 @@ export class AlfrescoSearchComponent implements OnChanges, OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
onItemClick(node, event?: Event): void {
|
||||
onItemClick(node, event?: Event) {
|
||||
if (this.navigate && this.navigationMode === AlfrescoSearchComponent.SINGLE_CLICK_NAVIGATION) {
|
||||
if (node && node.entry) {
|
||||
this.navigate.emit(node);
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { ReflectiveInjector } from '@angular/core';
|
||||
import { AlfrescoSearchService } from './alfresco-search.service';
|
||||
import { AlfrescoAuthenticationService, AlfrescoSettingsService, AlfrescoApiService, StorageService } from 'ng2-alfresco-core';
|
||||
import { AuthService, SettingsService, AlfrescoApiService, StorageService } from 'ng2-alfresco-core';
|
||||
import { fakeApi, fakeSearch, fakeError } from '../assets/alfresco-search.service.mock';
|
||||
|
||||
declare let jasmine: any;
|
||||
@@ -31,9 +31,9 @@ describe('AlfrescoSearchService', () => {
|
||||
beforeEach(() => {
|
||||
injector = ReflectiveInjector.resolveAndCreate([
|
||||
AlfrescoSearchService,
|
||||
AlfrescoSettingsService,
|
||||
SettingsService,
|
||||
AlfrescoApiService,
|
||||
AlfrescoAuthenticationService,
|
||||
AuthService,
|
||||
StorageService
|
||||
]);
|
||||
service = injector.get(AlfrescoSearchService);
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { Observable } from 'rxjs/Rx';
|
||||
import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-core';
|
||||
import { AuthService, AlfrescoApiService } from 'ng2-alfresco-core';
|
||||
|
||||
/**
|
||||
* Internal service used by Document List component.
|
||||
@@ -25,7 +25,8 @@ import { AlfrescoAuthenticationService, AlfrescoApiService } from 'ng2-alfresco-
|
||||
@Injectable()
|
||||
export class AlfrescoSearchService {
|
||||
|
||||
constructor(public authService: AlfrescoAuthenticationService, private apiService: AlfrescoApiService) {
|
||||
constructor(public authService: AuthService,
|
||||
private apiService: AlfrescoApiService) {
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -17,7 +17,7 @@
|
||||
|
||||
import { ReflectiveInjector } from '@angular/core';
|
||||
import { AlfrescoThumbnailService } from './alfresco-thumbnail.service';
|
||||
import { AlfrescoApiService, AlfrescoAuthenticationService, AlfrescoContentService, AlfrescoSettingsService, StorageService } from 'ng2-alfresco-core';
|
||||
import { AlfrescoApiService, AuthService, ContentService, SettingsService, StorageService } from 'ng2-alfresco-core';
|
||||
|
||||
describe('AlfrescoThumbnailService', () => {
|
||||
|
||||
@@ -27,9 +27,9 @@ describe('AlfrescoThumbnailService', () => {
|
||||
beforeEach(() => {
|
||||
injector = ReflectiveInjector.resolveAndCreate([
|
||||
AlfrescoApiService,
|
||||
AlfrescoAuthenticationService,
|
||||
AlfrescoContentService,
|
||||
AlfrescoSettingsService,
|
||||
AuthService,
|
||||
ContentService,
|
||||
SettingsService,
|
||||
AlfrescoThumbnailService,
|
||||
StorageService
|
||||
]);
|
||||
|
@@ -16,7 +16,7 @@
|
||||
*/
|
||||
|
||||
import { Injectable } from '@angular/core';
|
||||
import { AlfrescoContentService } from 'ng2-alfresco-core';
|
||||
import { ContentService } from 'ng2-alfresco-core';
|
||||
|
||||
@Injectable()
|
||||
export class AlfrescoThumbnailService {
|
||||
@@ -50,7 +50,7 @@ export class AlfrescoThumbnailService {
|
||||
'application/vnd.apple.numbers': 'ft_ic_spreadsheet'
|
||||
};
|
||||
|
||||
constructor(public contentService: AlfrescoContentService) {
|
||||
constructor(public contentService: ContentService) {
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user