You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/20 10:54:29 UTC
[incubator-dlab] 02/06: Merge branch 'DLAB-1079' of
github.com:apache/incubator-dlab into DLAB-1056
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 941dc21a04e914ffb67bfb6feb6783595b689d94
Merge: 957a333 6d72270
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Fri Sep 20 11:43:53 2019 +0300
Merge branch 'DLAB-1079' of github.com:apache/incubator-dlab into DLAB-1056
.../project/project-form/project-form.component.html | 4 ++++
.../project/project-form/project-form.component.scss | 7 +++++++
.../project/project-form/project-form.component.ts | 13 +++++++++++--
.../src/main/resources/webapp/src/app/core/core.module.ts | 2 ++
4 files changed, 24 insertions(+), 2 deletions(-)
diff --cc services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
index a847ef4,3173e94..9e3baba
--- a/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/core.module.ts
@@@ -41,11 -39,8 +41,12 @@@ import { DataengineConfigurationServic
import { StorageService } from './services/storage.service';
import { ProjectService } from './services/project.service';
import { EndpointService } from './services/endpoint.service';
+ import { UserAccessKeyService } from './services/userAccessKey.service';
+import { HttpTokenInterceptor } from './interceptors/http.token.interceptor';
+import { NoCacheInterceptor } from './interceptors/nocache.interceptor';
+import { ErrorInterceptor } from './interceptors/error.interceptor';
+
import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
@NgModule({
@@@ -81,23 -76,10 +82,24 @@@ export class CoreModule
StorageService,
ProjectService,
EndpointService,
+ UserAccessKeyService,
{ provide: MatDialogRef, useValue: {} },
- { provide: MAT_DIALOG_DATA, useValue: [] }
+ { provide: MAT_DIALOG_DATA, useValue: [] },
+
+ {
+ provide: HTTP_INTERCEPTORS,
+ useClass: HttpTokenInterceptor,
+ multi: true
+ }, {
+ provide: HTTP_INTERCEPTORS,
+ useClass: NoCacheInterceptor,
+ multi: true,
+ }, {
+ provide: HTTP_INTERCEPTORS,
+ useClass: ErrorInterceptor,
+ multi: true,
+ }
]
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org