Skip to content

fix(dashboard): gh #822 Fixed quick launcher configuration #72

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

Open
abujeda wants to merge 1 commit into
base: canary
Choose a base branch
from
Open

fix(dashboard): gh #822 Fixed quick launcher configuration #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions automated-testing/cypress.env.json.prod-cannon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"dashboard_baseUrl": "https://vdi.rc.fas.harvard.edu",
"dashboard_rootPath": "/pun/sys/sid",
"dashboard_fasrc_navigation": ["Clusters", "Files", "Jobs", "Interactive Apps", "My Interactive Sessions"],
"dashboard_fasrc_application": {"token": "Rstudio", "name": "Rstudio Server"},
"dashboard_fasrc_application": {"token": "RStudioServer", "name": "RStudio Server"},
"dashboard_welcome_text": "welcome to social sciences dashboard on the cannon cluster",
"active_launchers": ["cannon-rstudio", "cannon-rdesktop", "cannon-jupyter", "cannon-stata", "cannon-sas", "cannon-matlab"],
"quick_links": ["terminal", "sessions", "fasse"],
"dashboard_applications": [
{"token": "Rstudio", "name": "Rstudio Server"},
{"token": "NativeRD", "name": "FAS-RC Remote Desktop"},
{"token": "RStudioServer", "name": "RStudio Server"},
{"token": "RemoteDesktop", "name": "Remote Desktop"},
{"token": "Jupyter", "name": "Jupyter notebook / Jupyterlab"},
{"token": "Stata", "name": "Stata"},
{"token": "SAS", "name": "SAS"},
Expand Down
6 changes: 3 additions & 3 deletions automated-testing/cypress.env.json.prod-fasse
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"dashboard_baseUrl": "https://fasseood.rc.fas.harvard.edu",
"dashboard_rootPath": "/pun/sys/sid",
"dashboard_fasrc_navigation": ["Clusters", "Files", "Jobs", "Interactive Apps", "My Interactive Sessions"],
"dashboard_fasrc_application": {"token": "Rstudio", "name": "Rstudio Server"},
"dashboard_fasrc_application": {"token": "RStudioServer", "name": "RStudio Server"},
"dashboard_welcome_text": "welcome to social sciences dashboard on the fasse cluster",
"active_launchers": ["fasse-rstudio", "fasse-rdesktop", "fasse-jupyter", "fasse-stata", "fasse-sas"],
"quick_links": ["terminal", "sessions", "cannon"],
"dashboard_applications": [
{"token": "Rstudio", "name": "Rstudio Server"},
{"token": "NativeRD", "name": "FAS-RC Remote Desktop"},
{"token": "RStudioServer", "name": "RStudio Server"},
{"token": "RemoteDesktop", "name": "Remote Desktop"},
{"token": "Jupyter", "name": "Jupyter notebook / Jupyterlab"},
{"token": "Stata", "name": "Stata"},
{"token": "SAS", "name": "SAS"},
Expand Down
8 changes: 4 additions & 4 deletions automated-testing/cypress.env.json.remote-dev
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"dashboard_baseUrl": "https://vdi.rc.fas.harvard.edu",
"dashboard_rootPath": "/pun/dev/dashboard",
"dashboard_fasrc_navigation": ["Clusters", "Files", "Jobs", "Interactive Apps", "My Interactive Sessions"],
"dashboard_fasrc_application": {"token": "Rstudio", "name": "Rstudio Server"},
"dashboard_fasrc_application": {"token": "RStudioServer", "name": "RStudio Server"},
"dashboard_welcome_text": "welcome to social sciences dashboard on the cannon cluster",
"active_launchers": ["cannon-rstudio", "cannon-rdesktop", "cannon-jupyter", "cannon-stata", "cannon-sas", "cannon-matlab"],
"quick_links": ["terminal", "sessions", "fasse"],
"dashboard_applications": [
{"token": "Rstudio", "name": "Rstudio Server"},
{"token": "NativeRD", "name": "FAS-RC Remote Desktop"},
{"token": "RStudioServer", "name": "RStudio Server"},
{"token": "RemoteDesktop", "name": "Remote Desktop"},
{"token": "Jupyter", "name": "Jupyter notebook / Jupyterlab"},
{"token": "Stata", "name": "Stata"},
{"token": "SAS", "name": "SAS"},
{"token": "Matlab", "name": "Matlab"}
],
"support_ticket": {"creationEnabled": true, "queue": "Internal:Logging"}
"support_ticket": {"creationEnabled": false, "queue": "Internal:Logging"}
}
6 changes: 3 additions & 3 deletions automated-testing/cypress.env.json.remote-fasse
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
"dashboard_baseUrl": "https://fasseood.rc.fas.harvard.edu",
"dashboard_rootPath": "/pun/dev/dashboard",
"dashboard_fasrc_navigation": ["Clusters", "Files", "Jobs", "Interactive Apps", "My Interactive Sessions"],
"dashboard_fasrc_application": {"token": "Rstudio", "name": "Rstudio Server"},
"dashboard_fasrc_application": {"token": "RStudioServer", "name": "RStudio Server"},
"dashboard_welcome_text": "welcome to social sciences dashboard on the fasse cluster",
"active_launchers": ["fasse-rstudio", "fasse-rdesktop", "fasse-jupyter", "fasse-stata", "fasse-sas"],
"quick_links": ["terminal", "sessions", "cannon"],
"dashboard_applications": [
{"token": "Rstudio", "name": "Rstudio Server"},
{"token": "NativeRD", "name": "FAS-RC Remote Desktop"},
{"token": "RStudioServer", "name": "RStudio Server"},
{"token": "RemoteDesktop", "name": "Remote Desktop"},
{"token": "Jupyter", "name": "Jupyter notebook / Jupyterlab"},
{"token": "Stata", "name": "Stata"},
{"token": "SAS", "name": "SAS"},
Expand Down
8 changes: 4 additions & 4 deletions automated-testing/cypress/support/base.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ cy.sid = {
{"id": "dev-rstudio", "token": "sys/Rstudio", "name": "Rstudio Server"},
{"id": "dev-rdesktop", "token": "sys/OdysseyRD", "name": "Remote Desktop"},

{"id": "cannon-rstudio", "token": "sys/Rstudio", "name": "Rstudio Server"},
{"id": "cannon-rdesktop", "token": "sys/NativeRD", "name": "FAS-RC Remote Desktop"},
{"id": "cannon-rstudio", "token": "sys/RStudioServer", "name": "RStudio Server"},
{"id": "cannon-rdesktop", "token": "sys/RemoteDesktop", "name": "Remote Desktop"},
{"id": "cannon-jupyter", "token": "sys/Jupyter", "name": "Jupyter notebook / Jupyterlab"},
{"id": "cannon-stata", "token": "sys/Stata", "name": "Stata"},
{"id": "cannon-sas", "token": "sys/SAS", "name": "SAS"},
{"id": "cannon-matlab", "token": "sys/Matlab", "name": "Matlab"},

{"id": "fasse-rstudio", "token": "sys/Rstudio", "name": "Rstudio Server"},
{"id": "fasse-rdesktop", "token": "sys/NativeRD", "name": "FAS-RC Remote Desktop"},
{"id": "fasse-rstudio", "token": "sys/RStudioServer", "name": "RStudio Server"},
{"id": "fasse-rdesktop", "token": "sys/RemoteDesktop", "name": "Remote Desktop"},
{"id": "fasse-jupyter", "token": "sys/Jupyter", "name": "Jupyter notebook / Jupyterlab"},
{"id": "fasse-stata", "token": "sys/Stata", "name": "Stata"},
{"id": "fasse-sas", "token": "sys/SAS", "name": "SAS"}
Expand Down
2 changes: 1 addition & 1 deletion dashboard/application/app/apps/nav_config.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ class << self
self.categories_whitelist = false
self.apps_whitelist = true

App_whitelist_by_category = {"Interactive Apps" => ["arcgis", "jupyter", "matlab", "mathematica", "nativerd", "rstudio", "stata", "sas"]}
App_whitelist_by_category = {"Interactive Apps" => ["arcgis", "jupyter", "matlab", "mathematica", "nativerd", "remotedesktop", "rstudioserver", "stata", "sas"]}

def self.select_interactive_apps(app)
if apps_whitelist && App_whitelist_by_category[app.category]
Expand Down
10 changes: 5 additions & 5 deletions dashboard/application/config/launchers/cannon-jupyter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ cluster: "odyssey3"
form:
token: "sys/Jupyter"
bc_queue: "test"
bc_account: ""
bc_num_slots: "1"
bc_num_hours: "1"
jupyterlab_switch: "1"
custom_memory_per_node: "8"
custom_num_cores: "1"
custom_num_gpus: "0"
custom_time: "08:00:00"
working_folder: ""
envscript: ""
modules: ""
jupyterlab_switch: "1"
custom_reservation: ""
extra_slurm: ""
bc_account: ""
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""

view:
color: "#2D9BF0"
Expand Down
10 changes: 5 additions & 5 deletions dashboard/application/config/launchers/cannon-matlab.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ order: 60
cluster: "odyssey3"
form:
token: "sys/Matlab"
bc_queue: "test"
bc_account: ""
desktop: "xfce"
bc_vnc_resolution: "1024x768"
bc_num_slots: "1"
bc_num_hours: "1"
bc_queue: "test"
custom_memory_per_node: "8"
custom_num_cores: "1"
custom_num_gpus: "0"
custom_time: "08:00:00"
matlab_version: "matlab/R2022a-fasrc01"
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""
bc_vnc_resolution: "1024x768"
matlab_version: "matlab/R2021a-fasrc01"
bc_account: ""

view:
color: "#2D9BF0"
Expand Down
20 changes: 9 additions & 11 deletions dashboard/application/config/launchers/cannon-rdesktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,23 @@
order: 20
cluster: "odyssey3"
form:
token: "sys/NativeRD"
bc_queue: "test"
bc_account: ""
token: "sys/RemoteDesktop"
bc_vnc_idle: "0"
desktop: "myxfce"
bc_vnc_resolution: "1024x768"
bc_num_slots: "1"
bc_num_hours: "1"
node_type: ""
bc_queue: "test"
custom_memory_per_node: "4"
custom_num_cores: "2"
custom_num_gpus: "0"
bc_num_hours: ""
custom_time: "08:00:00"
envscript: ""
custom_desktop: "1"
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""
bc_vnc_resolution: "1024x768"
custom_desktop: "1"
matlab_version: "NULL"
rstudio_version: "rstudio/1.1.453-fasrc01"
r_version: "R/4.1.0-fasrc01"
rlibs: "~/apps/R_4.1.0_fasrc01"
bc_account: ""

view:
color: "#2D9BF0"
Expand Down
14 changes: 5 additions & 9 deletions dashboard/application/config/launchers/cannon-rstudio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@
order: 10
cluster: "odyssey3"
form:
token: "sys/Rstudio"
token: "sys/RStudioServer"
modules: ""
bc_queue: "test"
bc_account: ""
bc_num_slots: "1"
bc_num_hours: "1"
custom_memory_per_node: "4"
custom_num_cores: "2"
custom_num_gpus: "0"
custom_time: "08:00:00"
envscript: ""
custom_email_address: ""
r_version: "/n/singularity_images/informatics/ifxrstudio/ifxrstudio:RELEASE_3_15.sif"
bc_email_on_started: "0"
custom_email_address: ""
custom_reservation: ""
r_version: "R/4.1.0-fasrc01"
rlibs: "~/apps/R_4.1.0_fasrc01"
custom_vanillaconf: "1"
bc_account: ""

view:
color: "#2D9BF0"
Expand Down
9 changes: 4 additions & 5 deletions dashboard/application/config/launchers/cannon-sas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ order: 50
cluster: "odyssey3"
form:
token: "sys/SAS"
bc_queue: "test"
bc_account: ""
desktop: "xfce"
bc_vnc_resolution: "1024x768"
bc_num_slots: "1"
bc_num_hours: "1"
bc_queue: "test"
custom_memory_per_node: "4"
custom_num_cores: "1"
custom_num_gpus: "0"
custom_time: "08:00:00"
envscript: ""
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""
bc_vnc_resolution: "1024x768"
bc_account: ""

view:
color: "#2D9BF0"
Expand Down
11 changes: 5 additions & 6 deletions dashboard/application/config/launchers/cannon-stata.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,19 @@ order: 40
cluster: "odyssey3"
form:
token: "sys/Stata"
bc_queue: "test"
bc_account: ""
desktop: "xfce"
bc_vnc_resolution: "1024x768"
bc_num_slots: "1"
bc_num_hours: "1"
bc_queue: "test"
custom_memory_per_node: "8"
custom_num_cores: "1"
custom_num_gpus: "0"
custom_time: "08:00:00"
envscript: ""
stata_version: "stata/17.0-fasrc01"
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""
bc_vnc_resolution: "1024x768"
stata_version: "stata/16.0-fasrc01"
bc_account: ""

view:
color: "#2D9BF0"
Expand Down
10 changes: 5 additions & 5 deletions dashboard/application/config/launchers/fasse-jupyter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ cluster: "fasse"
form:
token: "sys/Jupyter"
bc_queue: "test"
bc_account: ""
bc_num_slots: "1"
bc_num_hours: "1"
jupyterlab_switch: "1"
custom_memory_per_node: "8"
custom_num_cores: "1"
custom_num_gpus: "0"
custom_time: "08:00:00"
working_folder: ""
envscript: ""
modules: ""
jupyterlab_switch: "1"
custom_reservation: ""
extra_slurm: ""
bc_account: ""
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""

view:
color: "#DA6027"
Expand Down
20 changes: 9 additions & 11 deletions dashboard/application/config/launchers/fasse-rdesktop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,23 @@
order: 20
cluster: "fasse"
form:
token: "sys/NativeRD"
bc_queue: "test"
bc_account: ""
token: "sys/RemoteDesktop"
bc_vnc_idle: "0"
desktop: "myxfce"
bc_vnc_resolution: "1024x768"
bc_num_slots: "1"
bc_num_hours: "1"
node_type: ""
bc_queue: "test"
custom_memory_per_node: "4"
custom_num_cores: "2"
custom_num_gpus: "0"
bc_num_hours: ""
custom_time: "08:00:00"
envscript: ""
custom_desktop: "1"
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""
bc_vnc_resolution: "1024x768"
custom_desktop: "1"
matlab_version: "NULL"
rstudio_version: "NULL"
r_version: "R/3.3.3-fasrc01"
rlibs: ""
bc_account: ""

view:
color: "#DA6027"
Expand Down
14 changes: 5 additions & 9 deletions dashboard/application/config/launchers/fasse-rstudio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,18 @@
order: 10
cluster: "fasse"
form:
token: "sys/Rstudio"
token: "sys/RStudioServer"
modules: ""
bc_queue: "test"
bc_account: ""
bc_num_slots: "1"
bc_num_hours: "1"
custom_memory_per_node: "4"
custom_num_cores: "2"
custom_num_gpus: "0"
custom_time: "08:00:00"
envscript: ""
custom_email_address: ""
r_version: "/n/singularity_images/informatics/ifxrstudio/ifxrstudio:RELEASE_3_15.sif"
bc_email_on_started: "0"
custom_email_address: ""
custom_reservation: ""
r_version: "R/4.1.0-fasrc01"
rlibs: "~/apps/R_4.1.0_fasrc01"
custom_vanillaconf: "1"
bc_account: ""

view:
color: "#DA6027"
Expand Down
9 changes: 4 additions & 5 deletions dashboard/application/config/launchers/fasse-sas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,18 @@ order: 50
cluster: "fasse"
form:
token: "sys/SAS"
bc_queue: "test"
bc_account: ""
desktop: "xfce"
bc_vnc_resolution: "1024x768"
bc_num_slots: "1"
bc_num_hours: "1"
bc_queue: "test"
custom_memory_per_node: "4"
custom_num_cores: "1"
custom_num_gpus: "0"
custom_time: "08:00:00"
envscript: ""
custom_email_address: ""
bc_email_on_started: "0"
custom_reservation: ""
bc_vnc_resolution: "1024x768"
bc_account: ""

view:
color: "#DA6027"
Expand Down
Loading