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

Less Terminal #2070

Merged
merged 61 commits into from
Apr 24, 2020
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
571b0ba
experimental log tailer
Jan 29, 2020
0bb3879
terrible hardcoded less tailer working
Jan 30, 2020
fa83328
less terrible hardcoded less tailer in file browser ui
Jan 30, 2020
42efdf4
show and tell
Jan 31, 2020
34eeb8a
back to wss
Jan 31, 2020
8287885
wss support
Feb 3, 2020
1a3d859
put less file browser behind config
Feb 5, 2020
3d641bb
disable shellsocket by default
Feb 5, 2020
68f29fe
science
Feb 7, 2020
0c4fd59
change config flag name to port
Feb 7, 2020
115a958
revert compose-dev.yml
Feb 7, 2020
b419bce
can't less directories
Feb 7, 2020
29d757c
workaround webpack build errors related to xterm attach addon
Feb 7, 2020
62b2c00
actually wire up less terminal UI config flag
Feb 10, 2020
d366b2b
focus less terminal upon opening
Feb 10, 2020
06ad943
xterm fit addon
Feb 20, 2020
e2f1277
minimal linkable less log tailer
Feb 20, 2020
1aa1e35
new version of xterm-addon-attach doesn't cause build errors
Feb 20, 2020
d7ba66f
figuring out how to reconcile existing tailer with terminal
Feb 20, 2020
9ac8001
checkpoint
Feb 21, 2020
b04c1a6
give less terminal its own route
Feb 21, 2020
e0119b2
separate less route, with fallback redirects
Feb 21, 2020
86bcddd
one new working class - inline links remain
Feb 22, 2020
bc65a95
contextmenu experiments
Feb 23, 2020
11b6d6a
terminal line links - fallback to clipboard
Feb 23, 2020
390d49b
cleaning up some console.logs
Feb 24, 2020
4762177
experiement with webgl / hidden less commands
Feb 25, 2020
4a05260
command chaining
Feb 25, 2020
ae53504
make current tailer default, allow switching between all 3
Feb 26, 2020
e59776f
handle large files by disabling line counting for large files
Feb 27, 2020
b9d8d53
prompt link
Feb 27, 2020
9d8d73e
prompt should print end, in case of smaller files
Feb 27, 2020
94f8bfa
cleanup some experimental code
Feb 27, 2020
891fb77
turn off automatic line numbering
Feb 28, 2020
5ce4765
enable http(s) link detection
Feb 28, 2020
23180b8
off by one
Feb 28, 2020
bf3f211
don't automatically enable line numbers
Mar 5, 2020
d110bf4
fix less terminal line number regex
Mar 9, 2020
a34e9a0
save last used tailer to localStorage
Mar 9, 2020
e836685
use Utils.tailerPath for task file browser links
Mar 9, 2020
2b2877f
fix preferred log tailer bugs
Mar 9, 2020
f79bb37
redirect to task detail page on less terminal close
Mar 9, 2020
34bbb7c
fix switch to old tailer from less tailer
Mar 9, 2020
f359240
improve redirect on less terminal close
Mar 11, 2020
c1019f8
support custom less tailer path
Mar 23, 2020
3c85c25
stub horizontal scroll
Mar 23, 2020
4f3d8c0
less tailer: match current tailer font size
Mar 23, 2020
df5d5cb
less help
Mar 24, 2020
5e67c47
bump xterm-webgl version
Mar 24, 2020
3bfe9e5
pin non-broken version of xterm-addon-webgl
Mar 24, 2020
97860bb
fix less help commands
Mar 24, 2020
02b56dc
support horizontal scroll of terminal
Mar 25, 2020
91b9a88
fix offset links
Mar 26, 2020
26ec67f
use tailerPath in task history log links
Mar 27, 2020
cc48773
less tail by default, allow cancel on mobile
Apr 2, 2020
835005b
cancel initial tail on click
Apr 2, 2020
036db3a
less terminal redirect to finished log if doesn't exist at startup
Apr 7, 2020
4e2272a
handle log file rename while tailing, kinda
Apr 8, 2020
f59d79e
less: ctrl-c to copy/paste on normal computers
Apr 8, 2020
5940d7e
fix incorrect redirect from very short service logs
Apr 14, 2020
717a0a4
bump xterm webgl version
Apr 14, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
actually wire up less terminal UI config flag
  • Loading branch information
William Hou committed Feb 27, 2020
commit 62b2c0001abba19b62c424aa00aac30eb394af2b
Original file line number Diff line number Diff line change
@@ -115,6 +115,9 @@ public static RootUrlMode parse(String value) {
@JsonProperty
private Map<String, String> navTitleLinks = Collections.emptyMap();

@JsonProperty
private Integer lessTerminalPort = 0;

public boolean isHideNewDeployButton() {
return hideNewDeployButton;
}
@@ -306,4 +309,12 @@ public Map<String, String> getNavTitleLinks() {
public void setNavTitleLinks(Map<String, String> navTitleLinks) {
this.navTitleLinks = navTitleLinks;
}

public Integer getLessTerminalPort() {
return lessTerminalPort;
}

public void setLessTerminalPort(Integer lessTerminalPort) {
this.lessTerminalPort = lessTerminalPort;
}
}
Original file line number Diff line number Diff line change
@@ -71,6 +71,7 @@ public class IndexView extends View {
private final String authTokenKey;
private final String quickLinks;
private final String navTitleLinks;
private final Integer lessTerminalPort;

private final String appJsPath;
private final String appCssPath;
@@ -155,6 +156,8 @@ public IndexView(String singularityUriBase, String appRoot, IndexViewConfigurati
throw new RuntimeException(e);
}

this.lessTerminalPort = uiConfiguration.getLessTerminalPort();

try {
Map<String, String> revManifest = mapper.readValue(
Resources.getResource("assets/static/rev-manifest.json"),
@@ -312,6 +315,10 @@ public String getNavTitleLinks() {
return navTitleLinks;
}

public Integer getLessTerminalPort() {
return lessTerminalPort;
}

public String getAppJsPath() {
return appJsPath;
}
@@ -363,6 +370,7 @@ public String toString() {
", authTokenKey='" + authTokenKey + '\'' +
", quickLinks='" + quickLinks + '\'' +
", navTitleLinks='" + navTitleLinks + '\'' +
", lessTerminalPort='" + lessTerminalPort + '\'' +
", appJsPath='" + appJsPath + '\'' +
", appCssPath='" + appCssPath + '\'' +
", vendorJsPath='" + vendorJsPath + '\'' +