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

feat: Add Search Bar to Xterm Output on Job Details Web Page #3507

Merged
merged 1 commit into from
Jun 11, 2023

Conversation

X-Guardian
Copy link
Contributor

@X-Guardian X-Guardian commented Jun 10, 2023

what

Add the xterm-addon-search and xterm-addon-search-bar JavaScript packages to the ProjectJobs web template to add a search bar to the Xterm output on the Job Details page.

The xterm-addon-search-bar JavaScript package is a customised version of xterm-addon-search-bar.

why

Allows searching text within the xterm output, which is not currently available..

tests

image image

references

Dependencies

@X-Guardian X-Guardian requested a review from a team as a code owner June 10, 2023 22:07
@github-actions github-actions bot added the go Pull requests that update Go code label Jun 10, 2023
@X-Guardian X-Guardian changed the title feature: Add Search Bar to Xterm Output on Job Details Web Page feat: Add Search Bar to Xterm Output on Job Details Web Page Jun 10, 2023
@@ -407,6 +407,8 @@ var ProjectJobsTemplate = template.Must(template.New("blank.html.tmpl").Parse(`
<script src="{{ .CleanedBasePath }}/static/js/xterm-4.9.0.js"></script>
<script src="{{ .CleanedBasePath }}/static/js/xterm-addon-attach-0.6.0.js"></script>
<script src="{{ .CleanedBasePath }}/static/js/xterm-addon-fit-0.4.0.js"></script>
<script src="{{ .CleanedBasePath }}/static/js/xterm-addon-search-0.7.0.js"></script>
Copy link
Member

Choose a reason for hiding this comment

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

This seems like an older version

https://www.npmjs.com/package/xterm-addon-search

Can you verify which versions here are the latest?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You need to use the correct versions for the xterm.js release. See https://github.com/xtermjs/xterm.js/releases/tag/4.9.0

Copy link
Member

Choose a reason for hiding this comment

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

Ah so it seems like we need to bump xterm version then. Would it be OK to bump the versions here as part of this PR ?

If not to 5.x xterm, then at least 4.19.0 xterm which would then allow xterm-addon-search@0.9.0

https://github.com/xtermjs/xterm.js/releases/tag/4.19.0

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, I tried that, it caused other issues.

Copy link
Member

Choose a reason for hiding this comment

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

Ok. Thank you for trying. We'll have to upgrade at some point in another pr :(

@nitrocode nitrocode added this to the v0.24.3 milestone Jun 11, 2023
Copy link
Member

@nitrocode nitrocode left a comment

Choose a reason for hiding this comment

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

Thank you!

@nitrocode nitrocode merged commit fa6a77a into runatlantis:main Jun 11, 2023
14 of 15 checks passed
mtavaresmedeiros pushed a commit to mtavaresmedeiros/atlantis that referenced this pull request Jul 3, 2023
ijames-gc pushed a commit to gocardless/atlantis that referenced this pull request Feb 13, 2024
ijames-gc pushed a commit to gocardless/atlantis that referenced this pull request Feb 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
go Pull requests that update Go code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Atlantis GUI Job Details does not allow searching output text
2 participants