From 9b8155e70a7581b776f2f576f2be707bca92e087 Mon Sep 17 00:00:00 2001 From: lombardof Date: Sun, 3 Jun 2018 18:04:42 +0200 Subject: [PATCH] Onboarding drag and drop box in VNF packages and NS packages section Change-Id: Ieb93b56b7dbaccad7dc3055d257fc8c0db62b98a Signed-off-by: lombardof --- .../osm/descriptor/descriptor_new.html | 75 +------------------ .../osm/descriptor/descriptorlist.html | 72 ++++++++++++------ .../project/osm/osm_project_descriptors.html | 5 ++ static/src/projecthandler/descriptorslist.js | 72 +++++++++--------- static/src/projecthandler/onboard_package.js | 72 ++++++++++++++++++ 5 files changed, 166 insertions(+), 130 deletions(-) create mode 100644 static/src/projecthandler/onboard_package.js diff --git a/projecthandler/template/project/osm/descriptor/descriptor_new.html b/projecthandler/template/project/osm/descriptor/descriptor_new.html index 762d931..ff93ce0 100644 --- a/projecthandler/template/project/osm/descriptor/descriptor_new.html +++ b/projecthandler/template/project/osm/descriptor/descriptor_new.html @@ -51,85 +51,14 @@ Onboard new {{ descriptor_type }} package + {% endblock %} {% block footer %} diff --git a/projecthandler/template/project/osm/descriptor/descriptorlist.html b/projecthandler/template/project/osm/descriptor/descriptorlist.html index 67f4a75..fee1b86 100644 --- a/projecthandler/template/project/osm/descriptor/descriptorlist.html +++ b/projecthandler/template/project/osm/descriptor/descriptorlist.html @@ -10,12 +10,12 @@ Onboard {{descriptor_type|upper}} + class="fa fa-upload"> Onboard {{ descriptor_type|upper }}
+ role="grid"> @@ -28,26 +28,44 @@ {% for k in descriptors %} - - - - - - - + + + + + + - + + {% endfor %} @@ -55,3 +73,15 @@ + +
+
+
+ +
+ Just drag and drop files here +
+
+
+
+ diff --git a/projecthandler/template/project/osm/osm_project_descriptors.html b/projecthandler/template/project/osm/osm_project_descriptors.html index 81c17a7..1e35c7c 100644 --- a/projecthandler/template/project/osm/osm_project_descriptors.html +++ b/projecthandler/template/project/osm/osm_project_descriptors.html @@ -45,9 +45,14 @@ {% block resource_block %} {{ block.super }} + + {% endblock %} diff --git a/static/src/projecthandler/descriptorslist.js b/static/src/projecthandler/descriptorslist.js index 5a803da..24b7ba5 100644 --- a/static/src/projecthandler/descriptorslist.js +++ b/static/src/projecthandler/descriptorslist.js @@ -1,42 +1,42 @@ - function deletePackage(project_id, descriptor_type, package_id) { - bootbox.confirm("Are you sure want to delete?", function (result) { - if (result) { - location.href = '/projects/' + project_id + '/descriptors/' + descriptor_type + '/' + package_id + '/delete' - } - }) +function deletePackage(project_id, descriptor_type, package_id) { + bootbox.confirm("Are you sure want to delete?", function (result) { + if (result) { + location.href = '/projects/' + project_id + '/descriptors/' + descriptor_type + '/' + package_id + '/delete' } + }) +} - - function openPackageContentList(project_id, type, pkg_id) { - var dialog = bootbox.dialog({ - message: '
Loading...
', - closeButton: true - }); - $.ajax({ - url: '/projects/' + project_id + '/descriptors/' + type + '/' + pkg_id + '/action/get_package_files_list', - type: 'GET', - dataType: "json", - contentType: "application/json;charset=utf-8", - success: function (result) { - //$('#modal_show_vim_body').empty(); - dialog.modal('hide'); - build_file_list("Files in " + pkg_id, result.files); - }, - error: function (result) { - dialog.modal('hide'); - bootbox.alert("An error occurred while retrieving the package content."); - } - }); +function openPackageContentList(project_id, type, pkg_id) { + var dialog = bootbox.dialog({ + message: '
Loading...
', + closeButton: true + }); + $.ajax({ + url: '/projects/' + project_id + '/descriptors/' + type + '/' + pkg_id + '/action/get_package_files_list', + type: 'GET', + dataType: "json", + contentType: "application/json;charset=utf-8", + success: function (result) { + //$('#modal_show_vim_body').empty(); + dialog.modal('hide'); + build_file_list("Files in " + pkg_id, result.files); + }, + error: function (result) { + dialog.modal('hide'); + bootbox.alert("An error occurred while retrieving the package content."); } + }); +} + +function build_file_list(title, list) { + $('#files_list_tbody').find('tr:gt(0)').remove(); + $('#files_list_tbody_title').text(title) + for (var i in list) { + var template = '' + $('#files_list_tbody').append(template) + } + $('#modal_files_list').modal('show'); +} - function build_file_list(title, list) { - $('#files_list_tbody').find('tr:gt(0)').remove(); - $('#files_list_tbody_title').text(title) - for (var i in list) { - var template = '' - $('#files_list_tbody').append(template) - } - $('#modal_files_list').modal('show'); - } \ No newline at end of file diff --git a/static/src/projecthandler/onboard_package.js b/static/src/projecthandler/onboard_package.js new file mode 100644 index 0000000..801acf2 --- /dev/null +++ b/static/src/projecthandler/onboard_package.js @@ -0,0 +1,72 @@ +var dropZone = document.getElementById('drop-zone'); +dropZone.ondrop = function (e) { + e.preventDefault(); + this.className = 'upload-drop-zone'; + create(e.dataTransfer.files, true); +}; + +dropZone.ondragover = function () { + this.className = 'upload-drop-zone drop'; + return false; +}; + +dropZone.ondragleave = function () { + this.className = 'upload-drop-zone'; + return false; +}; + + +function create(fs, dropzone) { + var id = $('.nav-tabs .active').attr('id'); + if (dropzone) id = 'file_li'; + var type, text; + var data = new FormData(); + switch (id) { + + case 'file_li': + type = 'file'; + + var files = dropzone ? fs : document.getElementById('js-upload-files').files; + if (!files || !files.length) { + files = document.getElementById('drop-zone').files; + if (!files || !files.length) { + alert("Select a file"); + return + } + } + console.log(files[0]) + var patt1 = /\.([0-9a-z]+)(?:[\?#]|$)/i; + console.log(files[0].name.match(patt1)); + var extension = files[0].name.substr(files[0].name.lastIndexOf('.') + 1); + console.log(extension); + if (!(extension == 'gz' )) { + alert("The file must be .tar.gz"); + return + } + + data.append('file', files[0]); + break; + } + data.append('csrfmiddlewaretoken', csrf_token); + data.append('type', type); + data.append('text', text); + data.append('id', '{{descriptor_id}}'); + console.log(text); + $.ajax({ + url: "new", + type: 'POST', + data: data, + cache: false, + contentType: false, + processData: false, + success: function (result) { + console.log(result); + + window.location.href = descr_list_url + + }, + error: function (result) { + showAlert(result); + } + }); +} \ No newline at end of file -- 2.17.1
Id
{{ k|get:"_id" }}{{ k|get:"short-name" }} {{ k|get:"description" }} {{ k|get:"vendor" }} {{ k|get:"version" }} -
- {% if descriptor_type == "nsd" %} - - {% endif %} - - - - - -
+
{{ k|get:"_id" }}{{ k|get:"short-name" }} {{ k|get:"description" }} {{ k|get:"vendor" }} {{ k|get:"version" }} +
+ {% if descriptor_type == "nsd" %} + + {% endif %} + + + + + +
-
-' + list[i] + '
-' + list[i] + '