inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix AlfrescoTranslateService usage

Browse Source
This commit is contained in:
Denys Vuika
2017-01-05 21:35:15 +00:00
parent d42f41ec00
commit e640cac74f
14 changed files with 42 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ng2-components/ng2-activiti-diagrams/src/components/diagram.component.spec.ts
View File

@@ -16,10 +16,7 @@
*/ */
import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { import { CoreModule, AlfrescoTranslateService } from 'ng2-alfresco-core';
CoreModule,
AlfrescoTranslationService
} from 'ng2-alfresco-core';
import { DIAGRAM_DIRECTIVES, DIAGRAM_PROVIDERS } from './index'; import { DIAGRAM_DIRECTIVES, DIAGRAM_PROVIDERS } from './index';
import { RAPHAEL_DIRECTIVES, RAPHAEL_PROVIDERS } from './raphael/index'; import { RAPHAEL_DIRECTIVES, RAPHAEL_PROVIDERS } from './raphael/index';
@@ -50,7 +47,7 @@ describe('Test ng2-activiti-diagrams ', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
CoreModule CoreModule.forRoot()
], ],
declarations: [ declarations: [
...DIAGRAM_DIRECTIVES, ...DIAGRAM_DIRECTIVES,
@@ -59,7 +56,7 @@ describe('Test ng2-activiti-diagrams ', () => {
providers: [ providers: [
...DIAGRAM_PROVIDERS, ...DIAGRAM_PROVIDERS,
...RAPHAEL_PROVIDERS, ...RAPHAEL_PROVIDERS,
{provide: AlfrescoTranslationService, useClass: TranslationMock} {provide: AlfrescoTranslateService, useClass: TranslationMock}
] ]
}).compileComponents(); }).compileComponents();
})); }));

6
ng2-components/ng2-activiti-form/src/components/activiti-start-form.component.spec.ts
View File

@@ -25,7 +25,7 @@ import { WIDGET_DIRECTIVES } from './widgets/index';
import { FormService } from './../services/form.service'; import { FormService } from './../services/form.service';
import { EcmModelService } from './../services/ecm-model.service'; import { EcmModelService } from './../services/ecm-model.service';
import { WidgetVisibilityService } from './../services/widget-visibility.service'; import { WidgetVisibilityService } from './../services/widget-visibility.service';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import { TranslationMock } from './../assets/translation.service.mock'; import { TranslationMock } from './../assets/translation.service.mock';
describe('ActivitiStartForm', () => { describe('ActivitiStartForm', () => {
@@ -41,14 +41,14 @@ describe('ActivitiStartForm', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [CoreModule], imports: [CoreModule.forRoot()],
declarations: [ declarations: [
ActivitiStartForm, ActivitiStartForm,
FormFieldComponent, FormFieldComponent,
...WIDGET_DIRECTIVES ...WIDGET_DIRECTIVES
], ],
providers: [ providers: [
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslateService, useClass: TranslationMock },
EcmModelService, EcmModelService,
FormService, FormService,
WidgetVisibilityService WidgetVisibilityService

4
ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.spec.ts
View File

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import { ActivitiFormModule } from 'ng2-activiti-form'; import { ActivitiFormModule } from 'ng2-activiti-form';
import { ActivitiProcessComments } from './activiti-process-comments.component'; import { ActivitiProcessComments } from './activiti-process-comments.component';
@@ -46,7 +46,7 @@ describe('ActivitiProcessInstanceComments', () => {
ActivitiProcessComments ActivitiProcessComments
], ],
providers: [ providers: [
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslateService, useClass: TranslationMock },
ActivitiProcessService ActivitiProcessService
] ]
}).compileComponents(); }).compileComponents();

4
ng2-components/ng2-activiti-processlist/src/components/activiti-process-comments.component.ts
View File

@@ -16,7 +16,7 @@
*/ */
import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { ActivitiProcessService } from './../services/activiti-process.service'; import { ActivitiProcessService } from './../services/activiti-process.service';
import { Comment } from 'ng2-activiti-tasklist'; import { Comment } from 'ng2-activiti-tasklist';
import { Observer } from 'rxjs/Observer'; import { Observer } from 'rxjs/Observer';
@@ -56,7 +56,7 @@ export class ActivitiProcessComments implements OnChanges {
* @param translate Translation service * @param translate Translation service
* @param activitiProcess Process service * @param activitiProcess Process service
*/ */
constructor(private translate: AlfrescoTranslationService, constructor(private translate: AlfrescoTranslateService,
private activitiProcess: ActivitiProcessService) { private activitiProcess: ActivitiProcessService) {
if (translate) { if (translate) {

16
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-header.component.spec.ts
View File

@@ -17,14 +17,7 @@
import { ComponentFixture, TestBed, async } from '@angular/core/testing'; import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import {
AlfrescoTranslationService,
CoreModule,
AuthService,
SettingsService,
AlfrescoApiService } from 'ng2-alfresco-core';
import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component'; import { ActivitiProcessInstanceHeader } from './activiti-process-instance-header.component';
import { TranslationMock } from './../assets/translation.service.mock'; import { TranslationMock } from './../assets/translation.service.mock';
import { exampleProcess } from './../assets/activiti-process.model.mock'; import { exampleProcess } from './../assets/activiti-process.model.mock';
@@ -41,18 +34,15 @@ describe('ActivitiProcessInstanceHeader', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
CoreModule CoreModule.forRoot()
], ],
declarations: [ declarations: [
ActivitiProcessInstanceHeader, ActivitiProcessInstanceHeader,
ActivitiProcessComments ActivitiProcessComments
], ],
providers: [ providers: [
SettingsService,
AuthService,
AlfrescoApiService,
ActivitiProcessService, ActivitiProcessService,
{provide: AlfrescoTranslationService, useClass: TranslationMock} {provide: AlfrescoTranslateService, useClass: TranslationMock}
] ]
}).compileComponents(); }).compileComponents();
})); }));

