You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by dg...@apache.org on 2021/02/09 15:18:28 UTC
[incubator-datalab] branch DATALAB-2280 created (now 8dcb2ea)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2280
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at 8dcb2ea [DATALAB-2280]: Applied central horizontal alignment to confirmation message in bucket browser
This branch includes the following new commits:
new 4e9decc Merge remote-tracking branch 'origin/develop' into develop
new 8dcb2ea [DATALAB-2280]: Applied central horizontal alignment to confirmation message in bucket browser
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/02: Merge remote-tracking branch
'origin/develop' into develop
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2280
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 4e9deccee990a21b8739b44662657b5bd1070daa
Merge: 9ed2457 c946031
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Feb 9 10:29:13 2021 +0200
Merge remote-tracking branch 'origin/develop' into develop
.../src/app/administration/configuration/configuration.component.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/02: [DATALAB-2280]: Applied central
horizontal alignment to confirmation message in bucket browser
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2280
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 8dcb2ea7e1411e30aec15c4df4ae7e1efdbc18bd
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Tue Feb 9 17:18:06 2021 +0200
[DATALAB-2280]: Applied central horizontal alignment to confirmation message in bucket browser
---
.../src/app/core/services/configutration.service.ts | 15 ++++++++++-----
.../bucket-confirmation-dialog.component.scss | 4 ++--
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts
index 1def8d2..8d4a836 100644
--- a/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/core/services/configutration.service.ts
@@ -29,27 +29,28 @@ export class ConfigurationService {
constructor(private applicationServiceFacade: ApplicationServiceFacade) { }
public getServiceSettings(service): Observable<{}> {
- return this.applicationServiceFacade
+ service = this.convertProvisioning(service);
+ return this.applicationServiceFacade
.buildGetServiceConfig(service)
.pipe(
map(response => response),
catchError(ErrorUtils.handleServiceError));
}
- public setServiceConfig(service, config) {
+ public setServiceConfig(service: string, config: string): Observable<{}> {
const settings = {
ymlString: config
};
- const selectedService = service === 'provisioning' ? 'provisioning-service' : service;
+ service = this.convertProvisioning(service);
return this.applicationServiceFacade
- .buildSetServiceConfig(selectedService, settings)
+ .buildSetServiceConfig(service, settings)
.pipe(
map(response => response),
catchError(ErrorUtils.handleServiceError));
}
- public restartServices(self, prov, billing) {
+ public restartServices(self: string, prov: string, billing: string): Observable<{}> {
const queryString = `?billing=${billing}&provserv=${prov}&ui=${self}`;
return this.applicationServiceFacade
.buildRestartServices(queryString)
@@ -58,4 +59,8 @@ export class ConfigurationService {
catchError(ErrorUtils.handleServiceError));
}
+ private convertProvisioning(service: string): string {
+ return (service === 'provisioning') ? 'provisioning-service' : service;
+ }
+
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.scss
index e739c5b..2dcca6b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-confirmation-dialog/bucket-confirmation-dialog.component.scss
@@ -87,8 +87,7 @@
}
.upload-item-name{
max-width: 300px;
- display: inline-block;
- margin-bottom: -4px;
+ display: inline-flex;
}
.mat-radio-button{
@@ -160,6 +159,7 @@
}
.upload-message{
display: flex;
+ justify-content: center;
.upload-item-name{
max-width: 340px;
display: block;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org