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

Jupyter UI that manages Notebook CRs #2357

Merged
merged 4 commits into from
Feb 14, 2019
Merged

Jupyter UI that manages Notebook CRs #2357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e006a7f
Introduce jupyter-web-app's code under /components
kimwnasptd Jan 25, 2019
928c95d
Add jupyter-web-app component in jupyter pkg
kimwnasptd Jan 25, 2019
c5cf523
UI fixes
kimwnasptd Feb 12, 2019
06b0a1b
Add webapp to init scripts
kimwnasptd Feb 13, 2019
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
UI fixes 
Fixes noted from avdaredevil:

* Fix XSS vulnerability
* Use template literals for HTML inside JS

Signed-off-by: Kimonas Sotirchos <kimwnasptd@arrikto.com>
  • Loading branch information
@kimwnasptd
kimwnasptd committed Feb 13, 2019
commit c5cf523cc931d9fe6710a1a852ae9c7f20d25a1b
16 changes: 9 additions & 7 deletions components/jupyter-web-app/default/kubeflow/jupyter/static/js/add_notebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,13 +729,15 @@ function postNotebook(form, data) {
window.location.href = prefix + "/notebooks" +"?namespace=" + ns
}
else {
$("#error-msgs").empty();
var innerHTML = ''
innerHTML = '<div class="alert alert-danger alert-dismissible">';
innerHTML += '<span class="close" '
innerHTML += 'onclick="this.parentElement.style.display=\'none\';">&times;</span>';
innerHTML += '<strong>Error: </strong>' + res.log + ' </div>';
$("#error-msgs").html(innerHTML);
innerHTML = `
<div class="alert alert-danger">
<span class="close" onclick="this.parentElement.style.display='none'">&times;</span>
<strong>Error: </strong><span class='danger-log'></span>
</div>`

const $e = $("#error-msgs").html(innerHTML)
$('.danger-log', $e).text(res.log)

window.scrollTo(0, 0);
}
})
Expand Down
94 changes: 48 additions & 46 deletions components/jupyter-web-app/default/kubeflow/jupyter/static/js/notebooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,33 @@
$(document).ready(function(){
// Update the Notebooks when a Namespace is selected
$("#ns-select").on("change", function() {
var ns = this.value;
updateNotebooksInNamespace(ns);

// Change the function for the CREATE NOTEBOOK button
$("#create-nb-btn").click(_ => createNotebook(ns))
});

// Search Bar
$('#search-nb').bind("enterKey",function(e){
var ns = this.value;
updateNotebooksInNamespace(ns);

// Change the function for the CREATE NOTEBOOK button
$("#create-nb-btn").click(_ => createNotebook(ns))

// In case user sees only default ns and we go to a ns with search bar
// then the change listener won't be triggered
$("#ns-select").val("")

});

$('#search-nb').keyup(function(e){
if(e.keyCode == 13) {
$(this).trigger("enterKey");
}
});

// Get Notebooks for the ServiceAccount's Namespace
var ns = new URL(window.location.href).searchParams.get("namespace")
if (ns) {
Expand All @@ -10,35 +39,34 @@ $(document).ready(function(){

function deleteNotebook(ns, nb) {
$.getJSON(prefix + "/delete-notebook", { namespace:ns, notebook:nb}, function(data, status) {
var innerHTML = $("#error-msgs").html()
var innerHTML = ''
if(data.success == true) {
updateNotebooksInNamespace(ns)
innerHTML = '';
}
else {
innerHTML = '<div class="alert alert-warning">';
innerHTML += '<span class="close" '
innerHTML += 'onclick="this.parentElement.style.display=\'none\';">&times;</span>';
innerHTML += '<strong>Warning! </strong>' + data.log + ' </div>';
innerHTML = `
<div class="alert alert-warning">
<span class="close" onclick="this.parentElement.style.display='none'">&times;</span>
<strong>Warning!</strong><span class='warning-log'></span>
</div>`
}
$("#error-msgs").html(innerHTML);
const $e = $("#error-msgs").html(innerHTML)
$('.warning-log', $e).text(data.log)
});
};

function connectNotebook(ns, nb) {
window.open("/" + ns + "/" + nb, "_blank");
window.open(`/${ns}/${nb}`, "_blank");
};

function createNotebook(ns) {
// Redirect to Add Notebook URL
window.location.href = prefix + "/add-notebook?namespace="+ns
window.location.href = `${prefix}/add-notebook?namespace=${ns}`
};

function updateNotebooksInNamespace(ns) {
// Put the add Notebook button
$('#nb-table-body').html("");
var row = $("<tr>");
// var row = ""

// Get the Notebooks for selected Namespace
$.getJSON(prefix + "/list-notebooks", { namespace:ns }, function(data, status) {
Expand Down Expand Up @@ -101,11 +129,14 @@ function updateNotebooksInNamespace(ns) {
}
}
else{
var innerHTML = ''
innerHTML = '<div class="alert alert-warning alert-dismissible">';
innerHTML += '<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>';
innerHTML += '<strong>Warning! </strong>' + data.log + ' </div>';
$("#error-msgs").html(innerHTML);
innerHTML = `
<div class="alert alert-warning">
<span class="close" onclick="this.parentElement.style.display='none'">&times;</span>
<strong>Warning!</strong><span class='warning-log'></span>
</div>`

const $e = $("#error-msgs").html(innerHTML)
$('.warning-log', $e).text(data.log)
}

// Load the dynamic components of mdl
Expand All @@ -115,35 +146,6 @@ function updateNotebooksInNamespace(ns) {
});
}

// Search Bar
$('#search-nb').bind("enterKey",function(e){
var ns = this.value;
updateNotebooksInNamespace(ns);

// Change the function for the CREATE NOTEBOOK button
$("#create-nb-btn").attr("onclick", "createNotebook('" + ns + "')")

// In case user sees only default ns and we go to a ns with search bar
// then the change listener won't be triggered
$("#ns-select").val("")

});

$('#search-nb').keyup(function(e){
if(e.keyCode == 13) {
$(this).trigger("enterKey");
}
});

function searchOut() {
$("#ns-select").text("")
}

// Update the Notebooks when a Namespace is selected
$("#ns-select").on("change", function() {
var ns = this.value;
updateNotebooksInNamespace(ns);

// Change the function for the CREATE NOTEBOOK button
$("#create-nb-btn").attr("onclick", "createNotebook('" + ns + "')")
});
}
9 changes: 6 additions & 3 deletions components/jupyter-web-app/default/kubeflow/jupyter/templates/notebooks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
{% extends "layout.html" %}
{% block content %}
{% block javascript %}
{{ super() }}
<script src="{{ prefix + url_for('static', filename='js/notebooks.js') }}">
</script>
{% endblock %}

{% block content %}
<!-- Namespaces Control Buttons -->
<table class="ns" align="center">
<tr>
Expand Down Expand Up @@ -71,6 +76,4 @@ <h2 class="mdl-card__title-text mdl-typography--title">Notebooks</h2>
</div>
</div>
</div>

<script src="{{ prefix + url_for('static', filename='js/notebooks.js') }}"></script>
{% endblock content %}
16 changes: 9 additions & 7 deletions components/jupyter-web-app/rok/kubeflow/rokui/static/js/add_notebook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -796,13 +796,15 @@ function postNotebook(form, data) {
window.location.href = prefix + "/notebooks" +"?namespace=" + ns
}
else {
$("#error-msgs").empty();
var innerHTML = ''
innerHTML = '<div class="alert alert-danger alert-dismissible">';
innerHTML += '<span class="close" '
innerHTML += 'onclick="this.parentElement.style.display=\'none\';">&times;</span>';
innerHTML += '<strong>Error: </strong>' + res.log + ' </div>';
$("#error-msgs").html(innerHTML);
innerHTML = `
<div class="alert alert-danger">
<span class="close" onclick="this.parentElement.style.display='none'">&times;</span>
<strong>Error: </strong><span class='danger-log'></span>
</div>`

const $e = $("#error-msgs").html(innerHTML)
$('.danger-log', $e).text(res.log)

window.scrollTo(0, 0);
}
})
Expand Down
38 changes: 20 additions & 18 deletions components/jupyter-web-app/rok/kubeflow/rokui/static/js/notebooks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $(document).ready(function(){
updateNotebooksInNamespace(ns);

// Change the function for the CREATE NOTEBOOK button
$("#create-nb-btn").attr("onclick", "createNotebook('" + ns + "')")
$("#create-nb-btn").click(_ => createNotebook(ns))
});

// Search Bar
Expand All @@ -14,7 +14,7 @@ $(document).ready(function(){
updateNotebooksInNamespace(ns);

// Change the function for the CREATE NOTEBOOK button
$("#create-nb-btn").attr("onclick", "createNotebook('" + ns + "')")
$("#create-nb-btn").click(_ => createNotebook(ns))

// In case user sees only default ns and we go to a ns with search bar
// then the change listener won't be triggered
Expand All @@ -39,35 +39,34 @@ $(document).ready(function(){

function deleteNotebook(ns, nb) {
$.getJSON(prefix + "/delete-notebook", { namespace:ns, notebook:nb}, function(data, status) {
var innerHTML = $("#error-msgs").html()
var innerHTML = ''
if(data.success == true) {
updateNotebooksInNamespace(ns)
innerHTML = '';
}
else {
innerHTML = '<div class="alert alert-warning">';
innerHTML += '<span class="close" '
innerHTML += 'onclick="this.parentElement.style.display=\'none\';">&times;</span>';
innerHTML += '<strong>Warning! </strong>' + data.log + ' </div>';
innerHTML = `
<div class="alert alert-warning">
<span class="close" onclick="this.parentElement.style.display='none'">&times;</span>
<strong>Warning!</strong><span class='warning-log'></span>
</div>`
}
$("#error-msgs").html(innerHTML);
const $e = $("#error-msgs").html(innerHTML)
$('.warning-log', $e).text(data.log)
});
};

function connectNotebook(ns, nb) {
window.open("/" + ns + "/" + nb, "_blank");
window.open(`/${ns}/${nb}`, "_blank");
};

function createNotebook(ns) {
// Redirect to Add Notebook URL
window.location.href = prefix + "/add-notebook?namespace="+ns
window.location.href = `${prefix}/add-notebook?namespace=${ns}`
};

function updateNotebooksInNamespace(ns) {
// Put the add Notebook button
$('#nb-table-body').html("");
var row = $("<tr>");
// var row = ""

// Get the Notebooks for selected Namespace
$.getJSON(prefix + "/list-notebooks", { namespace:ns }, function(data, status) {
Expand Down Expand Up @@ -130,11 +129,14 @@ function updateNotebooksInNamespace(ns) {
}
}
else{
var innerHTML = ''
innerHTML = '<div class="alert alert-warning alert-dismissible">';
innerHTML += '<a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>';
innerHTML += '<strong>Warning! </strong>' + data.log + ' </div>';
$("#error-msgs").html(innerHTML);
innerHTML = `
<div class="alert alert-warning">
<span class="close" onclick="this.parentElement.style.display='none'">&times;</span>
<strong>Warning!</strong><span class='warning-log'></span>
</div>`

const $e = $("#error-msgs").html(innerHTML)
$('.warning-log', $e).text(data.log)
}

// Load the dynamic components of mdl
Expand Down