diff --git a/modules/admin/app/assets/css/datasets.scss b/modules/admin/app/assets/css/datasets.scss index 78e6185b5..0b9486a99 100644 --- a/modules/admin/app/assets/css/datasets.scss +++ b/modules/admin/app/assets/css/datasets.scss @@ -1025,11 +1025,12 @@ $active-table-row: #e7f1ff; } .ingest-options-properties-container { - height: 6rem; + height: 8rem; display: flex; flex-direction: column; overflow-y: auto; width: 100%; + font-size: $font-size-sm; background-color: $gray-100; .panel-placeholder { @@ -1051,6 +1052,12 @@ $active-table-row: #e7f1ff; cursor: pointer; } +.ingest-options-properties th { + position: sticky; + top: 0; + background-color: $gray-200; +} + .ingest-options-properties tr { cursor: pointer; &.active { diff --git a/modules/admin/app/assets/js/datasets/components/_modal-ingest-config.vue b/modules/admin/app/assets/js/datasets/components/_modal-ingest-config.vue index 275c9fe56..d826c8661 100644 --- a/modules/admin/app/assets/js/datasets/components/_modal-ingest-config.vue +++ b/modules/admin/app/assets/js/datasets/components/_modal-ingest-config.vue @@ -6,6 +6,8 @@ import {DatasetManagerApi} from "../api"; import _pick from 'lodash/pick'; import _size from 'lodash/size'; +import {timeToRelative} from "../common"; +import _forIn from "lodash/forIn"; export default { @@ -48,44 +50,58 @@ export default { .then(data => this.$emit("saved-config", data, this.commit)) .catch(error => this.$emit("error", "Error saving import config", error)); }, - uploadProperties: function (event: Event | DragEvent) { - this.loading = true; - let fileList = event.dataTransfer - ? event.dataTransfer.files - : event.target.files; - - if (fileList.length > 0) { - let file = fileList[0]; + uploadProperties: async function (event: Event | DragEvent) { + let fileList = event.dataTransfer ? event.dataTransfer.files : event.target.files; + if (fileList.length == 0) { + return; + } + let file = fileList[0]; - // NB: the fileStage arg here is 'config', since we are uploading a config file, rather then - // the stage of the ingest manager ('output'). - this.api.uploadHandle(this.datasetId, this.config.config, _pick(file, ['name', 'type', 'size'])) - .then(data => this.api - .uploadFile(data.presignedUrl, file, () => true) - .then(() => { - this.$emit("update"); - this.properties = file.name; - if (event.target.files) { - event.target.files = null; - } - }) - ) - .catch(e => this.error = "Error uploading properties: " + e) - .finally(() => this.loading = false); + // NB: the fileStage arg here is 'config', since we are uploading a config file, rather then + // the stage of the ingest manager ('output'). + try { + this.loading = true; + let data = await this.api.uploadHandle(this.datasetId, this.config.config, _pick(file, ['name', 'type', 'size'])) + await this.api.uploadFile(data.presignedUrl, file, () => true); + this.$emit("update"); + this.properties = file.name; + if (event.target.files) { + event.target.files = null; + } + } catch (e) { + this.error = "Error uploading properties: " + e; + } finally { + this.loading = false; } }, - deleteProperties: function (file: FileMeta) { + downloadProperties: async function (key) { + this.loading = true; + this.$emit("update"); + try { + let urls = await this.api.fileUrls(this.datasetId, this.config.config, [key]); + _forIn(urls, (url, fileName) => window.open(url, key)); + } catch (e) { + this.error = "Error fetching download URLs" + e; + } finally { + this.loading = false; + } + }, + deleteProperties: async function (file: FileMeta) { this.loading = true; if (file.key === this.properties) { this.properties = null; } - this.api.deleteFiles(this.datasetId, this.config.config, [file.key]) - .then(() => this.$emit("update")) - .finally(() => this.loading = false); + try { + await this.api.deleteFiles(this.datasetId, this.config.config, [file.key]); + this.$emit("update"); + } finally { + this.loading = false; + } }, selectPropFile: function (file: FileMeta) { this.properties = this.properties === file.key ? null : file.key; - } + }, + prettyDate: timeToRelative, }, computed: { isValidConfig: function () { @@ -127,6 +143,7 @@ export default { Properties File +   @@ -134,6 +151,13 @@ export default {
+ + + + + + + - + + +
FileLast Modified
{{ f.key }}{{ prettyDate(f.lastModified) }}