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

[ODC-5071]: Update web terminal to explain the reason why the workspace was stopped #7199

Merged
merged 5 commits into from Nov 26, 2020
Merged

[ODC-5071]: Update web terminal to explain the reason why the workspace was stopped #7199

merged 5 commits into from Nov 26, 2020

Conversation

JPinkney
Copy link
Contributor

@JPinkney JPinkney commented Nov 12, 2020 •
edited

This PR updates the web terminal to look into the custom resource annotation controller.devfile.io/stopped-by to determine why the workspace has stopped. Additionally, when that error is thrown it shows a button that allows you to restart your web terminal.

If WTO 1.1 is installed it just defaults to the old error "The terminal connection has closed" since the controller.devfile.io/stopped-by annotation does not exist in the CR.

Before: https://www.youtube.com/watch?v=2S4inkX5sKc
After: https://www.youtube.com/watch?v=YUld4YKFeoU

Signed-off-by: Josh Pinkney joshpinkney@gmail.com

@openshift-ci-robot openshift-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Nov 12, 2020
@openshift-ci-robot
Copy link
Contributor

Hi @JPinkney. 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.

@serenamarie125
Copy link
Contributor

Nice usability enhancement for the Web Terminal. Can we get this reviewed and merged for 4.7 @christianvogt ?

@serenamarie125
Copy link
Contributor

FYI, In order for this to be exposed in the Dev Console, WTO 1.2 is needed ( currently planned for a couple weeks after 4.7 GA )

@sleshchenko
Copy link
Contributor

In order for this to be exposed in the Dev Console, WTO 1.2 is needed ( currently planned for a couple weeks after 4.7 GA )

@JPinkney Could you describe the expected behavior with these changes and WTO 1.1? Thx

@JPinkney
Copy link
Contributor Author

If WTO 1.1 is installed it just defaults to the old error "The terminal connection has closed" since the controller.devfile.io/stopped-by annotation does not exist in the CR

@sleshchenko sleshchenko mentioned this pull request Nov 19, 2020
Closed
14 tasks
@sleshchenko
Copy link
Contributor

Tested on crc with custom-built images and works as expected and demoed in the video.

One minor comment that is not really related to the purpose of this PR.
When list devworkspaces or exec/init fails OpenShift Console still shows try again link that just refresh the browser page. Maybe it makes sense to rework it with the new Restart terminal button that would just retry init terminal widget?

Screenshot_20201119_164647

It may be better to limit the scope of this PR and do not add the proposed changes even if they make sense.

@JPinkney
Copy link
Contributor Author

When list devworkspaces or exec/init fails OpenShift Console still shows try again link that just refresh the browser page. Maybe it makes sense to rework it with the new Restart terminal button that would just retry init terminal widget?

Yeah, I think we can go that as an improvement in the future just so we can have this code reviewed and merged asap

@christianvogt
Copy link
Contributor

/ok-to-test

@openshift-ci-robot openshift-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 23, 2020
@christianvogt
Copy link
Contributor

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot 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 Nov 23, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Nov 23, 2020
@JPinkney
Update web terminal to explain the reason why the workspace was stopped
1deae34 
Signed-off-by: Josh Pinkney <joshpinkney@gmail.com>
@JPinkney
Allow restart to work if user runs exit in terminal
9cbc2aa 
Signed-off-by: Josh Pinkney <joshpinkney@gmail.com>
@JPinkney
Differ the terminal restart button depending on the current state
3378a1c 
Signed-off-by: Josh Pinkney <joshpinkney@gmail.com>
@JPinkney
Move some CloudShellTerminal css to CloudShellExec css
99c8240 
Signed-off-by: Josh Pinkney <joshpinkney@gmail.com>
@JPinkney
Copy link
Contributor Author

@christianvogt I'm a bit confused, the tests are failing with what looks like \ No newline at end of file but I've tried both with and without a newline and the tests still fail. Is it possible that i18n files are not up to date. Commit them to fix. is causing the error?

@christianvogt
Copy link
Contributor

Did you run the i18n yarn script? or manually update the file? Try to run it again and commit any change.

@JPinkney
Ran i18n on cloudshell.json
efb4d84 
Signed-off-by: Josh Pinkney <joshpinkney@gmail.com>
@JPinkney
Copy link
Contributor Author

Ah I didn't know I had to run yarn i18n that was the issue! thanks!

@christianvogt
Copy link
Contributor

/lgtm
/retest

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 24, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: christianvogt, JPinkney, sleshchenko

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-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

16 similar comments
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit baf0fcc into openshift:master Nov 26, 2020
@JPinkney JPinkney deleted the cloud-shell-stopped-by branch November 26, 2020 22:03
@jerolimov jerolimov mentioned this pull request Nov 27, 2020
Merged
4 tasks
@spadgett spadgett added this to the v4.7 milestone Nov 30, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@christianvogt christianvogt christianvogt left review comments

@sleshchenko sleshchenko sleshchenko approved these changes

@jeff-phillips-18 jeff-phillips-18 Awaiting requested review from jeff-phillips-18

@zherman0 zherman0 Awaiting requested review from zherman0

Assignees

@christianvogt christianvogt

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. component/core Related to console core functionality lgtm Indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
v4.7
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@JPinkney @openshift-ci-robot @serenamarie125 @sleshchenko @christianvogt @openshift-bot @spadgett @openshift-merge-robot