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

[RFC][Testing] Attempt to add "vscode" as a Session Container Type in VSCode #48

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,7 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*

.vscode
.gradle
bin
3 changes: 2 additions & 1 deletion public/dev/js/science_portal_session.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@
"desktop" : 2,
"carta" : 3,
"contributed" : 4,
"headless" : 5
"headless" : 5,
"vscode-server" : 6,
}

function sortSessions(sList) {
Expand Down
6 changes: 6 additions & 0 deletions public/dev/json/sessiontype_map_en.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@
"form_fields": ["name", "type", "image", "memory", "cores"],
"portal_icon": "fas_cube.png",
"portal_text": "contributed"
},
{
"name": "vscode-server",
Copy link
Author

Choose a reason for hiding this comment

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

Should probably be "vscode" to be in line with the server side name

"form_fields": ["name", "type", "image", "memory", "cores"],
"portal_icon": "vscode_logo.png",
"portal_text": "VSCode"
}
],
"default" : "notebook"
Expand Down
14 changes: 14 additions & 0 deletions public/test_config/sp_test_config.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,20 @@ const SESSION_DISPLAY_DATA = [
"deleteHandler": handleDeleteSession,
"connectHandler": handleConnectRequest,
"startTime" : '2022-11-22T20:49:56Z'
},
{
"name": "TEST vscode",
"id": "abcd1234",
"image": "images-rc.canfar.net/skaha/vscode-server:3.0",
"status": "Running",
"type": "headless",
"RAM": "2G",
"cores": "2 cores",
"logo": "https://www.canfar.net/science-portal/images/vscode-server.png",
"altText": "carta",
"deleteHandler": handleDeleteSession,
"connectHandler": handleConnectRequest,
"startTime" : '2022-11-22T20:49:56Z'
}
]

Expand Down
Binary file added src/main/webapp/images/vscode_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.