Remove more store -> core dependencies

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

@@ -15,7 +15,6 @@ import {
   StratosTabType,
 } from '../../../../../../core/src/core/extension/extension-service';
 import { CurrentUserPermissionsService } from '../../../../../../core/src/core/permissions/current-user-permissions.service';
-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 {
@@ -31,6 +30,7 @@ import { ActionState } from '../../../../../../store/src/reducers/api-request-re
 import { endpointEntitiesSelector } from '../../../../../../store/src/selectors/endpoint.selectors';
 import { APIResource } from '../../../../../../store/src/types/api.types';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
+import { getFavoriteFromEntity } from '../../../../../../store/src/user-favorite-helpers';
 import { UpdateExistingApplication } from '../../../../actions/application.actions';
 import { IApp, IOrganization, ISpace } from '../../../../cf-api.types';
 import { CF_ENDPOINT_TYPE } from '../../../../cf-types';

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,6 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../core/src/core/extension/extension-service';
-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 {
@@ -20,6 +19,7 @@ import {
 import { IHeaderBreadcrumb } from '../../../../../../../core/src/shared/components/page-header/page-header.types';
 import { EntitySchema } from '../../../../../../../store/src/helpers/entity-schema';
 import { UserFavorite } from '../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../store/src/user-favorite-helpers';
 import { cfEntityFactory } from '../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../cf-types';
 import { CfUserService } from '../../../../../shared/data-services/cf-user.service';

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,6 @@ import {
   StratosActionType,
   StratosTabType,
 } from '../../../../../../../../core/src/core/extension/extension-service';
-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';
@@ -23,6 +22,7 @@ import {
 import { IHeaderBreadcrumb } from '../../../../../../../../core/src/shared/components/page-header/page-header.types';
 import { RouterNav } from '../../../../../../../../store/src/actions/router.actions';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';
 import { CfUserService } from '../../../../../../shared/data-services/cf-user.service';

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/app/card/card-app.component.ts

@@ -6,14 +6,14 @@ import { map, startWith } from 'rxjs/operators';
 import { CFAppState } from '../../../../../../../../cloud-foundry/src/cf-app-state';
 import { applicationEntityType } from '../../../../../../../../cloud-foundry/src/cf-entity-types';
 import { IAppFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-metadata-types';
-import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import {
   FavoritesConfigMapper,
 } from '../../../../../../../../core/src/shared/components/favorites-meta-card/favorite-config-mapper';
 import { CardCell } from '../../../../../../../../core/src/shared/components/list/list.types';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../../../../../../../core/src/shared/shared.types';
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-orgs/cf-org-card/cf-org-card.component.ts

@@ -8,7 +8,6 @@ import { organizationEntityType } from '../../../../../../../../cloud-foundry/sr
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -26,6 +25,7 @@ import { PaginationMonitorFactory } from '../../../../../../../../store/src/moni
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, IOrganization } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { getStartedAppInstanceCount } from '../../../../../../cf.helpers';

src/frontend/packages/cloud-foundry/src/shared/components/list/list-types/cf-spaces/cf-space-card/cf-space-card.component.ts

@@ -9,7 +9,6 @@ import { ISpaceFavMetadata } from '../../../../../../../../cloud-foundry/src/cf-
 import {
   CurrentUserPermissionsService,
 } from '../../../../../../../../core/src/core/permissions/current-user-permissions.service';
-import { getFavoriteFromEntity } from '../../../../../../../../core/src/core/user-favorite-helpers';
 import { truthyIncludingZeroString } from '../../../../../../../../core/src/core/utils.service';
 import { ConfirmationDialogConfig } from '../../../../../../../../core/src/shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../../../../../core/src/shared/components/confirmation-dialog.service';
@@ -27,6 +26,7 @@ import { PaginationMonitorFactory } from '../../../../../../../../store/src/moni
 import { APIResource } from '../../../../../../../../store/src/types/api.types';
 import { EndpointUser } from '../../../../../../../../store/src/types/endpoint.types';
 import { UserFavorite } from '../../../../../../../../store/src/types/user-favorites.types';
+import { getFavoriteFromEntity } from '../../../../../../../../store/src/user-favorite-helpers';
 import { IApp, ISpace } from '../../../../../../cf-api.types';
 import { cfEntityFactory } from '../../../../../../cf-entity-factory';
 import { CF_ENDPOINT_TYPE } from '../../../../../../cf-types';

src/frontend/packages/cloud-foundry/src/user-permissions/cf-user-roles-fetch.ts

@@ -3,7 +3,6 @@ import { Action, Store } from '@ngrx/store';
 import { combineLatest, Observable, of } from 'rxjs';
 import { catchError, first, map, pairwise, share, skipWhile, switchMap, tap } from 'rxjs/operators';
 
-import { LoggerService } from '../../../core/src/core/logger.service';
 import { AppState } from '../../../store/src/app-state';
 import { entityCatalog } from '../../../store/src/entity-catalog/entity-catalog';
 import {
@@ -50,7 +49,6 @@ const createEndpointArray = (store: Store<AppState>, endpoints: string[] | Entit
 export const cfUserRolesFetch: EntityUserRolesFetch = (
   endpoints: string[] | EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ) => {
   return createEndpointArray(store, endpoints).pipe(
@@ -61,7 +59,7 @@ export const cfUserRolesFetch: EntityUserRolesFetch = (
         cfEndpoints.forEach(endpoint => store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_SUCCESS)))
       } else {
         // If some endpoints are not connected as admin, go out and fetch the current user's specific roles
-        const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, logService, httpClient);
+        const flagsAndRoleRequests = dispatchRoleRequests(cfEndpoints, store, httpClient);
         const allRequestsCompleted = handleCfRequests(flagsAndRoleRequests);
         return combineLatest(allRequestsCompleted).pipe(
           map(succeeds => succeeds.every(succeeded => !!succeeded)),
@@ -84,7 +82,6 @@ interface IEndpointConnectionInfo {
 function dispatchRoleRequests(
   endpoints: EntityUserRolesEndpoint[],
   store: Store<AppState>,
-  logService: LoggerService,
   httpClient: HttpClient
 ): CfsRequestState {
   const requests: CfsRequestState = {};
@@ -117,7 +114,7 @@ function dispatchRoleRequests(
           );
         }),
         catchError(err => {
-          logService.warn('Failed to fetch current user permissions for a cf: ', err);
+          console.warn('Failed to fetch current user permissions for a cf: ', err);
           store.dispatch(new GetCfUserRelations(endpoint.guid, GET_CURRENT_CF_USER_RELATIONS_FAILED));
           return of(err);
         })

src/frontend/packages/core/src/app.module.ts

@@ -26,6 +26,7 @@ import { recentlyVisitedSelector } from '../../store/src/selectors/recently-visi
 import { AppStoreModule } from '../../store/src/store.module';
 import { EndpointModel } from '../../store/src/types/endpoint.types';
 import { IFavoriteMetadata, UserFavorite } from '../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../store/src/user-favorite-manager';
 import { TabNavService } from '../tab-nav.service';
 import { XSRFModule } from '../xsrf.module';
 import { AppComponent } from './app.component';
@@ -36,7 +37,6 @@ import { DynamicExtensionRoutes } from './core/extension/dynamic-extension-route
 import { ExtensionService } from './core/extension/extension-service';
 import { getGitHubAPIURL, GITHUB_API_URL } from './core/github.helpers';
 import { CurrentUserPermissionsService } from './core/permissions/current-user-permissions.service';
-import { UserFavoriteManager } from './core/user-favorite-manager';
 import { CustomImportModule } from './custom-import.module';
 import { AboutModule } from './features/about/about.module';
 import { DashboardModule } from './features/dashboard/dashboard.module';

src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.spec.ts

@@ -4,11 +4,11 @@ import { BehaviorSubject, of } from 'rxjs';
 
 import { PaginationMonitorFactory } from '../../../../store/src/monitors/pagination-monitor.factory';
 import { IFavoriteMetadata, UserFavorite } from '../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../store/src/user-favorite-manager';
 import { BaseTestModulesNoShared } from '../../../test-framework/core-test.helper';
 import { ConfirmationDialogService } from '../../shared/components/confirmation-dialog.service';
 import { DialogConfirmComponent } from '../../shared/components/dialog-confirm/dialog-confirm.component';
 import { FavoritesConfigMapper } from '../../shared/components/favorites-meta-card/favorite-config-mapper';
-import { UserFavoriteManager } from '../user-favorite-manager';
 import { EntityFavoriteStarComponent } from './entity-favorite-star.component';
 
 describe('EntityFavoriteStarComponent', () => {

src/frontend/packages/core/src/core/entity-favorite-star/entity-favorite-star.component.ts

@@ -3,11 +3,11 @@ import { Observable } from 'rxjs';
 import { first, tap } from 'rxjs/operators';
 
 import { IFavoriteMetadata, UserFavorite } from '../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../store/src/user-favorite-manager';
 import { ConfirmationDialogConfig } from '../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../shared/components/confirmation-dialog.service';
 import { FavoritesConfigMapper } from '../../shared/components/favorites-meta-card/favorite-config-mapper';
 import { EndpointsService } from '../endpoints.service';
-import { UserFavoriteManager } from '../user-favorite-manager';
 
 @Component({
   selector: 'app-entity-favorite-star',

src/frontend/packages/core/src/environments/environment.prod.ts

@@ -1,10 +1,11 @@
+import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
 import { LogLevel } from './../../../store/src/actions/log.actions';
 
 export const environment = {
   production: true,
   logLevel: LogLevel.WARN,
-  proxyAPIVersion: 'v1',
-  cfAPIVersion: 'v2',
+  proxyAPIVersion,
+  cfAPIVersion,
   logToConsole: true,
   logEnableConsoleActions: false,
   showObsDebug: false,

src/frontend/packages/core/src/environments/environment.ts

@@ -1,4 +1,5 @@
 import { LogLevel } from '../../../store/src/actions/log.actions';
+import { cfAPIVersion, proxyAPIVersion } from '../../../store/src/jetstream';
 
 // The file contents for the current environment will overwrite these during build.
 // The build system defaults to the dev environment which uses `environment.ts`, but if you do
@@ -7,8 +8,8 @@ import { LogLevel } from '../../../store/src/actions/log.actions';
 
 export const environment = {
   production: false,
-  proxyAPIVersion: 'v1',
-  cfAPIVersion: 'v2',
+  proxyAPIVersion,
+  cfAPIVersion,
   logLevel: LogLevel.DEBUG,
   logToConsole: true,
   logEnableConsoleActions: false,

src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/credentials-auth-form.component.ts

@@ -1,6 +1,7 @@
-import { FormGroup } from '@angular/forms';
 import { Component, Input } from '@angular/core';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+import { FormGroup } from '@angular/forms';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-credentials-auth-form',

src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/none-auth-form.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-none-auth-form',

src/frontend/packages/core/src/features/endpoints/connect-endpoint-dialog/auth-forms/sso-auth-form.component.ts

@@ -1,6 +1,7 @@
 import { Component, Input } from '@angular/core';
 import { FormGroup } from '@angular/forms';
-import { IAuthForm } from '../../../../core/extension/extension-types';
+
+import { IAuthForm } from '../../../../../../store/src/extension-types';
 
 @Component({
   selector: 'app-sso-auth-form',

src/frontend/packages/core/src/features/endpoints/connect-endpoint/connect-endpoint.component.ts

@@ -13,10 +13,9 @@ import {
 } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 import { Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
 
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
-import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../core/extension/extension-types';
+import { EndpointAuthTypeConfig, IAuthForm, IEndpointAuthComponent } from '../../../../../store/src/extension-types';
 import { safeUnsubscribe } from '../../../core/utils.service';
 import { ConnectEndpointConfig, ConnectEndpointData, ConnectEndpointService } from '../connect.service';
 import { BaseEndpointAuth } from '../endpoint-auth';

src/frontend/packages/core/src/features/endpoints/connect.service.ts

@@ -19,12 +19,12 @@ import { STRATOS_ENDPOINT_TYPE } from '../../../../store/src/base-entity-schemas
 import { EndpointsEffect } from '../../../../store/src/effects/endpoint.effects';
 import { SystemEffects } from '../../../../store/src/effects/system.effects';
 import { entityCatalog } from '../../../../store/src/entity-catalog/entity-catalog';
+import { EndpointType } from '../../../../store/src/extension-types';
 import { endpointSchemaKey } from '../../../../store/src/helpers/entity-factory';
 import { ActionState } from '../../../../store/src/reducers/api-request-reducer/types';
 import { selectEntity, selectRequestInfo, selectUpdateInfo } from '../../../../store/src/selectors/api.selectors';
 import { EndpointModel } from '../../../../store/src/types/endpoint.types';
 import { EndpointsService } from '../../core/endpoints.service';
-import { EndpointType } from '../../core/extension/extension-types';
 import { safeUnsubscribe } from '../../core/utils.service';
 
 export interface ConnectEndpointConfig {

src/frontend/packages/core/src/features/endpoints/endpoint-auth.ts

@@ -1,9 +1,10 @@
-import { EndpointAuthTypeNames } from './endpoint-helpers';
 import { Validators } from '@angular/forms';
-import { EndpointType, EndpointAuthTypeConfig } from '../../core/extension/extension-types';
+
+import { EndpointAuthTypeConfig, EndpointType } from '../../../../store/src/extension-types';
 import { CredentialsAuthFormComponent } from './connect-endpoint-dialog/auth-forms/credentials-auth-form.component';
-import { SSOAuthFormComponent } from './connect-endpoint-dialog/auth-forms/sso-auth-form.component';
 import { NoneAuthFormComponent } from './connect-endpoint-dialog/auth-forms/none-auth-form.component';
+import { SSOAuthFormComponent } from './connect-endpoint-dialog/auth-forms/sso-auth-form.component';
+import { EndpointAuthTypeNames } from './endpoint-helpers';
 
 export abstract class BaseEndpointAuth {
   static readonly UsernamePassword = {

src/frontend/packages/core/src/features/home/home/home-page.component.ts

@@ -5,12 +5,12 @@ import { first, map } from 'rxjs/operators';
 
 import { RouterNav } from '../../../../../store/src/actions/router.actions';
 import { AppState, IRequestEntityTypeState } from '../../../../../store/src/app-state';
+import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 import { IUserFavoritesGroups } from '../../../../../store/src/types/favorite-groups.types';
 import { UserFavorite } from '../../../../../store/src/types/user-favorites.types';
+import { UserFavoriteManager } from '../../../../../store/src/user-favorite-manager';
 import { EndpointsService } from '../../../core/endpoints.service';
 import { LoggerService } from '../../../core/logger.service';
-import { UserFavoriteManager } from '../../../core/user-favorite-manager';
-import { EntityCatalogHelpers } from '../../../../../store/src/entity-catalog/entity-catalog.helper';
 
 @Component({
   selector: 'app-home-page',

src/frontend/packages/core/src/shared/components/favorites-entity-list/favorites-entity-list.component.ts

@@ -2,7 +2,7 @@ import { Component, Input, OnInit } from '@angular/core';
 import { combineLatest, Observable, ReplaySubject, Subject } from 'rxjs';
 import { distinctUntilChanged, map, scan, startWith } from 'rxjs/operators';
 
-import { IFavoriteEntity } from '../../../core/user-favorite-manager';
+import { IFavoriteEntity } from '../../../../../store/src/user-favorite-manager';
 import { FavoritesConfigMapper, IFavoriteTypes } from '../favorites-meta-card/favorite-config-mapper';
 
 

src/frontend/packages/core/src/shared/components/favorites-global-list/favorites-global-list.component.ts

@@ -10,7 +10,7 @@ import {
   IFavoritesInfo,
   IGroupedFavorites,
   UserFavoriteManager,
-} from '../../../core/user-favorite-manager';
+} from '../../../../../store/src/user-favorite-manager';
 
 
 @Component({

src/frontend/packages/core/src/shared/components/favorites-meta-card/favorites-meta-card.component.ts

@@ -11,7 +11,7 @@ import { userFavoritesEntitySchema } from '../../../../../store/src/base-entity-
 import { entityCatalog } from '../../../../../store/src/entity-catalog/entity-catalog';
 import { endpointEntitiesSelector } from '../../../../../store/src/selectors/endpoint.selectors';
 import { IFavoriteMetadata, UserFavorite } from '../../../../../store/src/types/user-favorites.types';
-import { IFavoriteEntity } from '../../../core/user-favorite-manager';
+import { IFavoriteEntity } from '../../../../../store/src/user-favorite-manager';
 import { isEndpointConnected } from '../../../features/endpoints/connect.service';
 import { ComponentEntityMonitorConfig, StratosStatus } from '../../shared.types';
 import { ConfirmationDialogConfig } from '../confirmation-dialog.config';