Merge upstream (#402)

* WIP * Add theme migration * File moves * WIP * Add theme migration * Start to make core a separate library * Tweaks * WIP * Fix package imports * Fix migration script * First pass at permission effects * Fix merge issues * First pass at reducer * Tidy up logging * Fix dark theme support * Final set of cloud-foundry code out of common * TIdy up and get themable packages working * Tidy up custom build code * Tidy ups * Set defaults when no stratos.yaml file is present * FIx migrate script for when stratos.yaml not present * Remove comments * Disable scss linter from code climate * Rejig example extensions to be a package for v4 build * Renames, todos * Minor fixes * Fix frontend unit test * Fix removed e2e target * Fix unit tests * Tweaks * Finish todos * Fix transition from space summary to app summary page - an entity service for a space with no org was cached by guid - an entity service for a space requiring org used cached version - solution is to make cache id include schema key (determines with/without org) * Add comment, tidy up rootUpdatingKey * Fix issue where gitlab summary tab threw errors in console - fixes cloudfoundry#4325 * Push combine of permission configs into checkers - overcomes some weird change of permission type * Fix issue where default add/remove setting in change role by username was incorrect - add/remove radio button default value governed by add/remove feature flags - when one is set to false the radio button should be disabled and the other selected * Fix store-test-helper * Update readme following move to Travis-ci.com * Ensure the correct key is used metacard favourite info (cloudfoundry#4321) * Fix display of details in endpoint card in endpoint list (cloudfoundry#4319) * Clean default/blocked logic * Rename @Stratos to @stratosui * FIx references in tsconfig.json * Revert change to @stratosui in code * Revert change to @stratosui in code * Fix endpoint connect * Fix unit test * Fix e2e test * Change following review #1 * Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream (cloudfoundry#4199) * Bump github.com/gorilla/websocket from 1.4.1 to 1.4.2 in /src/jetstream Bumps [github.com/gorilla/websocket](https://github.com/gorilla/websocket) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/gorilla/websocket/releases) - [Commits](gorilla/websocket@v1.4.1...v1.4.2) Signed-off-by: dependabot-preview[bot] <[email protected]> * Update go.sum Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Neil MacDougall <[email protected]> * Fix errors in console log during setup screens * Helm: Change default image pull policy to Always * Add copy address and edit to endpoint list view * Use icon that is less confusing with refresh * Change following review #2 - Fix cf package module file name - Make CUSTOM_USER_PERMISSION_CHECKERS optional - Remove need to inject CUSTOM_USER_PERMISSION_CHECKERS in multiple cf modules * Add newline at end for codeclimate * Tidy up code and add some more comments * Fix for buildpack filename wrapping on card * Fix code climate issue * Fix compilation issues * Update endpoint-list.helpers.ts * Improve naming * Tidy up * Update .gitignore * Tidy up. Build tools in dist/tools * Change following review * Rename tools to devkit. Add schematics * More improvements and theme schematic added. * Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream (cloudfoundry#4336) * Bump gopkg.in/yaml.v2 from 2.2.8 to 2.3.0 in /src/jetstream Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.3.0. - [Release notes](https://github.com/go-yaml/yaml/releases) - [Commits](go-yaml/yaml@v2.2.8...v2.3.0) Signed-off-by: dependabot-preview[bot] <[email protected]> * CI bump Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Neil MacDougall <[email protected]> * Remove unused import * Remove unused import * [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 (cloudfoundry#4356) Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4. **This update includes a security fix.** - [Release notes](https://github.com/faye/websocket-extensions-node/releases) - [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md) - [Commits](faye/websocket-extensions-node@0.1.3...0.1.4) Signed-off-by: dependabot-preview[bot] <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> * Hide deployment info card if not space developer - fixes cloudfoundry#4322 * Only space developers can create/unmap/delete routes in app routes table - fixes cloudfoundry#4324 * Only Space Developers should be able to change count, terminate or ssh to instances - fixes cloudfoundry#4330 * Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy - fixes cloudfoundry#4323 * Users with no developer roles could click on add app button - fixes cloudfoundry#4361 * Fix tests * Fail CI build if imagelist generation fails * Org Managers: Disable org role checkboxes in roles stepper if not admin/org manager - fixes cloudfoundry#4332 * Routes List: Filter by org breaks when user is an org auditor - fixes cloudfoundry#4343 * Rename the e2e cf helper file * Fix autoscaler tab * Changes following review * A few minor tidy-ups to help with review * Fix several space developer permission bugs (cloudfoundry#4362) * Hide deployment info card if not space developer - fixes cloudfoundry#4322 * Only space developers can create/unmap/delete routes in app routes table - fixes cloudfoundry#4324 * Only Space Developers should be able to change count, terminate or ssh to instances - fixes cloudfoundry#4330 * Permissions: Only Space Developers should be able to create/edit/delete an Autoscaler policy - fixes cloudfoundry#4323 * Users with no developer roles could click on add app button - fixes cloudfoundry#4361 * Fix tests * Fix autoscaler tab * Changes following review * Fix service stepper navigation (cloudfoundry#4366) * Fix service stepper navigation on create/edit cancel/sumbit - create service stepper from app service tab, marketplace service summary, service wall - edit service stepper from marketplace service instances, service wall instances, space service instances and app service instances lists - fixes cloudfoundry#4052, contrinbutes to cloudfoundry#4079, cloudfoundry#4051 * Fix subscription leak - fixes cloudfoundry#4295 - code no-longer needed * Force return location of service stepper, fix table edit of upsi and other improvements * Fix unit tests * Fix e2e tests * Fix e2e tests, add search to marketplace service instances table * Changes following review * Move base-entity-* to store package * Add snackbar * Remove pathget * Remove more store -> core dependencies * Move extension-types to store * Move favourite mgr and helper from core to store * Move user fav manager and helper to store package * More references * Fix logger service removal * Fix build * Address PR feedback * Fix LoggerService after code moves * Fix logger service ref * Fix build issues * Fix health check import * Move sortStringify (only used once) * NonOptionalKeys - only used once * Move KnownKeys * Move BrowserStandardEncoder * Remove last environment link * Move favourite config mapper * Remove dependency on StratosScopeStrings * Move BaseEndpointAuth * Move StratosTheme * Move ThemeService * Move types from utils.service that are only used once in store * Move PermissionValues * Move http and jetstream helpers * Move StyleService * Move MetricQueryType * Move getFullEndpointApiUrl * Move StratosStatus * Move generateStratosEntities back to core * Finish store -> core sep * Address PR feedback * Fix compilation issue * Fix merge weirdness * Merge downstream (cloudfoundry#4369) * src based changes * changes to ./build * ./docs * ./ * Changes following review * Address PR feedback * fix build * whitespace changes * Fix in core public-api after merge * Fix duplicated k8s docs * Typed access to actions and entities via catalog entity: Core Stratos Entities (cloudfoundry#4387) * WIP * WIP * WIP * Endpoint changes * Fix failure handling during connect on stepper * Fix favourites * Removed some TODOs * Fixes & todos * Unit test fixes * Fixes following merge * Fix cf unit tests * Changes following review * Theming improvements for header * Tweaks, Migration Script Docs & Notes on others (cloudfoundry#4389) Co-authored-by: Neil MacDougall <[email protected]> * Build devkit outside of dist folder * Add dist-devkit to git ignore * Ignore example packages when there's a stratos config file (cloudfoundry#4399) * Fix CF App Restage (cloudfoundry#4393) * Remove action entityLocation (not used) * Fix restage - fixes cloudfoundry#4392 * Remove RequestEntityLocation * Update icons (cloudfoundry#4404) * Update icons * Update docker icon and optimize other pngs * Improve resolution of container icon * Update e2e test for new icons * Improve theming to reduce need to override in a hacky way (cloudfoundry#4407) * Change following merge Co-authored-by: Neil MacDougall <[email protected]> Co-authored-by: Neil MacDougall <[email protected]> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com> Co-authored-by: Neil MacDougall <[email protected]>
SUSE · Jun 29, 2020 · 767b9c5 · 767b9c5
1 parent 669b40e
commit 767b9c5
Show file tree

Hide file tree

Showing 40 changed files with 131 additions and 131 deletions.
diff --git a/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/app-metadata.actions.ts
@@ -1,7 +1,7 @@
 import { HttpRequest } from '@angular/common/http';
 
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { ICFAction, RequestEntityLocation } from '../../../store/src/types/request.types';
+import { ICFAction } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { appEnvVarsEntityType, applicationEntityType, appStatsEntityType, appSummaryEntityType } from '../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
@@ -39,7 +39,6 @@ export class GetAppStatsAction extends CFStartAction implements PaginatedAction,
     'order-direction': 'desc',
     'order-direction-field': 'index',
   };
