Merge upstream

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 {

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];

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',

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;
 }

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',

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,

src/frontend/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',

src/frontend/packages/cloud-foundry/src/features/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$ },

src/frontend/packages/cloud-foundry/src/features/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}}

src/frontend/packages/cloud-foundry/src/features/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,

src/frontend/packages/cloud-foundry/src/features/applications/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>

src/frontend/packages/cloud-foundry/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',

src/frontend/packages/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>

src/frontend/packages/cloud-foundry/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>

src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/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',

src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-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',

src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-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>