diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx
index 949e76259d6..f18e1df8519 100644
--- a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx
+++ b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/BasicSettings.tsx
@@ -1,16 +1,57 @@
import * as React from 'react';
import { FormikProps } from 'formik';
-import { AccountSelectInput, HelpField, Application } from '@spinnaker/core';
+import { AccountSelectInput, Application, HelpField, IAccount } from '@spinnaker/core';
import { IKubernetesManifestCommandData } from 'kubernetes/v2/manifest/manifestCommandBuilder.service';
export interface IManifestBasicSettingsProps {
+ app: Application;
+ accounts: IAccount[];
+ onAccountSelect: (account: string) => void;
+ selectedAccount: string;
+}
+
+export function ManifestBasicSettings({
+ app,
+ accounts,
+ onAccountSelect,
+ selectedAccount,
+}: IManifestBasicSettingsProps) {
+ return (
+
+
+
+ Account
+
+
+
onAccountSelect(evt.target.value)}
+ readOnly={false}
+ accounts={accounts}
+ provider="kubernetes"
+ />
+
+
+
+
+ Application
+
+
+
+
+
+
+ );
+}
+
+export interface IWizardManifestBasicSettingsProps {
app: Application;
formik: FormikProps;
}
-export class ManifestBasicSettings extends React.Component {
+export class WizardManifestBasicSettings extends React.Component {
private accountUpdated = (account: string): void => {
const { formik } = this.props;
formik.values.command.account = account;
@@ -19,34 +60,13 @@ export class ManifestBasicSettings extends React.Component
-
-
- Account
-
-
-
this.accountUpdated(evt.target.value)}
- readOnly={false}
- accounts={accounts}
- provider="kubernetes"
- />
-
-
-
-
- Application
-
-
-
-
-
-
+
);
}
}
diff --git a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/ManifestWizard.tsx b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/ManifestWizard.tsx
index 22d734436ec..93bbebaf68b 100644
--- a/app/scripts/modules/kubernetes/src/v2/manifest/wizard/ManifestWizard.tsx
+++ b/app/scripts/modules/kubernetes/src/v2/manifest/wizard/ManifestWizard.tsx
@@ -15,7 +15,7 @@ import {
KubernetesManifestCommandBuilder,
IKubernetesManifestCommandData,
} from 'kubernetes/v2/manifest/manifestCommandBuilder.service';
-import { ManifestBasicSettings } from 'kubernetes/v2/manifest/wizard/BasicSettings';
+import { WizardManifestBasicSettings } from 'kubernetes/v2/manifest/wizard/BasicSettings';
import { ManifestEntry } from 'kubernetes/v2/manifest/wizard/ManifestEntry';
export interface IKubernetesManifestModalProps extends IModalComponentProps {
@@ -87,7 +87,9 @@ export class ManifestWizard extends React.Component }
+ render={({ innerRef }) => (
+
+ )}
/>