-  entityLocation = RequestEntityLocation.ARRAY;
 }
 
 export class GetAppEnvVarsAction extends CFStartAction implements PaginatedAction, ICFAction {

diff --git a/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/application.actions.ts
@@ -1,4 +1,4 @@
-import { HttpHeaders, HttpParams, HttpRequest } from '@angular/common/http';
+import { HttpParams, HttpRequest } from '@angular/common/http';
 
 import { pick } from '../../../store/src/helpers/reducer.helper';
 import { ActionMergeFunction } from '../../../store/src/types/api.types';
@@ -164,9 +164,6 @@ export class DeleteApplication extends CFStartAction implements ICFAction {
       `apps/${guid}`,
       null,
       {
-        headers: new HttpHeaders({
-          'x-cap-passthrough': 'true'
-        }),
         params: new HttpParams({
           fromObject: {
             recursive: 'true'
@@ -192,12 +189,7 @@ export class DeleteApplicationInstance extends CFStartAction
     this.options = new HttpRequest(
       'DELETE',
       `apps/${appGuid}/instances/${index}`,
-      null,
-      {
-        headers: new HttpHeaders({
-          'x-cap-passthrough': 'true'
-        })
-      }
+      null
     );
     this.guid = `${appGuid}-${index}`;
   }
@@ -215,11 +207,6 @@ export class RestageApplication extends CFStartAction implements ICFAction {
       'POST',
       `apps/${guid}/restage`,
       null,
-      {
-        headers: new HttpHeaders({
-          'x-cap-passthrough': 'true'
-        })
-      }
     );
   }
   actions = [RESTAGE, RESTAGE_SUCCESS, RESTAGE_FAILED];

diff --git a/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/feature-flags.actions.ts
@@ -3,7 +3,6 @@ import { HttpRequest } from '@angular/common/http';
 import { getActions } from '../../../store/src/actions/action.helper';
 import { endpointEntityType } from '../../../store/src/helpers/stratos-entity-factory';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { RequestEntityLocation } from '../../../store/src/types/request.types';
 import { cfEntityFactory } from '../cf-entity-factory';
 import { featureFlagEntityType } from '../cf-entity-types';
 import { createEntityRelationPaginationKey } from '../entity-relations/entity-relations.types';
@@ -25,7 +24,6 @@ export class GetAllFeatureFlags extends CFStartAction implements PaginatedAction
   actions = getActions('Feature Flags', 'Fetch all');
   options: HttpRequest<any>;
   flattenPagination = true;
-  entityLocation = RequestEntityLocation.ARRAY;
   initialParams = {
     page: 1,
     'order-direction': 'desc',

diff --git a/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts b/src/frontend/packages/cloud-foundry/src/actions/relation.actions.ts
@@ -2,7 +2,7 @@ import { HttpParams, HttpRequest } from '@angular/common/http';
 
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
 import { PaginatedAction } from '../../../store/src/types/pagination.types';
-import { RequestActionEntity, RequestEntityLocation } from '../../../store/src/types/request.types';
+import { RequestActionEntity } from '../../../store/src/types/request.types';
 import { EntityTreeRelation } from '../entity-relations/entity-relation-tree';
 import { EntityInlineChildAction, EntityInlineParentAction } from '../entity-relations/entity-relations.types';
 import { CFStartAction } from './cf-action.types';
@@ -95,8 +95,6 @@ export class FetchRelationSingleAction extends FetchRelationAction {
       populateMissing,
       url,
     );
-    this.entityLocation = RequestEntityLocation.OBJECT;
     this.entity = child.entity;
   }
-  entityLocation: RequestEntityLocation;
 }
diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations-validate.spec.ts
@@ -9,11 +9,7 @@ import { InternalAppState, IRequestTypeState } from '../../../store/src/app-stat
 import { EntityCatalogTestModuleManualStore, TEST_CATALOGUE_ENTITIES } from '../../../store/src/entity-catalog-test.module';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import { EntityCatalogEntityConfig } from '../../../store/src/entity-catalog/entity-catalog.types';
-import {
-  EntityRequestAction,
-  RequestEntityLocation,
-  WrapperRequestActionSuccess,
-} from '../../../store/src/types/request.types';
+import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
 import {
   entityRelationMissingQuotaGuid,
   entityRelationMissingQuotaUrl,
@@ -444,7 +440,6 @@ describe('Entity Relations - validate -', () => {
       const associateAPIAction: EntityRequestAction = {
         endpointGuid: getOrgAction.endpointGuid,
         entity: getOrgAction.entity[0],
-        entityLocation: RequestEntityLocation.OBJECT,
         guid: orgGuid,
         entityType: organizationEntityType,
         type: '[Entity] Associate with parent',

diff --git a/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.ts b/src/frontend/packages/cloud-foundry/src/entity-relations/entity-relations.ts
@@ -17,11 +17,7 @@ import { getAPIRequestDataState, selectEntity, selectRequestInfo } from '../../.
 import { selectPaginationState } from '../../../store/src/selectors/pagination.selectors';
 import { APIResource, NormalizedResponse } from '../../../store/src/types/api.types';
 import { isPaginatedAction, PaginatedAction, PaginationEntityState } from '../../../store/src/types/pagination.types';
-import {
-  EntityRequestAction,
-  RequestEntityLocation,
-  WrapperRequestActionSuccess,
-} from '../../../store/src/types/request.types';
+import { EntityRequestAction, WrapperRequestActionSuccess } from '../../../store/src/types/request.types';
 import { FetchRelationAction, FetchRelationPaginatedAction, FetchRelationSingleAction } from '../actions/relation.actions';
 import { EntityTreeRelation } from './entity-relation-tree';
 import { validationPostProcessor } from './entity-relations-post-processor';
@@ -341,7 +337,6 @@ function associateChildWithParent(
         const parentAction: EntityRequestAction = {
           endpointGuid: action.endpointGuid,
           entity: catalogEntity.getSchema(action.parentEntityConfig.schemaKey),
-          entityLocation: RequestEntityLocation.OBJECT,
           guid: action.parentGuid,
           entityType: action.parentEntityConfig.entityType,
           endpointType: action.parentEntityConfig.endpointType,

diff --git a/...ontend/packages/cloud-foundry/src/entity-relations/processors/org-space-post-processor.ts b/...ontend/packages/cloud-foundry/src/entity-relations/processors/org-space-post-processor.ts
@@ -8,7 +8,7 @@ import { deepMergeState, mergeEntity } from '../../../../store/src/helpers/reduc
 import { selectPaginationState } from '../../../../store/src/selectors/pagination.selectors';
 import { APIResource } from '../../../../store/src/types/api.types';
 import { PaginatedAction, PaginationEntityState } from '../../../../store/src/types/pagination.types';
-import { RequestEntityLocation, WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
+import { WrapperRequestActionSuccess } from '../../../../store/src/types/request.types';
 import { GetOrganization } from '../../actions/organization.actions';
 import { GetSpace } from '../../actions/space.actions';
 import { getCFEntityKey } from '../../cf-entity-helpers';
@@ -105,7 +105,6 @@ export function orgSpacePostProcess(
       actions: [],
       endpointGuid: action.endpointGuid,
       entity: userCatalogEntity.getSchema(),
-      entityLocation: RequestEntityLocation.ARRAY,
       entityType: userCatalogEntity.definition.type,
       endpointType: CF_ENDPOINT_TYPE,
       type: '[Entity] Post-process Org/Space Users',

diff --git a/...eatures/applications/application/application-tabs-base/application-tabs-base.component.ts b/...eatures/applications/application/application-tabs-base/application-tabs-base.component.ts
@@ -93,9 +93,9 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
     );
 
     this.tabLinks = [
-      { link: 'summary', label: 'Summary', icon: 'description' },
-      { link: 'instances', label: 'Instances', icon: 'library_books' },
-      { link: 'routes', label: 'Routes', iconFont: 'stratos-icons', icon: 'network_route' },
+      { link: 'summary', label: 'Summary', iconFont: 'stratos-icons', icon: 'application' },
+      { link: 'instances', label: 'Instances', iconFont: 'stratos-icons', icon: 'application_instance' },
+      { link: 'routes', label: 'Routes', iconFont: 'stratos-icons', icon: 'route' },
       { link: 'log-stream', label: 'Log Stream', icon: 'featured_play_list' },
       { link: 'services', label: 'Services', iconFont: 'stratos-icons', icon: 'service' },
       { link: 'variables', label: 'Variables', icon: 'list', hidden$: appDoesNotHaveEnvVars$ },

diff --git a/...es/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html b/...es/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.html
@@ -85,7 +85,7 @@
                 <app-metadata-item icon="access_time" label="Modified">
                   {{ appSvc.app.entity.package_updated_at ? (appSvc.app.entity.package_updated_at | date:'medium') : '-' }}
                 </app-metadata-item>
-                <app-metadata-item icon="developer_mode" label="SSH Enabled">{{ sshStatus$ | async }}
+                <app-metadata-item icon="virtual_guest" iconFont="stratos-icons" label="SSH Enabled">{{ sshStatus$ | async }}
                 </app-metadata-item>
               </div>
               <div class="app-metadata__two-cols">
@@ -95,7 +95,7 @@
                 <app-metadata-item icon="service" iconFont="stratos-icons" label="Services">
                   {{(applicationService.appSummary$ | async)?.entity?.services?.length || '0' }}
                 </app-metadata-item>
-                <app-metadata-item icon="network_route" iconFont="stratos-icons" label="Routes">
+                <app-metadata-item icon="route" iconFont="stratos-icons" label="Routes">
                   {{(applicationService.appSummary$ | async)?.entity?.routes?.length || '0' }}
                 </app-metadata-item>
               </div>
@@ -118,7 +118,7 @@
                 <a
                   [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata.guid]">{{ appOrg.entity.name }}</a>
               </app-metadata-item>
-              <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" icon="language" label="Space">
+              <app-metadata-item *ngIf="applicationService.appSpace$ | async as appSpace" iconFont="stratos-icons" icon="virtual_space" label="Space">
                 <a
                   [routerLink]="['/cloud-foundry/' + appSvc.cf?.guid + '/organizations/' + appOrg.metadata?.guid + '/spaces/' + appSpace.metadata?.guid]">{{ appSpace.entity.name }}</a>
               </app-metadata-item>
@@ -174,7 +174,7 @@
               <app-metadata-item *ngSwitchCase="'archive'" icon="insert_drive_file" label="File">
                 Deployed from local file
               </app-metadata-item>
-              <app-metadata-item *ngSwitchCase="'docker'" iconFont="stratos-icons" icon="docker" label="Docker Image">
+              <app-metadata-item *ngSwitchCase="'docker'" iconFont="stratos-icons" icon="container" label="Docker Image">
                 <a *ngIf="deploySource.dockerUrl; else noDockerUrl" href="{{ deploySource.dockerUrl }}"
                   rel="noopener noreferrer" target="_blank">
                   {{deploySource.dockerImage}}

diff --git a/...ures/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts b/...ures/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.ts
@@ -59,6 +59,7 @@ const appRestageConfirmation = new ConfirmationDialogConfig(
 export class BuildTabComponent implements OnInit {
   public isBusyUpdating$: Observable<{ updating: boolean }>;
   public manageAppPermission = CfCurrentUserPermissions.APPLICATION_MANAGE;
+
   constructor(
     public applicationService: ApplicationService,
     private scmService: GitSCMService,

diff --git a/...ns/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.html b/...ns/application/application-tabs-base/tabs/routes-tab/routes-tab/routes-tab.component.html
@@ -1,5 +1,5 @@
 <ng-template #noEntries>
-  <app-no-content-message iconFont="stratos-icons" icon="network_route" [firstLine]="'This application has no routes'" [secondLine]="{
+  <app-no-content-message iconFont="stratos-icons" icon="route" [firstLine]="'This application has no routes'" [secondLine]="{
       text: ''
     }"></app-no-content-message>
 </ng-template>

diff --git a/...y/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts b/...y/src/features/cloud-foundry/cloud-foundry-tabs-base/cloud-foundry-tabs-base.component.ts
@@ -68,15 +68,15 @@ export class CloudFoundryTabsBaseComponent implements OnInit {
 
     // Default tabs + add any tabs from extensions
     this.tabLinks = [
-      { link: 'summary', label: 'Summary', icon: 'description' },
+      { link: 'summary', label: 'Summary', icon: 'cloud_foundry', iconFont: 'stratos-icons' },
       { link: 'organizations', label: 'Organizations', icon: 'organization', iconFont: 'stratos-icons' },
       {
         link: CloudFoundryTabsBaseComponent.cells,
         label: 'Cells',
         icon: 'select_all',
         hidden$: cellsHidden$
       },
-      { link: 'routes', label: 'Routes', icon: 'network_route', iconFont: 'stratos-icons', },
+      { link: 'routes', label: 'Routes', icon: 'route', iconFont: 'stratos-icons', },
       {
         link: CloudFoundryTabsBaseComponent.users,
         label: 'Users',

diff --git a/...cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html b/...cloud-foundry/src/features/cloud-foundry/quota-definition/quota-definition.component.html
@@ -46,7 +46,7 @@ <h4 class="quota-definition-base__section-header">Memory</h4>
       <h4 class="quota-definition-base__section-header">Application</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="apps" label="Maximum Application Instances"
+          <app-card-number-metric labelAtTop="true" icon="application_instance" iconFont="stratos-icons"  label="Maximum Application Instances"
             value="{{ quotaDefinition.entity?.app_instance_limit }}">
           </app-card-number-metric>
         </app-tile>
@@ -74,12 +74,12 @@ <h4 class="quota-definition-base__section-header">Service</h4>
       <h4 class="quota-definition-base__section-header">Routes & Domains</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons" label="Maximum Routes"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons" label="Maximum Routes"
             value="{{ quotaDefinition.entity?.total_routes }}">
           </app-card-number-metric>
         </app-tile>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons"
             label="Maximum Reserved Route Ports" value="{{ quotaDefinition.entity?.total_reserved_route_ports }}">
           </app-card-number-metric>
         </app-tile>

diff --git a/...y/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html b/...y/src/features/cloud-foundry/space-quota-definition/space-quota-definition.component.html
@@ -45,7 +45,7 @@ <h4 class="quota-definition-base__section-header">Memory</h4>
       <h4 class="quota-definition-base__section-header">Application</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="apps" label="Maximum Application Instances"
+          <app-card-number-metric labelAtTop="true" icon="application_instance" iconFont="stratos-icons" label="Maximum Application Instances"
             value="{{ quotaDefinition.entity?.app_instance_limit }}">
           </app-card-number-metric>
         </app-tile>
@@ -73,12 +73,12 @@ <h4 class="quota-definition-base__section-header">Service</h4>
       <h4 class="quota-definition-base__section-header">Routes</h4>
       <app-tile-group>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons" label="Maximum Routes"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons" label="Maximum Routes"
             value="{{ quotaDefinition.entity?.total_routes }}">
           </app-card-number-metric>
         </app-tile>
         <app-tile>
-          <app-card-number-metric labelAtTop="true" icon="network_route" iconFont="stratos-icons"
+          <app-card-number-metric labelAtTop="true" icon="route" iconFont="stratos-icons"
             label="Maximum Reserved Route Ports" value="{{ quotaDefinition.entity?.total_reserved_route_ports }}">
           </app-card-number-metric>
         </app-tile>

diff --git a/...rganizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts b/...rganizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts
@@ -46,12 +46,14 @@ export class CloudFoundryOrganizationBaseComponent {
     {
       link: 'summary',
       label: 'Summary',
-      icon: 'description'
+      icon: 'organization',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'spaces',
       label: 'Spaces',
-      icon: 'language'
+      icon: 'virtual_space',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'users',
@@ -61,12 +63,14 @@ export class CloudFoundryOrganizationBaseComponent {
     {
       link: 'quota',
       label: 'Quota',
-      icon: 'data_usage'
+      icon: 'quota',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'space-quota-definitions',
       label: 'Space Quotas',
-      icon: 'data_usage'
+      icon: 'quota',
+      iconFont: 'stratos-icons'
     },
     {
       link: 'events',

diff --git a/...oundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts b/...oundry-organization-spaces/cloud-foundry-space-base/cloud-foundry-space-base.component.ts
@@ -50,7 +50,8 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
     {
       link: 'summary',
       label: 'Summary',
-      icon: 'description'
+      icon: 'virtual_space',
+      iconFont: 'stratos-icons',
     },
     {
       link: 'apps',
@@ -73,7 +74,7 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
       link: 'routes',
       label: 'Routes',
       iconFont: 'stratos-icons',
-      icon: 'network_route'
+      icon: 'route'
     },
     {
       link: 'users',

diff --git a/...zation-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html b/...zation-spaces/tabs/cloud-foundry-space-summary/cloud-foundry-space-summary.component.html
@@ -34,14 +34,14 @@
           </app-card-number-metric>
         </app-tile>
         <app-tile *ngIf="cfEndpointService.appsPagObs.hasEntities$ | async">
-          <app-card-number-metric icon="content_copy" label="App Instances"
+          <app-card-number-metric icon="application_instance" iconFont="stratos-icons" label="App Instances"
             value="{{ (cfSpaceService.appInstances$ | async) }}"
             limit="{{ (cfSpaceService.quotaDefinition$ | async)?.app_instance_limit}}"></app-card-number-metric>
         </app-tile>
         <app-tile>
           <app-card-number-metric
             link="/cloud-foundry/{{cfSpaceService.cfGuid}}/organizations/{{cfSpaceService.orgGuid}}/spaces/{{cfSpaceService.spaceGuid}}/routes"
-            iconFont="stratos-icons" icon="network_route" label="Routes"
+            iconFont="stratos-icons" icon="route" label="Routes"
             value="{{ (cfSpaceService.routes$ | async)?.length }}"
             limit="{{ (cfSpaceService.quotaDefinition$ | async)?.total_routes}}"></app-card-number-metric>
         </app-tile>