Merge branch 'main' into w2p-71429_Features-support-part-1

Conflicts:
	src/app/process-page/form/process-form.component.spec.ts
This commit is contained in:
Kristof De Langhe
2020-07-14 17:36:20 +02:00
20 changed files with 667 additions and 131 deletions

View File

@@ -144,6 +144,7 @@ import { ScriptDataService } from './data/processes/script-data.service';
import { ProcessFilesResponseParsingService } from './data/process-files-response-parsing.service';
import { WorkflowActionDataService } from './data/workflow-action-data.service';
import { WorkflowAction } from './tasks/models/workflow-action-object.model';
import { LocaleInterceptor } from './locale/locale.interceptor';
import { ItemTemplateDataService } from './data/item-template-data.service';
import { TemplateItem } from './shared/template-item.model';
import { Feature } from './shared/feature.model';
@@ -291,6 +292,12 @@ const PROVIDERS = [
useClass: AuthInterceptor,
multi: true
},
// register LocaleInterceptor as HttpInterceptor
{
provide: HTTP_INTERCEPTORS,
useClass: LocaleInterceptor,
multi: true
},
NotificationsService,
FilteredDiscoveryPageResponseParsingService,
{ provide: NativeWindowService, useFactory: NativeWindowFactory }