Merge pull request openshift#8771 from glekner/fix-1952732

Bug 1952732: Users did not understand the boot source labels
christianaranda · Apr 29, 2021 · e0c3a2b · e0c3a2b
2 parents 671468e + 2307c0e
commit e0c3a2b
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 16 deletions.
diff --git a/...ages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/customize-source.spec.ts b/...ages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/customize-source.spec.ts
@@ -36,7 +36,7 @@ describe('test vm template source image', () => {
  virtualization.templates.addSource(TEMPLATE_NAME);
  addSource.addBootSource(ProvisionSource.REGISTRY);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Importing');
- virtualization.templates.testSource(TEMPLATE_NAME, 'Available');
+ virtualization.templates.testSource(TEMPLATE_NAME, 'test-provider');
 
  virtualization.templates.customizeSource(TEMPLATE_NAME);
  customizeSource.fillForm({ vmtName });

diff --git a/...packages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/source-image.spec.ts b/...packages/kubevirt-plugin/integration-tests-cypress/tests/vm-template/source-image.spec.ts
@@ -29,7 +29,7 @@ describe('test vm template source image', () => {
  virtualization.templates.addSource(TEMPLATE_NAME);
  addSource.addBootSource(ProvisionSource.REGISTRY);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Importing');
- virtualization.templates.testSource(TEMPLATE_NAME, 'Available');
+ virtualization.templates.testSource(TEMPLATE_NAME, 'test-provider');
  virtualization.templates.deleteSource(TEMPLATE_NAME);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Add source');
  });
@@ -38,7 +38,7 @@ describe('test vm template source image', () => {
  virtualization.templates.addSource(TEMPLATE_NAME);
  addSource.addBootSource(ProvisionSource.URL);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Importing');
- virtualization.templates.testSource(TEMPLATE_NAME, 'Available');
+ virtualization.templates.testSource(TEMPLATE_NAME, 'test-provider');
  virtualization.templates.deleteSource(TEMPLATE_NAME);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Add source');
  });
@@ -51,7 +51,7 @@ describe('test vm template source image', () => {
  pvcNamespace: 'default',
  });
  virtualization.templates.testSource(TEMPLATE_NAME, 'Cloning');
- virtualization.templates.testSource(TEMPLATE_NAME, 'Available');
+ virtualization.templates.testSource(TEMPLATE_NAME, 'test-provider');
  virtualization.templates.deleteSource(TEMPLATE_NAME);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Add source');
  });
@@ -66,7 +66,7 @@ describe('test vm template source image', () => {
  virtualization.templates.addSource(TEMPLATE_NAME);
  addSource.addBootSource(ProvisionSource.UPLOAD);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Uploading');
- virtualization.templates.testSource(TEMPLATE_NAME, 'Available');
+ virtualization.templates.testSource(TEMPLATE_NAME, 'test-provider');
  virtualization.templates.deleteSource(TEMPLATE_NAME);
  virtualization.templates.testSource(TEMPLATE_NAME, 'Add source');
  });

diff --git a/frontend/packages/kubevirt-plugin/integration-tests-cypress/view/add-source.ts b/frontend/packages/kubevirt-plugin/integration-tests-cypress/view/add-source.ts
@@ -35,9 +35,7 @@ export const addSource = {
  .clear()
  .type('5');
  }
