Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug 1829341: Move cert input field after url input field in ovirt import wizard #5471

Merged
merged 2 commits into from May 18, 2020
Merged

Bug 1829341: Move cert input field after url input field in ovirt import wizard #5471

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc5e102
Move cert input field after url inpur field in ovirt import wizard
yaacov May 17, 2020
0639cc7
reorder ovirt-initial-state cert to under url
yaacov May 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...tend/packages/kubevirt-plugin/src/components/create-vm-wizard/strings/renderable-field.ts
View file
Open in desktop
Expand Up @@ -11,10 +11,10 @@ import { ProvisionSource } from '../../../constants/vm/provision-source';
export const titleResolver: RenderableFieldResolver = {
[OvirtProviderField.OVIRT_ENGINE_SECRET_NAME]: 'RHV Instance',
[OvirtProviderField.API_URL]: 'API URL',
[OvirtProviderField.CERTIFICATE]: 'CA certificate',
[OvirtProviderField.USERNAME]: 'Username',
[OvirtProviderField.PASSWORD]: 'Password',
[OvirtProviderField.REMEMBER_PASSWORD]: 'Save as new RHV Instance secret',
[OvirtProviderField.CERTIFICATE]: 'CA certificate',
[OvirtProviderField.CLUSTER]: 'Cluster',
[OvirtProviderField.VM]: 'VM to Import',
[OvirtProviderField.STATUS]: '',
Expand Down
42 changes: 21 additions & 21 deletions ...izard/tabs/import-providers-tab/providers/ovirt-import-provider/ovirt-import-provider.tsx
View file
Open in desktop
Expand Up @@ -64,6 +64,27 @@ class OvirtImportProviderConnected extends React.Component<OvirtImportProviderPr
<TextInput onChange={this.onChange(OvirtProviderField.API_URL)} />
</FormField>
</FormFieldMemoRow>
<FormFieldMemoRow
key={OvirtProviderField.CERTIFICATE}
field={this.getField(OvirtProviderField.CERTIFICATE)}
fieldType={FormFieldType.TEXT_AREA}
fieldHelp={
<a
href="https://ovirt.github.io/ovirt-engine-api-model/master/#_obtaining_the_ca_certificate"
target="_blank"
rel="noopener noreferrer"
>
Obtaining the CA certificate
</a>
}
>
<FormField>
<TextArea
onChange={this.onChange(OvirtProviderField.CERTIFICATE)}
className="kubevirt-create-vm-modal__ovirt-provider-ca"
/>
</FormField>
</FormFieldMemoRow>
<FormFieldMemoRow
key={OvirtProviderField.USERNAME}
field={this.getField(OvirtProviderField.USERNAME)}
Expand All @@ -87,27 +108,6 @@ class OvirtImportProviderConnected extends React.Component<OvirtImportProviderPr
/>
</FormField>
</FormFieldMemoRow>
<FormFieldMemoRow
key={OvirtProviderField.CERTIFICATE}
field={this.getField(OvirtProviderField.CERTIFICATE)}
fieldType={FormFieldType.TEXT_AREA}
fieldHelp={
<a
href="https://ovirt.github.io/ovirt-engine-api-model/master/#_obtaining_the_ca_certificate"
target="_blank"
rel="noopener noreferrer"
>
Obtaining the CA certificate
</a>
}
>
<FormField>
<TextArea
onChange={this.onChange(OvirtProviderField.CERTIFICATE)}
className="kubevirt-create-vm-modal__ovirt-provider-ca"
/>
</FormField>
</FormFieldMemoRow>
<OvirtProviderClustersVMs key="vms" wizardReduxID={wizardReduxID} />
<VMImportProviderControllerErrors
key="errors"
Expand Down
4 changes: 2 additions & 2 deletions frontend/packages/kubevirt-plugin/src/components/create-vm-wizard/types.ts
View file
Open in desktop
Expand Up @@ -117,10 +117,10 @@ export enum VMWareProviderField {
export enum OvirtProviderField {
OVIRT_ENGINE_SECRET_NAME = 'ovirt_OVIRT_ENGINE_SECRET_NAME',
API_URL = 'ovirt_API_URL',
CERTIFICATE = 'ovirt_CERTIFICATE',
USERNAME = 'ovirt_USERNAME',
PASSWORD = 'ovirt_PASSWORD',
REMEMBER_PASSWORD = 'ovirt_REMEMBER_PASSWORD',
CERTIFICATE = 'ovirt_CERTIFICATE',

VM = 'ovirt_VM',
CLUSTER = 'ovirt_CLUSTER',
Expand Down Expand Up @@ -156,10 +156,10 @@ export type VMWareProviderRenderableField =
export type OvirtProviderRenderableField =
| OvirtProviderField.OVIRT_ENGINE_SECRET_NAME
| OvirtProviderField.API_URL
| OvirtProviderField.CERTIFICATE
| OvirtProviderField.USERNAME
| OvirtProviderField.PASSWORD
| OvirtProviderField.REMEMBER_PASSWORD
| OvirtProviderField.CERTIFICATE
| OvirtProviderField.STATUS
| OvirtProviderField.CLUSTER
| OvirtProviderField.VM;
Expand Down
10 changes: 5 additions & 5 deletions .../packages/kubevirt-plugin/src/components/create-vm-wizard/utils/renderable-field-utils.ts
View file
Open in desktop
Expand Up @@ -16,10 +16,10 @@ const renderableFieldOrder: { [key in RenderableField]: number } = {
[ImportProvidersField.PROVIDER]: 0,
[OvirtProviderField.OVIRT_ENGINE_SECRET_NAME]: 1,
[OvirtProviderField.API_URL]: 2,
[OvirtProviderField.USERNAME]: 3,
[OvirtProviderField.PASSWORD]: 4,
[OvirtProviderField.REMEMBER_PASSWORD]: 5,
[OvirtProviderField.CERTIFICATE]: 6,
[OvirtProviderField.CERTIFICATE]: 3,
[OvirtProviderField.USERNAME]: 4,
[OvirtProviderField.PASSWORD]: 5,
[OvirtProviderField.REMEMBER_PASSWORD]: 6,
[OvirtProviderField.CLUSTER]: 7,
[OvirtProviderField.VM]: 8,
[OvirtProviderField.STATUS]: 9,
Expand Down Expand Up @@ -49,10 +49,10 @@ const idResolver: RenderableFieldResolver = {
[ImportProvidersField.PROVIDER]: 'provider-dropdown',
[OvirtProviderField.OVIRT_ENGINE_SECRET_NAME]: 'ovirt-engine-dropdown',
[OvirtProviderField.API_URL]: 'ovirt-engine-api-url',
[OvirtProviderField.CERTIFICATE]: 'ovirt-engine-certificate',
[OvirtProviderField.USERNAME]: 'ovirt-engine-username',
[OvirtProviderField.PASSWORD]: 'ovirt-engine-password',
[OvirtProviderField.REMEMBER_PASSWORD]: 'ovirt-engine-remember-credentials',
[OvirtProviderField.CERTIFICATE]: 'ovirt-engine-certificate',
[OvirtProviderField.CLUSTER]: 'ovirt-cluster-dropdown',
[OvirtProviderField.VM]: 'ovirt-vm-dropdown',
[OvirtProviderField.STATUS]: 'ovirt-engine-status',
Expand Down