@spinnaker/cloudfoundry 2026.2.2 → 2026.3.0

package/dist/instance/details/CloudFoundryInstanceActions.d.ts

@@ -1,11 +1,14 @@
 import React from 'react';
-import type { Application } from '@spinnaker/core';
+import type { Application, IRouterInjectedProps } from '@spinnaker/core';
 import type { ICloudFoundryInstance } from '../../domain';
 export interface ICloudFoundryInstanceActionsProps {
     application: Application;
     instance: ICloudFoundryInstance;
 }
-export declare class CloudFoundryInstanceActions extends React.Component<ICloudFoundryInstanceActionsProps> {
+export declare class CloudFoundryInstanceActionsComponent extends React.Component<ICloudFoundryInstanceActionsProps & IRouterInjectedProps> {
     private terminateInstance;
     render(): JSX.Element;
 }
+export declare const CloudFoundryInstanceActions: React.ForwardRefExoticComponent<Omit<ICloudFoundryInstanceActionsProps & IRouterInjectedProps, keyof IRouterInjectedProps> & {
+    children?: React.ReactNode;
+} & React.RefAttributes<any>>;

package/dist/loadBalancer/configure/CloudFoundryMapLoadBalancerModal.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { Application, IAccount, ILoadBalancerModalProps, IModalComponentProps } from '@spinnaker/core';
-import { TaskMonitor } from '@spinnaker/core';
+import type { Application, DeckRuntimeServices, IAccount, ILoadBalancerModalProps, IModalComponentProps } from '@spinnaker/core';
+import { DeckRuntimeContext, TaskMonitor } from '@spinnaker/core';
 export interface ICreateCloudFoundryMapLoadBalancerState {
     accounts: IAccount[];
     regions: string[];
@@ -18,12 +18,13 @@ export interface ICloudFoundryLoadBalancerModalValues {
     routes: string[];
 }
 export declare class CloudFoundryMapLoadBalancerModal extends React.Component<ICloudFoundryLoadBalancerModalProps, ICreateCloudFoundryMapLoadBalancerState> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     static defaultProps: Partial<ICloudFoundryLoadBalancerModalProps>;
     private destroy$;
     private formikRef;
-    private $uibModalInstanceEmulation;
     constructor(props: ICloudFoundryLoadBalancerModalProps);
-    static show(props: ILoadBalancerModalProps): Promise<void>;
+    static show(props: ILoadBalancerModalProps, runtimeServices: DeckRuntimeServices): Promise<void>;
     componentDidMount(): void;
     componentWillUnmount(): void;
     private submit;

package/dist/loadBalancer/details/CloudFoundryLoadBalancerActions.d.ts

@@ -1,10 +1,13 @@
 import React from 'react';
-import type { Application, ILoadBalancer } from '@spinnaker/core';
+import type { Application, ILoadBalancer, IRouterInjectedProps } from '@spinnaker/core';
 export interface ICloudFoundryLoadBalancerActionsProps {
     application: Application;
     loadBalancer: ILoadBalancer;
 }
-export declare class CloudFoundryLoadBalancerActions extends React.Component<ICloudFoundryLoadBalancerActionsProps> {
+export declare class CloudFoundryLoadBalancerActionsComponent extends React.Component<ICloudFoundryLoadBalancerActionsProps & IRouterInjectedProps> {
     private deleteLoadBalancer;
     render(): JSX.Element;
 }
+export declare const CloudFoundryLoadBalancerActions: React.ForwardRefExoticComponent<Omit<ICloudFoundryLoadBalancerActionsProps & IRouterInjectedProps, keyof IRouterInjectedProps> & {
+    children?: React.ReactNode;
+} & React.RefAttributes<any>>;

package/dist/loadBalancer/loadBalancer.transformer.d.ts

@@ -13,12 +13,9 @@ export declare class CloudFoundryLoadBalancerUpsertDescription implements ILoadB
     constructor(loadBalancer: ICloudFoundryLoadBalancer);
 }
 export declare class CloudFoundryLoadBalancerTransformer {
-    private $q;
-    static $inject: string[];
-    constructor($q: ng.IQService);
-    normalizeLoadBalancer(loadBalancer: ILoadBalancer): PromiseLike<ILoadBalancer>;
+    normalizeLoadBalancer(loadBalancer: ILoadBalancer): Promise<ILoadBalancer>;
     constructNewCloudFoundryLoadBalancerTemplate(application: Application): ICloudFoundryLoadBalancerUpsertCommand;
-    convertLoadBalancerForEditing(loadBalancer: ICloudFoundryLoadBalancer, application: Application): PromiseLike<ICloudFoundryLoadBalancer>;
+    convertLoadBalancerForEditing(loadBalancer: ICloudFoundryLoadBalancer, application: Application): Promise<ICloudFoundryLoadBalancer>;
     convertLoadBalancerToUpsertDescription(loadBalancer: ICloudFoundryLoadBalancer): CloudFoundryLoadBalancerUpsertDescription;
     private buildInstanceCounts;
     private transformInstance;

package/dist/pipeline/stages/cloneServerGroup/CloudFoundryCloneServerGroupStageConfig.d.ts

@@ -1,9 +1,12 @@
 import React from 'react';
 import type { IStageConfigProps } from '@spinnaker/core';
+import { DeckRuntimeContext } from '@spinnaker/core';
 export interface ICloudFoundryCloneServerGroupStageConfigState {
     buttonText: string;
 }
 export declare class CloudFoundryCloneServerGroupStageConfig extends React.Component<IStageConfigProps, ICloudFoundryCloneServerGroupStageConfigState> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     constructor(props: IStageConfigProps);
     private handleResult;
     private addCluster;

package/dist/serverGroup/configure/serverGroupCommandBuilderShim.service.cf.d.ts

@@ -1,14 +1,10 @@
-import type { IQService } from 'angular';
 import type { Application, IPipeline, IStage } from '@spinnaker/core';
 import type { ICloudFoundryApplication, ICloudFoundryServerGroup } from '../../domain';
 import type { ICloudFoundryCreateServerGroupCommand, ICloudFoundryDeployConfiguration } from './serverGroupConfigurationModel.cf';
 export declare class CloudFoundryServerGroupCommandBuilderShim {
-    private $q;
-    static $inject: string[];
-    constructor($q: IQService);
-    buildNewServerGroupCommand(app: Application, defaults: any): PromiseLike<ICloudFoundryCreateServerGroupCommand>;
-    buildServerGroupCommandFromExisting(app: Application, serverGroup: ICloudFoundryServerGroup, mode?: string): PromiseLike<ICloudFoundryCreateServerGroupCommand>;
-    buildNewServerGroupCommandForPipeline(stage: IStage, pipeline: IPipeline): PromiseLike<ICloudFoundryCreateServerGroupCommand>;
-    buildServerGroupCommandFromPipeline(application: ICloudFoundryApplication, originalCluster: ICloudFoundryDeployConfiguration, stage: IStage, pipeline: IPipeline): PromiseLike<ICloudFoundryCreateServerGroupCommand>;
-    buildCloneServerGroupCommandFromPipeline(stage: IStage, pipeline: IPipeline): PromiseLike<ICloudFoundryCreateServerGroupCommand>;
+    buildNewServerGroupCommand(app: Application, defaults: any): Promise<ICloudFoundryCreateServerGroupCommand>;
+    buildServerGroupCommandFromExisting(app: Application, serverGroup: ICloudFoundryServerGroup, mode?: string): Promise<ICloudFoundryCreateServerGroupCommand>;
+    buildNewServerGroupCommandForPipeline(stage: IStage, pipeline: IPipeline): Promise<ICloudFoundryCreateServerGroupCommand>;
+    buildServerGroupCommandFromPipeline(application: ICloudFoundryApplication, originalCluster: ICloudFoundryDeployConfiguration, stage: IStage, pipeline: IPipeline): Promise<ICloudFoundryCreateServerGroupCommand>;
+    buildCloneServerGroupCommandFromPipeline(stage: IStage, pipeline: IPipeline): Promise<ICloudFoundryCreateServerGroupCommand>;
 }

package/dist/serverGroup/configure/wizard/CreateServerGroupModal.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { Application, IModalComponentProps, IPipeline, IStage } from '@spinnaker/core';
-import { TaskMonitor } from '@spinnaker/core';
+import type { Application, DeckRuntimeServices, IModalComponentProps, IPipeline, IStage } from '@spinnaker/core';
+import { DeckRuntimeContext, TaskMonitor } from '@spinnaker/core';
 import type { ICloudFoundryServerGroup } from '../../../domain';
 import type { ICloudFoundryCreateServerGroupCommand } from '../serverGroupConfigurationModel.cf';
 import './serverGroup.less';
@@ -20,8 +20,10 @@ export interface ICloudFoundryCreateServerGroupState {
     taskMonitor: TaskMonitor;
 }
 export declare class CloudFoundryCreateServerGroupModal extends React.Component<ICloudFoundryCreateServerGroupProps, ICloudFoundryCreateServerGroupState> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     static defaultProps: Partial<ICloudFoundryCreateServerGroupProps>;
-    static show(props: ICloudFoundryCreateServerGroupProps): Promise<ICloudFoundryCreateServerGroupCommand>;
+    static show(props: ICloudFoundryCreateServerGroupProps, runtimeServices: DeckRuntimeServices): Promise<ICloudFoundryCreateServerGroupCommand>;
     constructor(props: ICloudFoundryCreateServerGroupProps);
     private templateSelected;
     private initialize;

package/dist/serverGroup/details/cloudFoundryServerGroupActions.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
-import type { IServerGroupActionsProps, IServerGroupJob } from '@spinnaker/core';
+import type { IRouterInjectedProps, IServerGroupActionsProps, IServerGroupJob } from '@spinnaker/core';
+import { DeckRuntimeContext } from '@spinnaker/core';
 import type { ICloudFoundryServerGroup } from '../../domain';
 export interface ICloudFoundryServerGroupActionsProps extends IServerGroupActionsProps {
     serverGroup: ICloudFoundryServerGroup;
@@ -7,7 +8,9 @@ export interface ICloudFoundryServerGroupActionsProps extends IServerGroupAction
 export interface ICloudFoundryServerGroupJob extends IServerGroupJob {
     serverGroupId: string;
 }
-export declare class CloudFoundryServerGroupActions extends React.Component<ICloudFoundryServerGroupActionsProps> {
+export declare class CloudFoundryServerGroupActionsComponent extends React.Component<ICloudFoundryServerGroupActionsProps & IRouterInjectedProps> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     private isEnableLocked;
     private isRollbackEnabled;
     private hasDisabledInstances;
@@ -22,3 +25,6 @@ export declare class CloudFoundryServerGroupActions extends React.Component<IClo
     private cloneServerGroup;
     render(): JSX.Element;
 }
+export declare const CloudFoundryServerGroupActions: React.ForwardRefExoticComponent<Omit<ICloudFoundryServerGroupActionsProps & IRouterInjectedProps, keyof IRouterInjectedProps> & {
+    children?: React.ReactNode;
+} & React.RefAttributes<any>>;

package/dist/serverGroup/details/mapLoadBalancers/CloudFoundryMapLoadBalancersModal.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { Application, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
-import { TaskMonitor } from '@spinnaker/core';
+import type { Application, DeckRuntimeServices, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
+import { DeckRuntimeContext, TaskMonitor } from '@spinnaker/core';
 import type { ICloudFoundryServerGroup } from '../../../domain';
 export interface ICloudFoundryLoadBalancerLinksModalProps extends IModalComponentProps {
     application: Application;
@@ -18,9 +18,11 @@ export interface ICloudFoundryLoadBalancerLinkJob extends IServerGroupJob {
     serverGroupName: string;
 }
 export declare class CloudFoundryMapLoadBalancersModal extends React.Component<ICloudFoundryLoadBalancerLinksModalProps, ICloudFoundryLoadBalancerLinksModalState> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     static defaultProps: Partial<ICloudFoundryLoadBalancerLinksModalProps>;
     private formikRef;
-    static show(props: ICloudFoundryLoadBalancerLinksModalProps): Promise<ICloudFoundryLoadBalancerLinkJob>;
+    static show(props: ICloudFoundryLoadBalancerLinksModalProps, runtimeServices: DeckRuntimeServices): Promise<ICloudFoundryLoadBalancerLinkJob>;
     constructor(props: ICloudFoundryLoadBalancerLinksModalProps);
     private close;
     private submit;

package/dist/serverGroup/details/mapLoadBalancers/CloudFoundryUnmapLoadBalancersModal.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { Application, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
-import { TaskMonitor } from '@spinnaker/core';
+import type { Application, DeckRuntimeServices, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
+import { DeckRuntimeContext, TaskMonitor } from '@spinnaker/core';
 import type { ICloudFoundryServerGroup } from '../../../domain';
 export interface ICloudFoundryLoadBalancerLinksModalProps extends IModalComponentProps {
     application: Application;
@@ -18,9 +18,11 @@ export interface ICloudFoundryLoadBalancerLinkJob extends IServerGroupJob {
     serverGroupName: string;
 }
 export declare class CloudFoundryUnmapLoadBalancersModal extends React.Component<ICloudFoundryLoadBalancerLinksModalProps, ICloudFoundryLoadBalancerLinksModalState> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     static defaultProps: Partial<ICloudFoundryLoadBalancerLinksModalProps>;
     private formikRef;
-    static show(props: ICloudFoundryLoadBalancerLinksModalProps): Promise<ICloudFoundryLoadBalancerLinkJob>;
+    static show(props: ICloudFoundryLoadBalancerLinksModalProps, runtimeServices: DeckRuntimeServices): Promise<ICloudFoundryLoadBalancerLinkJob>;
     constructor(props: ICloudFoundryLoadBalancerLinksModalProps);
     private close;
     private submit;

package/dist/serverGroup/details/resize/CloudFoundryResizeServerGroupModal.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { Application, ICapacity, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
-import { TaskMonitor } from '@spinnaker/core';
+import type { Application, DeckRuntimeServices, ICapacity, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
+import { DeckRuntimeContext, TaskMonitor } from '@spinnaker/core';
 import type { ICloudFoundryServerGroup } from '../../../domain';
 export interface ICloudFoundryResizeServerGroupModalProps extends IModalComponentProps {
     application: Application;
@@ -25,9 +25,11 @@ export interface ICloudFoundryResizeJob extends IServerGroupJob {
     reason?: string;
 }
 export declare class CloudFoundryResizeServerGroupModal extends React.Component<ICloudFoundryResizeServerGroupModalProps, ICloudFoundryResizeServerGroupModalState> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     static defaultProps: Partial<ICloudFoundryResizeServerGroupModalProps>;
     private formikRef;
-    static show(props: ICloudFoundryResizeServerGroupModalProps): Promise<ICloudFoundryResizeJob>;
+    static show(props: ICloudFoundryResizeServerGroupModalProps, runtimeServices: DeckRuntimeServices): Promise<ICloudFoundryResizeJob>;
     constructor(props: ICloudFoundryResizeServerGroupModalProps);
     private close;
     private submit;

package/dist/serverGroup/details/rollback/CloudFoundryRollbackServerGroupModal.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { Application, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
-import { TaskMonitor } from '@spinnaker/core';
+import type { Application, DeckRuntimeServices, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
+import { DeckRuntimeContext, TaskMonitor } from '@spinnaker/core';
 import type { ICloudFoundryServerGroup } from '../../../domain';
 export interface ICloudFoundryRollbackServerGroupModalProps extends IModalComponentProps {
     application: Application;
@@ -26,9 +26,11 @@ export interface ICloudFoundryRollbackJob extends IServerGroupJob {
     };
 }
 export declare class CloudFoundryRollbackServerGroupModal extends React.Component<ICloudFoundryRollbackServerGroupModalProps, ICloudFoundryRollbackServerGroupModalState> {
+    static contextType: React.Context<import("@spinnaker/core").DeckRuntimeContextValue>;
+    context: React.ContextType<typeof DeckRuntimeContext>;
     static defaultProps: Partial<ICloudFoundryRollbackServerGroupModalProps>;
     private formikRef;
-    static show(props: ICloudFoundryRollbackServerGroupModalProps): Promise<ICloudFoundryRollbackJob>;
+    static show(props: ICloudFoundryRollbackServerGroupModalProps, runtimeServices: DeckRuntimeServices): Promise<ICloudFoundryRollbackJob>;
     constructor(props: ICloudFoundryRollbackServerGroupModalProps);
     private close;
     private submit;

package/dist/serverGroup/serverGroup.transformer.d.ts

@@ -1,10 +1,7 @@
 import type { ICloudFoundryServerGroup } from '../domain';
 export declare class CloudFoundryServerGroupTransformer {
-    private $q;
-    static $inject: string[];
-    constructor($q: ng.IQService);
     normalizeServerGroupDetails(serverGroup: ICloudFoundryServerGroup): ICloudFoundryServerGroup;
-    normalizeServerGroup(serverGroup: ICloudFoundryServerGroup): PromiseLike<ICloudFoundryServerGroup>;
+    normalizeServerGroup(serverGroup: ICloudFoundryServerGroup): Promise<ICloudFoundryServerGroup>;
     convertServerGroupCommandToDeployConfiguration(base: any): any;
     private convertManifestEnv;
 }

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/spinnaker/spinnaker.git"
   },
   "license": "Apache-2.0",
-  "version": "2026.2.2",
+  "version": "2026.3.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -23,14 +23,10 @@
   "dependencies": {
     "@spinnaker/core": "^0.29.1",
     "@uirouter/react": "1.0.7",
-    "@uirouter/react-hybrid": "1.0.2",
-    "angular": "1.8.3",
-    "angular-ui-bootstrap": "2.5.0",
     "enzyme": "3.11.0",
     "formik": "1.5.1",
-    "js-yaml": "3.13.1",
+    "js-yaml": "4.1.1",
     "lodash": "4.18.1",
-    "ngimport": "0.6.1",
     "react": "16.14.0",
     "react-bootstrap": "0.32.1",
     "react-select": "1.2.1",
@@ -41,8 +37,6 @@
     "@spinnaker/eslint-plugin": "^3.0.2",
     "@spinnaker/mocks": "1.0.7",
     "@spinnaker/scripts": "^0.4.0",
-    "@types/angular": "1.6.26",
-    "@types/angular-ui-bootstrap": "0.13.41",
     "@types/enzyme": "3.10.3",
     "@types/js-yaml": "3.5.30",
     "@types/lodash": "4.14.64",
@@ -52,5 +46,5 @@
     "shx": "0.3.3",
     "typescript": "5.0.4"
   },
-  "gitHead": "db086c61529c9421e8c0c2d4a2b8eca88c675ac8"
+  "gitHead": "0f7d75f5d4b42c1675e2ecc69a53f8eb73090eb9"
 }

package/src/image/image.reader.cf.ts

@@ -2,7 +2,7 @@ import { REST } from '@spinnaker/core';
 import type { ICloudFoundryCluster } from '../domain';
 
 export class CloudFoundryImageReader {
-  public static findImages(account: string): PromiseLike<ICloudFoundryCluster[]> {
+  public static findImages(account: string): Promise<ICloudFoundryCluster[]> {
     return REST('/images/find')
       .query({
         account,

package/src/instance/details/CloudFoundryInstanceActions.tsx

@@ -2,8 +2,9 @@ import { cloneDeep } from 'lodash';
 import React from 'react';
 import { Dropdown } from 'react-bootstrap';
 
-import type { Application } from '@spinnaker/core';
-import { ConfirmationModalService, InstanceWriter, ReactInjector } from '@spinnaker/core';
+import type { Application, IRouterInjectedProps } from '@spinnaker/core';
+import { ConfirmationModalService, InstanceWriter, withRouter } from '@spinnaker/core';
+
 import type { ICloudFoundryInstance } from '../../domain';
 
 export interface ICloudFoundryInstanceActionsProps {
@@ -11,7 +12,9 @@ export interface ICloudFoundryInstanceActionsProps {
   instance: ICloudFoundryInstance;
 }
 
-export class CloudFoundryInstanceActions extends React.Component<ICloudFoundryInstanceActionsProps> {
+export class CloudFoundryInstanceActionsComponent extends React.Component<
+  ICloudFoundryInstanceActionsProps & IRouterInjectedProps
+> {
   private terminateInstance = () => {
     const { application, instance } = this.props;
     const instanceClone = cloneDeep(instance) as any;
@@ -20,9 +23,9 @@ export class CloudFoundryInstanceActions extends React.Component<ICloudFoundryIn
     const taskMonitor = {
       application: application,
       title: 'Terminating ' + instance.name,
-      onTaskComplete() {
-        if (ReactInjector.$state.includes('**.serverGroup', { instanceId: instance.name })) {
-          ReactInjector.$state.go('^');
+      onTaskComplete: () => {
+        if (this.props.stateService.includes('**.serverGroup', { instanceId: instance.name })) {
+          this.props.stateService.go('^');
         }
       },
     };
@@ -57,3 +60,5 @@ export class CloudFoundryInstanceActions extends React.Component<ICloudFoundryIn
     );
   }
 }
+
+export const CloudFoundryInstanceActions = withRouter(CloudFoundryInstanceActionsComponent);

package/src/instance/details/CloudFoundryInstanceDetails.tsx

@@ -1,5 +1,4 @@
 import { UISref } from '@uirouter/react';
-import { UIRouterContext } from '@uirouter/react-hybrid';
 import { flattenDeep } from 'lodash';
 import React from 'react';
 
@@ -34,7 +33,6 @@ interface ICloudFoundryInstanceDetailsProps {
   loading: boolean;
 }
 
-@UIRouterContext
 export class CloudFoundryInstanceDetails extends React.Component<
   ICloudFoundryInstanceDetailsProps,
   ICloudFoundryInstanceDetailsState

package/src/loadBalancer/configure/CloudFoundryMapLoadBalancerModal.tsx

@@ -1,8 +1,5 @@
-import type { IDeferred } from 'angular';
-import type { IModalServiceInstance } from 'angular-ui-bootstrap';
 import type { Formik } from 'formik';
 import { Form } from 'formik';
-import { $q } from 'ngimport';
 import React from 'react';
 import { Modal, ModalFooter } from 'react-bootstrap';
 import { from as observableFrom, Subject } from 'rxjs';
@@ -10,6 +7,7 @@ import { takeUntil } from 'rxjs/operators';
 
 import type {
   Application,
+  DeckRuntimeServices,
   IAccount,
   ILoadBalancerModalProps,
   IModalComponentProps,
@@ -17,14 +15,15 @@ import type {
 } from '@spinnaker/core';
 import {
   AccountService,
+  DeckRuntimeContext,
   ModalClose,
   noop,
-  ReactInjector,
   ReactModal,
   SpinFormik,
   TaskMonitor,
   TaskMonitorWrapper,
 } from '@spinnaker/core';
+
 import type { ICloudFoundryServerGroup } from '../../domain';
 import { AccountRegionClusterSelector, Routes } from '../../presentation';
 
@@ -51,6 +50,9 @@ export class CloudFoundryMapLoadBalancerModal extends React.Component<
   ICloudFoundryLoadBalancerModalProps,
   ICreateCloudFoundryMapLoadBalancerState
 > {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   public static defaultProps: Partial<ICloudFoundryLoadBalancerModalProps> = {
     closeModal: noop,
     dismissModal: noop,
@@ -58,19 +60,10 @@ export class CloudFoundryMapLoadBalancerModal extends React.Component<
 
   private destroy$ = new Subject();
   private formikRef = React.createRef<Formik<ICloudFoundryLoadBalancerModalValues>>();
-  private $uibModalInstanceEmulation: IModalServiceInstance & { deferred?: IDeferred<any> };
 
   constructor(props: ICloudFoundryLoadBalancerModalProps) {
     super(props);
 
-    const deferred = $q.defer();
-    const promise = deferred.promise;
-    this.$uibModalInstanceEmulation = {
-      result: promise,
-      close: () => this.props.dismissModal(),
-      dismiss: () => this.props.dismissModal(),
-    } as IModalServiceInstance;
-    Object.assign(this.$uibModalInstanceEmulation, { deferred });
     this.state = {
       accounts: [],
       regions: [],
@@ -84,7 +77,7 @@ export class CloudFoundryMapLoadBalancerModal extends React.Component<
       taskMonitor: new TaskMonitor({
         application: props.application,
         title: 'Mapping a route to your server group',
-        modalInstance: TaskMonitor.modalInstanceEmulation(() => this.props.dismissModal()),
+        onDismiss: () => this.props.dismissModal(),
         onTaskComplete: () => this.props.application.serverGroups.refresh(),
       }),
     };
@@ -93,7 +86,7 @@ export class CloudFoundryMapLoadBalancerModal extends React.Component<
       .subscribe((rawAccounts: IAccount[]) => this.setState({ accounts: rawAccounts }));
   }
 
-  public static show(props: ILoadBalancerModalProps): Promise<void> {
+  public static show(props: ILoadBalancerModalProps, runtimeServices: DeckRuntimeServices): Promise<void> {
     const modalProps = { dialogClassName: 'wizard-modal modal-lg' };
     return ReactModal.show(
       CloudFoundryMapLoadBalancerModal,
@@ -102,6 +95,7 @@ export class CloudFoundryMapLoadBalancerModal extends React.Component<
         // className: 'create-pipeline-modal-overflow-visible',
       },
       modalProps,
+      runtimeServices,
     );
   }
 
@@ -137,7 +131,7 @@ export class CloudFoundryMapLoadBalancerModal extends React.Component<
     };
 
     this.state.taskMonitor.submit(() => {
-      return ReactInjector.serverGroupWriter.mapLoadBalancers(coreServerGroup, this.props.application, {
+      return this.context.services.serverGroupWriter.mapLoadBalancers(coreServerGroup, this.props.application, {
         serverGroupName: serverGroup.name,
       });
     });

package/src/loadBalancer/details/CloudFoundryLoadBalancerActions.tsx

@@ -1,24 +1,25 @@
 import React from 'react';
-
 import { Dropdown } from 'react-bootstrap';
 
-import type { Application, ILoadBalancer, ILoadBalancerDeleteCommand } from '@spinnaker/core';
-import { ConfirmationModalService, LoadBalancerWriter, ReactInjector } from '@spinnaker/core';
+import type { Application, ILoadBalancer, ILoadBalancerDeleteCommand, IRouterInjectedProps } from '@spinnaker/core';
+import { ConfirmationModalService, LoadBalancerWriter, withRouter } from '@spinnaker/core';
 
 export interface ICloudFoundryLoadBalancerActionsProps {
   application: Application;
   loadBalancer: ILoadBalancer;
 }
 
-export class CloudFoundryLoadBalancerActions extends React.Component<ICloudFoundryLoadBalancerActionsProps> {
+export class CloudFoundryLoadBalancerActionsComponent extends React.Component<
+  ICloudFoundryLoadBalancerActionsProps & IRouterInjectedProps
+> {
   private deleteLoadBalancer = () => {
     const { application, loadBalancer } = this.props;
     const taskMonitor = {
       application: application,
       title: 'Deleting ' + loadBalancer.name,
-      onTaskComplete() {
-        if (ReactInjector.$state.includes('**.serverGroup', { instanceId: loadBalancer.name })) {
-          ReactInjector.$state.go('^');
+      onTaskComplete: () => {
+        if (this.props.stateService.includes('**.serverGroup', { instanceId: loadBalancer.name })) {
+          this.props.stateService.go('^');
         }
       },
     };
@@ -59,3 +60,5 @@ export class CloudFoundryLoadBalancerActions extends React.Component<ICloudFound
     );
   }
 }
+
+export const CloudFoundryLoadBalancerActions = withRouter(CloudFoundryLoadBalancerActionsComponent);

package/src/loadBalancer/details/CloudFoundryLoadBalancerDetails.tsx

@@ -1,5 +1,4 @@
 import { UISref } from '@uirouter/react';
-import { UIRouterContext } from '@uirouter/react-hybrid';
 import React from 'react';
 
 import type { Application, LoadBalancerWriter } from '@spinnaker/core';
@@ -30,7 +29,6 @@ export interface ICloudFoundryLoadBalancerDetailsProps {
   loadBalancerWriter: LoadBalancerWriter;
 }
 
-@UIRouterContext
 export class CloudFoundryLoadBalancerDetails extends React.Component<
   ICloudFoundryLoadBalancerDetailsProps,
   ICloudFoundryLoadBalancerDetailsState
@@ -72,7 +70,7 @@ export class CloudFoundryLoadBalancerDetails extends React.Component<
       this.setState({
         refreshListenerUnsubscribe: this.props.app
           .getDataSource('loadBalancers')
-          .onRefresh(null, () => this.extractLoadBalancer()),
+          .onRefresh(() => this.extractLoadBalancer()),
       });
     } else {
       this.setState({

package/src/loadBalancer/loadBalancer.transformer.ts

@@ -41,10 +41,7 @@ export class CloudFoundryLoadBalancerUpsertDescription
 }
 
 export class CloudFoundryLoadBalancerTransformer {
-  public static $inject = ['$q'];
-  constructor(private $q: ng.IQService) {}
-
-  public normalizeLoadBalancer(loadBalancer: ILoadBalancer): PromiseLike<ILoadBalancer> {
+  public normalizeLoadBalancer(loadBalancer: ILoadBalancer): Promise<ILoadBalancer> {
     loadBalancer.provider = loadBalancer.type;
     loadBalancer.instanceCounts = this.buildInstanceCounts(loadBalancer.serverGroups);
     loadBalancer.instances = [];
@@ -63,7 +60,7 @@ export class CloudFoundryLoadBalancerTransformer {
 
     const activeServerGroups = loadBalancer.serverGroups.filter((sg) => !sg.isDisabled);
     loadBalancer.instances = chain(activeServerGroups).map('instances').flatten().value() as IInstance[];
-    return this.$q.resolve(loadBalancer);
+    return Promise.resolve(loadBalancer);
   }
 
   public constructNewCloudFoundryLoadBalancerTemplate(
@@ -87,7 +84,7 @@ export class CloudFoundryLoadBalancerTransformer {
   public convertLoadBalancerForEditing(
     loadBalancer: ICloudFoundryLoadBalancer,
     application: Application,
-  ): PromiseLike<ICloudFoundryLoadBalancer> {
+  ): Promise<ICloudFoundryLoadBalancer> {
     return application
       .getDataSource('loadBalancers')
       .ready()

package/src/pipeline/stages/cloneServerGroup/CloudFoundryCloneServerGroupStageConfig.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 
 import type { IStageConfigProps } from '@spinnaker/core';
-import { StageConstants } from '@spinnaker/core';
+import { DeckRuntimeContext, StageConstants } from '@spinnaker/core';
 import { CloudFoundryServerGroupCommandBuilder } from '../../../serverGroup/configure';
 import { CloudFoundryCreateServerGroupModal } from '../../../serverGroup/configure/wizard/CreateServerGroupModal';
 
@@ -13,6 +13,9 @@ export class CloudFoundryCloneServerGroupStageConfig extends React.Component<
   IStageConfigProps,
   ICloudFoundryCloneServerGroupStageConfigState
 > {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   constructor(props: IStageConfigProps) {
     super(props);
     this.props.updateStageField({
@@ -48,12 +51,15 @@ export class CloudFoundryCloneServerGroupStageConfig extends React.Component<
     const { application, stage, pipeline } = this.props;
     const title = 'Clone Cluster';
     const command = CloudFoundryServerGroupCommandBuilder.buildCloneServerGroupCommandFromPipeline(stage, pipeline);
-    CloudFoundryCreateServerGroupModal.show({
-      application,
-      command,
-      isSourceConstant: false,
-      title,
-    })
+    CloudFoundryCreateServerGroupModal.show(
+      {
+        application,
+        command,
+        isSourceConstant: false,
+        title,
+      },
+      this.context.services,
+    )
       .then(this.handleResult)
       .catch(() => {});
   };

package/src/pipeline/stages/createServiceBindings/CloudFoundryCreateServiceBindingsStageConfigForm.tsx

@@ -7,10 +7,10 @@ import {
   AccountService,
   ArtifactTypePatterns,
   excludeAllTypesExcept,
-  NgReact,
   StageArtifactSelectorDelegate,
   StageConfigField,
   StageConstants,
+  TargetSelect,
   TextInput,
 } from '@spinnaker/core';
 
@@ -141,7 +141,6 @@ export class CloudFoundryCreateServiceBindingsStageConfigForm extends React.Comp
     const stage = this.props.formik.values;
     const { accounts, application } = this.state;
     const { target } = stage;
-    const { TargetSelect } = NgReact;
 
     return (
       <>