6
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-tasks.component.spec.ts
View File

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import { TaskDetailsModel } from 'ng2-activiti-tasklist'; import { TaskDetailsModel } from 'ng2-activiti-tasklist';
import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component'; import { ActivitiProcessInstanceTasks } from './activiti-process-instance-tasks.component';
@@ -43,13 +43,13 @@ describe('ActivitiProcessInstanceTasks', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
CoreModule CoreModule.forRoot()
], ],
declarations: [ declarations: [
ActivitiProcessInstanceTasks ActivitiProcessInstanceTasks
], ],
providers: [ providers: [
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslateService, useClass: TranslationMock },
ActivitiProcessService ActivitiProcessService
], ],
schemas: [NO_ERRORS_SCHEMA] schemas: [NO_ERRORS_SCHEMA]

8
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.spec.ts
View File

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import { DataTableModule, ObjectDataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable'; import { DataTableModule, ObjectDataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable';
import { ActivitiProcessInstanceVariables } from './activiti-process-instance-variables.component'; import { ActivitiProcessInstanceVariables } from './activiti-process-instance-variables.component';
@@ -40,14 +40,14 @@ describe('ActivitiProcessInstanceVariables', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
CoreModule, CoreModule.forRoot(),
DataTableModule DataTableModule.forRoot()
], ],
declarations: [ declarations: [
ActivitiProcessInstanceVariables ActivitiProcessInstanceVariables
], ],
providers: [ providers: [
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslateService, useClass: TranslationMock },
ActivitiProcessService ActivitiProcessService
] ]
}).compileComponents(); }).compileComponents();

4
ng2-components/ng2-activiti-processlist/src/components/activiti-process-instance-variables.component.ts
View File

