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.

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

OCPBUGS-47722: always show associated plugin name on CSV details page #14656

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

yapei
Copy link
Contributor

@yapei yapei commented Jan 3, 2025

  • Since we are showing Console plugin section only when csvPlugins.length > 0 and we are aiming to always present console plugin name on CSV details page, so removed csvPluginsCount from ConsolePlugins
              {csvPlugins.length > 0 && subscription && (
                <ConsolePlugins
                  csvPlugins={csvPlugins}
                  trusted={isCatalogSourceTrusted(subscription?.spec?.source)}
                />
              )}
  • Since we are trying to always show console plugin name in Console Plugin Modal, so also removed csvPluginsCount from ConsolePluginModal

  • Always show plugin name on CSV details page regardless of plugin count
    Screenshot 2025-01-03 at 4 14 28 PM
    Screenshot 2025-01-03 at 4 15 08 PM

  • Always show plugin name in plugin modal regardless of plugin count
    Screenshot 2025-01-03 at 4 27 56 PM
    Screenshot 2025-01-03 at 4 29 08 PM

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Jan 3, 2025
@openshift-ci-robot
Copy link
Contributor

@yapei: This pull request references Jira Issue OCPBUGS-47222, which is invalid:

  • expected the vulnerability to target either version "4.19." or "openshift-4.19.", but it targets "4.15.z" instead

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

  • Since we are showing Console plugin section only when csvPlugins.length > 0 and we are aiming to always present console plugin name on CSV details page, so removed csvPluginsCount from ConsolePlugins
             {csvPlugins.length > 0 && subscription && (
               <ConsolePlugins
                 csvPlugins={csvPlugins}
                 trusted={isCatalogSourceTrusted(subscription?.spec?.source)}
               />
             )}
  • Since we are trying to always show console plugin name in Console Plugin Modal, so also removed csvPluginsCount from ConsolePluginModal

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from spadgett and TheRealJon January 3, 2025 08:22
@openshift-ci openshift-ci bot added component/olm Related to OLM component/shared Related to console-shared kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated labels Jan 3, 2025
Copy link
Member

@rhamilto rhamilto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/approve
/lgtm

Thanks, @yapei! Nice work.

@openshift-ci openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 10, 2025
@rhamilto
Copy link
Member

/retest

1 similar comment
@rhamilto
Copy link
Member

/retest

@yapei
Copy link
Contributor Author

yapei commented Jan 20, 2025

/retest-required

1 similar comment
@yapei
Copy link
Contributor Author

yapei commented Jan 20, 2025

/retest-required

@yapei yapei changed the title OCPBUGS-47222: always show associated plugin name on CSV details page OCPBUGS-47722: always show associated plugin name on CSV details page Jan 20, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. labels Jan 20, 2025
@openshift-ci-robot
Copy link
Contributor

@yapei: This pull request references Jira Issue OCPBUGS-47722, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @yapei

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

  • Since we are showing Console plugin section only when csvPlugins.length > 0 and we are aiming to always present console plugin name on CSV details page, so removed csvPluginsCount from ConsolePlugins
             {csvPlugins.length > 0 && subscription && (
               <ConsolePlugins
                 csvPlugins={csvPlugins}
                 trusted={isCatalogSourceTrusted(subscription?.spec?.source)}
               />
             )}
  • Since we are trying to always show console plugin name in Console Plugin Modal, so also removed csvPluginsCount from ConsolePluginModal

  • Always show plugin name on CSV details page regardless of plugin count
    Screenshot 2025-01-03 at 4 14 28 PM
    Screenshot 2025-01-03 at 4 15 08 PM

  • Always show plugin name in plugin modal regardless of plugin count
    Screenshot 2025-01-03 at 4 27 56 PM
    Screenshot 2025-01-03 at 4 29 08 PM

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot removed the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Jan 20, 2025
Copy link
Contributor

openshift-ci bot commented Jan 20, 2025

@openshift-ci-robot: GitHub didn't allow me to request PR reviews from the following users: yapei.

Note that only openshift members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

@yapei: This pull request references Jira Issue OCPBUGS-47722, which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.19.0) matches configured target version for branch (4.19.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @yapei

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

  • Since we are showing Console plugin section only when csvPlugins.length > 0 and we are aiming to always present console plugin name on CSV details page, so removed csvPluginsCount from ConsolePlugins
             {csvPlugins.length > 0 && subscription && (
               <ConsolePlugins
                 csvPlugins={csvPlugins}
                 trusted={isCatalogSourceTrusted(subscription?.spec?.source)}
               />
             )}
  • Since we are trying to always show console plugin name in Console Plugin Modal, so also removed csvPluginsCount from ConsolePluginModal

  • Always show plugin name on CSV details page regardless of plugin count
    Screenshot 2025-01-03 at 4 14 28 PM
    Screenshot 2025-01-03 at 4 15 08 PM

  • Always show plugin name in plugin modal regardless of plugin count
    Screenshot 2025-01-03 at 4 27 56 PM
    Screenshot 2025-01-03 at 4 29 08 PM

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 openshift-eng/jira-lifecycle-plugin repository.

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-sigs/prow repository.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 20, 2025
@yapei
Copy link
Contributor Author

yapei commented Jan 20, 2025

/retest-required


return (
<>
{consoleOperatorConfig && canPatchConsoleOperatorConfig && (
<dl className="co-clusterserviceversion-details__field">
<dt>{t('olm~Console plugin', { count: csvPluginsCount })}</dt>
<dt>{t('olm~Console plugin')}</dt>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We still want the pluralization if there are more than one?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, you are right
updated~

@yapei
Copy link
Contributor Author

yapei commented Jan 21, 2025

/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 21, 2025
@yapei
Copy link
Contributor Author

yapei commented Jan 24, 2025

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 24, 2025
@yapei
Copy link
Contributor Author

yapei commented Jan 24, 2025

show plugin name when there is only one associated plugin
Screenshot 2025-01-24 at 3 23 08 PM

@yapei
Copy link
Contributor Author

yapei commented Jan 24, 2025

/test e2e-gcp-console

@yapei
Copy link
Contributor Author

yapei commented Jan 24, 2025

@rhamilto May I have another review?

</ModalTitle>
<ModalBody>
<p>
{csvPluginsCount
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want to keep the ternary here so the verbiage is more precise since the modal can be launched from either the CSV details page or the Dynamic Plugins list page.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

got it!

@yapei
Copy link
Contributor Author

yapei commented Jan 26, 2025

Single plugin
Screenshot 2025-01-26 at 1 39 14 PM

More plugins
Screenshot 2025-01-26 at 1 41 26 PM

@yapei
Copy link
Contributor Author

yapei commented Jan 27, 2025

/test e2e-gcp-console

Copy link
Contributor

openshift-ci bot commented Jan 27, 2025

@yapei: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 51842e2 link false /test okd-scos-e2e-aws-ovn
ci/prow/e2e-gcp-console 51842e2 link true /test e2e-gcp-console

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

@rhamilto
Copy link
Member

/lgtm

/hold for #14621

@openshift-ci openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. labels Jan 27, 2025
Copy link
Contributor

openshift-ci bot commented Jan 27, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, yapei

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:

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/olm Related to OLM component/shared Related to console-shared do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. kind/i18n Indicates issue or PR relates to internationalization or has content that needs to be translated lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants