tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improvements on Background Processes list and Importers Page. Ref .20.

This commit is contained in:
Mateus Machado Luna 2018-08-07 11:23:18 -03:00
parent c925750a0d
commit ccac64abde
3 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/admin/components/edition/importer-edition-form.vue
View File

@ -143,6 +143,7 @@
(importer.accepts.file && importer.accepts.url && !importerFile && !url)" (importer.accepts.file && importer.accepts.url && !importerFile && !url)"
id="button-submit-collection-creation" id="button-submit-collection-creation"
@click.prevent="onFinishImporter()" @click.prevent="onFinishImporter()"
:class="{'is-loading': isLoadingUpload }"
class="button is-success">{{ $i18n.get('next') }}</button> class="button is-success">{{ $i18n.get('next') }}</button>
</div> </div>
</div> </div>
@ -164,6 +165,7 @@ export default {
importer: null, importer: null,
isLoading: false, isLoading: false,
isLoadingRun: false, isLoadingRun: false,
isLoadingUpload: false,
isFetchingCollections: false, isFetchingCollections: false,
form: { form: {
@ -295,20 +297,33 @@ export default {
}); });
}, },
uploadSource() { uploadSource() {
this.isLoadingUpload = true;
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
if (this.importer.accepts.file && !this.importer.accepts.url) if (this.importer.accepts.file && !this.importer.accepts.url) {
this.onUploadFile().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); this.onUploadFile()
else if (!this.importer.accepts.file && this.importer.accepts.url) .then(() => { this.isLoadingUpload = false; resolve(); })
this.onInputURL().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); .catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors) });
else if (this.importer.accepts.file && this.importer.accepts.url) { } else if (!this.importer.accepts.file && this.importer.accepts.url) {
if (this.importerFile) this.onInputURL()
this.onUploadFile().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); .then(() => { this.isLoadingUpload = false; resolve() })
else if (this.url) .catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors); });
this.onInputURL().then(() => { resolve() }).catch((errors) => this.$console.log(errors)); } else if (this.importer.accepts.file && this.importer.accepts.url) {
else if (this.importerFile) {
this.onUploadFile()
.then(() => { this.isLoadingUpload = false; resolve(); })
.catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors) });
} else if (this.url) {
this.onInputURL()
.then(() => { this.isLoadingUpload = false; resolve() })
.catch((errors) => { this.isLoadingUpload = false; this.$console.log(errors); });
} else {
this.isLoadingUpload = false;
reject('No source file given'); reject('No source file given');
} else }
} else {
this.isLoadingUpload = false;
resolve(); resolve();
}
}); });
}, },
onFinishImporter() { onFinishImporter() {

15
src/admin/components/lists/processes-list.vue
View File

@ -106,7 +106,9 @@
autoHide: false, autoHide: false,
placement: 'auto-start' placement: 'auto-start'
}"> }">
{{ bgProcess.progress_label ? bgProcess.progress_label + (bgProcess.progress_value ? ' (' + bgProcess.progress_value + '%)' : '') : $i18n.get('label_no_details_of_process') }}</p> <span class="occluding-content">{{ bgProcess.progress_label ? bgProcess.progress_label : $i18n.get('label_no_details_of_process') }}</span>
<span>{{ bgProcess.progress_value ? ' (' + bgProcess.progress_value + '%)' : '' }}</span>
</p>
</td> </td>
<!-- Queued on --> <!-- Queued on -->
<td <td
@ -136,7 +138,7 @@
</td> </td>
<!-- Logs --> <!-- Logs -->
<td <td
class="column-small-width" class="column-needed-width"
:label="$i18n.get('label_log_file')" :label="$i18n.get('label_log_file')"
:aria-label="$i18n.get('label_log_gile')"> :aria-label="$i18n.get('label_log_gile')">
<p> <p>
@ -386,6 +388,15 @@
} }
} }
.occluding-content {
width: calc(100% - 40px);
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
top: 4px;
position: relative;
}
</style> </style>

5
src/classes/filter-types/checkbox/Checkbox.vue
View File

@ -6,8 +6,9 @@
class="metadatum"> class="metadatum">
<b-checkbox <b-checkbox
v-model="selected" v-model="selected"
:native-value="option.value" :native-value="option.value">
>{{ option.label }}</b-checkbox> {{ option.label }}
</b-checkbox>
<div <div
class="view-all-button-container" class="view-all-button-container"
v-if="option.seeMoreLink" v-if="option.seeMoreLink"