Bug 1754478: Migrate TemplateSource component #3154

irosenzw · 2019-10-30T14:09:31Z

Migrate TemplateSource component from kubevirt-web-ui-components

Signed-off-by: Ido Rosenzwig irosenzw@redhat.com

openshift-ci-robot · 2019-10-30T14:09:35Z

@irosenzw: This pull request references Bugzilla bug 1754478, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Bug 1754478: Migrate TemplateSource component

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot · 2019-10-30T14:09:45Z

Hi @irosenzw. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

ohadlevy · 2019-10-30T14:15:04Z

should we include any tests ?

frontend/packages/kubevirt-plugin/integration-tests/tests/utils/mocks.ts

frontend/packages/kubevirt-plugin/integration-tests/tests/vm.template.source.scenario.tsx

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

frontend/packages/kubevirt-plugin/src/utils/url.tsx

atiratree · 2019-11-12T15:50:12Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-resource.tsx

-  const isProvisionSource =
-    dataVolumes && !!_.get(getTemplateProvisionSource(template, dataVolumes), 'type');
+  const provisionSource = ProvisionSource.getProvisionSourceDetails(template);
+  const isProvisionSource = dataVolumes && !!provisionSource.type;


you can discard the dataVolumes (loading and all) from the vm template details. They are not needed anymore.

atiratree · 2019-11-12T15:56:34Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-resource.tsx

