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

tslint arrow-parens rule (#4003)

Browse Source
This commit is contained in:
Eugenio Romano
2018-11-23 01:06:56 +00:00
committed by GitHub
parent 51bb6a420f
commit 34a30c0f14
194 changed files with 725 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/core/form/components/form-field/form-field.component.ts
View File

@@ -95,7 +95,7 @@ export class FormFieldComponent implements OnInit, OnDestroy {
this.componentRef = this.container.createComponent(factory);
let instance = <WidgetComponent> this.componentRef.instance;
instance.field = this.field;
instance.fieldChanged.subscribe(field => {
instance.fieldChanged.subscribe((field) => {
if (field && this.field.form) {
this.visibilityService.refreshVisibility(field.form);
field.form.onFormFieldChanged(field);
@@ -154,7 +154,7 @@ export class FormFieldComponent implements OnInit, OnDestroy {
}
let module: ModuleWithComponentFactories<any> = compiler.compileModuleAndAllComponentsSync(RuntimeComponentModule);
return module.componentFactories.find(x => x.componentType === decoratedCmp);
return module.componentFactories.find((x) => x.componentType === decoratedCmp);
}
focusToggle() {

50
lib/core/form/components/form.component.spec.ts
View File

@@ -172,7 +172,7 @@ describe('FormComponent', () => {
it('should get process variable if is a process task', () => {
spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ taskId: currentTaskId });
observer.complete();
});
@@ -180,7 +180,7 @@ describe('FormComponent', () => {
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ taskId: currentTaskId, processDefinitionId: '10201' });
observer.complete();
});
@@ -195,7 +195,7 @@ describe('FormComponent', () => {
it('should not get process variable if is not a process task', () => {
spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ taskId: currentTaskId });
observer.complete();
});
@@ -203,7 +203,7 @@ describe('FormComponent', () => {
spyOn(visibilityService, 'getTaskProcessVariable').and.returnValue(of({}));
spyOn(formService, 'getTask').and.callFake((currentTaskId) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ taskId: currentTaskId, processDefinitionId: 'null' });
observer.complete();
});
@@ -311,7 +311,7 @@ describe('FormComponent', () => {
let saved = false;
formComponent.form = formModel;
formComponent.formSaved.subscribe(v => saved = true);
formComponent.formSaved.subscribe((v) => saved = true);
spyOn(formComponent, 'completeTaskForm').and.stub();
let result = formComponent.onOutcomeClicked(outcome);
@@ -362,7 +362,7 @@ describe('FormComponent', () => {
let saved = false;
formComponent.form = formModel;
formComponent.formSaved.subscribe(v => saved = true);
formComponent.formSaved.subscribe((v) => saved = true);
let result = formComponent.onOutcomeClicked(outcome);
expect(result).toBeTruthy();
@@ -421,7 +421,7 @@ describe('FormComponent', () => {
it('should fetch and parse form by task id', (done) => {
spyOn(formService, 'getTask').and.returnValue(of({}));
spyOn(formService, 'getTaskForm').and.callFake((currentTaskId) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ taskId: currentTaskId });
observer.complete();
});
@@ -448,7 +448,7 @@ describe('FormComponent', () => {
return throwError(error);
});
formComponent.getFormByTaskId('123').then(_ => {
formComponent.getFormByTaskId('123').then((_) => {
expect(formComponent.handleError).toHaveBeenCalledWith(error);
done();
});
@@ -457,14 +457,14 @@ describe('FormComponent', () => {
it('should apply readonly state when getting form by task id', (done) => {
spyOn(formService, 'getTask').and.returnValue(of({}));
spyOn(formService, 'getTaskForm').and.callFake((taskId) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ taskId: taskId });
observer.complete();
});
});
formComponent.readOnly = true;
formComponent.getFormByTaskId('123').then(_ => {
formComponent.getFormByTaskId('123').then((_) => {
expect(formComponent.form).toBeDefined();
expect(formComponent.form.readOnly).toBe(true);
done();
@@ -473,7 +473,7 @@ describe('FormComponent', () => {
it('should fetch and parse form definition by id', () => {
spyOn(formService, 'getFormDefinitionById').and.callFake((currentFormId) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ id: currentFormId });
observer.complete();
});
@@ -505,14 +505,14 @@ describe('FormComponent', () => {
it('should fetch and parse form definition by form name', () => {
spyOn(formService, 'getFormDefinitionByName').and.callFake((currentFormName) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next(currentFormName);
observer.complete();
});
});
spyOn(formService, 'getFormDefinitionById').and.callFake((currentFormName) => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({ name: currentFormName });
observer.complete();
});
@@ -533,7 +533,7 @@ describe('FormComponent', () => {
it('should save task form and raise corresponding event', () => {
spyOn(formService, 'saveTaskForm').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
@@ -541,7 +541,7 @@ describe('FormComponent', () => {
let saved = false;
let savedForm = null;
formComponent.formSaved.subscribe(form => {
formComponent.formSaved.subscribe((form) => {
saved = true;
savedForm = form;
});
@@ -598,7 +598,7 @@ describe('FormComponent', () => {
it('should complete form form and raise corresponding event', () => {
spyOn(formService, 'completeTaskForm').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
@@ -703,7 +703,7 @@ describe('FormComponent', () => {
it('should load form for ecm node', () => {
let metadata = {};
spyOn(nodeService, 'getNodeMetadata').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next({ metadata: metadata });
observer.complete();
})
@@ -791,7 +791,7 @@ describe('FormComponent', () => {
formComponent.disableCompleteButton = true;
expect(formModel.isValid).toBeTruthy();
let completeOutcome = formComponent.form.outcomes.find(outcome => outcome.name === FormOutcomeModel.COMPLETE_ACTION);
let completeOutcome = formComponent.form.outcomes.find((outcome) => outcome.name === FormOutcomeModel.COMPLETE_ACTION);
expect(formComponent.isOutcomeButtonEnabled(completeOutcome)).toBeFalsy();
});
@@ -802,7 +802,7 @@ describe('FormComponent', () => {
formComponent.disableStartProcessButton = true;
expect(formModel.isValid).toBeTruthy();
let startProcessOutcome = formComponent.form.outcomes.find(outcome => outcome.name === FormOutcomeModel.START_PROCESS_ACTION);
let startProcessOutcome = formComponent.form.outcomes.find((outcome) => outcome.name === FormOutcomeModel.START_PROCESS_ACTION);
expect(formComponent.isOutcomeButtonEnabled(startProcessOutcome)).toBeFalsy();
});
@@ -825,8 +825,8 @@ describe('FormComponent', () => {
formComponent.form = new FormModel(JSON.parse(JSON.stringify(fakeForm)));
let formFields = formComponent.form.getFormFields();
let labelField = formFields.find(field => field.id === 'label');
let radioField = formFields.find(field => field.id === 'radio');
let labelField = formFields.find((field) => field.id === 'label');
let radioField = formFields.find((field) => field.id === 'radio');
expect(labelField.value).toBe('empty');
expect(radioField.value).toBeNull();
@@ -841,8 +841,8 @@ describe('FormComponent', () => {
formComponent.ngOnChanges({ 'data': change });
formFields = formComponent.form.getFormFields();
labelField = formFields.find(field => field.id === 'label');
radioField = formFields.find(field => field.id === 'radio');
labelField = formFields.find((field) => field.id === 'label');
radioField = formFields.find((field) => field.id === 'radio');
expect(labelField.value).toBe('option_2');
expect(radioField.value).toBe('option_2');
});
@@ -850,7 +850,7 @@ describe('FormComponent', () => {
it('should refresh radio buttons value when id is given to data', () => {
formComponent.form = new FormModel(JSON.parse(JSON.stringify(fakeForm)));
let formFields = formComponent.form.getFormFields();
let radioFieldById = formFields.find(field => field.id === 'radio');
let radioFieldById = formFields.find((field) => field.id === 'radio');
let formValues: any = {};
formValues.radio = 'option_3';
@@ -859,7 +859,7 @@ describe('FormComponent', () => {
formComponent.ngOnChanges({ 'data': change });
formFields = formComponent.form.getFormFields();
radioFieldById = formFields.find(field => field.id === 'radio');
radioFieldById = formFields.find((field) => field.id === 'radio');
expect(radioFieldById.value).toBe('option_3');
});
});

22
lib/core/form/components/start-form.component.spec.ts
View File

@@ -147,7 +147,7 @@ describe('StartFormComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'mocktext');
const labelField = formFields.find((field) => field.id === 'mocktext');
const textWidget = fixture.debugElement.nativeElement.querySelector('text-widget');
const textWidgetLabel = fixture.debugElement.nativeElement.querySelector('.adf-label');
expect(labelField.type).toBe('text');
@@ -165,7 +165,7 @@ describe('StartFormComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'radio-but');
const labelField = formFields.find((field) => field.id === 'radio-but');
const radioButtonWidget = fixture.debugElement.nativeElement.querySelector('radio-buttons-widget');
const radioButtonWidgetLabel = fixture.debugElement.nativeElement.querySelector('.adf-input');
expect(labelField.type).toBe('radio-buttons');
@@ -183,7 +183,7 @@ describe('StartFormComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'amount');
const labelField = formFields.find((field) => field.id === 'amount');
const amountWidget = fixture.debugElement.nativeElement.querySelector('amount-widget');
const amountWidgetLabel = fixture.debugElement.nativeElement.querySelector('.adf-input');
expect(labelField.type).toBe('amount');
@@ -201,7 +201,7 @@ describe('StartFormComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'number');
const labelField = formFields.find((field) => field.id === 'number');
const numberWidget = fixture.debugElement.nativeElement.querySelector('number-widget');
expect(labelField.type).toBe('integer');
expect(numberWidget).toBeDefined();
@@ -217,7 +217,7 @@ describe('StartFormComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'mockTypeDropDown');
const labelField = formFields.find((field) => field.id === 'mockTypeDropDown');
const dropDownWidget = fixture.debugElement.nativeElement.querySelector('dropdown-widget');
const selectElement = fixture.debugElement.nativeElement.querySelector('.adf-dropdown-widget>mat-select .mat-select-trigger');
selectElement.click();
@@ -240,7 +240,7 @@ describe('StartFormComponent', () => {
fixture.whenStable().then(() => {
fixture.detectChanges();
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'date');
const labelField = formFields.find((field) => field.id === 'date');
const dateWidget = fixture.debugElement.nativeElement.querySelector('dropdown-widget');
const dateLabelElement = fixture.debugElement.nativeElement.querySelector('#data-widget .mat-form-field-infix> .adf-label');
expect(dateWidget).toBeDefined();
@@ -256,11 +256,11 @@ describe('StartFormComponent', () => {
component.ngOnChanges({ processDefinitionId: new SimpleChange(exampleId1, exampleId2, true) });
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'billdate');
const labelField = formFields.find((field) => field.id === 'billdate');
expect(labelField.type).toBe('date');
const formFields1 = component.form.getFormFields();
const labelField1 = formFields1.find(field => field.id === 'claimtype');
const labelField1 = formFields1.find((field) => field.id === 'claimtype');
expect(labelField1.type).toBe('dropdown');
});
@@ -272,7 +272,7 @@ describe('StartFormComponent', () => {
fixture.detectChanges();
fixture.whenStable().then(() => {
const formFields = component.form.getFormFields();
const labelField = formFields.find(field => field.id === 'claimtype');
const labelField = formFields.find((field) => field.id === 'claimtype');
expect(labelField.type).toBe('dropdown');
expect(labelField.options[0].name).toBe('Chooseone...');
expect(labelField.options[1].name).toBe('Cashless');
@@ -333,8 +333,8 @@ describe('StartFormComponent', () => {
fixture.detectChanges();
fixture.whenStable().then(() => {
const formTabs = component.form.tabs;
const tabField1 = formTabs.find(tab => tab.id === 'form1');
const tabField2 = formTabs.find(tab => tab.id === 'form2');
const tabField1 = formTabs.find((tab) => tab.id === 'form1');
const tabField2 = formTabs.find((tab) => tab.id === 'form2');
const tabsWidgetElement = fixture.debugElement.nativeElement.querySelector('tabs-widget');
expect(tabField1.name).toBe('Tab 1');
expect(tabField2.name).toBe('Tab 2');

12
lib/core/form/components/start-form.component.ts
View File

@@ -82,7 +82,7 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
ngOnInit() {
this.subscriptions.push(
this.formService.formContentClicked.subscribe(content => {
this.formService.formContentClicked.subscribe((content) => {
this.formContentClicked.emit(content);
}),
this.formService.validateForm.subscribe((validateFormEvent: ValidateFormEvent) => {
@@ -94,7 +94,7 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
}
ngOnDestroy() {
this.subscriptions.forEach(subscription => subscription.unsubscribe());
this.subscriptions.forEach((subscription) => subscription.unsubscribe());
this.subscriptions = [];
}
@@ -120,7 +120,7 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
this.formService
.getStartFormInstance(processId)
.subscribe(
form => {
(form) => {
this.formName = form.name;
if (instance.variables) {
form.processVariables = instance.variables;
@@ -131,7 +131,7 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
this.form.readOnly = this.readOnlyForm;
this.onFormLoaded(this.form);
},
error => this.handleError(error)
(error) => this.handleError(error)
);
});
}
@@ -140,7 +140,7 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
this.formService
.getStartFormDefinition(processId)
.subscribe(
form => {
(form) => {
this.formName = form.processDefinitionName;
this.form = this.parseForm(form);
this.visibilityService.refreshVisibility(this.form);
@@ -148,7 +148,7 @@ export class StartFormComponent extends FormComponent implements OnChanges, OnIn
this.form.readOnly = this.readOnlyForm;
this.onFormLoaded(this.form);
},
error => this.handleError(error)
(error) => this.handleError(error)
);
}

2
lib/core/form/components/widgets/container/container.widget.spec.ts
View File

@@ -104,7 +104,7 @@ describe('ContainerWidgetComponent', () => {
it('should send an event when a value is changed in the form', (done) => {
let fakeForm = new FormModel();
let fakeField = new FormFieldModel(fakeForm, {id: 'fakeField', value: 'fakeValue'});
widget.fieldChanged.subscribe(field => {
widget.fieldChanged.subscribe((field) => {
expect(field).not.toBe(null);
expect(field.id).toBe('fakeField');
expect(field.value).toBe('fakeValue');

4
lib/core/form/components/widgets/core/form-field-validator.ts
View File

@@ -66,7 +66,7 @@ export class RequiredFieldValidator implements FormFieldValidator {
}
if (field.type === FormFieldTypes.RADIO_BUTTONS) {
let option = field.options.find(opt => opt.id === field.value);
let option = field.options.find((opt) => opt.id === field.value);
return !!option;
}
@@ -497,7 +497,7 @@ export class FixedValueFieldValidator implements FormFieldValidator {
}
hasValidName(field: FormFieldModel) {
return field.options.find(item => item.name && item.name.toLocaleLowerCase() === field.value.toLocaleLowerCase()) ? true : false;
return field.options.find((item) => item.name && item.name.toLocaleLowerCase() === field.value.toLocaleLowerCase()) ? true : false;
}
hasValidId(field: FormFieldModel) {

4
lib/core/form/components/widgets/core/form-field.model.spec.ts
View File

@@ -58,7 +58,7 @@ describe('FormFieldModel', () => {
value: '<value>'
};
let field = new FormFieldModel(new FormModel(), json);
Object.keys(json).forEach(key => {
Object.keys(json).forEach((key) => {
expect(field[key]).toBe(json[key]);
});
});
@@ -346,7 +346,7 @@ describe('FormFieldModel', () => {
it('should not update form with display-only field value', () => {
let form = new FormModel();
FormFieldTypes.READONLY_TYPES.forEach(typeName => {
FormFieldTypes.READONLY_TYPES.forEach((typeName) => {
let field = new FormFieldModel(form, {
id: typeName,
type: typeName

14
lib/core/form/components/widgets/core/form-field.model.ts
View File

@@ -271,7 +271,7 @@ export class FormFieldModel extends FormWidgetModel {
if (json.fields.hasOwnProperty(currentField)) {
let col = new ContainerColumnModel();
let fields: FormFieldModel[] = (json.fields[currentField] || []).map(f => new FormFieldModel(form, f));
let fields: FormFieldModel[] = (json.fields[currentField] || []).map((f) => new FormFieldModel(form, f));
col.fields = fields;
col.rowspan = json.fields[currentField].length;
@@ -315,7 +315,7 @@ export class FormFieldModel extends FormWidgetModel {
// Activiti has a bug with default radio button value where initial selection passed as `name` value
// so try resolving current one with a fallback to first entry via name or id
// TODO: needs to be reported and fixed at Activiti side
let entry: FormFieldOption[] = this.options.filter(opt =>
let entry: FormFieldOption[] = this.options.filter((opt) =>
opt.id === value || opt.name === value || (value && (opt.id === value.id || opt.name === value.name)));
if (entry.length > 0) {
value = entry[0].id;
@@ -357,7 +357,7 @@ export class FormFieldModel extends FormWidgetModel {
if (this.value === 'empty' || this.value === '') {
this.form.values[this.id] = {};
} else {
let entry: FormFieldOption[] = this.options.filter(opt => opt.id === this.value);
let entry: FormFieldOption[] = this.options.filter((opt) => opt.id === this.value);
if (entry.length > 0) {
this.form.values[this.id] = entry[0];
}
@@ -368,20 +368,20 @@ export class FormFieldModel extends FormWidgetModel {
This is needed due to Activiti issue related to reading radio button values as value string
but saving back as object: { id: <id>, name: <name> }
*/
let rbEntry: FormFieldOption[] = this.options.filter(opt => opt.id === this.value);
let rbEntry: FormFieldOption[] = this.options.filter((opt) => opt.id === this.value);
if (rbEntry.length > 0) {
this.form.values[this.id] = rbEntry[0];
}
break;
case FormFieldTypes.UPLOAD:
if (this.value && this.value.length > 0) {
this.form.values[this.id] = this.value.map(elem => elem.id).join(',');
this.form.values[this.id] = this.value.map((elem) => elem.id).join(',');
} else {
this.form.values[this.id] = null;
}
break;
case FormFieldTypes.TYPEAHEAD:
let taEntry: FormFieldOption[] = this.options.filter(opt => opt.id === this.value || opt.name === this.value);
let taEntry: FormFieldOption[] = this.options.filter((opt) => opt.id === this.value || opt.name === this.value);
if (taEntry.length > 0) {
this.form.values[this.id] = taEntry[0];
} else if (this.options.length > 0) {
@@ -435,7 +435,7 @@ export class FormFieldModel extends FormWidgetModel {
}
getOptionName(): string {
let option: FormFieldOption = this.options.find(opt => opt.id === this.value);
let option: FormFieldOption = this.options.find((opt) => opt.id === this.value);
return option ? option.name : null;
}

2
lib/core/form/components/widgets/core/form.model.spec.ts
View File

@@ -49,7 +49,7 @@ describe('FormModel', () => {
};
let form = new FormModel(json);
Object.keys(json).forEach(key => {
Object.keys(json).forEach((key) => {
expect(form[key]).toEqual(form[key]);
});
});

6
lib/core/form/components/widgets/core/form.model.ts
View File

@@ -99,7 +99,7 @@ export class FormModel {
this.processVariables = json.processVariables;
this.tabs = (json.tabs || []).map(t => {
this.tabs = (json.tabs || []).map((t) => {
let model = new TabModel(this, t);
tabCache[model.id] = model;
return model;
@@ -138,7 +138,7 @@ export class FormModel {
isSystem: true
});
let customOutcomes = (json.outcomes || []).map(obj => new FormOutcomeModel(this, obj));
let customOutcomes = (json.outcomes || []).map((obj) => new FormOutcomeModel(this, obj));
this.outcomes = [saveOutcome].concat(
customOutcomes.length > 0 ? customOutcomes : [completeOutcome, startProcessOutcome]
@@ -157,7 +157,7 @@ export class FormModel {
}
getFieldById(fieldId: string): FormFieldModel {
return this.getFormFields().find(field => field.id === fieldId);
return this.getFormFields().find((field) => field.id === fieldId);
}
// TODO: consider evaluating and caching once the form is loaded

4
lib/core/form/components/widgets/dropdown/dropdown.widget.spec.ts
View File

@@ -89,7 +89,7 @@ describe('DropdownWidgetComponent', () => {
});
spyOn(formService, 'getRestFieldValues').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(null);
observer.complete();
})
@@ -101,7 +101,7 @@ describe('DropdownWidgetComponent', () => {
it('should preserve empty option when loading fields', () => {
let restFieldValue: FormFieldOption = <FormFieldOption> { id: '1', name: 'Option1' };
spyOn(formService, 'getRestFieldValues').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next([restFieldValue]);
observer.complete();
});

4
lib/core/form/components/widgets/dropdown/dropdown.widget.ts
View File

@@ -62,7 +62,7 @@ export class DropdownWidgetComponent extends WidgetComponent implements OnInit {
this.field.options = options.concat((result || []));
this.field.updateForm();
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}
@@ -81,7 +81,7 @@ export class DropdownWidgetComponent extends WidgetComponent implements OnInit {
this.field.options = options.concat((result || []));
this.field.updateForm();
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}

10
lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.model.ts
View File

@@ -51,7 +51,7 @@ export class DynamicTableModel extends FormWidgetModel {
return;
}
this.rows.forEach(row => row.selected = false);
this.rows.forEach((row) => row.selected = false);
this._selectedRow = value;
@@ -68,11 +68,11 @@ export class DynamicTableModel extends FormWidgetModel {
const columns = this.getColumns(field);
if (columns) {
this.columns = columns;
this.visibleColumns = this.columns.filter(col => col.visible);
this.visibleColumns = this.columns.filter((col) => col.visible);
}
if (field.json.value) {
this.rows = field.json.value.map(obj => <DynamicTableRow> {selected: false, value: obj});
this.rows = field.json.value.map((obj) => <DynamicTableRow> {selected: false, value: obj});
}
}
@@ -91,7 +91,7 @@ export class DynamicTableModel extends FormWidgetModel {
}
if (definitions) {
return definitions.map(obj => <DynamicTableColumn> obj);
return definitions.map((obj) => <DynamicTableColumn> obj);
}
}
return null;
@@ -99,7 +99,7 @@ export class DynamicTableModel extends FormWidgetModel {
flushValue() {
if (this.field) {
this.field.value = this.rows.map(r => r.value);
this.field.value = this.rows.map((r) => r.value);
this.field.updateForm();
}
}

2
lib/core/form/components/widgets/dynamic-table/dynamic-table.widget.ts
View File

@@ -195,7 +195,7 @@ export class DynamicTableWidgetComponent extends WidgetComponent implements OnIn
if (typeof obj === 'object' && obj !== null && obj !== undefined) {
result = Object.assign({}, obj);
Object.keys(obj).forEach(key => {
Object.keys(obj).forEach((key) => {
if (typeof obj[key] === 'object') {
result[key] = this.copyObject(obj[key]);
}

4
lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.spec.ts
View File

@@ -98,7 +98,7 @@ describe('DropdownEditorComponent', () => {
];
spyOn(formService, 'getRestFieldValuesColumn').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(restResults);
observer.complete();
})
@@ -121,7 +121,7 @@ describe('DropdownEditorComponent', () => {
column.optionType = 'rest';
spyOn(formService, 'getRestFieldValuesColumn').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(null);
observer.complete();
})

6
lib/core/form/components/widgets/dynamic-table/editors/dropdown/dropdown.editor.ts
View File

@@ -77,7 +77,7 @@ export class DropdownEditorComponent implements OnInit {
this.options = this.column.options;
this.value = this.table.getCellValue(this.row, this.column);
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}
@@ -94,13 +94,13 @@ export class DropdownEditorComponent implements OnInit {
this.options = this.column.options;
this.value = this.table.getCellValue(this.row, this.column);
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}
onValueChanged(row: DynamicTableRow, column: DynamicTableColumn, event: any) {
let value: any = (<HTMLInputElement> event).value;
value = column.options.find(opt => opt.name === value);
value = column.options.find((opt) => opt.name === value);
row.value[column.id] = value;
}

6
lib/core/form/components/widgets/dynamic-table/editors/row.editor.spec.ts
View File

@@ -41,7 +41,7 @@ describe('RowEditorComponent', () => {
});
it('should emit [cancel] event', (done) => {
component.cancel.subscribe(e => {
component.cancel.subscribe((e) => {
expect(e.table).toBe(component.table);
expect(e.row).toBe(component.row);
expect(e.column).toBe(component.column);
@@ -60,7 +60,7 @@ describe('RowEditorComponent', () => {
spyOn(component.table, 'validateRow').and.returnValue(
<DynamicRowValidationSummary> {isValid: true, message: null}
);
component.save.subscribe(e => {
component.save.subscribe((e) => {
expect(e.table).toBe(component.table);
expect(e.row).toBe(component.row);
expect(e.column).toBe(component.column);
@@ -74,7 +74,7 @@ describe('RowEditorComponent', () => {
<DynamicRowValidationSummary> {isValid: false, message: 'error'}
);
let raised = false;
component.save.subscribe(e => raised = true);
component.save.subscribe((e) => raised = true);
component.onSaveChanges();
expect(raised).toBeFalsy();
});

8
lib/core/form/components/widgets/functional-group/functional-group.widget.spec.ts
View File

@@ -40,7 +40,7 @@ describe('FunctionalGroupWidgetComponent', () => {
widget.field.value = group;
spyOn(formService, 'getWorkflowGroups').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(null);
observer.complete();
})
@@ -128,7 +128,7 @@ describe('FunctionalGroupWidgetComponent', () => {
new GroupModel()
];
spyOn(formService, 'getWorkflowGroups').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(groups);
observer.complete();
})
@@ -148,7 +148,7 @@ describe('FunctionalGroupWidgetComponent', () => {
new GroupModel()
];
spyOn(formService, 'getWorkflowGroups').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(groups);
observer.complete();
})
@@ -165,7 +165,7 @@ describe('FunctionalGroupWidgetComponent', () => {
it('should hide popup when fetching empty group list', () => {
spyOn(formService, 'getWorkflowGroups').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(null);
observer.complete();
})

2
lib/core/form/components/widgets/functional-group/functional-group.widget.ts
View File

@@ -78,7 +78,7 @@ export class FunctionalGroupWidgetComponent extends WidgetComponent implements O
}
flushValue() {
let option = this.groups.find(item => item.name.toLocaleLowerCase() === this.value.toLocaleLowerCase());
let option = this.groups.find((item) => item.name.toLocaleLowerCase() === this.value.toLocaleLowerCase());
if (option) {
this.field.value = option;

10
lib/core/form/components/widgets/people/people.widget.spec.ts
View File

@@ -49,8 +49,8 @@ describe('PeopleWidgetComponent', () => {
formService = TestBed.get(FormService);
translationService = TestBed.get(TranslateService);
spyOn(translationService, 'instant').and.callFake(key => { return key; });
spyOn(translationService, 'get').and.callFake(key => { return of(key); });
spyOn(translationService, 'instant').and.callFake((key) => { return key; });
spyOn(translationService, 'get').and.callFake((key) => { return of(key); });
element = fixture.nativeElement;
widget = fixture.componentInstance;
@@ -88,7 +88,7 @@ describe('PeopleWidgetComponent', () => {
});
spyOn(formService, 'getWorkflowUsers').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(null);
observer.complete();
})
@@ -111,7 +111,7 @@ describe('PeopleWidgetComponent', () => {
widget.field.form.readOnly = true;
spyOn(formService, 'getWorkflowUsers').and.returnValue(
new Observable(observer => {
new Observable((observer) => {
observer.next(null);
observer.complete();
})
@@ -166,7 +166,7 @@ describe('PeopleWidgetComponent', () => {
{ id: 1002, firstName: 'Test02', lastName: 'Test02', email: 'test2' }];
beforeEach(async(() => {
spyOn(formService, 'getWorkflowUsers').and.returnValue(new Observable(observer => {
spyOn(formService, 'getWorkflowUsers').and.returnValue(new Observable((observer) => {
observer.next(fakeUserResult);
observer.complete();
}));

2
lib/core/form/components/widgets/people/people.widget.ts
View File

@@ -64,7 +64,7 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit {
let value = searchTerm.email ? this.getDisplayName(searchTerm) : searchTerm;
return this.formService.getWorkflowUsers(value, this.groupId)
.pipe(
catchError(err => {
catchError((err) => {
this.errorMsg = err.message;
return of();
})

8
lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.spec.ts
View File

@@ -59,7 +59,7 @@ describe('RadioButtonsWidgetComponent', () => {
restUrl: '<url>'
});
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next(null);
observer.complete();
}));
@@ -82,7 +82,7 @@ describe('RadioButtonsWidgetComponent', () => {
let field = widget.field;
spyOn(field, 'updateForm').and.stub();
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next(null);
observer.complete();
}));
@@ -102,7 +102,7 @@ describe('RadioButtonsWidgetComponent', () => {
id: fieldId,
restUrl: '<url>'
});
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next(null);
observer.complete();
}));
@@ -179,7 +179,7 @@ describe('RadioButtonsWidgetComponent', () => {
expect(element.querySelector('#radio-id')).not.toBeNull();
expect(option).not.toBeNull();
option.click();
widget.fieldChanged.subscribe(field => {
widget.fieldChanged.subscribe((field) => {
expect(element.querySelector('#radio-id')).toBeNull();
expect(element.querySelector('#radio-id-opt-1-input')).toBeNull();
});

4
lib/core/form/components/widgets/radio-buttons/radio-buttons.widget.ts
View File

@@ -58,7 +58,7 @@ export class RadioButtonsWidgetComponent extends WidgetComponent implements OnIn
this.field.options = result || [];
this.field.updateForm();
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}
@@ -73,7 +73,7 @@ export class RadioButtonsWidgetComponent extends WidgetComponent implements OnIn
this.field.options = result || [];
this.field.updateForm();
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}

2
lib/core/form/components/widgets/tabs/tabs.widget.spec.ts
View File

@@ -57,7 +57,7 @@ describe('TabsWidgetComponent', () => {
it('should emit tab changed event', (done) => {
let field = new FormFieldModel(null);
widget.formTabChanged.subscribe(tab => {
widget.formTabChanged.subscribe((tab) => {
expect(tab).toBe(field);
done();
});

2
lib/core/form/components/widgets/tabs/tabs.widget.ts
View File

@@ -44,7 +44,7 @@ export class TabsWidgetComponent implements AfterContentChecked {
}
filterVisibleTabs() {
this.visibleTabs = this.tabs.filter(tab => {
this.visibleTabs = this.tabs.filter((tab) => {
return tab.isVisible;
});
}

14
lib/core/form/components/widgets/typeahead/typeahead.widget.spec.ts
View File

@@ -45,8 +45,8 @@ describe('TypeaheadWidgetComponent', () => {
beforeEach(() => {
translationService = TestBed.get(TranslateService);
spyOn(translationService, 'instant').and.callFake(key => { return key; });
spyOn(translationService, 'get').and.callFake(key => { return of(key); });
spyOn(translationService, 'instant').and.callFake((key) => { return key; });
spyOn(translationService, 'get').and.callFake((key) => { return of(key); });
formService = new FormService(null, null, null);
widget = new TypeaheadWidgetComponent(formService, null);
@@ -67,7 +67,7 @@ describe('TypeaheadWidgetComponent', () => {
restUrl: 'whateverURL'
});
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next(null);
observer.complete();
}));
@@ -137,7 +137,7 @@ describe('TypeaheadWidgetComponent', () => {
});
it('should setup initial value', () => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next([
{ id: '1', name: 'One' },
{ id: '2', name: 'Two' }
@@ -153,7 +153,7 @@ describe('TypeaheadWidgetComponent', () => {
});
it('should not setup initial value due to missing option', () => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next([
{ id: '1', name: 'One' },
{ id: '2', name: 'Two' }
@@ -175,7 +175,7 @@ describe('TypeaheadWidgetComponent', () => {
{ id: '2', name: 'Two' }
];
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next(options);
observer.complete();
}));
@@ -185,7 +185,7 @@ describe('TypeaheadWidgetComponent', () => {
});
it('should update form upon options setup', () => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable(observer => {
spyOn(formService, 'getRestFieldValues').and.returnValue(new Observable((observer) => {
observer.next([]);
observer.complete();
}));

12
lib/core/form/components/widgets/typeahead/typeahead.widget.ts
View File

@@ -67,7 +67,7 @@ export class TypeaheadWidgetComponent extends WidgetComponent implements OnInit
let fieldValue = this.field.value;
if (fieldValue) {
let toSelect = options.find(item => item.id === fieldValue || item.name.toLocaleLowerCase() === fieldValue.toLocaleLowerCase());
let toSelect = options.find((item) => item.id === fieldValue || item.name.toLocaleLowerCase() === fieldValue.toLocaleLowerCase());
if (toSelect) {
this.value = toSelect.name;
}
@@ -75,7 +75,7 @@ export class TypeaheadWidgetComponent extends WidgetComponent implements OnInit
this.onFieldChanged(this.field);
this.field.updateForm();
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}
@@ -92,7 +92,7 @@ export class TypeaheadWidgetComponent extends WidgetComponent implements OnInit
let fieldValue = this.field.value;
if (fieldValue) {
let toSelect = options.find(item => item.id === fieldValue);
let toSelect = options.find((item) => item.id === fieldValue);
if (toSelect) {
this.value = toSelect.name;
}
@@ -100,20 +100,20 @@ export class TypeaheadWidgetComponent extends WidgetComponent implements OnInit
this.onFieldChanged(this.field);
this.field.updateForm();
},
err => this.handleError(err)
(err) => this.handleError(err)
);
}
getOptions(): FormFieldOption[] {
let val = this.value.trim().toLocaleLowerCase();
return this.field.options.filter(item => {
return this.field.options.filter((item) => {
let name = item.name.toLocaleLowerCase();
return name.indexOf(val) > -1;
});
}
isValidOptionName(optionName: string): boolean {
let option = this.field.options.find(item => item.name && item.name.toLocaleLowerCase() === optionName.toLocaleLowerCase());
let option = this.field.options.find((item) => item.name && item.name.toLocaleLowerCase() === optionName.toLocaleLowerCase());
return option ? true : false;
}

2
lib/core/form/components/widgets/upload-folder/upload-folder.widget.ts
View File

@@ -76,7 +76,7 @@ export class UploadFolderWidgetComponent extends WidgetComponent implements OnIn
if (files && files.length > 0) {
from(files)
.pipe(mergeMap(file => this.uploadRawContent(file)))
.pipe(mergeMap((file) => this.uploadRawContent(file)))
.subscribe(
(res) => {
filesSaved.push(res);

2
lib/core/form/components/widgets/upload/upload.widget.ts
View File

@@ -76,7 +76,7 @@ export class UploadWidgetComponent extends WidgetComponent implements OnInit {
if (files && files.length > 0) {
from(files)
.pipe(mergeMap(file => this.uploadRawContent(file)))
.pipe(mergeMap((file) => this.uploadRawContent(file)))
.subscribe(
(res) => filesSaved.push(res),
() => this.logService.error('Error uploading file. See console output for more details.'),

4
lib/core/form/components/widgets/widget.component.spec.ts
View File

@@ -68,7 +68,7 @@ describe('WidgetComponent', () => {
let fakeField = new FormFieldModel(fakeForm, {id: 'fakeField', value: 'fakeValue'});
widget.field = fakeField;
widget.fieldChanged.subscribe(field => {
widget.fieldChanged.subscribe((field) => {
expect(field).not.toBe(null);
expect(field.id).toBe('fakeField');
expect(field.value).toBe('fakeValue');
@@ -81,7 +81,7 @@ describe('WidgetComponent', () => {
it('should send an event when a field is changed', (done) => {
let fakeForm = new FormModel();
let fakeField = new FormFieldModel(fakeForm, {id: 'fakeField', value: 'fakeValue'});
widget.fieldChanged.subscribe(field => {
widget.fieldChanged.subscribe((field) => {
expect(field).not.toBe(null);
expect(field.id).toBe('fakeField');
expect(field.value).toBe('fakeValue');

8
lib/core/form/services/activiti-alfresco.service.ts
View File

@@ -48,7 +48,7 @@ export class ActivitiContentService {
return from(apiService.activiti.alfrescoApi.getContentInFolder(accountShortId, folderId))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -67,7 +67,7 @@ export class ActivitiContentService {
return from(apiService.activiti.alfrescoApi.getRepositories(opts))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -89,7 +89,7 @@ export class ActivitiContentService {
}))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -106,7 +106,7 @@ export class ActivitiContentService {
return from(apiService.activiti.contentApi.createTemporaryRelatedContent(params))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}

20
lib/core/form/services/ecm-model.service.spec.ts
View File

@@ -229,14 +229,14 @@ describe('EcmModelService', () => {
it('Should create an ECM type with properties', (done) => {
spyOn(service, 'createEcmType').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
});
spyOn(service, 'addPropertyToAType').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
@@ -251,14 +251,14 @@ describe('EcmModelService', () => {
it('Should return the already existing type', (done) => {
spyOn(service, 'searchEcmType').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({test: 'I-EXIST'});
observer.complete();
});
});
spyOn(service, 'createEcmTypeWithProperties').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
@@ -273,14 +273,14 @@ describe('EcmModelService', () => {
it('Should create an ECM type with properties if the ecm Type is not defined already', (done) => {
spyOn(service, 'searchEcmType').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
});
spyOn(service, 'createEcmTypeWithProperties').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
@@ -295,14 +295,14 @@ describe('EcmModelService', () => {
it('Should create an ECM model for the activiti if not defined already', (done) => {
spyOn(service, 'searchActivitiEcmModel').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
});
spyOn(service, 'createActivitiEcmModel').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});
@@ -317,14 +317,14 @@ describe('EcmModelService', () => {
it('If a model for the activiti is already define has to save the new type', (done) => {
spyOn(service, 'searchActivitiEcmModel').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next({test: 'I-EXIST'});
observer.complete();
});
});
spyOn(service, 'saveFomType').and.callFake(() => {
return new Observable(observer => {
return new Observable((observer) => {
observer.next();
observer.complete();
});

56
lib/core/form/services/ecm-model.service.ts
View File

@@ -36,22 +36,22 @@ export class EcmModelService {
}
public createEcmTypeForActivitiForm(formName: string, form: FormModel): Observable<any> {
return new Observable(observer => {
return new Observable((observer) => {
this.searchActivitiEcmModel().subscribe(
model => {
(model) => {
if (!model) {
this.createActivitiEcmModel(formName, form).subscribe(typeForm => {
this.createActivitiEcmModel(formName, form).subscribe((typeForm) => {
observer.next(typeForm);
observer.complete();
});
} else {
this.saveFomType(formName, form).subscribe(typeForm => {
this.saveFomType(formName, form).subscribe((typeForm) => {
observer.next(typeForm);
observer.complete();
});
}
},
err => this.handleError(err)
(err) => this.handleError(err)
);
});
@@ -59,38 +59,38 @@ export class EcmModelService {
searchActivitiEcmModel() {
return this.getEcmModels().pipe(map(function (ecmModels: any) {
return ecmModels.list.entries.find(model => model.entry.name === EcmModelService.MODEL_NAME);
return ecmModels.list.entries.find((model) => model.entry.name === EcmModelService.MODEL_NAME);
}));
}
createActivitiEcmModel(formName: string, form: FormModel): Observable<any> {
return new Observable(observer => {
return new Observable((observer) => {
this.createEcmModel(EcmModelService.MODEL_NAME, EcmModelService.MODEL_NAMESPACE).subscribe(
model => {
(model) => {
this.logService.info('model created', model);
this.activeEcmModel(EcmModelService.MODEL_NAME).subscribe(
modelActive => {
(modelActive) => {
this.logService.info('model active', modelActive);
this.createEcmTypeWithProperties(formName, form).subscribe(typeCreated => {
this.createEcmTypeWithProperties(formName, form).subscribe((typeCreated) => {
observer.next(typeCreated);
observer.complete();
});
},
err => this.handleError(err)
(err) => this.handleError(err)
);
},
err => this.handleError(err)
(err) => this.handleError(err)
);
});
}
saveFomType(formName: string, form: FormModel): Observable<any> {
return new Observable(observer => {
return new Observable((observer) => {
this.searchEcmType(formName, EcmModelService.MODEL_NAME).subscribe(
ecmType => {
(ecmType) => {
this.logService.info('custom types', ecmType);
if (!ecmType) {
this.createEcmTypeWithProperties(formName, form).subscribe(typeCreated => {
this.createEcmTypeWithProperties(formName, form).subscribe((typeCreated) => {
observer.next(typeCreated);
observer.complete();
});
@@ -99,31 +99,31 @@ export class EcmModelService {
observer.complete();
}
},
err => this.handleError(err)
(err) => this.handleError(err)
);
});
}
public createEcmTypeWithProperties(formName: string, form: FormModel): Observable<any> {
return new Observable(observer => {
return new Observable((observer) => {
this.createEcmType(formName, EcmModelService.MODEL_NAME, EcmModelService.TYPE_MODEL).subscribe(
typeCreated => {
(typeCreated) => {
this.logService.info('type Created', typeCreated);
this.addPropertyToAType(EcmModelService.MODEL_NAME, formName, form).subscribe(
propertyAdded => {
(propertyAdded) => {
this.logService.info('property Added', propertyAdded);
observer.next(typeCreated);
observer.complete();
},
err => this.handleError(err));
(err) => this.handleError(err));
},
err => this.handleError(err));
(err) => this.handleError(err));
});
}
public searchEcmType(typeName: string, modelName: string): Observable<any> {
return this.getEcmType(modelName).pipe(map(function (customTypes: any) {
return customTypes.list.entries.find(type => type.entry.prefixedName === typeName || type.entry.title === typeName);
return customTypes.list.entries.find((type) => type.entry.prefixedName === typeName || type.entry.title === typeName);
}));
}
@@ -131,7 +131,7 @@ export class EcmModelService {
return from(this.apiService.getInstance().core.customModelApi.activateCustomModel(modelName))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -139,7 +139,7 @@ export class EcmModelService {
return from(this.apiService.getInstance().core.customModelApi.createCustomModel('DRAFT', '', modelName, modelName, nameSpace))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -147,7 +147,7 @@ export class EcmModelService {
return from(this.apiService.getInstance().core.customModelApi.getAllCustomModel())
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -155,7 +155,7 @@ export class EcmModelService {
return from(this.apiService.getInstance().core.customModelApi.getAllCustomType(modelName))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -165,7 +165,7 @@ export class EcmModelService {
return from(this.apiService.getInstance().core.customModelApi.createCustomType(modelName, name, parentType, typeName, ''))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -192,7 +192,7 @@ export class EcmModelService {
return from(this.apiService.getInstance().core.customModelApi.addPropertyToType(modelName, name, properties))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}

28
lib/core/form/services/form.service.spec.ts
View File

@@ -94,7 +94,7 @@ describe('Form service', () => {
let simpleResponseBody = { id: 1, modelType: 'test' };
it('should fetch and parse process definitions', (done) => {
service.getProcessDefinitions().subscribe(result => {
service.getProcessDefinitions().subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('/process-definitions')).toBeTruthy();
expect(result).toEqual(JSON.parse(jasmine.Ajax.requests.mostRecent().response).data);
done();
@@ -108,7 +108,7 @@ describe('Form service', () => {
});
it('should fetch and parse tasks', (done) => {
service.getTasks().subscribe(result => {
service.getTasks().subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('/tasks/query')).toBeTruthy();
expect(result).toEqual(JSON.parse(jasmine.Ajax.requests.mostRecent().response).data);
done();
@@ -122,7 +122,7 @@ describe('Form service', () => {
});
it('should fetch and parse the task by id', (done) => {
service.getTask('1').subscribe(result => {
service.getTask('1').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('/tasks/1')).toBeTruthy();
expect(result.id).toEqual('1');
done();
@@ -182,7 +182,7 @@ describe('Form service', () => {
});
it('should get task form by id', (done) => {
service.getTaskForm('1').subscribe(result => {
service.getTaskForm('1').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('/task-forms/1')).toBeTruthy();
expect(result.id).toEqual(1);
done();
@@ -196,7 +196,7 @@ describe('Form service', () => {
});
it('should get form definition by id', (done) => {
service.getFormDefinitionById('1').subscribe(result => {
service.getFormDefinitionById('1').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('/form-models/1')).toBeTruthy();
expect(result.id).toEqual(1);
done();
@@ -218,7 +218,7 @@ describe('Form service', () => {
]
};
service.getFormDefinitionByName(formName).subscribe(result => {
service.getFormDefinitionByName(formName).subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith(`models?filter=myReusableForms&filterText=${formName}&modelType=2`)).toBeTruthy();
expect(result).toEqual(formId);
done();
@@ -241,7 +241,7 @@ describe('Form service', () => {
});
processApiSpy.getProcessDefinitionStartForm.and.returnValue(Promise.resolve({ id: '1' }));
service.getStartFormDefinition('myprocess:1').subscribe(result => {
service.getStartFormDefinition('myprocess:1').subscribe((result) => {
expect(processApiSpy.getProcessDefinitionStartForm).toHaveBeenCalledWith('myprocess:1');
done();
});
@@ -309,7 +309,7 @@ describe('Form service', () => {
});
it('should get all the forms with modelType=2', (done) => {
service.getForms().subscribe(result => {
service.getForms().subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('models?modelType=2')).toBeTruthy();
expect(result.length).toEqual(2);
done();
@@ -330,7 +330,7 @@ describe('Form service', () => {
it('should search for Form with modelType=2', (done) => {
let response = { data: [{ id: 1, name: 'findMe' }, { id: 2, name: 'testForm' }] };
service.searchFrom('findMe').subscribe(result => {
service.searchFrom('findMe').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('models?modelType=2')).toBeTruthy();
expect(result.name).toEqual('findMe');
expect(result.id).toEqual(1);
@@ -345,7 +345,7 @@ describe('Form service', () => {
});
it('should create a Form with modelType=2', (done) => {
service.createForm('testName').subscribe(result => {
service.createForm('testName').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('/models')).toBeTruthy();
expect(JSON.parse(jasmine.Ajax.requests.mostRecent().params).modelType).toEqual(2);
expect(JSON.parse(jasmine.Ajax.requests.mostRecent().params).name).toEqual('testName');
@@ -365,7 +365,7 @@ describe('Form service', () => {
let data = [{ name: 'name' }, { name: 'email' }];
let formDefinitionModel = new FormDefinitionModel(formId, name, 'testUserName', '2016-09-05T14:41:19.049Z', data);
service.addFieldsToAForm(formId, formDefinitionModel).subscribe(result => {
service.addFieldsToAForm(formId, formDefinitionModel).subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('/form-models/' + formId)).toBeTruthy();
expect(JSON.parse(jasmine.Ajax.requests.mostRecent().params).formRepresentation.name).toEqual(name);
done();
@@ -382,7 +382,7 @@ describe('Form service', () => {
spyOn(service, 'getUserProfileImageApi').and.returnValue('/app/rest/users/2002/picture');
let fakeFilter: string = 'whatever';
service.getWorkflowUsers(fakeFilter).subscribe(result => {
service.getWorkflowUsers(fakeFilter).subscribe((result) => {
expect(result).toBeDefined();
expect(result.length).toBe(3);
expect(result[0].id).toBe(2002);
@@ -400,7 +400,7 @@ describe('Form service', () => {
it('should return list of groups', (done) => {
let fakeFilter: string = 'whatever';
service.getWorkflowGroups(fakeFilter).subscribe(result => {
service.getWorkflowGroups(fakeFilter).subscribe((result) => {
expect(result).toBeDefined();
expect(result.length).toBe(2);
expect(result[0].id).toBe('2004');
@@ -433,7 +433,7 @@ describe('Form service', () => {
stubAddFieldsToAForm();
service.createFormFromANode(nameForm).subscribe(result => {
service.createFormFromANode(nameForm).subscribe((result) => {
expect(result.id).toEqual(formId);
done();
});

56
lib/core/form/services/form.service.ts
View File

@@ -118,20 +118,20 @@ export class FormService {
* @returns The new form
*/
createFormFromANode(formName: string): Observable<any> {
return new Observable(observer => {
return new Observable((observer) => {
this.createForm(formName).subscribe(
form => {
(form) => {
this.ecmModelService.searchEcmType(formName, EcmModelService.MODEL_NAME).subscribe(
customType => {
(customType) => {
let formDefinitionModel = new FormDefinitionModel(form.id, form.name, form.lastUpdatedByFullName, form.lastUpdated, customType.entry.properties);
this.addFieldsToAForm(form.id, formDefinitionModel).subscribe(formData => {
this.addFieldsToAForm(form.id, formDefinitionModel).subscribe((formData) => {
observer.next(formData);
observer.complete();
}, err => this.handleError(err));
}, (err) => this.handleError(err));
},
err => this.handleError(err));
(err) => this.handleError(err));
},
err => this.handleError(err));
(err) => this.handleError(err));
});
}
@@ -193,9 +193,9 @@ export class FormService {
)
.pipe(
map(function (forms: any) {
return forms.data.find(formData => formData.name === name);
return forms.data.find((formData) => formData.name === name);
}),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -211,7 +211,7 @@ export class FormService {
return from(this.modelsApi.getModels(opts))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -223,7 +223,7 @@ export class FormService {
return from(this.processApi.getProcessDefinitions({}))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -236,7 +236,7 @@ export class FormService {
return from(this.processInstanceVariablesApi.getProcessInstanceVariables(processInstanceId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -248,7 +248,7 @@ export class FormService {
return from(this.taskApi.listTasks({}))
.pipe(
map(this.toJsonArray),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -261,7 +261,7 @@ export class FormService {
return from(this.taskApi.getTask(taskId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -276,7 +276,7 @@ export class FormService {
return from(this.taskApi.saveTaskForm(taskId, body))
.pipe(
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -296,7 +296,7 @@ export class FormService {
return from(this.taskApi.completeTaskForm(taskId, body))
.pipe(
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -309,7 +309,7 @@ export class FormService {
return from(this.taskApi.getTaskForm(taskId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -322,7 +322,7 @@ export class FormService {
return from(this.editorApi.getForm(formId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -341,7 +341,7 @@ export class FormService {
return from(this.modelsApi.getModels(opts))
.pipe(
map(this.getFormId),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -354,7 +354,7 @@ export class FormService {
return from(this.processApi.getProcessInstanceStartForm(processId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -367,7 +367,7 @@ export class FormService {
return from(this.processApi.getProcessInstance(processId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -380,7 +380,7 @@ export class FormService {
return from(this.processApi.getProcessDefinitionStartForm(processId))
.pipe(
map(this.toJson),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -393,7 +393,7 @@ export class FormService {
getRestFieldValues(taskId: string, field: string): Observable<any> {
return from(this.taskApi.getRestFieldValues(taskId, field))
.pipe(
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -406,7 +406,7 @@ export class FormService {
getRestFieldValuesByProcessId(processDefinitionId: string, field: string): Observable<any> {
return from(this.processApi.getRestFieldValues(processDefinitionId, field))
.pipe(
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -420,7 +420,7 @@ export class FormService {
getRestFieldValuesColumnByProcessId(processDefinitionId: string, field: string, column?: string): Observable<any> {
return from(this.processApi.getRestTableFieldValues(processDefinitionId, field, column))
.pipe(
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -434,7 +434,7 @@ export class FormService {
getRestFieldValuesColumn(taskId: string, field: string, column?: string): Observable<any> {
return from(this.taskApi.getRestFieldValuesColumn(taskId, field, column))
.pipe(
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -467,7 +467,7 @@ export class FormService {
}),
combineAll(),
defaultIfEmpty([]),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}
@@ -485,7 +485,7 @@ export class FormService {
return from(this.groupsApi.getGroups(option))
.pipe(
map((response: any) => <GroupModel[]> response.data || []),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}

10
lib/core/form/services/node.service.spec.ts
View File

@@ -65,7 +65,7 @@ describe('NodeService', () => {
}
};
service.getNodeMetadata('-nodeid-').subscribe(result => {
service.getNodeMetadata('-nodeid-').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('nodes/-nodeid-')).toBeTruthy();
let node = new NodeMetadata({
test: 'test',
@@ -94,7 +94,7 @@ describe('NodeService', () => {
}
};
service.getNodeMetadata('-nodeid-').subscribe(result => {
service.getNodeMetadata('-nodeid-').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('nodes/-nodeid-')).toBeTruthy();
let node = new NodeMetadata({
test: 'test',
@@ -123,7 +123,7 @@ describe('NodeService', () => {
isFolder: true
};
service.createNodeMetadata('typeTest', EcmModelService.MODEL_NAMESPACE, data, '/Sites/swsdp/documentLibrary', 'testNode').subscribe(result => {
service.createNodeMetadata('typeTest', EcmModelService.MODEL_NAMESPACE, data, '/Sites/swsdp/documentLibrary', 'testNode').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('-root-/children')).toBeTruthy();
expect(result).toEqual(responseBody);
done();
@@ -142,7 +142,7 @@ describe('NodeService', () => {
testdata: 'testdata'
};
service.createNodeMetadata('typeTest', EcmModelService.MODEL_NAMESPACE, data, '/Sites/swsdp/documentLibrary').subscribe(result => {
service.createNodeMetadata('typeTest', EcmModelService.MODEL_NAMESPACE, data, '/Sites/swsdp/documentLibrary').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('-root-/children')).toBeTruthy();
expect(JSON.parse(jasmine.Ajax.requests.mostRecent().params).properties[EcmModelService.MODEL_NAMESPACE + ':test']).toBeDefined();
expect(JSON.parse(jasmine.Ajax.requests.mostRecent().params).properties[EcmModelService.MODEL_NAMESPACE + ':testdata']).toBeDefined();
@@ -162,7 +162,7 @@ describe('NodeService', () => {
testdata: 'testdata'
};
service.createNodeMetadata('typeTest', EcmModelService.MODEL_NAMESPACE, data, '/Sites/swsdp/documentLibrary').subscribe(result => {
service.createNodeMetadata('typeTest', EcmModelService.MODEL_NAMESPACE, data, '/Sites/swsdp/documentLibrary').subscribe((result) => {
expect(jasmine.Ajax.requests.mostRecent().url.endsWith('-root-/children')).toBeTruthy();
expect(JSON.parse(jasmine.Ajax.requests.mostRecent().params).name).toBeDefined();
done();

6
lib/core/form/services/process-content.service.spec.ts
View File

@@ -146,7 +146,7 @@ describe('ProcessContentService', () => {
it('should return the unsupported content when the file is an image', (done) => {
let contentId: number = 888;
service.getFileContent(contentId).subscribe(result => {
service.getFileContent(contentId).subscribe((result) => {
expect(result.id).toEqual(contentId);
expect(result.name).toEqual('fake-name.jpg');
expect(result.simpleType).toEqual('image');
@@ -164,7 +164,7 @@ describe('ProcessContentService', () => {
it('should return the supported content when the file is a pdf', (done) => {
let contentId: number = 999;
service.getFileContent(contentId).subscribe(result => {
service.getFileContent(contentId).subscribe((result) => {
expect(result.id).toEqual(contentId);
expect(result.name).toEqual('fake-name.pdf');
expect(result.simpleType).toEqual('pdf');
@@ -189,7 +189,7 @@ describe('ProcessContentService', () => {
let contentId: number = 999;
let blob = createFakeBlob();
spyOn(service, 'getContentThumbnail').and.returnValue(of(blob));
service.getContentThumbnail(contentId).subscribe(result => {
service.getContentThumbnail(contentId).subscribe((result) => {
expect(result).toEqual(jasmine.any(Blob));
expect(result.size).toEqual(48);
expect(result.type).toEqual('image/png');

20
lib/core/form/services/process-content.service.ts
View File

@@ -45,7 +45,7 @@ export class ProcessContentService {
*/
createTemporaryRawRelatedContent(file: any): Observable<RelatedContentRepresentation> {
return from(this.contentApi.createTemporaryRawRelatedContent(file))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -55,7 +55,7 @@ export class ProcessContentService {
*/
getFileContent(contentId: number): Observable<RelatedContentRepresentation> {
return from(this.contentApi.getContent(contentId))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -65,7 +65,7 @@ export class ProcessContentService {
*/
getFileRawContent(contentId: number): Observable<Blob> {
return from(this.contentApi.getRawContent(contentId))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -74,7 +74,7 @@ export class ProcessContentService {
* @returns Binary data of the content preview
*/
getContentPreview(contentId: number): Observable<Blob> {
return new Observable(observer => {
return new Observable((observer) => {
this.contentApi.getContentPreview(contentId).then(
(result) => {
observer.next(result);
@@ -112,7 +112,7 @@ export class ProcessContentService {
*/
getContentThumbnail(contentId: number): Observable<Blob> {
return from(this.contentApi.getContentThumbnail(contentId))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -122,7 +122,7 @@ export class ProcessContentService {
*/
getTaskRelatedContent(taskId: string): Observable<any> {
return from(this.contentApi.getRelatedContentForTask(taskId))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -132,7 +132,7 @@ export class ProcessContentService {
*/
getProcessRelatedContent(processId: string): Observable<any> {
return from(this.contentApi.getRelatedContentForProcessInstance(processId))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -142,7 +142,7 @@ export class ProcessContentService {
*/
deleteRelatedContent(contentId: number): Observable<any> {
return from(this.contentApi.deleteContent(contentId))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -154,7 +154,7 @@ export class ProcessContentService {
*/
createProcessRelatedContent(processInstanceId: string, content: any, opts?: any): Observable<any> {
return from(this.contentApi.createRelatedContentOnProcessInstance(processInstanceId, content, opts))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**
@@ -166,7 +166,7 @@ export class ProcessContentService {
*/
createTaskRelatedContent(taskId: string, file: any, opts?: any) {
return from(this.contentApi.createRelatedContentOnTask(taskId, file, opts))
.pipe(catchError(err => this.handleError(err)));
.pipe(catchError((err) => this.handleError(err)));
}
/**

14
lib/core/form/services/widget-visibility.service.ts
View File

@@ -38,11 +38,11 @@ export class WidgetVisibilityService {
public refreshVisibility(form: FormModel) {
if (form && form.tabs && form.tabs.length > 0) {
form.tabs.map(tabModel => this.refreshEntityVisibility(tabModel));
form.tabs.map((tabModel) => this.refreshEntityVisibility(tabModel));
}
if (form) {
form.getFormFields().map(field => this.refreshEntityVisibility(field));
form.getFormFields().map((field) => this.refreshEntityVisibility(field));
}
}
@@ -150,7 +150,7 @@ export class WidgetVisibilityService {
if (field.value && field.value.name) {
value = field.value.name;
} else if (field.options) {
let option = field.options.find(opt => opt.id === field.value);
let option = field.options.find((opt) => opt.id === field.value);
if (option) {
value = this.getValueFromOption(fieldId, option);
}
@@ -188,14 +188,14 @@ export class WidgetVisibilityService {
private getFormVariableValue(form: FormModel, name: string) {
if (form.json.variables) {
let formVariable = form.json.variables.find(formVar => formVar.name === name);
let formVariable = form.json.variables.find((formVar) => formVar.name === name);
return formVariable ? formVariable.value : formVariable;
}
}
private getProcessVariableValue(name: string, processVarList: TaskProcessVariableModel[]) {
if (this.processVarList) {
let processVariable = this.processVarList.find(variable => variable.id === name);
let processVariable = this.processVarList.find((variable) => variable.id === name);
return processVariable ? processVariable.value : processVariable;
}
}
@@ -248,12 +248,12 @@ export class WidgetVisibilityService {
getTaskProcessVariable(taskId: string): Observable<TaskProcessVariableModel[]> {
return from(this.apiService.getInstance().activiti.taskFormsApi.getTaskFormVariables(taskId))
.pipe(
map(res => {
map((res) => {
let jsonRes = this.toJson(res);
this.processVarList = <TaskProcessVariableModel[]> jsonRes;
return jsonRes;
}),
catchError(err => this.handleError(err))
catchError((err) => this.handleError(err))
);
}