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 2020/12/04 16:05:16 UTC
[incubator-datalab] branch DATALAB-2141 created (now ae6e22c)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a change to branch DATALAB-2141
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at ae6e22c [DATALAB-2141]: Fixed role values change their position during update
This branch includes the following new commits:
new 2b02d3c Merge remote-tracking branch 'origin/develop' into develop
new ae6e22c [DATALAB-2141]: Fixed role values change their position during update
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] 02/02: [DATALAB-2141]: Fixed role values change
their position during update
Posted by dg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DATALAB-2141
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit ae6e22c66be87185dbe9cc05805dc75568dbfcfb
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Dec 4 18:04:13 2020 +0200
[DATALAB-2141]: Fixed role values change their position during update
---
.../app/administration/roles/roles.component.ts | 34 +++++++++-------------
1 file changed, 14 insertions(+), 20 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
index b194851..a44922b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
@@ -165,13 +165,7 @@ export class RolesComponent implements OnInit {
case 'update':
this.rolesService.updateGroup($event.value).subscribe(() => {
this.toastr.success(`Group data is updated successfully!`, 'Success!');
- // if (!$event.value.roleIds.includes('admin' || 'projectAdmin')) {
- // this.applicationSecurityService.isLoggedIn().subscribe(() => {
- // this.getEnvironmentHealthStatus();
- // });
- // } else {
this.openManageRolesDialog();
- // }
}, (re) => this.toastr.error('Failed group data updating!', 'Oops!'));
break;
@@ -194,6 +188,20 @@ export class RolesComponent implements OnInit {
}
}
+ public updateGroupData(groups) {
+ this.groupsData = groups.map(v => {
+ if (!v.users) {
+ v.users = [];
+ }
+ return v;
+ }).sort((a, b) => (a.group > b.group) ? 1 : ((b.group > a.group) ? -1 : 0));
+ this.groupsData.forEach(item => {
+ const selectedRoles = item.roles.map(role => ({role: role.description, type: role.type, cloud: role.cloud}));
+ item.selected_roles = SortUtils.sortByKeys(selectedRoles, ['role', 'type']);
+ });
+ this.getGroupsListCopy();
+ }
+
public extractIds(sourceList, target) {
const map = new Map();
const mapped = sourceList.reduce((acc, item) => {
@@ -214,20 +222,6 @@ export class RolesComponent implements OnInit {
return obj;
}
- public updateGroupData(groups) {
- this.groupsData = groups.map(v => {
- if (!v.users) {
- v.users = [];
- }
- return v;
- }).sort((a, b) => (a.group > b.group) ? 1 : ((b.group > a.group) ? -1 : 0));
- this.groupsData.forEach(item => {
- const selectedRoles = item.roles.map(role => ({role: role.description, type: role.type, cloud: role.cloud}));
- item.selected_roles = SortUtils.sortByKeys(selectedRoles, ['type']);
- });
- this.getGroupsListCopy();
- }
-
private getGroupsListCopy() {
this.startedGroups = JSON.parse(JSON.stringify(this.groupsData));
}
---------------------------------------------------------------------
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-2141
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 2b02d3c477ccfcbe01d95c77263677e896b9daaa
Merge: 1b36db5 da789e6
Author: Dmytro_Gnatyshyn <di...@ukr.net>
AuthorDate: Fri Dec 4 13:47:02 2020 +0200
Merge remote-tracking branch 'origin/develop' into develop
.../terraform/aws/ssn-helm-charts/main/keycloak.tf | 2 +-
.../terraform/gcp/ssn-gke/README.md | 73 +++
.../terraform/gcp/ssn-gke/main/main.tf | 1 +
.../templates/configmap-billing-conf.yaml | 24 +-
.../templates/deployment.yaml | 121 +++--
.../datalab-billing-chart/templates/service.yaml | 45 +-
.../helm_charts/datalab-billing-chart/values.yaml | 7 +-
.../{datalab-billing.tf => datalab-billing.tfb} | 3 +
.../templates/configmap-ui-conf.yaml | 31 +-
.../datalab-ui-chart/templates/deployment.yaml | 3 +-
.../datalab-ui-chart/templates/ingress.yaml | 44 +-
.../datalab-ui-chart/templates/service.yaml | 3 +-
.../helm_charts/datalab-ui-chart/values.yaml | 2 +-
.../ssn-gke/main/modules/helm_charts/datalab-ui.tf | 11 +-
.../modules/helm_charts/files/keycloak_values.yaml | 5 +-
.../Chart.yaml} | 48 +-
.../keycloak-chart/ci/postgres-ha-values.yaml | 57 +++
.../scripts/datasource.cli} | 30 +-
.../helm_charts/keycloak-chart/scripts/ha.cli | 30 ++
.../scripts/logging.cli} | 33 +-
.../scripts/node-identifier.cli} | 29 +-
.../helm_charts/keycloak-chart/templates/NOTES.txt | 69 +++
.../keycloak-chart/templates/_helpers.tpl | 211 ++++++++
.../templates/configmap-sh.yaml} | 39 +-
.../templates/configmap-startup.yaml | 69 +++
.../templates/ingress.yaml} | 81 ++--
.../templates/poddisruptionbudget.yaml} | 41 +-
.../templates/prometheusrules.yaml} | 42 +-
.../templates/route.yaml} | 60 ++-
.../templates/secret-db.yaml} | 40 +-
.../templates/secret-keycloak.yaml} | 39 +-
.../templates/service-headless.yaml} | 56 ++-
.../templates/service-http.yaml} | 78 ++-
.../templates/serviceaccount.yaml} | 36 +-
.../templates/servicemonitor.yaml} | 48 +-
.../keycloak-chart/templates/statefulset.yaml | 201 ++++++++
.../templates/test/configmap-test.yaml | 77 +++
.../keycloak-chart/templates/test/pod-test.yaml | 62 +++
.../modules/helm_charts/keycloak-chart/values.yaml | 389 +++++++++++++++
.../ssn-gke/main/modules/helm_charts/keycloak.tf | 5 +-
.../gcp/ssn-gke/main/modules/helm_charts/main.tf | 4 +
.../gcp/ssn-gke/main/modules/helm_charts/mongo.tf | 2 +-
.../.helmignore} | 27 +-
.../Chart.yaml} | 45 +-
.../modules/helm_charts/mongodb-chart/README.md | 336 +++++++++++++
.../helm_charts/mongodb-chart/templates/NOTES.txt | 117 +++++
.../mongodb-chart/templates/_helpers.tpl | 273 +++++++++++
.../templates/configmap.yaml} | 42 +-
.../templates/deployment-standalone.yaml | 327 +++++++++++++
.../templates/ingress.yaml} | 77 ++-
.../templates/initialization-configmap.yaml} | 41 +-
.../templates/poddisruptionbudget-arbiter-rs.yaml} | 53 ++-
.../poddisruptionbudget-secondary-rs.yaml} | 53 ++-
.../templates/prometheus-alerting-rule.yaml} | 45 +-
.../templates/prometheus-service-monitor.yaml | 58 +++
.../templates/pvc-standalone.yaml} | 48 +-
.../mongodb-chart/templates/secrets.yaml | 55 +++
.../templates/statefulset-arbiter-rs.yaml | 210 ++++++++
.../templates/statefulset-primary-rs.yaml | 330 +++++++++++++
.../templates/statefulset-secondary-rs.yaml | 304 ++++++++++++
.../templates/svc-headless-rs.yaml} | 51 +-
.../mongodb-chart/templates/svc-primary-rs.yaml | 67 +++
.../mongodb-chart/templates/svc-standalone.yaml | 66 +++
.../modules/helm_charts/mongodb-chart/values.yaml | 529 +++++++++++++++++++++
.../.helmignore} | 28 +-
.../{datalab-billing.tf => mysql-chart/Chart.yaml} | 43 +-
.../main/modules/helm_charts/mysql-chart/README.md | 255 ++++++++++
.../helm_charts/mysql-chart/templates/NOTES.txt | 69 +++
.../helm_charts/mysql-chart/templates/_helpers.tpl | 64 +++
.../templates/configurationFiles-configmap.yaml} | 40 +-
.../mysql-chart/templates/deployment.yaml | 282 +++++++++++
.../templates/initializationFiles-configmap.yaml} | 40 +-
.../values.yaml => mysql-chart/templates/pvc.yaml} | 73 ++-
.../helm_charts/mysql-chart/templates/secrets.yaml | 74 +++
.../templates/serviceaccount.yaml} | 39 +-
.../templates/servicemonitor.yaml} | 54 ++-
.../helm_charts/mysql-chart/templates/svc.yaml | 65 +++
.../templates/tests/test-configmap.yaml | 46 ++
.../mysql-chart/templates/tests/test.yaml | 82 ++++
.../modules/helm_charts/mysql-chart/values.yaml | 267 +++++++++++
.../gcp/ssn-gke/main/modules/helm_charts/mysql.tf | 2 +-
.../modules/helm_charts/step-ca-chart/Chart.yaml | 32 +-
.../helm_charts/step-ca-chart/templates/NOTES.txt | 20 +
.../step-ca-chart/templates/bootstrap.yaml | 33 +-
.../helm_charts/step-ca-chart/templates/ca.yaml | 262 +++++-----
.../step-ca-chart/templates/configmaps.yaml | 194 ++++----
.../step-ca-chart/templates/ingress.yaml | 41 +-
.../helm_charts/step-ca-chart/templates/rbac.yaml | 30 +-
.../step-ca-chart/templates/secrets.yaml | 30 +-
.../step-ca-chart/templates/service.yaml | 49 +-
.../templates/tests/test-connection.yaml | 6 +-
.../modules/helm_charts/step-ca-chart/values.yaml | 15 +-
.../terraform/gcp/ssn-gke/main/variables.tf | 4 +-
.../epam/datalab/dto/status/EnvResourceList.java | 48 +-
.../datalab/dto/status/EnvResourceDTOTest.java | 6 +-
.../epam/datalab/dto/status/EnvStatusDTOTest.java | 6 +-
.../handlers/ResourcesStatusCallbackHandler.java | 27 +-
.../com/epam/datalab/backendapi/dao/EnvDAO.java | 7 +-
.../service/impl/EnvironmentServiceImpl.java | 4 +-
.../impl/InfrastructureInfoServiceImpl.java | 7 +-
.../project-list/project-list.component.html | 2 +-
.../project-list/project-list.component.scss | 7 +
.../service/impl/EnvironmentServiceImplTest.java | 10 +-
.../impl/InfrastructureInfoServiceImplTest.java | 63 +--
104 files changed, 6363 insertions(+), 1468 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org