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

Add free and paid online-extensions.js files for custom quota messages #40

Merged

Conversation

damemi
Copy link

@damemi damemi commented Jul 12, 2018

Card: https://trello.com/c/BkleYWax/958-2-pro-provide-custom-messages-for-hitting-quotas

Note that adding these two files will require them to be added to the webconsole configmap under scriptURLs in order to take effect, and only on their specific clusters

Screenshot of paid cluster:
quota-2

See this pr for reference: openshift/origin-web-console#2116
(Available quota messages: https://github.com/openshift/origin-web-console/blob/master/app/scripts/services/quota.js#L115)

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 12, 2018
@damemi damemi requested review from abhgupta and dak1n1 and removed request for dinhxuanvu and sallyom July 12, 2018 17:50
@dak1n1
Copy link
Contributor

dak1n1 commented Jul 12, 2018

I always like to run wording by @wgordon17 . The current wording is: Upgrade to OpenShift Online Pro if you need more resources. ... I'd probably try to find a way to remove "you" from the sentence and say "Add additional memory by upgrading to Pro". Or something... I'm not the best at words. Just my opinion.

Thanks for CCing me on this change. It can probably go out with next week's update.

Copy link
Contributor

@wgordon17 wgordon17 left a comment

Choose a reason for hiding this comment

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

Wow, it's a lot harder to remove the "you" from the Pro plan messaging than I would've thought. I put one suggestion in there without "you", but it sounds kinda weird. I'll let @damemi pick which he likes.

I would also like to see persistentvolumeclaims and requests.storage added as notification messages.


window.OPENSHIFT_CONSTANTS.QUOTA_NOTIFICATION_MESSAGE = {
"limits.memory": "Upgrade to <a href=\""+window.OPENSHIFT_EXTENSION_PROPERTIES.account_url+"/register/plan\">OpenShift Online Pro</a> if you need more resources",
"limits.cpu": "Upgrade to <a href=\""+window.OPENSHIFT_EXTENSION_PROPERTIES.account_url+"/register/plan\">OpenShift Online Pro</a> if you need more resources"
Copy link
Contributor

Choose a reason for hiding this comment

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

Some suggested edits:

Get access to additional resources by upgrading to OpenShift Online Pro.
Access additional resources by upgrade to OpenShift Online Pro.
Upgrade to OpenShift Online Pro for access to additional resources.
OpenShift Online Pro provides additional resources.


window.OPENSHIFT_CONSTANTS.QUOTA_NOTIFICATION_MESSAGE = {
"limits.memory": "You can <a href=\""+window.OPENSHIFT_EXTENSION_PROPERTIES.account_url+"\">upgrade your plan</a> if you need more resources",
"limits.cpu": "You can <a href=\""+window.OPENSHIFT_EXTENSION_PROPERTIES.account_url+"\">upgrade your plan</a> if you need more resources"
Copy link
Contributor

Choose a reason for hiding this comment

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

Some suggested edits:

  • <a>Add additional resources</a> to increase the quota.
  • <a>Manage your subscription</a> to add additional resources.
  • <a>Manage your subscription</a> to increase the quota.

@damemi damemi force-pushed the quota-notification-message branch from 0c39bdb to 0b1fa88 Compare July 12, 2018 19:36
@damemi damemi force-pushed the quota-notification-message branch from 0b1fa88 to 8c1628a Compare July 16, 2018 15:09
@damemi damemi changed the title [WIP] Add free and paid online-extensions.js files for custom quota messages Add free and paid online-extensions.js files for custom quota messages Jul 16, 2018
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 16, 2018
@damemi
Copy link
Author

damemi commented Jul 16, 2018

@sspeiche does this wording/approach look good to you?

@abhgupta
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 17, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abhgupta, damemi

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

@openshift-merge-robot openshift-merge-robot merged commit 5fad57a into openshift:master Jul 17, 2018
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. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants