From 90d2293cfda19cf427baabe76564cbabd2d6d55e Mon Sep 17 00:00:00 2001 From: mutantsan Date: Wed, 3 Jul 2024 14:20:12 +0300 Subject: [PATCH] add display_snippet, add separate progress bar, implement mass upload, update media gallery etc --- .../file_upload_widget/assets/css/styles.css | 169 +----------------- .../assets/js/file-upload-widget.js | 167 ++++++++++++++--- ckanext/file_upload_widget/helpers.py | 8 - .../display_snippets/files_upload_widget.html | 14 ++ .../form_snippets/files_upload_widget.html | 24 +-- ckanext/file_upload_widget/theme/styles.scss | 7 +- 6 files changed, 167 insertions(+), 222 deletions(-) create mode 100644 ckanext/file_upload_widget/templates/scheming/display_snippets/files_upload_widget.html diff --git a/ckanext/file_upload_widget/assets/css/styles.css b/ckanext/file_upload_widget/assets/css/styles.css index 38c508a..a620d8c 100644 --- a/ckanext/file_upload_widget/assets/css/styles.css +++ b/ckanext/file_upload_widget/assets/css/styles.css @@ -1,168 +1 @@ -.file-upload-widget .fuw-main-window { - display: flex; - flex-direction: column; - justify-content: center; - align-items: center; - text-align: center; - width: 100%; -} -.file-upload-widget .fuw-main-window .fuw-or { - margin: 1rem 0; -} -.file-upload-widget .fuw-main-window .fuw-main-window__dropzone { - padding: 2rem; - border-radius: 0.5rem; - border: 2px dashed #ccc; - width: 100%; -} -.file-upload-widget .fuw-main-window .fuw-main-window__dropzone.active { - border-color: black; -} -.file-upload-widget .fuw-main-window .fuw-main-window__alternative label.btn-file-input:after { - display: none; -} -.file-upload-widget .fuw-url-input { - width: 100%; -} -.file-upload-widget .fuw-media-input { - width: 100%; -} -.file-upload-widget .fuw-media-input .search-input { - margin-bottom: 1rem; - position: relative; -} -.file-upload-widget .fuw-media-input .search-input input { - padding-left: 2rem; -} -.file-upload-widget .fuw-media-input .search-input .input-group-btn { - position: absolute; - left: 10px; - top: 10px; -} -.file-upload-widget .fuw-media-input .search-input .input-group-btn i { - color: #6c757d; -} -.file-upload-widget .fuw-media-input .fuw-media-input--files { - display: flex; - flex-direction: column; - padding: 0; - border-radius: 0.5rem; - height: 250px; - overflow-y: scroll; -} -.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item { - display: flex; - padding: 7px 15px; - gap: 1rem; -} -.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item label { - display: flex; - align-items: center; - gap: 0.5rem; - width: 100%; -} -.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item label:after { - display: none; -} -.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item label .highlight { - background-color: yellow; -} -.file-upload-widget .fuw-media-input .fuw-media-input--empty { - align-items: center; - color: #939393; - display: flex; - height: 250px; - flex: 1; - flex-flow: column wrap; - justify-content: center; -} -.file-upload-widget .fuw-selected-files { - position: absolute; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list { - width: 100%; - height: 310px; - overflow-y: scroll; - padding-right: 1rem; - padding-top: 1rem; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper { - display: flex; - align-items: center; - gap: 0.5rem; - border-bottom: 1px solid #eaeaea; - padding: 0.5rem 0; - position: relative; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-preview { - height: 50px; - width: 50px; - position: relative; - background: aliceblue; - box-shadow: 0 1px 2px rgba(119, 119, 119, 0.4588235294); - border-radius: 3px; - display: flex; - flex-direction: column; - justify-content: center; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-preview .file-tile--file-icon { - display: flex; - align-items: center; - justify-content: center; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-info .fuw-selected-files--file-name { - -webkit-font-smoothing: antialiased; - word-wrap: anywhere; - font-size: 1rem; - font-weight: bold; - line-height: 1.3; - word-break: break-all; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-info .fuw-selected-files--file-size { - font-size: 0.8rem; - color: #757575; - font-weight: 400; - line-height: 1; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .file-tile--file-remove, -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .file-tile--file-upload { - cursor: pointer; - position: absolute; - right: 0; - background: black; - color: white; - border: 1px solid black; - border-radius: 50%; - width: 25px; - height: 25px; - display: flex; - align-items: center; - justify-content: center; -} -.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .file-tile--file-upload { - right: 30px; -} -.file-upload-widget .fuw-cancel-btn, -.file-upload-widget .fuw-close-selected-btn { - cursor: pointer; -} -.file-upload-widget .hidden { - display: none !important; -} -.file-upload-widget .modal .modal-header { - gap: 0.5rem; -} -.file-upload-widget .modal .modal-body { - min-height: 145px; - display: flex; - align-items: center; - justify-content: center; - flex-direction: column; -} -.file-upload-widget .modal .modal-inner-footer { - padding: 0.75rem 0 0 0; -} -.file-upload-widget.form-group .btn { - position: static; -} -/*# sourceMappingURL=data:application/json;charset=utf8;base64,{"version":3,"sources":["styles.scss"],"names":[],"mappings":"AAII;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EACI;;AAMA;EACI;;AAMhB;EACI;;AAGJ;EACI;;AAEA;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAMhB;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAIR;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAKJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;AAAA;EAEI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAMhB;AAAA;EAEI;;AAGJ;EACI;;AAIA;EACI;;AAEJ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAIR;EACI","file":"styles.css","sourcesContent":["@import \"variables\";\n@import \"mixins\";\n\n.file-upload-widget {\n    .fuw-main-window {\n        display: flex;\n        flex-direction: column;\n        justify-content: center;\n        align-items: center;\n        text-align: center;\n        width: 100%;\n\n        .fuw-or {\n            margin: 1rem 0;\n        }\n\n        .fuw-main-window__dropzone {\n            padding: 2rem;\n            border-radius: 0.5rem;\n            border: 2px dashed #ccc;\n            width: 100%;\n\n            &.active {\n                border-color: black;\n            }\n        }\n\n        .fuw-main-window__alternative {\n            label.btn-file-input {\n                &:after {\n                    display: none;\n                }\n            }\n        }\n    }\n\n    .fuw-url-input {\n        width: 100%;\n    }\n\n    .fuw-media-input {\n        width: 100%;\n\n        .search-input {\n            margin-bottom: 1rem;\n            position: relative;\n\n            input {\n                padding-left: 2rem;\n            }\n\n            .input-group-btn {\n                position: absolute;\n                left: 10px;\n                top: 10px;\n\n                i {\n                    color: #6c757d;\n                }\n            }\n        }\n\n        .fuw-media-input--files {\n            display: flex;\n            flex-direction: column;\n            padding: 0;\n            border-radius: 0.5rem;\n            height: 250px;\n            overflow-y: scroll;\n\n            .files--file-item {\n                display: flex;\n                padding: 7px 15px;\n                gap: 1rem;\n\n                label {\n                    display: flex;\n                    align-items: center;\n                    gap: 0.5rem;\n                    width: 100%;\n\n                    &:after {\n                        display: none;\n                    }\n\n                    .highlight {\n                        background-color: yellow;\n                    }\n                }\n            }\n        }\n\n        .fuw-media-input--empty {\n            align-items: center;\n            color: #939393;\n            display: flex;\n            height: 250px;\n            flex: 1;\n            flex-flow: column wrap;\n            justify-content: center\n        }\n    }\n\n    .fuw-selected-files {\n        position: absolute;\n\n        ul.fuw-selected-files--list {\n            width: 100%;\n            height: 310px;\n            overflow-y: scroll;\n            padding-right: 1rem;\n            padding-top: 1rem;\n\n            li.fuw-selected-files--file-item-wrapper {\n                display: flex;\n                align-items: center;\n                gap: 0.5rem;\n                border-bottom: 1px solid #eaeaea;\n                padding: 0.5rem 0;\n                position: relative;\n\n                .fuw-selected-files--file-preview {\n                    height: 50px;\n                    width: 50px;\n                    position: relative;\n                    background: aliceblue;\n                    box-shadow: 0 1px 2px #77777775;\n                    border-radius: 3px;\n                    display: flex;\n                    flex-direction: column;\n                    justify-content: center;\n\n                    .file-tile--file-icon {\n                        display: flex;\n                        align-items: center;\n                        justify-content: center;\n                    }\n                }\n\n                .fuw-selected-files--file-info {\n                    .fuw-selected-files--file-name {\n                        -webkit-font-smoothing: antialiased;\n                        word-wrap: anywhere;\n                        font-size: 1rem;\n                        font-weight: bold;\n                        line-height: 1.3;\n                        word-break: break-all;\n                    }\n\n                    .fuw-selected-files--file-size {\n                        font-size: 0.8rem;\n                        color: #757575;\n                        font-weight: 400;\n                        line-height: 1;\n                    }\n                }\n\n                .file-tile--file-remove,\n                .file-tile--file-upload {\n                    cursor: pointer;\n                    position: absolute;\n                    right: 0;\n                    background: black;\n                    color: white;\n                    border: 1px solid black;\n                    border-radius: 50%;\n                    width: 25px;\n                    height: 25px;\n                    display: flex;\n                    align-items: center;\n                    justify-content: center;\n                }\n\n                .file-tile--file-upload {\n                    right: 30px;\n                }\n            }\n        }\n    }\n\n    .fuw-cancel-btn,\n    .fuw-close-selected-btn {\n        cursor: pointer;\n    }\n\n    .hidden {\n        display: none !important;\n    }\n\n    .modal {\n        .modal-header {\n            gap: 0.5rem;\n        }\n        .modal-body {\n            min-height: 145px;\n            display: flex;\n            align-items: center;\n            justify-content: center;\n            flex-direction: column;\n        }\n\n        .modal-inner-footer {\n            padding: 0.75rem 0 0 0;\n        }\n    }\n\n    &.form-group .btn {\n        position: static;\n    }\n}\n"]} */ +.file-upload-widget .fuw-main-window{display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;width:100%}.file-upload-widget .fuw-main-window .fuw-or{margin:1rem 0}.file-upload-widget .fuw-main-window .fuw-main-window__dropzone{padding:2rem;border-radius:.5rem;border:2px dashed #ccc;width:100%}.file-upload-widget .fuw-main-window .fuw-main-window__dropzone.active{border-color:#000}.file-upload-widget .fuw-main-window .fuw-main-window__alternative label.btn-file-input:after{display:none}.file-upload-widget .fuw-url-input{width:100%}.file-upload-widget .fuw-media-input{width:100%}.file-upload-widget .fuw-media-input .search-input{margin-bottom:1rem;position:relative}.file-upload-widget .fuw-media-input .search-input input{padding-left:2rem}.file-upload-widget .fuw-media-input .search-input .input-group-btn{position:absolute;left:10px;top:10px}.file-upload-widget .fuw-media-input .search-input .input-group-btn i{color:#6c757d}.file-upload-widget .fuw-media-input .fuw-media-input--files{display:flex;flex-direction:column;padding:0;border-radius:.5rem;height:250px;overflow-y:scroll}.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item{display:flex;padding:7px 15px;gap:1rem}.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item label{display:flex;align-items:center;gap:.5rem;width:100%}.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item label:after{display:none}.file-upload-widget .fuw-media-input .fuw-media-input--files .files--file-item label .highlight{background-color:#ff0}.file-upload-widget .fuw-media-input .fuw-media-input--empty{align-items:center;color:#939393;display:flex;height:250px;flex:1;flex-flow:column wrap;justify-content:center}.file-upload-widget .fuw-selected-files{position:absolute}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list{width:100%;height:310px;overflow-y:scroll;padding-right:1rem}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper{display:flex;align-items:center;gap:.5rem;border-bottom:1px solid #eaeaea;padding:.5rem 0;position:relative}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-preview{height:50px;width:50px;position:relative;background:#f0f8ff;box-shadow:0 1px 2px rgba(119,119,119,.4588235294);border-radius:3px;display:flex;flex-direction:column;justify-content:center}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-preview .file-tile--file-icon{display:flex;align-items:center;justify-content:center}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-info .fuw-selected-files--file-name{-webkit-font-smoothing:antialiased;word-wrap:anywhere;font-size:1rem;font-weight:bold;line-height:1.3;word-break:break-all}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .fuw-selected-files--file-info .fuw-selected-files--file-size{font-size:.8rem;color:#757575;font-weight:400;line-height:1}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .file-tile--file-remove,.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .file-tile--file-upload{cursor:pointer;position:absolute;right:0;background:#000;color:#fff;border:1px solid #000;border-radius:50%;width:25px;height:25px;display:flex;align-items:center;justify-content:center}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list li.fuw-selected-files--file-item-wrapper .file-tile--file-upload{right:30px}.file-upload-widget .fuw-selected-files ul.fuw-selected-files--list .fuw-selected-files--progress{position:absolute;bottom:0;width:100%}.file-upload-widget .fuw-cancel-btn,.file-upload-widget .fuw-close-selected-btn{cursor:pointer}.file-upload-widget .hidden{display:none !important}.file-upload-widget .modal .modal-header{gap:.5rem}.file-upload-widget .modal .modal-body{min-height:145px;display:flex;align-items:center;justify-content:center;flex-direction:column}.file-upload-widget .modal .modal-inner-footer{padding:.75rem 0 0 0}.file-upload-widget.form-group .btn{position:static} \ No newline at end of file diff --git a/ckanext/file_upload_widget/assets/js/file-upload-widget.js b/ckanext/file_upload_widget/assets/js/file-upload-widget.js index 23b2e0d..b74ba9a 100644 --- a/ckanext/file_upload_widget/assets/js/file-upload-widget.js +++ b/ckanext/file_upload_widget/assets/js/file-upload-widget.js @@ -46,8 +46,11 @@ ckan.module("file-upload-widget", function ($, _) { mediaSelectBtn: '.fuw-media-select-btn', dropZone: '.fuw-main-window__dropzone', selectedFiles: '.fuw-selected-files--list', + mediaFilesContainer: '.fuw-media-input--files', + mediaFilesEmptyContainer: '.fuw-media-input--empty', mediaWindowFooter: '.modal-footer--media', selectedFileItem: 'li.fuw-selected-file', + fileProgressContainer: '.fuw-selected-files--progress', attrFileName: 'fuw-file-name', attrFileId: 'fuw-file-id', @@ -72,6 +75,8 @@ ckan.module("file-upload-widget", function ($, _) { return }; + window.fuwProgressBars = window.fuwProgressBars || {}; + this.fileAdapter = new ckan.CKANEXT_FILES.adapters.Standard(); this.urlAdapter = new ckan.CKANEXT_FILES.adapters.Standard({ "storage": "link" @@ -99,6 +104,8 @@ ckan.module("file-upload-widget", function ($, _) { this.fileInput = this.el.find('input[type="file"]'); this.selectedFilesContainer = this.el.find(this.const.selectedFiles); this.urlImportBtn = this.urlWindow.find(".btn-url-import"); + this.mediaFilesContainer = this.el.find(this.const.mediaFilesContainer); + this.mediaFilesEmptyContainer = this.el.find(this.const.mediaFilesEmptyContainer); this.cancelBtn = this.el.find(this.const.cancelBtn); this.discardBtn = this.el.find(this.const.discardBtn); @@ -126,6 +133,8 @@ ckan.module("file-upload-widget", function ($, _) { this.urlAdapter.addEventListener("progress", this._onUploadProgress); this.fileAdapter.addEventListener("finish", this._onFinishUpload); this.urlAdapter.addEventListener("finish", this._onFinishUpload); + this.fileAdapter.addEventListener("fail", this._onFailUpload); + this.urlAdapter.addEventListener("fail", this._onFailUpload); // Bind events on non existing elements $("body").on("click", ".file-tile--file-remove", this._onRemoveSelectedFile); @@ -133,25 +142,20 @@ ckan.module("file-upload-widget", function ($, _) { // Dropzone events this.dropZoneArea.on("drop", this._onDropFile); - - // Prevent default drag behaviors - ; ["dragenter", "dragover", "dragleave", "drop"].forEach(eventName => { this.dropZoneArea.on(eventName, this._preventDropDefaults) $(document.body).on(eventName, this._preventDropDefaults) }); - - // Highlight drop area when item is dragged over it - ; ["dragenter", "dragover"].forEach(eventName => { this.dropZoneArea.on(eventName, this._highlightDropZone) }); - - // Unhighlight drop area when item is dragged out of it - ; ["dragleave", "drop"].forEach(eventName => { this.dropZoneArea.on(eventName, this._unhighlightDropZone) }) + + // ON INIT + this._recreateSelectedFiles(); + this._updateMediaGallery(); }, /** @@ -259,10 +263,10 @@ ckan.module("file-upload-widget", function ($, _) { if (isEmpty && !visibleFilesNum) { this.el.find(".fuw-media-input--empty").showEl(); - this.el.find(".fuw-media-input--files").hideEl(); + this.mediaFilesContainer.hideEl(); } else { this.el.find(".fuw-media-input--empty").hideEl(); - this.el.find(".fuw-media-input--files").showEl(); + this.mediaFilesContainer.showEl(); } }, @@ -380,7 +384,6 @@ ckan.module("file-upload-widget", function ($, _) { }, _onFileSelected: function (e) { - console.log(e); Array.from(e.target.files).forEach(file => { file.id = generateUUID4(); file.fuw_type = this.const.type.file; @@ -412,7 +415,7 @@ ckan.module("file-upload-widget", function ($, _) { this._disableUrlWindow(); this._disableMediaWindow(); - this._toggleSelectedFilesButton(1); + this._toggleSelectedFilesButton(); this.selectionWindow.showEl(); }, @@ -512,7 +515,7 @@ ckan.module("file-upload-widget", function ($, _) { let selectedFiles = this._calculateSelectedFilesNum() > 0; this._toggleFileSelectionWindow(selectedFiles); - this._toggleSelectedFilesButton(selectedFiles); + this._toggleSelectedFilesButton(); this._updateFileIdsInput(); }, @@ -529,8 +532,11 @@ ckan.module("file-upload-widget", function ($, _) { } }, - _toggleSelectedFilesButton: function (flag) { - this.openSelectedFilesBtn.toggleEl(flag); + _toggleSelectedFilesButton: function (fileNum = null) { + let selectedFiles = fileNum ? fileNum : this._calculateSelectedFilesNum(); + + this.openSelectedFilesBtn.find("span").text(selectedFiles); + this.openSelectedFilesBtn.toggleEl(selectedFiles); }, _onUploadSelectedFile: function (e) { @@ -551,11 +557,12 @@ ckan.module("file-upload-widget", function ($, _) { _uploadFile(fileItem) { let fileType = fileItem.attr(this.const.attrFileType); let fileId = fileItem.attr(this.const.attrFileId); + let fileProgressContainer = fileItem.find(this.const.fileProgressContainer); - this.uploadBar = new ProgressBar.Line('.upload-progress-bar', { + window.fuwProgressBars[fileId] = new ProgressBar.Line(fileProgressContainer.get(0), { easing: 'easeInOut' - }); - this.uploadBar.animate(0); + }) + window.fuwProgressBars[fileId].animate(0); if (fileType === this.const.type.url) { let url = fileItem.attr(this.const.attrFileName); @@ -582,8 +589,6 @@ ckan.module("file-upload-widget", function ($, _) { this.fileAdapter.upload(file, {}) } - - this._updateFileIdsInput(); }, /** @@ -659,6 +664,7 @@ ckan.module("file-upload-widget", function ($, _) { ${!fileUploaded ? '' : ""} +
` }, @@ -672,7 +678,7 @@ ckan.module("file-upload-widget", function ($, _) { this.el.find(this.const.selectedFileItem).remove(); this._onCloseSelectedFiles(); - this._toggleSelectedFilesButton(0); + this._toggleSelectedFilesButton(); }, _onUploadAllSelectedFiles: function (e) { @@ -708,18 +714,28 @@ ckan.module("file-upload-widget", function ($, _) { }, _onUploadProgress: function (e) { - let progress = e.detail.loaded / e.detail.total; + let progressbar = window.fuwProgressBars[e.detail.file.id]; - this.uploadBar.animate(progress); + if (progressbar) { + progressbar.animate(e.detail.loaded / e.detail.total); + } }, _onFinishUpload: function (e) { console.log(e.detail); - this.uploadBar.destroy(); + + let progressBar = window.fuwProgressBars[e.detail.file.id]; + + if (progressBar) { + progressBar.destroy(); + } this._removeUploadButtonForFile(e.detail.file.id); this._replaceWithUploadedFileId(e.detail.file.id, e.detail.result.id); this._updateUploadedFileSize(e.detail.result.id, e.detail.result.size); + + this._updateFileIdsInput(); + this._updateMediaGallery(); }, _removeUploadButtonForFile: function (fileId) { @@ -756,5 +772,106 @@ ckan.module("file-upload-widget", function ($, _) { console.log(fileIds.get().join(",")); this.fileIdsInput.val(fileIds.get().join(",")); }, + + _recreateSelectedFiles: function () { + let fileIdsVal = this.fileIdsInput.val(); + + if (!fileIdsVal) { + return; + } + + let fileIds = this.fileIdsInput.val().split(","); + + fileIds.forEach(fileId => { + this.sandbox.client.call( + "GET", + "files_file_show", + `?id=${fileId}`, + (data) => { + this._addFileItem( + data.result.id, + data.result.name, + data.result.size, + this.const.type.file, + true) + }, (resp) => { + if (resp.responseJSON.error.message === "Not found: file") { + this._removeMissingFile(fileId); + } + // TODO: some toast message? + } + ); + }) + + this._toggleSelectedFilesButton(fileIds.length); + }, + + _onFailUpload: function (e) { + // implement some toast message system + Object.entries(e.detail.reasons).forEach(([key, value]) => { + if (key.startsWith("__")) { + return; + } + console.log(`${key}: ${value}`); + }) + + this.uploadBar.destroy(); + }, + + _removeMissingFile: function (fileId) { + let fileIds = this.fileIdsInput.val().split(","); + + fileIds = fileIds.filter(id => id !== fileId); + + this.fileIdsInput.val(fileIds.join(",")); + + let fileEl = this.el.find(`li[fuw-file-id="${fileId}"]`); + fileEl.remove(); + this._toggleSelectedFilesButton(); + }, + + _updateMediaGallery: function () { + this.sandbox.client.call( + "GET", + "files_file_scan", + "", + (data) => { + let mediaFiles = data.result.results; + + this.mediaFilesContainer.toggleEl(mediaFiles.length); + this.mediaFilesEmptyContainer.toggleEl(mediaFiles.length === 0); + + this.mediaFilesContainer.empty(); + + data.result.results.forEach(file => { + this.mediaFilesContainer.append($(this._mediaFileItemTemplate( + file.id, + file.name, + file.size + ))); + }); + }, (resp) => { + console.error(resp); + // TODO: some toast message? + } + ); + }, + + _mediaFileItemTemplate: function (fileId, fileName, fileSize) { + let fileIconType = "data"; + let mungedFileName = this._truncateFileName(fileName); + let formattedFileSize = this._formatFileSize(fileSize); + + return ` +
  • + + +
    • + ` + }, }; }); diff --git a/ckanext/file_upload_widget/helpers.py b/ckanext/file_upload_widget/helpers.py index 50e8a91..d77e623 100644 --- a/ckanext/file_upload_widget/helpers.py +++ b/ckanext/file_upload_widget/helpers.py @@ -1,14 +1,6 @@ from __future__ import annotations import math -from typing import Any - -import ckan.plugins.toolkit as tk - - -def fuw_get_user_files(user: str) -> list[dict[str, Any]]: - return tk.get_action("files_file_scan")({}, {}).get("results", []) - def fuw_printable_file_size(size_bytes: int) -> str: if size_bytes == 0: diff --git a/ckanext/file_upload_widget/templates/scheming/display_snippets/files_upload_widget.html b/ckanext/file_upload_widget/templates/scheming/display_snippets/files_upload_widget.html new file mode 100644 index 0000000..9ffa08c --- /dev/null +++ b/ckanext/file_upload_widget/templates/scheming/display_snippets/files_upload_widget.html @@ -0,0 +1,14 @@ + +{% if data[field.field_name] %} + +{% endif %} diff --git a/ckanext/file_upload_widget/templates/scheming/form_snippets/files_upload_widget.html b/ckanext/file_upload_widget/templates/scheming/form_snippets/files_upload_widget.html index ee58738..523f576 100644 --- a/ckanext/file_upload_widget/templates/scheming/form_snippets/files_upload_widget.html +++ b/ckanext/file_upload_widget/templates/scheming/form_snippets/files_upload_widget.html @@ -32,7 +32,7 @@
    - +
    @@ -82,24 +82,9 @@
    - {% set user_files = h.fuw_get_user_files(g.userobj.id) %} - - - -
    +
      + +

      {{ _("No files found") }}

      @@ -123,7 +108,6 @@
      -
      diff --git a/ckanext/file_upload_widget/theme/styles.scss b/ckanext/file_upload_widget/theme/styles.scss index 5e98346..6156a45 100644 --- a/ckanext/file_upload_widget/theme/styles.scss +++ b/ckanext/file_upload_widget/theme/styles.scss @@ -109,7 +109,6 @@ height: 310px; overflow-y: scroll; padding-right: 1rem; - padding-top: 1rem; li.fuw-selected-files--file-item-wrapper { display: flex; @@ -175,6 +174,12 @@ right: 30px; } } + + .fuw-selected-files--progress { + position: absolute; + bottom: 0; + width: 100%; + } } }