A few more store -> core dependency fixes

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

@@ -1,5 +1,4 @@
-import { jetStreamErrorResponseToSafeString } from '../../core/src/jetstream.helpers';
-import { JetStreamErrorResponse } from '../../store/src/jetstream';
+import { JetStreamErrorResponse, jetStreamErrorResponseToSafeString } from '../../store/src/jetstream';
 
 export interface CfErrorObject {
   code: number;

src/frontend/packages/core/src/features/endpoints/backup-restore/backup-endpoints/backup-endpoints.component.ts

@@ -8,10 +8,10 @@ import { filter, first, map } from 'rxjs/operators';
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { AppState } from '../../../../../../store/src/app-state';
 import { entityCatalog } from '../../../../../../store/src/entity-catalog/entity-catalog';
+import { httpErrorResponseToSafeString } from '../../../../../../store/src/jetstream';
 import { PaginationMonitorFactory } from '../../../../../../store/src/monitors/pagination-monitor.factory';
 import { getPaginationObservables } from '../../../../../../store/src/reducers/pagination-reducer/pagination-reducer.helper';
 import { EndpointModel } from '../../../../../../store/src/types/endpoint.types';
-import { httpErrorResponseToSafeString } from '../../../../jetstream.helpers';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
 import { ITableListDataSource } from '../../../../shared/components/list/data-sources-controllers/list-data-source-types';

src/frontend/packages/core/src/features/endpoints/backup-restore/restore-endpoints/restore-endpoints.component.ts

@@ -7,8 +7,8 @@ import { first, map } from 'rxjs/operators';
 
 import { GetAllEndpoints } from '../../../../../../store/src/actions/endpoint.actions';
 import { GeneralEntityAppState } from '../../../../../../store/src/app-state';
+import { httpErrorResponseToSafeString } from '../../../../../../store/src/jetstream';
 import { getEventFiles } from '../../../../core/browser-helper';
-import { httpErrorResponseToSafeString } from '../../../../jetstream.helpers';
 import { ConfirmationDialogConfig } from '../../../../shared/components/confirmation-dialog.config';
 import { ConfirmationDialogService } from '../../../../shared/components/confirmation-dialog.service';
 import { StepOnNextFunction, StepOnNextResult } from '../../../../shared/components/stepper/step/step.component';

src/frontend/packages/core/src/jetstream.helpers.ts

@@ -2,27 +2,3 @@ import { HttpErrorResponse } from '@angular/common/http';
 
 import { isHttpErrorResponse, JetStreamErrorResponse } from '../../store/src/jetstream';
 
-
-export function jetStreamErrorResponseToSafeString(response: JetStreamErrorResponse): string {
-  return response.error && response.error.status && response.error.statusCode ?
-    `${response.error.status}. Status Code ${response.error.statusCode}` :
-    null;
-}
-
-/**
- * Attempt to create a sensible string explaining the error object returned from a failed http request
- * @param err The raw error from a http request
- */
-export function httpErrorResponseToSafeString(err: any): string {
-  const httpResponse: HttpErrorResponse = isHttpErrorResponse(err);
-  if (httpResponse) {
-    if (httpResponse.error) {
-      if (typeof (httpResponse.error) === 'string') {
-        return httpResponse.error + ` (${httpResponse.status})`;
-      }
-      return httpResponse.error.error + ` (${httpResponse.status})`;
-    }
-    return JSON.stringify(httpResponse.error) + ` (${httpResponse.status})`;
-  }
-  return err.message;
-}

src/frontend/packages/store/src/jetstream.ts

@@ -32,6 +32,30 @@ export function isHttpErrorResponse(obj: any): HttpErrorResponse {
   ) ? obj as HttpErrorResponse : null;
 }
 
+export function jetStreamErrorResponseToSafeString(response: JetStreamErrorResponse): string {
+  return response.error && response.error.status && response.error.statusCode ?
+    `${response.error.status}. Status Code ${response.error.statusCode}` :
+    null;
+}
+
+/**
+ * Attempt to create a sensible string explaining the error object returned from a failed http request
+ * @param err The raw error from a http request
+ */
+export function httpErrorResponseToSafeString(err: any): string {
+  const httpResponse: HttpErrorResponse = isHttpErrorResponse(err);
+  if (httpResponse) {
+    if (httpResponse.error) {
+      if (typeof (httpResponse.error) === 'string') {
+        return httpResponse.error + ` (${httpResponse.status})`;
+      }
+      return httpResponse.error.error + ` (${httpResponse.status})`;
+    }
+    return JSON.stringify(httpResponse.error) + ` (${httpResponse.status})`;
+  }
+  return err.message;
+}
+
 // TODO It would be nice if the BE could return a unique para for us to check for. #3827
 // There is always a chance that this will return a false positive (more so with extensions).
 export function hasJetStreamError(pages: Partial<JetStreamErrorResponse>[]): JetStreamErrorResponse {