Fix favourites helper

src/frontend/packages/cf-autoscaler/src/cf-autoscaler.module.ts

@@ -5,11 +5,11 @@ import { EffectsModule } from '@ngrx/effects';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 import { of } from 'rxjs';
 
-import { CloudFoundryComponentsModule } from '../../cloud-foundry/src/shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../cloud-foundry/src/shared/cf-shared.module';
 import { CoreModule } from '../../core/src/core/core.module';
-import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
 import { MDAppModule } from '../../core/src/core/md.module';
 import { SharedModule } from '../../core/src/shared/shared.module';
+import { EntityCatalogModule } from '../../store/src/entity-catalog.module';
 import { AutoscalerModule } from './core/autoscaler.module';
 import { AutoscalerTabExtensionComponent } from './features/autoscaler-tab-extension/autoscaler-tab-extension.component';
 import { generateASEntities } from './store/autoscaler-entity-generator';
@@ -38,7 +38,7 @@ const customRoutes: Routes = [
     SharedModule,
     MDAppModule,
     NgxChartsModule,
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
     AutoscalerModule,
     RouterModule.forRoot(customRoutes),
     EntityCatalogModule.forFeature(generateASEntities),

src/frontend/packages/cf-autoscaler/src/core/autoscaler.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { ApplicationService } from '../../../cloud-foundry/src/features/applications/application.service';
-import { CloudFoundryComponentsModule } from '../../../cloud-foundry/src/shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../cloud-foundry/src/shared/cf-shared.module';
 import { CoreModule } from '../../../core/src/core/core.module';
 import { SharedModule } from '../../../core/src/shared/shared.module';
 import { AutoscalerBaseComponent } from '../features/autoscaler-base.component';
@@ -54,7 +54,7 @@ import { AutoscalerRoutingModule } from './autoscaler.routing';
     SharedModule,
     AutoscalerRoutingModule,
     NgxChartsModule,
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
   ],
   declarations: [
     AutoscalerBaseComponent,

src/frontend/packages/cloud-foundry/src/cf-entity-generator.ts

@@ -3,6 +3,7 @@ import * as moment from 'moment';
 import { combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { EndpointHealthCheck } from '../../core/endpoints-health-checks';
 import { urlValidationExpression } from '../../core/src/core/utils.service';
 import { BaseEndpointAuth } from '../../core/src/features/endpoints/endpoint-auth';
 import { AppState } from '../../store/src/app-state';
@@ -13,6 +14,7 @@ import {
 } from '../../store/src/entity-catalog/entity-catalog-entity';
 import { entityCatalog } from '../../store/src/entity-catalog/entity-catalog.service';
 import {
+  IEntityMetadata,
   IStratosEntityDefinition,
   StratosEndpointExtensionDefinition,
 } from '../../store/src/entity-catalog/entity-catalog.types';
@@ -88,6 +90,7 @@ import {
   userProvidedServiceInstanceEntityType,
 } from './cf-entity-types';
 import { CfErrorResponse, getCfError } from './cf-error-helpers';
+import { getFavoriteFromCfEntity } from './cf-favorites-helpers';
 import { IAppFavMetadata, IBasicCFMetaData, IOrgFavMetadata, ISpaceFavMetadata } from './cf-metadata-types';
 import { CF_ENDPOINT_TYPE } from './cf-types';
 import { appEnvVarActionBuilders } from './entity-action-builders/application-env-var.action-builders';
@@ -160,6 +163,11 @@ export function generateCFEntities(): StratosBaseCatalogEntity[] {
     authTypes: [BaseEndpointAuth.UsernamePassword, BaseEndpointAuth.SSO],
     listDetailsComponent: CfEndpointDetailsComponent,
     renderPriority: 1,
+    healthCheck: new EndpointHealthCheck(CF_ENDPOINT_TYPE, (endpoint) => {
+      entityCatalog.getEntity<IEntityMetadata, any, CfInfoDefinitionActionBuilders>(CF_ENDPOINT_TYPE, cfInfoEntityType)
+        .actionDispatchManager.dispatchGet(endpoint.guid);
+    }),
+    favoriteFromEntity: getFavoriteFromCfEntity,
     globalPreRequest: (request, action) => {
       return addCfRelationParams(request, action);
     },

src/frontend/packages/cloud-foundry/src/cf-favorites-helpers.ts

@@ -0,0 +1,25 @@
+import { FavoritesConfigMapper } from '../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
+import { IEntityMetadata } from '../../store/src/entity-catalog/entity-catalog.types';
+import { UserFavorite } from '../../store/src/types/user-favorites.types';
+import { CfAPIResource } from './store/types/cf-api.types';
+
+export function getFavoriteFromCfEntity<T extends IEntityMetadata = IEntityMetadata>(
+  entity,
+  entityKey: string,
+  favoritesConfigMapper: FavoritesConfigMapper
+): UserFavorite<T> {
+  if (isCfEntity(entity as CfAPIResource)) {
+    return favoritesConfigMapper.getFavoriteFromEntity<T>(
+      entityKey,
+      'cf',
+      entity.entity.cfGuid,
+      entity
+    );
+  }
+  return null;
+}
+
+function isCfEntity(entity: CfAPIResource) {
+  return entity && entity.entity.cfGuid && entity.metadata && entity.metadata.guid;
+}
+

src/frontend/packages/cloud-foundry/src/cloud-foundry.module.ts

@@ -15,7 +15,7 @@ import { ApplicationsModule } from './features/applications/applications.module'
 import { CloudFoundryModule } from './features/cloud-foundry/cloud-foundry.module';
 import { ServiceCatalogModule } from './features/service-catalog/service-catalog.module';
 import { ServicesModule } from './features/services/services.module';
-import { CloudFoundryComponentsModule } from './shared/components/components.module';
+import { CloudFoundrySharedModule } from './shared/cf-shared.module';
 import { CfUserService } from './shared/data-services/cf-user.service';
 import { CloudFoundryService } from './shared/data-services/cloud-foundry.service';
 import { LongRunningCfOperationsService } from './shared/data-services/long-running-cf-op.service';
@@ -71,7 +71,7 @@ function infoValidator(action: ICFAction, dispatcher) {
     ServicesModule,
     CloudFoundryStoreModule,
     // FIXME: Ensure that anything lazy loaded is not included here - #3675
-    CloudFoundryComponentsModule,
+    CloudFoundrySharedModule,
     // FIXME: Move cf effects into cf module - #3675
     // EffectsModule.for Root([
     //   PermissionsEffects,

src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/application-tabs-base.component.ts

@@ -16,7 +16,7 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromCfEntity } from '../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../core/src/core/user-favorite-helpers';
 import { safeUnsubscribe } from '../../../../../../core/src/core/utils.service';
 import { IPageSideNavTab } from '../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import {
@@ -52,7 +52,7 @@ export class ApplicationTabsBaseComponent implements OnInit, OnDestroy {
 
   public favorite$ = this.applicationService.app$.pipe(
     filter(app => !!app),
-    map(app => getFavoriteFromCfEntity<IAppFavMetadata>(app.entity, applicationEntityType, this.favoritesConfigMapper))
+    map(app => getFavoriteFromEntity<IAppFavMetadata>(app.entity, applicationEntityType, this.favoritesConfigMapper, CF_ENDPOINT_TYPE))
   );
 
   isBusyUpdating$: Observable<{ updating: boolean }>;

src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/build-tab/build-tab.component.spec.ts

@@ -13,7 +13,7 @@ import { ApplicationServiceMock } from '../../../../../../../../core/test-framew
 import { EntityServiceFactory } from '../../../../../../../../store/src/entity-service-factory.service';
 import { AppStoreModule } from '../../../../../../../../store/src/store.module';
 import { generateCfStoreModules } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from '../../../../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { cfApplicationEntityServiceFactory } from '../../../application-base.component';
@@ -42,7 +42,7 @@ describe('BuildTabComponent', () => {
         NoopAnimationsModule,
         HttpClientModule,
         HttpClientTestingModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ],
       providers: [
         { provide: ApplicationService, useClass: ApplicationServiceMock },

src/frontend/packages/cloud-foundry/src/features/applications/application/application-tabs-base/tabs/instances-tab/instances-tab.component.spec.ts

@@ -12,7 +12,7 @@ import {
   generateCfStoreModules,
   generateTestCfEndpointServiceProvider,
 } from '../../../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from '../../../../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../../../../shared/services/application-state.service';
 import { ApplicationService } from '../../../../application.service';
 import { ApplicationEnvVarsHelper } from '../build-tab/application-env-vars.service';
@@ -31,7 +31,7 @@ describe('InstancesTabComponent', () => {
         SharedModule,
         RouterTestingModule,
         NoopAnimationsModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ],
       providers: [
         generateTestCfEndpointServiceProvider(),

src/frontend/packages/cloud-foundry/src/features/applications/applications.module.ts

@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
 import { ApplicationDeleteComponent } from './application-delete/application-delete.component';
 import {
   DeleteAppServiceInstancesComponent,
@@ -43,7 +43,7 @@ import { SshApplicationComponent } from './ssh-application/ssh-application.compo
     CoreModule,
     SharedModule,
     ApplicationsRoutingModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     ApplicationWallComponent,

src/frontend/packages/cloud-foundry/src/features/applications/cli-info-application/cli-info-application.component.spec.ts

@@ -11,7 +11,7 @@ import { generateTestApplicationServiceProvider } from '../../../../../core/test
 import { generateTestEntityServiceProvider } from '../../../../../core/test-framework/entity-service.helper';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
 import { applicationEntityType } from '../../../cf-entity-types';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { ApplicationStateService } from '../../../shared/services/application-state.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { CliInfoApplicationComponent } from './cli-info-application.component';
@@ -32,7 +32,7 @@ describe('CliInfoApplicationComponent', () => {
         SharedModule,
         MDAppModule,
         RouterTestingModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ],
       providers: [
         generateTestEntityServiceProvider(

src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application-step2/create-application-step2.component.spec.ts

@@ -7,7 +7,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { CoreModule } from '../../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../../core/src/shared/shared.module';
 import { generateCfStoreModules } from '../../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from './../../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../../shared/cf-shared.module';
 import { CreateApplicationStep2Component } from './create-application-step2.component';
 
 describe('CreateApplicationStep2Component', () => {
@@ -24,7 +24,7 @@ describe('CreateApplicationStep2Component', () => {
         CommonModule,
         CoreModule,
         SharedModule,
-        CloudFoundryComponentsModule,
+        CloudFoundrySharedModule,
         NoopAnimationsModule,
         HttpClientModule,
         HttpClientTestingModule,

src/frontend/packages/cloud-foundry/src/features/applications/create-application/create-application.module.ts

@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { CreateApplicationStep2Component } from './create-application-step2/create-application-step2.component';
 import { CreateApplicationStep3Component } from './create-application-step3/create-application-step3.component';
 import { CreateApplicationComponent } from './create-application.component';
@@ -13,7 +13,7 @@ import { CreateApplicationComponent } from './create-application.component';
     CommonModule,
     CoreModule,
     SharedModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     CreateApplicationComponent,

src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.component.spec.ts

@@ -9,7 +9,7 @@ import { getGitHubAPIURL, GITHUB_API_URL } from '../../../../../core/src/core/gi
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
 import { TabNavService } from '../../../../../core/tab-nav.service';
 import { generateCfStoreModules } from '../../../../test-framework/cloud-foundry-endpoint-service.helper';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { CfOrgSpaceDataService } from '../../../shared/data-services/cf-org-space-service.service';
 import { ApplicationEnvVarsHelper } from '../application/application-tabs-base/tabs/build-tab/application-env-vars.service';
 import { CreateApplicationModule } from '../create-application/create-application.module';
@@ -69,7 +69,7 @@ describe('DeployApplicationComponent', () => {
         HttpClientModule,
         HttpClientTestingModule,
         HttpClientModule,
-        CloudFoundryComponentsModule
+        CloudFoundrySharedModule
       ]
     })
       .compileComponents();

src/frontend/packages/cloud-foundry/src/features/applications/deploy-application/deploy-application.module.ts

@@ -3,7 +3,7 @@ import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../../shared/cf-shared.module';
 import { CreateApplicationModule } from '../create-application/create-application.module';
 import {
   DeployApplicationOptionsStepComponent,
@@ -27,7 +27,7 @@ import { GithubProjectExistsDirective } from './github-project-exists.directive'
     SharedModule,
     CommonModule,
     CreateApplicationModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     DeployApplicationComponent,

src/frontend/packages/cloud-foundry/src/features/cloud-foundry/cloud-foundry.module.ts

@@ -4,7 +4,7 @@ import { NgxChartsModule } from '@swimlane/ngx-charts';
 
 import { CoreModule } from '../../../../core/src/core/core.module';
 import { SharedModule } from '../../../../core/src/shared/shared.module';
-import { CloudFoundryComponentsModule } from '../../shared/components/components.module';
+import { CloudFoundrySharedModule } from '../../shared/cf-shared.module';
 import {
   CFEndpointsListConfigService,
 } from '../../shared/components/list/list-types/cf-endpoints/cf-endpoints-list-config.service';
@@ -140,7 +140,7 @@ import { RemoveUserComponent } from './users/remove-user/remove-user.component';
     CloudFoundryRoutingModule,
     RouterModule,
     NgxChartsModule,
-    CloudFoundryComponentsModule
+    CloudFoundrySharedModule
   ],
   declarations: [
     CloudFoundryBaseComponent,

src/frontend/packages/cloud-foundry/src/features/cloud-foundry/tabs/cloud-foundry-organizations/cloud-foundry-organization-base/cloud-foundry-organization-base.component.ts

@@ -11,7 +11,7 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromCfEntity } from '../../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../core/src/core/user-favorite-helpers';
 import { environment } from '../../../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import {
@@ -21,6 +21,7 @@ import { IHeaderBreadcrumb } from '../../../../../../../core/src/shared/componen
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../services/cloud-foundry-endpoint.service';
@@ -92,7 +93,7 @@ export class CloudFoundryOrganizationBaseComponent {
     this.schema = cfEntityFactory(organizationEntityType);
     this.favorite$ = cfOrgService.org$.pipe(
       first(),
-      map(org => getFavoriteFromCfEntity<IOrgFavMetadata>(org.entity, organizationEntityType, favoritesConfigMapper))
+      map(org => getFavoriteFromEntity<IOrgFavMetadata>(org.entity, organizationEntityType, favoritesConfigMapper, CF_ENDPOINT_TYPE))
     );
     this.name$ = cfOrgService.org$.pipe(
       map(org => org.entity.entity.name),

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

@@ -13,7 +13,7 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../../core/src/core/extension/extension-service';
-import { getFavoriteFromCfEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
+import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { environment } from '../../../../../../../../core/src/environments/environment.prod';
 import { IPageSideNavTab } from '../../../../../../../../core/src/features/dashboard/page-side-nav/page-side-nav.component';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -24,6 +24,7 @@ import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/compo
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
+import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';
 import { getActiveRouteCfOrgSpaceProvider } from '../../../../cf.helpers';
 import { CloudFoundryEndpointService } from '../../../../services/cloud-foundry-endpoint.service';
@@ -111,7 +112,7 @@ export class CloudFoundrySpaceBaseComponent implements OnDestroy {
     favoritesConfigMapper: FavoritesConfigMapper
   ) {
     this.favorite$ = cfSpaceService.space$.pipe(
-      map(space => getFavoriteFromCfEntity<ISpaceFavMetadata>(space.entity, spaceEntityType, favoritesConfigMapper))
+      map(space => getFavoriteFromEntity<ISpaceFavMetadata>(space.entity, spaceEntityType, favoritesConfigMapper, CF_ENDPOINT_TYPE))
     );
     this.isFetching$ = cfSpaceService.space$.pipe(
       map(space => space.entityRequestInfo.fetching)