@spinnaker/cloudfoundry 2026.2.3 → 2026.3.0

package/src/serverGroup/details/cfServerGroupDetailsGetter.ts

@@ -5,7 +5,7 @@ import type { IServerGroupDetailsProps } from '@spinnaker/core';
 import { ServerGroupReader } from '@spinnaker/core';
 import type { ICloudFoundryLoadBalancer, ICloudFoundryServerGroup } from '../../domain';
 
-function extractServerGroupSummary(props: IServerGroupDetailsProps): PromiseLike<ICloudFoundryServerGroup> {
+function extractServerGroupSummary(props: IServerGroupDetailsProps): Promise<ICloudFoundryServerGroup> {
   const { app, serverGroup } = props;
   return app.ready().then(() => {
     let summary: ICloudFoundryServerGroup = app.serverGroups.data.find((toCheck: ICloudFoundryServerGroup) => {

package/src/serverGroup/details/cloudFoundryServerGroupActions.tsx

@@ -2,14 +2,15 @@ import { filter, find, get, orderBy } from 'lodash';
 import React from 'react';
 import { Dropdown, Tooltip } from 'react-bootstrap';
 
-import type { IOwnerOption, IServerGroupActionsProps, IServerGroupJob } from '@spinnaker/core';
+import type { IOwnerOption, IRouterInjectedProps, IServerGroupActionsProps, IServerGroupJob } from '@spinnaker/core';
 import {
   AddEntityTagLinks,
   ClusterTargetBuilder,
   ConfirmationModalService,
-  ReactInjector,
+  DeckRuntimeContext,
   ServerGroupWarningMessageService,
   SETTINGS,
+  withRouter,
 } from '@spinnaker/core';
 
 import { CloudFoundryServerGroupCommandBuilder } from '../configure';
@@ -28,7 +29,12 @@ export interface ICloudFoundryServerGroupJob extends IServerGroupJob {
   serverGroupId: string;
 }
 
-export class CloudFoundryServerGroupActions extends React.Component<ICloudFoundryServerGroupActionsProps> {
+export class CloudFoundryServerGroupActionsComponent extends React.Component<
+  ICloudFoundryServerGroupActionsProps & IRouterInjectedProps
+> {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   private isEnableLocked(): boolean {
     if (this.props.serverGroup.isDisabled) {
       const resizeTasks = (this.props.serverGroup.runningTasks || []).filter((task) =>
@@ -79,15 +85,15 @@ export class CloudFoundryServerGroupActions extends React.Component<ICloudFoundr
       application: app,
       title: 'Destroying ' + serverGroup.name,
       onTaskComplete: () => {
-        if (ReactInjector.$state.includes('**.serverGroup', stateParams)) {
-          ReactInjector.$state.go('^');
+        if (this.props.stateService.includes('**.serverGroup', stateParams)) {
+          this.props.stateService.go('^');
         }
       },
     };
 
     const submitMethod = (params: ICloudFoundryServerGroupJob) => {
       params.serverGroupName = serverGroup.name;
-      return ReactInjector.serverGroupWriter.destroyServerGroup(serverGroup, app, params);
+      return this.context.services.serverGroupWriter.destroyServerGroup(serverGroup, app, params);
     };
 
     const confirmationModalParams = {
@@ -120,7 +126,7 @@ export class CloudFoundryServerGroupActions extends React.Component<ICloudFoundr
 
     const submitMethod = (params: ICloudFoundryServerGroupJob) => {
       params.serverGroupName = serverGroup.name;
-      return ReactInjector.serverGroupWriter.disableServerGroup(serverGroup, app.name, params);
+      return this.context.services.serverGroupWriter.disableServerGroup(serverGroup, app.name, params);
     };
 
     const confirmationModalParams = {
@@ -178,7 +184,7 @@ export class CloudFoundryServerGroupActions extends React.Component<ICloudFoundr
 
     const submitMethod = (params: ICloudFoundryServerGroupJob) => {
       params.serverGroupName = serverGroup.name;
-      return ReactInjector.serverGroupWriter.enableServerGroup(serverGroup, app, params);
+      return this.context.services.serverGroupWriter.enableServerGroup(serverGroup, app, params);
     };
 
     const confirmationModalParams = {
@@ -242,41 +248,47 @@ export class CloudFoundryServerGroupActions extends React.Component<ICloudFoundr
       region: serverGroup.region,
     }) as ICloudFoundryServerGroup[];
 
-    CloudFoundryRollbackServerGroupModal.show({
-      serverGroup,
-      previousServerGroup,
-      disabledServerGroups: disabledServerGroups.sort((a, b) => b.name.localeCompare(a.name)),
-      allServerGroups: allServerGroups.sort((a, b) => b.name.localeCompare(a.name)),
-      application: app,
-    });
+    CloudFoundryRollbackServerGroupModal.show(
+      {
+        serverGroup,
+        previousServerGroup,
+        disabledServerGroups: disabledServerGroups.sort((a, b) => b.name.localeCompare(a.name)),
+        allServerGroups: allServerGroups.sort((a, b) => b.name.localeCompare(a.name)),
+        application: app,
+      },
+      this.context.services,
+    );
   };
 
   private resizeServerGroup = (): void => {
     const { app, serverGroup } = this.props;
-    CloudFoundryResizeServerGroupModal.show({ application: app, serverGroup });
+    CloudFoundryResizeServerGroupModal.show({ application: app, serverGroup }, this.context.services);
   };
 
   private mapServerGroupToLoadBalancers = (): void => {
     const { app, serverGroup } = this.props;
-    CloudFoundryMapLoadBalancersModal.show({ application: app, serverGroup });
+    CloudFoundryMapLoadBalancersModal.show({ application: app, serverGroup }, this.context.services);
   };
 
   private unmapServerGroupFromLoadBalancers = (): void => {
     const { app, serverGroup } = this.props;
-    CloudFoundryUnmapLoadBalancersModal.show({ application: app, serverGroup });
+    CloudFoundryUnmapLoadBalancersModal.show({ application: app, serverGroup }, this.context.services);
   };
 
   private cloneServerGroup = (): void => {
     const { app, serverGroup } = this.props;
     const command = CloudFoundryServerGroupCommandBuilder.buildServerGroupCommandFromExisting(app, serverGroup);
     const title = `Clone ${serverGroup.name}`;
-    CloudFoundryCreateServerGroupModal.show({
-      application: app,
-      command,
-      isSourceConstant: true,
-      serverGroup,
-      title,
-    });
+    CloudFoundryCreateServerGroupModal.show(
+      {
+        application: app,
+        command,
+        isSourceConstant: true,
+        serverGroup,
+        title,
+      },
+      this.context.services,
+    );
   };
 
   public render(): JSX.Element {
@@ -363,3 +375,5 @@ export class CloudFoundryServerGroupActions extends React.Component<ICloudFoundr
     );
   }
 }
+
+export const CloudFoundryServerGroupActions = withRouter(CloudFoundryServerGroupActionsComponent);

package/src/serverGroup/details/mapLoadBalancers/CloudFoundryMapLoadBalancersModal.tsx

@@ -3,16 +3,23 @@ import { Form } from 'formik';
 import React from 'react';
 import { Modal, ModalFooter } from 'react-bootstrap';
 
-import type { Application, IModalComponentProps, IServerGroup, IServerGroupJob } from '@spinnaker/core';
+import type {
+  Application,
+  DeckRuntimeServices,
+  IModalComponentProps,
+  IServerGroup,
+  IServerGroupJob,
+} from '@spinnaker/core';
 import {
+  DeckRuntimeContext,
   ModalClose,
   noop,
-  ReactInjector,
   ReactModal,
   SpinFormik,
   TaskMonitor,
   TaskMonitorWrapper,
 } from '@spinnaker/core';
+
 import type { ICloudFoundryServerGroup } from '../../../domain';
 import { Routes } from '../../../presentation/forms/serverGroup';
 
@@ -39,6 +46,9 @@ export class CloudFoundryMapLoadBalancersModal extends React.Component<
   ICloudFoundryLoadBalancerLinksModalProps,
   ICloudFoundryLoadBalancerLinksModalState
 > {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   public static defaultProps: Partial<ICloudFoundryLoadBalancerLinksModalProps> = {
     closeModal: noop,
     dismissModal: noop,
@@ -46,8 +56,11 @@ export class CloudFoundryMapLoadBalancersModal extends React.Component<
 
   private formikRef = React.createRef<Formik<ICloudFoundryLoadBalancerLinksModalValues>>();
 
-  public static show(props: ICloudFoundryLoadBalancerLinksModalProps): Promise<ICloudFoundryLoadBalancerLinkJob> {
-    return ReactModal.show(CloudFoundryMapLoadBalancersModal, props, {});
+  public static show(
+    props: ICloudFoundryLoadBalancerLinksModalProps,
+    runtimeServices: DeckRuntimeServices,
+  ): Promise<ICloudFoundryLoadBalancerLinkJob> {
+    return ReactModal.show(CloudFoundryMapLoadBalancersModal, props, {}, runtimeServices);
   }
 
   constructor(props: ICloudFoundryLoadBalancerLinksModalProps) {
@@ -60,7 +73,7 @@ export class CloudFoundryMapLoadBalancersModal 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(),
       }),
     };
@@ -86,7 +99,7 @@ export class CloudFoundryMapLoadBalancersModal 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/serverGroup/details/mapLoadBalancers/CloudFoundryUnmapLoadBalancersModal.tsx

@@ -3,16 +3,23 @@ import { Form } from 'formik';
 import React from 'react';
 import { Modal, ModalFooter } from 'react-bootstrap';
 
-import type { Application, IModalComponentProps, IServerGroup, IServerGroupJob } from '@spinnaker/core';
+import type {
+  Application,
+  DeckRuntimeServices,
+  IModalComponentProps,
+  IServerGroup,
+  IServerGroupJob,
+} from '@spinnaker/core';
 import {
+  DeckRuntimeContext,
   ModalClose,
   noop,
-  ReactInjector,
   ReactModal,
   SpinFormik,
   TaskMonitor,
   TaskMonitorWrapper,
 } from '@spinnaker/core';
+
 import type { ICloudFoundryServerGroup } from '../../../domain';
 import { Routes } from '../../../presentation/forms/serverGroup';
 
@@ -39,6 +46,9 @@ export class CloudFoundryUnmapLoadBalancersModal extends React.Component<
   ICloudFoundryLoadBalancerLinksModalProps,
   ICloudFoundryLoadBalancerLinksModalState
 > {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   public static defaultProps: Partial<ICloudFoundryLoadBalancerLinksModalProps> = {
     closeModal: noop,
     dismissModal: noop,
@@ -46,8 +56,11 @@ export class CloudFoundryUnmapLoadBalancersModal extends React.Component<
 
   private formikRef = React.createRef<Formik<ICloudFoundryLoadBalancerLinksModalValues>>();
 
-  public static show(props: ICloudFoundryLoadBalancerLinksModalProps): Promise<ICloudFoundryLoadBalancerLinkJob> {
-    return ReactModal.show(CloudFoundryUnmapLoadBalancersModal, props, {});
+  public static show(
+    props: ICloudFoundryLoadBalancerLinksModalProps,
+    runtimeServices: DeckRuntimeServices,
+  ): Promise<ICloudFoundryLoadBalancerLinkJob> {
+    return ReactModal.show(CloudFoundryUnmapLoadBalancersModal, props, {}, runtimeServices);
   }
 
   constructor(props: ICloudFoundryLoadBalancerLinksModalProps) {
@@ -60,7 +73,7 @@ export class CloudFoundryUnmapLoadBalancersModal extends React.Component<
       taskMonitor: new TaskMonitor({
         application: props.application,
         title: 'Unmapping a route from your server group',
-        modalInstance: TaskMonitor.modalInstanceEmulation(() => this.props.dismissModal()),
+        onDismiss: () => this.props.dismissModal(),
         onTaskComplete: () => this.props.application.serverGroups.refresh(),
       }),
     };
@@ -86,7 +99,7 @@ export class CloudFoundryUnmapLoadBalancersModal extends React.Component<
     };
 
     this.state.taskMonitor.submit(() => {
-      return ReactInjector.serverGroupWriter.unmapLoadBalancers(coreServerGroup, this.props.application, {
+      return this.context.services.serverGroupWriter.unmapLoadBalancers(coreServerGroup, this.props.application, {
         serverGroupName: serverGroup.name,
       });
     });

package/src/serverGroup/details/resize/CloudFoundryResizeServerGroupModal.tsx

@@ -3,19 +3,26 @@ import { Form } from 'formik';
 import React from 'react';
 import { Modal, ModalFooter } from 'react-bootstrap';
 
-import type { Application, ICapacity, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
+import type {
+  Application,
+  DeckRuntimeServices,
+  ICapacity,
+  IModalComponentProps,
+  IServerGroupJob,
+} from '@spinnaker/core';
 import {
+  DeckRuntimeContext,
   FormikFormField,
   ModalClose,
   noop,
   NumberInput,
-  ReactInjector,
   ReactModal,
   SpinFormik,
   TaskMonitor,
   TaskMonitorWrapper,
   TaskReason,
 } from '@spinnaker/core';
+
 import type { ICloudFoundryServerGroup } from '../../../domain';
 
 export interface ICloudFoundryResizeServerGroupModalProps extends IModalComponentProps {
@@ -48,6 +55,9 @@ export class CloudFoundryResizeServerGroupModal extends React.Component<
   ICloudFoundryResizeServerGroupModalProps,
   ICloudFoundryResizeServerGroupModalState
 > {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   public static defaultProps: Partial<ICloudFoundryResizeServerGroupModalProps> = {
     closeModal: noop,
     dismissModal: noop,
@@ -55,9 +65,12 @@ export class CloudFoundryResizeServerGroupModal extends React.Component<
 
   private formikRef = React.createRef<Formik<ICloudFoundryResizeServerGroupValues>>();
 
-  public static show(props: ICloudFoundryResizeServerGroupModalProps): Promise<ICloudFoundryResizeJob> {
+  public static show(
+    props: ICloudFoundryResizeServerGroupModalProps,
+    runtimeServices: DeckRuntimeServices,
+  ): Promise<ICloudFoundryResizeJob> {
     const modalProps = {};
-    return ReactModal.show(CloudFoundryResizeServerGroupModal, props, modalProps);
+    return ReactModal.show(CloudFoundryResizeServerGroupModal, props, modalProps, runtimeServices);
   }
 
   constructor(props: ICloudFoundryResizeServerGroupModalProps) {
@@ -74,7 +87,7 @@ export class CloudFoundryResizeServerGroupModal extends React.Component<
       taskMonitor: new TaskMonitor({
         application: props.application,
         title: 'Resizing your server group',
-        modalInstance: TaskMonitor.modalInstanceEmulation(() => this.props.dismissModal()),
+        onDismiss: () => this.props.dismissModal(),
         onTaskComplete: () => this.props.application.serverGroups.refresh(),
       }),
     };
@@ -102,7 +115,7 @@ export class CloudFoundryResizeServerGroupModal extends React.Component<
     };
 
     this.state.taskMonitor.submit(() => {
-      return ReactInjector.serverGroupWriter.resizeServerGroup(serverGroup, application, command);
+      return this.context.services.serverGroupWriter.resizeServerGroup(serverGroup, application, command);
     });
   };
 

package/src/serverGroup/details/rollback/CloudFoundryRollbackServerGroupModal.tsx

@@ -3,12 +3,12 @@ import { Form } from 'formik';
 import React from 'react';
 import { Modal, ModalFooter } from 'react-bootstrap';
 
-import type { Application, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
+import type { Application, DeckRuntimeServices, IModalComponentProps, IServerGroupJob } from '@spinnaker/core';
 import {
+  DeckRuntimeContext,
   FormikFormField,
   ModalClose,
   noop,
-  ReactInjector,
   ReactModal,
   ReactSelectInput,
   SpinFormik,
@@ -16,6 +16,7 @@ import {
   TaskMonitorWrapper,
   TaskReason,
 } from '@spinnaker/core';
+
 import type { ICloudFoundryServerGroup } from '../../../domain';
 
 export interface ICloudFoundryRollbackServerGroupModalProps extends IModalComponentProps {
@@ -49,6 +50,9 @@ export class CloudFoundryRollbackServerGroupModal extends React.Component<
   ICloudFoundryRollbackServerGroupModalProps,
   ICloudFoundryRollbackServerGroupModalState
 > {
+  public static contextType = DeckRuntimeContext;
+  public declare context: React.ContextType<typeof DeckRuntimeContext>;
+
   public static defaultProps: Partial<ICloudFoundryRollbackServerGroupModalProps> = {
     closeModal: noop,
     dismissModal: noop,
@@ -56,9 +60,12 @@ export class CloudFoundryRollbackServerGroupModal extends React.Component<
 
   private formikRef = React.createRef<Formik<ICloudFoundryRollbackServerGroupValues>>();
 
-  public static show(props: ICloudFoundryRollbackServerGroupModalProps): Promise<ICloudFoundryRollbackJob> {
+  public static show(
+    props: ICloudFoundryRollbackServerGroupModalProps,
+    runtimeServices: DeckRuntimeServices,
+  ): Promise<ICloudFoundryRollbackJob> {
     const modalProps = {};
-    return ReactModal.show(CloudFoundryRollbackServerGroupModal, props, modalProps);
+    return ReactModal.show(CloudFoundryRollbackServerGroupModal, props, modalProps, runtimeServices);
   }
 
   constructor(props: ICloudFoundryRollbackServerGroupModalProps) {
@@ -73,7 +80,7 @@ export class CloudFoundryRollbackServerGroupModal extends React.Component<
       taskMonitor: new TaskMonitor({
         application: props.application,
         title: 'Rollback ' + name,
-        modalInstance: TaskMonitor.modalInstanceEmulation(() => this.props.dismissModal()),
+        onDismiss: () => this.props.dismissModal(),
         onTaskComplete: () => this.props.application.serverGroups.refresh(),
       }),
     };
@@ -98,7 +105,7 @@ export class CloudFoundryRollbackServerGroupModal extends React.Component<
     };
 
     this.state.taskMonitor.submit(() => {
-      return ReactInjector.serverGroupWriter.rollbackServerGroup(serverGroup, application, command);
+      return this.context.services.serverGroupWriter.rollbackServerGroup(serverGroup, application, command);
     });
   };
 

package/src/serverGroup/serverGroup.transformer.ts

@@ -3,15 +3,12 @@ import { defaults } from 'lodash';
 import type { ICloudFoundryEnvVar, ICloudFoundryServerGroup } from '../domain';
 
 export class CloudFoundryServerGroupTransformer {
-  public static $inject = ['$q'];
-  public constructor(private $q: ng.IQService) {}
-
   public normalizeServerGroupDetails(serverGroup: ICloudFoundryServerGroup): ICloudFoundryServerGroup {
     return serverGroup;
   }
 
-  public normalizeServerGroup(serverGroup: ICloudFoundryServerGroup): PromiseLike<ICloudFoundryServerGroup> {
-    return this.$q.resolve(serverGroup);
+  public normalizeServerGroup(serverGroup: ICloudFoundryServerGroup): Promise<ICloudFoundryServerGroup> {
+    return Promise.resolve(serverGroup);
   }
 
   public convertServerGroupCommandToDeployConfiguration(base: any): any {