che-7246: fix fetch available RAM on workspace creation

Signed-off-by: Anna Shumilova <ashumilo@redhat.com>
eclipse-che · Feb 7, 2018 · d5a2357 · d5a2357
1 parent 307ee4f
commit d5a2357
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 34 deletions.
diff --git a/...oard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.service.ts b/...oard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.service.ts
@@ -82,8 +82,7 @@ export class NamespaceSelectorSvc {
       this.namespaceLabels = namespaces.map((namespace: che.INamespace) => {
         return namespace.label;
       });
-
-      return this.$q.when();
+      return this.fetchNamespaceInfoById(this.namespaceId);
     }
 
     return this.cheNamespaceRegistry.fetchNamespaces().then(() => {

diff --git a/dashboard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.styl b/dashboard/src/app/workspaces/create-workspace/namespace-selector/namespace-selector.styl
@@ -1 +1,10 @@
+.namespace-additional-info
+  margin-left 20px
+  color $label-secondary-color
 
+.empty-namespace-label
+  color $warning-color
+  margin-bottom 10px
+  i
+    margin-right 10px
+    font-size 16pt
diff --git a/dashboard/src/app/workspaces/workspace-details/workspace-details.styl b/dashboard/src/app/workspaces/workspace-details/workspace-details.styl
@@ -44,24 +44,6 @@
     che-filter-selector
       line-height 33px;
 
-    .namespace-toggle-button button
-      margin 0 10px 10px 0
-
-    .namespace-button button
-      text-transform none !important
-
-    .namespace-additional-info
-      color $label-secondary-color
-      margin-left 10px
-
-    .empty-namespace-label
-      color $warning-color
-      margin-bottom 10px
-
-      i
-        margin-right 10px
-        font-size 16pt
-
     span.workspace-status-text
       color lighten($che-ide-background-color, 40%) !important
       margin-bottom 4px

diff --git a/...d/src/app/workspaces/workspace-details/workspace-overview/workspace-details-overview.styl b/...d/src/app/workspaces/workspace-details/workspace-overview/workspace-details-overview.styl
@@ -45,9 +45,6 @@
   che-filter-selector
     line-height 33px
 
-  .namespace-toggle-button button
-    margin 0 10px 10px 0
-
   .namespace-link
     line-height 30px
     span
@@ -61,17 +58,6 @@
       outline none !important
       color $che-button-gray-color
 
-  .namespace-additional-info
-    color $label-secondary-color
-    margin-left 10px
-
-  .empty-namespace-label
-    color $warning-color
-    margin-bottom 10px
-    i
-      margin-right 10px
-      font-size 16pt
-
   span.workspace-status-text
     color lighten($che-ide-background-color, 40%) !important
     margin-bottom 4px

diff --git a/dashboard/src/components/api/che-organizations.factory.ts b/dashboard/src/components/api/che-organizations.factory.ts
@@ -511,6 +511,10 @@ export class CheOrganization implements che.api.ICheOrganization {
 
       return this.cheResourcesDistribution.fetchAvailableOrganizationResources(organization.id).then(() => {
         let resource = this.cheResourcesDistribution.getOrganizationAvailableResourceByType(organization.id, this.resourceLimits.RAM);
+        if (resource.amount === -1) {
+          return 'RAM is not limited'
+        }
+
         return resource ? 'Available RAM: ' + (resource.amount / 1024) + 'GB' : null;
       });
     });