Pre-Angular upgrade fixes (#5709)

* code fixes

* code fixes

* more code fixes

* even more fixes

* add missing typescript for cli

* rollback info drawer test changes

* use npx for cli commands

* restore attach providers
This commit is contained in:
Denys Vuika
2020-05-18 14:02:15 +01:00
committed by GitHub
parent 1def8000f0
commit 347e64fd91
150 changed files with 645 additions and 461 deletions

View File

@@ -16,9 +16,18 @@
*/
export * from './components/analytics.component';
export * from './components/analytics-report-heat-map.component';
export * from './components/analytics-generator.component';
export * from './components/analytics-report-list.component';
export * from './components/analytics-report-parameters.component';
export * from './components/analytics.component';
export * from './components/widgets/checkbox/checkbox.widget';
export * from './components/widgets/date-range/date-range.widget';
export * from './components/widgets/dropdown/dropdown.widget';
export * from './components/widgets/duration/duration.widget';
export * from './components/widgets/number/number.widget';
export * from './components/widgets/widget.component';
export * from './services/analytics.service';

View File

@@ -17,7 +17,6 @@
import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
import { Injectable } from '@angular/core';
import { Response } from '@angular/http';
import { Observable, from, throwError, of } from 'rxjs';
import { ParameterValueModel } from '../../diagram/models/report/parameter-value.model';
import { ReportParametersModel } from '../../diagram/models/report/report-parameters.model';
@@ -30,7 +29,7 @@ import { PieChart } from '../../diagram/models/chart/pie-chart.model';
import { TableChart } from '../../diagram/models/chart/table-chart.model';
import { map, catchError } from 'rxjs/operators';
@Injectable()
@Injectable({ providedIn: 'root' })
export class AnalyticsService {
constructor(private apiService: AlfrescoApiService,
@@ -256,7 +255,7 @@ export class AnalyticsService {
);
}
private handleError(error: Response) {
private handleError(error: any) {
this.logService.error(error);
return throwError(error || 'Server error');
}

View File

@@ -19,7 +19,7 @@ import { Injectable , OnDestroy } from '@angular/core';
declare let Raphael: any;
@Injectable()
@Injectable({ providedIn: 'root' })
export class RaphaelService implements OnDestroy {
paper: any;

View File

@@ -18,6 +18,95 @@
export * from './components/diagram-sequence-flow.component';
export * from './components/diagram.component';
export * from './components/activities/diagram-alfresco-publish-task.component';
export * from './components/activities/diagram-box-publish-task.component';
export * from './components/activities/diagram-business-rule-task.component';
export * from './components/activities/diagram-camel-task.component';
export * from './components/activities/diagram-container-service-task.component';
export * from './components/activities/diagram-google-drive-publish-task.component';
export * from './components/activities/diagram-manual-task.component';
export * from './components/activities/diagram-mule-task.component';
export * from './components/activities/diagram-receive-task.component';
export * from './components/activities/diagram-rest-call-task.component';
export * from './components/activities/diagram-script-task.component';
export * from './components/activities/diagram-send-task.component';
export * from './components/activities/diagram-service-task.component';
export * from './components/activities/diagram-task.component';
export * from './components/activities/diagram-user-task.component';
export * from './components/boundary-events/diagram-boundary-event.component';
export * from './components/boundary-events/diagram-throw-event.component';
export * from './components/events/diagram-end-event.component';
export * from './components/events/diagram-event.component';
export * from './components/events/diagram-start-event.component';
export * from './components/gateways/diagram-event-gateway.component';
export * from './components/gateways/diagram-exclusive-gateway.component';
export * from './components/gateways/diagram-gateway.component';
export * from './components/gateways/diagram-inclusive-gateway.component';
export * from './components/gateways/diagram-parallel-gateway.component';
export * from './components/icons/diagram-container-icon-event.component';
export * from './components/icons/diagram-icon-alfresco-publish-task.component';
export * from './components/icons/diagram-icon-box-publish-task.component';
export * from './components/icons/diagram-icon-business-rule-task.component';
export * from './components/icons/diagram-icon-camel-task.component';
export * from './components/icons/diagram-icon-error.component';
export * from './components/icons/diagram-icon-google-drive-publish-task.component';
export * from './components/icons/diagram-icon-manual-task.component';
export * from './components/icons/diagram-icon-message.component';
export * from './components/icons/diagram-icon-mule-task.component';
export * from './components/icons/diagram-icon-receive-task.component';
export * from './components/icons/diagram-icon-rest-call-task.component';
export * from './components/icons/diagram-icon-script-task.component';
export * from './components/icons/diagram-icon-send-task.component';
export * from './components/icons/diagram-icon-service-task.component';
export * from './components/icons/diagram-icon-signal.component';
export * from './components/icons/diagram-icon-timer.component';
export * from './components/icons/diagram-icon-user-task.component';
export * from './components/intermediate-catching-events/diagram-intermediate-catching-event.component';
export * from './components/raphael/icons/raphael-icon-alfresco-publish.component';
export * from './components/raphael/icons/raphael-icon-box-publish.component';
export * from './components/raphael/icons/raphael-icon-business-rule.component';
export * from './components/raphael/icons/raphael-icon-camel.component';
export * from './components/raphael/icons/raphael-icon-error.component';
export * from './components/raphael/icons/raphael-icon-google-drive-publish.component';
export * from './components/raphael/icons/raphael-icon-manual.component';
export * from './components/raphael/icons/raphael-icon-message.component';
export * from './components/raphael/icons/raphael-icon-mule.component';
export * from './components/raphael/icons/raphael-icon-receive.component';
export * from './components/raphael/icons/raphael-icon-rest-call.component';
export * from './components/raphael/icons/raphael-icon-script.component';
export * from './components/raphael/icons/raphael-icon-send.component';
export * from './components/raphael/icons/raphael-icon-service.component';
export * from './components/raphael/icons/raphael-icon-signal.component';
export * from './components/raphael/icons/raphael-icon-timer.component';
export * from './components/raphael/icons/raphael-icon-user.component';
export * from './components/raphael/anchor';
export * from './components/raphael/polyline';
export * from './components/raphael/raphael-base';
export * from './components/raphael/raphael-circle.component';
export * from './components/raphael/raphael-cross.component';
export * from './components/raphael/raphael-flow-arrow.component';
export * from './components/raphael/raphael-multiline-text.component';
export * from './components/raphael/raphael-pentagon.component';
export * from './components/raphael/raphael-plus.component';
export * from './components/raphael/raphael-rect.component';
export * from './components/raphael/raphael-rhombus.component';
export * from './components/raphael/raphael-text.component';
export * from './components/raphael/models/point';
export * from './components/raphael/raphael.service';
export * from './components/structural/diagram-event-subprocess.component';
export * from './components/structural/diagram-subprocess.component';
export * from './components/swimlanes/diagram-lane.component';
export * from './components/swimlanes/diagram-lanes.component';
export * from './components/swimlanes/diagram-pool.component';
export * from './components/swimlanes/diagram-pools.component';
export * from './components/tooltip/diagram-tooltip.component';
export * from './services/diagram-color.service';
export * from './services/diagrams.service';

View File

@@ -17,7 +17,7 @@
import { Injectable } from '@angular/core';
@Injectable()
@Injectable({ providedIn: 'root' })
export class DiagramColorService {
static CURRENT_COLOR = '#017501';
@@ -33,9 +33,6 @@ export class DiagramColorService {
totalColors: any;
constructor() {
}
setTotalColors(totalColors) {
this.totalColors = totalColors;
}

View File

@@ -20,7 +20,7 @@ import { Injectable } from '@angular/core';
import { Observable, from, throwError } from 'rxjs';
import { catchError } from 'rxjs/operators';
@Injectable()
@Injectable({ providedIn: 'root' })
export class DiagramsService {
constructor(private apiService: AlfrescoApiService,

View File

@@ -24,19 +24,6 @@ import { DiagramsModule } from './diagram/diagram.module';
import { AnalyticsProcessModule } from './analytics-process/analytics-process.module';
import { MaterialModule } from './material.module';
import { DiagramsService } from './diagram/services/diagrams.service';
import { DiagramColorService } from './diagram/services/diagram-color.service';
import { RaphaelService } from './diagram/components/raphael/raphael.service';
import { AnalyticsService } from './analytics-process/services/analytics.service';
export function providers() {
return [
AnalyticsService,
DiagramsService,
DiagramColorService,
RaphaelService
];
}
@NgModule({
imports: [
@@ -49,7 +36,6 @@ export function providers() {
AnalyticsProcessModule
],
providers: [
...providers(),
{
provide: TRANSLATION_PROVIDER,
multi: true,
@@ -73,7 +59,6 @@ export class InsightsModule {
return {
ngModule: InsightsModule,
providers: [
...providers(),
{
provide: TRANSLATION_PROVIDER,
multi: true,

View File

@@ -18,4 +18,5 @@
export * from './lib/analytics-process/public-api';
export * from './lib/diagram/public-api';
export * from './lib/material.module';
export * from './lib/insights.module';