@@ -125,7 +125,7 @@ export const VMTemplateDetailsList: React.FC<VMTemplateResourceListProps> = ({
        idValue={prefixedID(id, 'provisioning-source')}
        isNotAvail={!isProvisionSource}


this construct will never show a provision source error

in case we care about them, which I think we should

atiratree · 2019-11-12T15:58:14Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+};
+
+export const TemplateSource: React.FC<TemplateSourceProps> = ({ template, detailed = false }) => {
+  const provisionSource = ProvisionSource.getProvisionSourceDetails(template);


this call will return errors without a type

I think we should enhance this call for some kind of NA flag and render Not Available here

atiratree · 2019-11-12T16:02:03Z

frontend/packages/kubevirt-plugin/src/utils/url.tsx

+export const resolveURL = ({ urlObj, maxHostnameParts, maxPathnameParts }) =>
+  `${resolveOrigin(urlObj, maxHostnameParts)}${resolvePathname(urlObj, maxPathnameParts)}`;
+
+export const URLObj: React.FC<URLObjProps> = ({


IMO we shouldn't mix components with utils files

otherwise it would look better to git mv this file instead

atiratree · 2019-11-12T16:05:38Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+  return (
+    <>
+      <Type type={type.getValue()} source={source} error={error} />
+      <Source type={type.getValue()} source={source} />


why not just pass the type reference?

atiratree · 2019-11-18T15:39:30Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+  const { type, source, error } = provisionSource;
+
+  if (!provisionSource || !provisionSource.type) {
+    if (showError) {


still, 'No bootable device found.' error is the same as Not available. I would rather use just the later one to be consistent

Just to be clear, do you want: No bootable device found or Not available error message ?

Not available should be fine

atiratree · 2019-11-18T15:41:46Z

frontend/packages/kubevirt-plugin/integration-tests/tests/utils/templates.ts

@@ -0,0 +1,254 @@
+export const urlTemplate = {


IMO, I would rather split these templates into three files and put them to a separate directory

irosenzw · 2019-11-20T06:55:28Z

/retest

irosenzw · 2019-11-20T11:40:57Z

/retest

atiratree · 2019-11-21T15:13:32Z

frontend/packages/kubevirt-plugin/src/constants/vm/provision-source.ts

@@ -103,9 +103,13 @@ export class ProvisionSource extends ValueEnum<string> {
          return {
            error: `Datavolume ${volumeWrapper.getDataVolumeName()} does not have a supported source (${type}).`,
          };
+        case undefined:


we could have a special check like this here, but it should go right after the volume lookup.

atiratree · 2019-11-21T15:18:00Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+    }
+    return <div>Invalid source</div>;
+  }
+  return <div title={source}>{type.getValue()}</div>;


we should try to be consistent - this should also be a tooltip

atiratree · 2019-11-21T15:19:40Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+    if (!detailed) {
+      return (
+        <Tooltip position="bottom" enableFlip={false} content={<>{error}</>} exitDelay={0}>
+          <div>Invalid source</div>


something like this.. + different ifs above

Suggested change

<div>Invalid source</div>

<div>{error ? 'Invalid Source' : type}</div>

atiratree · 2019-11-21T15:20:45Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+  const sourceElem =
+    type.getValue() === ProvisionSource.URL.getValue() ? <URLObj urlPath={source} short /> : source;
+
+  return <div>{sourceElem}</div>;


again consistency - why div here and not for the error?

also, this component should return null if there is no source or an error

atiratree · 2019-11-21T15:22:16Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+  }
+
+  const sourceElem =
+    type.getValue() === ProvisionSource.URL.getValue() ? <URLObj urlPath={source} short /> : source;


Suggested change

type.getValue() === ProvisionSource.URL.getValue() ? <URLObj urlPath={source} short /> : source;

type.getValue() === ProvisionSource.URL.getValue() ? <URLObj urlPath={source} short /> : (source || error);

atiratree · 2019-11-21T16:42:03Z

frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx

+  }
+
+  const sourceElem =
+    !type || type.getValue() === ProvisionSource.URL.getValue() ? (


Suggested change

!type || type.getValue() === ProvisionSource.URL.getValue() ? (

type && type.getValue() === ProvisionSource.URL.getValue() ? (

it is not an URL by default

…mponents Signed-off-by: Ido Rosenzwig <irosenzw@redhat.com>

atiratree · 2019-11-21T17:07:11Z

/lgtm

openshift-ci-robot · 2019-11-21T17:07:26Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: irosenzw, suomiy

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~frontend/packages/kubevirt-plugin/OWNERS~~ [suomiy]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

atiratree · 2019-11-21T22:11:22Z

/retest

atiratree · 2019-11-22T10:17:29Z

/retest

atiratree · 2019-11-22T10:50:38Z

/retest

jelkosz · 2019-11-22T11:10:53Z

/test e2e-gcp-console

jelkosz · 2019-11-22T12:29:17Z

/retest

openshift-ci-robot · 2019-11-22T15:19:59Z

@irosenzw: All pull requests linked via external trackers have merged. Bugzilla bug 1754478 has been moved to the MODIFIED state.

In response to this:

Bug 1754478: Migrate TemplateSource component

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Oct 30, 2019

openshift-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. component/kubevirt Related to kubevirt-plugin labels Oct 30, 2019

openshift-ci-robot requested review from atiratree and vojtechszocs October 30, 2019 14:10

irosenzw force-pushed the migrate-templateSource branch 2 times, most recently from 970878b to 730ba6b Compare October 31, 2019 15:14

vojtechszocs suggested changes Oct 31, 2019

View reviewed changes

irosenzw force-pushed the migrate-templateSource branch from 730ba6b to b5bddea Compare November 3, 2019 15:55

openshift-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 3, 2019

irosenzw force-pushed the migrate-templateSource branch from b5bddea to 77ec164 Compare November 4, 2019 09:10

openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 4, 2019

irosenzw force-pushed the migrate-templateSource branch 3 times, most recently from feedfb7 to 3fab0e4 Compare November 7, 2019 11:22

atiratree suggested changes Nov 12, 2019

View reviewed changes

irosenzw force-pushed the migrate-templateSource branch from 3fab0e4 to 2a2bf0b Compare November 18, 2019 12:56

atiratree suggested changes Nov 18, 2019

View reviewed changes

irosenzw force-pushed the migrate-templateSource branch 3 times, most recently from ca57cc5 to c720ce0 Compare November 20, 2019 05:59

irosenzw force-pushed the migrate-templateSource branch from c720ce0 to 3ccb439 Compare November 21, 2019 08:22

irosenzw force-pushed the migrate-templateSource branch 3 times, most recently from 7a8e5a6 to ac28bf5 Compare November 21, 2019 15:04

atiratree suggested changes Nov 21, 2019

View reviewed changes

irosenzw force-pushed the migrate-templateSource branch 2 times, most recently from 15884eb to 901328b Compare November 21, 2019 16:40

atiratree reviewed Nov 21, 2019

View reviewed changes

irosenzw force-pushed the migrate-templateSource branch 2 times, most recently from d4b3c86 to 82e6dd9 Compare November 21, 2019 16:59

Bug 1754478: Migrate TemplateSource component from kubevirt-web-ui-co…

cc96dfe

…mponents Signed-off-by: Ido Rosenzwig <irosenzw@redhat.com>

irosenzw force-pushed the migrate-templateSource branch from 82e6dd9 to cc96dfe Compare November 21, 2019 17:04

openshift-ci-robot assigned atiratree Nov 21, 2019

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 21, 2019

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 21, 2019

openshift-merge-robot merged commit ae52137 into openshift:master Nov 22, 2019

spadgett added this to the v4.4 milestone Nov 22, 2019

mareklibra mentioned this pull request Nov 28, 2019

kubevirt: Migrate VMTemplateSource #3444

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1754478: Migrate TemplateSource component #3154

Bug 1754478: Migrate TemplateSource component #3154

irosenzw commented Oct 30, 2019

openshift-ci-robot commented Oct 30, 2019

openshift-ci-robot commented Oct 30, 2019

ohadlevy commented Oct 30, 2019

atiratree Nov 12, 2019

atiratree Nov 12, 2019

atiratree Nov 12, 2019

atiratree Nov 12, 2019

atiratree Nov 12, 2019

atiratree Nov 12, 2019

atiratree Nov 12, 2019

atiratree Nov 12, 2019

atiratree Nov 18, 2019

irosenzw Nov 19, 2019

atiratree Nov 19, 2019

atiratree Nov 18, 2019

irosenzw commented Nov 20, 2019

irosenzw commented Nov 20, 2019

atiratree Nov 21, 2019

atiratree Nov 21, 2019

atiratree Nov 21, 2019

atiratree Nov 21, 2019

atiratree Nov 21, 2019

atiratree Nov 21, 2019

atiratree Nov 21, 2019

atiratree commented Nov 21, 2019

openshift-ci-robot commented Nov 21, 2019

atiratree commented Nov 21, 2019

atiratree commented Nov 22, 2019

atiratree commented Nov 22, 2019

jelkosz commented Nov 22, 2019

jelkosz commented Nov 22, 2019

openshift-ci-robot commented Nov 22, 2019

		@@ -125,7 +125,7 @@ export const VMTemplateDetailsList: React.FC<VMTemplateResourceListProps> = ({
		idValue={prefixedID(id, 'provisioning-source')}
		isNotAvail={!isProvisionSource}

	<div>Invalid source</div>
	<div>{error ? 'Invalid Source' : type}</div>

	type.getValue() === ProvisionSource.URL.getValue() ? <URLObj urlPath={source} short /> : source;
	type.getValue() === ProvisionSource.URL.getValue() ? <URLObj urlPath={source} short /> : (source \|\| error);

	!type \|\| type.getValue() === ProvisionSource.URL.getValue() ? (
	type && type.getValue() === ProvisionSource.URL.getValue() ? (

Bug 1754478: Migrate TemplateSource component #3154

Bug 1754478: Migrate TemplateSource component #3154

Conversation

irosenzw commented Oct 30, 2019

openshift-ci-robot commented Oct 30, 2019

openshift-ci-robot commented Oct 30, 2019

ohadlevy commented Oct 30, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

irosenzw commented Nov 20, 2019

irosenzw commented Nov 20, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

atiratree commented Nov 21, 2019

openshift-ci-robot commented Nov 21, 2019

atiratree commented Nov 21, 2019

atiratree commented Nov 22, 2019

atiratree commented Nov 22, 2019

jelkosz commented Nov 22, 2019

jelkosz commented Nov 22, 2019

openshift-ci-robot commented Nov 22, 2019