@@ -17,7 +17,7 @@
import { Component, DebugElement, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; import { Component, DebugElement, EventEmitter, Input, Output, OnInit, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { ObjectDataTableAdapter, DataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ObjectDataTableAdapter, DataTableAdapter, ObjectDataRow } from 'ng2-alfresco-datatable';
import { ProcessInstanceVariable } from './../models/process-instance-variable.model'; import { ProcessInstanceVariable } from './../models/process-instance-variable.model';
import { ActivitiProcessService } from './../services/activiti-process.service'; import { ActivitiProcessService } from './../services/activiti-process.service';
@@ -67,7 +67,7 @@ export class ActivitiProcessInstanceVariables implements OnInit, OnChanges {
* @param translate Translation service * @param translate Translation service
* @param activitiProcess Process service * @param activitiProcess Process service
*/ */
constructor(private translate: AlfrescoTranslationService, constructor(private translate: AlfrescoTranslateService,
private activitiProcess: ActivitiProcessService) { private activitiProcess: ActivitiProcessService) {
if (translate) { if (translate) {

8
ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
View File

@@ -20,7 +20,7 @@ import { ComponentFixture, TestBed, async, fakeAsync, tick } from '@angular/core
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component'; import { ActivitiProcessInstanceListComponent } from './activiti-processlist.component';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter } from 'ng2-alfresco-datatable'; import { DataTableModule, ObjectDataRow, DataRowEvent, ObjectDataTableAdapter } from 'ng2-alfresco-datatable';
import { TranslationMock } from './../assets/translation.service.mock'; import { TranslationMock } from './../assets/translation.service.mock';
@@ -59,13 +59,13 @@ describe('ActivitiProcessInstanceListComponent', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [
CoreModule, CoreModule.forRoot(),
DataTableModule DataTableModule.forRoot()
], ],
declarations: [ ActivitiProcessInstanceListComponent ], declarations: [ ActivitiProcessInstanceListComponent ],
providers: [ providers: [
ActivitiProcessService, ActivitiProcessService,
{provide: AlfrescoTranslationService, useClass: TranslationMock} {provide: AlfrescoTranslateService, useClass: TranslationMock}
] ]
}).compileComponents().then(() => { }).compileComponents().then(() => {
fixture = TestBed.createComponent(ActivitiProcessInstanceListComponent); fixture = TestBed.createComponent(ActivitiProcessInstanceListComponent);

4
ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
View File

@@ -16,7 +16,7 @@
*/ */
import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable'; import { ObjectDataTableAdapter, DataTableAdapter, DataRowEvent, ObjectDataRow } from 'ng2-alfresco-datatable';
import { TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist'; import { TaskQueryRequestRepresentationModel } from 'ng2-activiti-tasklist';
@@ -70,7 +70,7 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
]; ];
constructor(private processService: ActivitiProcessService, constructor(private processService: ActivitiProcessService,
private translate: AlfrescoTranslationService) { private translate: AlfrescoTranslateService) {
if (translate !== null) { if (translate !== null) {
translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src'); translate.addTranslationFolder('ng2-activiti-processlist', 'node_modules/ng2-activiti-processlist/src');
} }

9
ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.spec.ts
View File

@@ -19,7 +19,7 @@ import { ComponentFixture, TestBed, async } from '@angular/core/testing';
import { By } from '@angular/platform-browser'; import { By } from '@angular/platform-browser';
import { DebugElement, SimpleChange } from '@angular/core'; import { DebugElement, SimpleChange } from '@angular/core';
import { Observable } from 'rxjs/Rx'; import { Observable } from 'rxjs/Rx';
import { AlfrescoTranslationService, CoreModule } from 'ng2-alfresco-core'; import { AlfrescoTranslateService, CoreModule } from 'ng2-alfresco-core';
import { ActivitiFormModule, FormService } from 'ng2-activiti-form'; import { ActivitiFormModule, FormService } from 'ng2-activiti-form';
import { TranslationMock } from './../assets/translation.service.mock'; import { TranslationMock } from './../assets/translation.service.mock';
@@ -41,12 +41,15 @@ describe('ActivitiStartProcessInstance', () => {
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ CoreModule, ActivitiFormModule ], imports: [
CoreModule.forRoot(),
ActivitiFormModule.forRoot()
],
declarations: [ declarations: [
ActivitiStartProcessInstance ActivitiStartProcessInstance
], ],
providers: [ providers: [
{ provide: AlfrescoTranslationService, useClass: TranslationMock }, { provide: AlfrescoTranslateService, useClass: TranslationMock },
ActivitiProcessService, ActivitiProcessService,
FormService FormService
] ]

4
ng2-components/ng2-activiti-processlist/src/components/activiti-start-process.component.ts
View File

@@ -16,7 +16,7 @@
*/ */
import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core'; import { Component, EventEmitter, Input, Output, ViewChild, OnChanges, SimpleChanges } from '@angular/core';
import { AlfrescoTranslationService } from 'ng2-alfresco-core'; import { AlfrescoTranslateService } from 'ng2-alfresco-core';
import { ActivitiStartForm } from 'ng2-activiti-form'; import { ActivitiStartForm } from 'ng2-activiti-form';
import { ProcessInstance } from './../models/process-instance.model'; import { ProcessInstance } from './../models/process-instance.model';
import { ProcessDefinitionRepresentation } from './../models/process-definition.model'; import { ProcessDefinitionRepresentation } from './../models/process-definition.model';
@@ -53,7 +53,7 @@ export class ActivitiStartProcessInstance implements OnChanges {
errorMessageId: string = ''; errorMessageId: string = '';
constructor(private translate: AlfrescoTranslationService, constructor(private translate: AlfrescoTranslateService,
private activitiProcess: ActivitiProcessService) { private activitiProcess: ActivitiProcessService) {
if (translate) { if (translate) {

4
ng2-components/ng2-alfresco-search/demo/src/main.ts
View File

@@ -25,7 +25,7 @@ import { SearchModule } from 'ng2-alfresco-search';
import { import {
SettingsService, SettingsService,
AuthService, AuthService,
AlfrescoTranslationService AlfrescoTranslateService
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
@Component({ @Component({
@@ -56,7 +56,7 @@ class SearchDemo implements OnInit {
constructor(private authService: AuthService, constructor(private authService: AuthService,
private settingsService: SettingsService, private settingsService: SettingsService,
translation: AlfrescoTranslationService, translation: AlfrescoTranslateService,
private logService: LogService) { private logService: LogService) {
settingsService.ecmHost = this.ecmHost; settingsService.ecmHost = this.ecmHost;

6
ng2-components/ng2-alfresco-tag/src/services/tag.service.spec.ts
View File

@@ -20,7 +20,8 @@ import {
AuthService, AuthService,
SettingsService, SettingsService,
AlfrescoApiService, AlfrescoApiService,
StorageService StorageService,
LogService
} from 'ng2-alfresco-core'; } from 'ng2-alfresco-core';
import { TagService } from '../services/tag.service'; import { TagService } from '../services/tag.service';
@@ -36,7 +37,8 @@ describe('Tag service', () => {
AlfrescoApiService, AlfrescoApiService,
AuthService, AuthService,
TagService, TagService,
StorageService StorageService,
LogService
]); ]);
}); });