- if (provider) {
- cy.get('#form-ds-provider-input').type(provider);
- }
+ cy.get('#form-ds-provider-input').type(provider || 'test-provider');
  if (Cypress.env('STORAGE_CLASS')) {
  cy.byTestID('advanced-section').within(() =>
  cy

diff --git a/frontend/packages/kubevirt-plugin/locales/en/kubevirt-plugin.json b/frontend/packages/kubevirt-plugin/locales/en/kubevirt-plugin.json
@@ -725,7 +725,6 @@
  "{{provider}} boot source": "{{provider}} boot source",
  "Preparing boot source": "Preparing boot source",
  "Boot source required": "Boot source required",
- "Available": "Available",
  "{{provider}} defined": "{{provider}} defined",
  "This operating system boot source was added to the cluster by user on {{date}}": "This operating system boot source was added to the cluster by user on {{date}}",
  "Unknown source": "Unknown source",

diff --git a/frontend/packages/kubevirt-plugin/src/components/create-vm/forms/boot-source-form.tsx b/frontend/packages/kubevirt-plugin/src/components/create-vm/forms/boot-source-form.tsx
@@ -456,11 +456,12 @@ export const BootSourceForm: React.FC<BootSourceFormProps> = ({
  </FormRow>
  )}
  {withUpload && (
- <FormRow fieldId="form-ds-provider" title={t('kubevirt-plugin~Source provider')}>
+ <FormRow fieldId="form-ds-provider" isRequired title={t('kubevirt-plugin~Source provider')}>
  <TextInput
  isDisabled={disabled}
  value={state.provider?.value}
  type="text"
+ isRequired
  onChange={(payload) => dispatch({ type: BOOT_ACTION_TYPE.SET_PROVIDER, payload })}
  aria-label={t('kubevirt-plugin~Source provider')}
  id="form-ds-provider-input"

diff --git a/...ackages/kubevirt-plugin/src/components/modals/add-template-source/add-template-source.tsx b/...ackages/kubevirt-plugin/src/components/modals/add-template-source/add-template-source.tsx
@@ -122,7 +122,7 @@ export const AddTemplateSourceModal: React.FC<ModalComponentProps &
  : null,
  );
  const isSCAvailable = storageClasses?.length > 0;
-
+ const withUpload = true; // to be dynamic in future?
  const { dataSource, file, isValid } = state;
 
  const onSubmit = async () => {
@@ -241,7 +241,7 @@ export const AddTemplateSourceModal: React.FC<ModalComponentProps &
  <BootSourceForm
  state={state}
  dispatch={dispatch}
- withUpload
+ withUpload={withUpload}
  disabled={isCheckingCert}
  storageClasses={storageClasses}
  storageClassesLoaded={scLoaded}
@@ -298,7 +298,9 @@ export const AddTemplateSourceModal: React.FC<ModalComponentProps &
  </Button>
  <Button
  variant="primary"
- isDisabled={!isValid || isSubmitting || !isSCAvailable}
+ isDisabled={
+ !isValid || isSubmitting || !isSCAvailable || (withUpload && !state?.provider)
+ }
  data-test="confirm-action"
  id="confirm-action"
  onClick={onSubmit}

diff --git a/frontend/packages/kubevirt-plugin/src/components/vm-templates/table/VMTemplateTable.tsx b/frontend/packages/kubevirt-plugin/src/components/vm-templates/table/VMTemplateTable.tsx
@@ -42,7 +42,7 @@ const vmTemplateTableHeader = (showNamespace: boolean, t: TFunction) =>
  transforms: [sortable],
  },
  {
- title: t('kubevirt-plugin~Boot source'),
+ title: t('kubevirt-plugin~Source provider'),
  transforms: [
  info({
  tooltip: t(

diff --git a/frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx b/frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx
@@ -344,10 +344,10 @@ export const TemplateSource: React.FC<TemplateSourceProps> = ({
  <SuccessStatus
  popoverTitle={
  provider === BOOT_SOURCE_AVAILABLE
- ? t('kubevirt-plugin~Available')
+ ? t('kubevirt-plugin~Unknown')
  : t('kubevirt-plugin~{{provider}} defined', { provider })
  }
- title={provider === BOOT_SOURCE_AVAILABLE ? t('kubevirt-plugin~Available') : provider}
+ title={provider === BOOT_SOURCE_AVAILABLE ? t('kubevirt-plugin~Unknown') : provider}
  >
  <Stack hasGutter>
  <StackItem className="text-secondary">