You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/02/20 13:28:13 UTC

[incubator-dlab] branch develop updated: [DLAB-1567]: billing issues for user who has not administrative role (#610)

This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
     new 44b932e  [DLAB-1567]: billing issues for user who has not administrative role (#610)
44b932e is described below

commit 44b932edff44a945d93845c162ca5ad309f12b6a
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Thu Feb 20 15:27:48 2020 +0200

    [DLAB-1567]: billing issues for user who has not administrative role (#610)
---
 .../webapp/src/app/reporting/reporting.component.ts   |  7 ++++++-
 .../src/app/reporting/toolbar/toolbar.component.scss  |  1 +
 .../computational-resources-list.component.scss       | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
index 1768440..d135261 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts
@@ -98,7 +98,12 @@ export class ReportingComponent implements OnInit, OnDestroy {
               this.rebuildBillingReport();
             }
       }
-    });
+    }, e => {
+      this.PROVIDER = 'gcp';
+      if (this.PROVIDER) {
+        this.rebuildBillingReport();
+      }
+      }) ;
   }
 
   getGeneralBillingData() {
diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss
index c273eab..4a150bf 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss
@@ -21,6 +21,7 @@ section.toolbar {
   display: flex;
   justify-content: space-between;
   font-weight: 300;
+  width: 100%;
 
   >div {
     width: 33%;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
index ef3776d..9314137 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
@@ -109,3 +109,22 @@
      }
    }
  }
+ @media screen and (max-width: 1520px) {
+   .source {
+
+     .resource-wrap {
+
+       .resource-name {
+         width: 45%;
+       }
+
+       .resource-status {
+         width: 40%;
+       }
+
+       .resource-actions {
+         width: 15%;
+       }
+     }
+   }
+ }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org