forked from enviPath/enviPy
[Feature] Modern UI roll out (#236)
This PR moves all the collection pages into the new UI in a rough push. I did not put the same amount of care into these as into search, index, and predict. ## Major changes - All modals are now migrated to a state based alpine.js implementation. - jQuery is no longer present in the base layout; ajax is replace by native fetch api - most of the pps.js is now obsolte (as I understand it; the code is not referenced any more @jebus please double check) - in-memory pagination for large result lists (set to 50; we can make that configurable later; performance degrades at around 1k) stukk a bit rough tracked in #235 ## Minor things - Sarch and index also use alpine now - The loading spinner is now CSS animated (not sure if it currently gets correctly called) ## Not done - Ihave not even cheked the admin pages. Not sure If these need migrations - The temporary migration pages still use the old template. Not sure what is supposed to happen with those? @jebus ## What I did to test - opend all pages in browse, and user ; plus all pages reachable from there. - Interacted and tested the functionality of each modal superfically with exception of the API key modal (no functional test). --- This PR is massive sorry for that; just did not want to push half-brokenn state. @jebus @liambrydon I would be glad if you could click around and try to break it :) Finally closes #133 Co-authored-by: Tim Lorsbach <tim@lorsba.ch> Reviewed-on: enviPath/enviPy#236 Co-authored-by: Tobias O <tobias.olenyi@envipath.com> Co-committed-by: Tobias O <tobias.olenyi@envipath.com>
This commit is contained in:
@ -1,109 +1,142 @@
|
||||
{% load static %}
|
||||
<!-- Copy Object -->
|
||||
<div id="generic_copy_object_modal" class="modal" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h3 class="modal-title">Copy {{ object_type|capfirst }}</h3>
|
||||
<button
|
||||
type="button"
|
||||
class="close"
|
||||
data-dismiss="modal"
|
||||
aria-label="Close"
|
||||
>
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form
|
||||
id="generic-copy-object-modal-form"
|
||||
accept-charset="UTF-8"
|
||||
data-remote="true"
|
||||
method="post"
|
||||
>
|
||||
{% csrf_token %}
|
||||
<label for="target-package"
|
||||
>Select the Target Package you want to copy this {{ object_type }}
|
||||
into</label
|
||||
>
|
||||
<dialog
|
||||
id="generic_copy_object_modal"
|
||||
class="modal"
|
||||
x-data="{
|
||||
isSubmitting: false,
|
||||
errorMessage: '',
|
||||
targetPackage: '',
|
||||
|
||||
reset() {
|
||||
this.isSubmitting = false;
|
||||
this.errorMessage = '';
|
||||
this.targetPackage = '';
|
||||
},
|
||||
|
||||
async submit() {
|
||||
if (!this.targetPackage) return;
|
||||
|
||||
this.isSubmitting = true;
|
||||
this.errorMessage = '';
|
||||
|
||||
try {
|
||||
const response = await fetch(this.targetPackage, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/x-www-form-urlencoded',
|
||||
'X-CSRFToken': document.querySelector('[name=csrfmiddlewaretoken]').value
|
||||
},
|
||||
body: new URLSearchParams({
|
||||
hidden: 'copy',
|
||||
object_to_copy: '{{ current_object.url }}'
|
||||
})
|
||||
});
|
||||
|
||||
const data = await response.json();
|
||||
|
||||
if (response.ok) {
|
||||
window.location.href = data.success;
|
||||
} else {
|
||||
if (data.error && data.error.indexOf('to the same package') > -1) {
|
||||
this.errorMessage = 'The target Package is the same as the source Package. Please select another target!';
|
||||
} else {
|
||||
this.errorMessage = data.error || 'An error occurred';
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
this.errorMessage = 'An error occurred while copying';
|
||||
} finally {
|
||||
this.isSubmitting = false;
|
||||
}
|
||||
}
|
||||
}"
|
||||
@close="reset()"
|
||||
>
|
||||
<div class="modal-box">
|
||||
<!-- Header -->
|
||||
<h3 class="text-lg font-bold">Copy {{ object_type|capfirst }}</h3>
|
||||
|
||||
<!-- Close button (X) -->
|
||||
<form method="dialog">
|
||||
<button
|
||||
class="btn btn-sm btn-circle btn-ghost absolute top-2 right-2"
|
||||
:disabled="isSubmitting"
|
||||
>
|
||||
✕
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<!-- Body -->
|
||||
<div class="py-4">
|
||||
<form
|
||||
id="generic-copy-object-modal-form"
|
||||
accept-charset="UTF-8"
|
||||
method="post"
|
||||
>
|
||||
{% csrf_token %}
|
||||
<div class="form-control">
|
||||
<label class="label" for="target-package">
|
||||
<span class="label-text">
|
||||
Select the Target Package you want to copy this {{ object_type }}
|
||||
into
|
||||
</span>
|
||||
</label>
|
||||
<select
|
||||
id="target-package"
|
||||
name="target-package"
|
||||
data-actions-box="true"
|
||||
class="form-control"
|
||||
data-width="100%"
|
||||
class="select select-bordered w-full"
|
||||
x-model="targetPackage"
|
||||
required
|
||||
>
|
||||
<option disabled selected>Select Target Package</option>
|
||||
<option value="" disabled selected>Select Target Package</option>
|
||||
{% for p in meta.writeable_packages %}
|
||||
<option value="{{ p.url }}">{{ p.name|safe }}</option>
|
||||
`
|
||||
{% endfor %}
|
||||
</select>
|
||||
<input type="hidden" name="hidden" value="copy" />
|
||||
</form>
|
||||
<div
|
||||
id="copy-object-error-message"
|
||||
class="alert alert-danger"
|
||||
role="alert"
|
||||
style="display: none"
|
||||
></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-secondary" data-dismiss="modal">
|
||||
Close
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary"
|
||||
id="generic-copy-object-modal-form-submit"
|
||||
>
|
||||
Copy
|
||||
</button>
|
||||
</div>
|
||||
<input type="hidden" name="hidden" value="copy" />
|
||||
</form>
|
||||
|
||||
<!-- Error Message -->
|
||||
<div
|
||||
x-show="errorMessage"
|
||||
x-cloak
|
||||
class="alert alert-error mt-4"
|
||||
role="alert"
|
||||
>
|
||||
<span x-text="errorMessage"></span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Footer -->
|
||||
<div class="modal-action">
|
||||
<button
|
||||
type="button"
|
||||
class="btn"
|
||||
onclick="this.closest('dialog').close()"
|
||||
:disabled="isSubmitting"
|
||||
>
|
||||
Close
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
class="btn btn-primary"
|
||||
@click="submit()"
|
||||
:disabled="isSubmitting || !targetPackage"
|
||||
>
|
||||
<span x-show="!isSubmitting">Copy</span>
|
||||
<span
|
||||
x-show="isSubmitting"
|
||||
class="loading loading-spinner loading-sm"
|
||||
></span>
|
||||
<span x-show="isSubmitting">Copying...</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script>
|
||||
$(function () {
|
||||
$("#generic-copy-object-modal-form-submit").click(function (e) {
|
||||
e.preventDefault();
|
||||
$("#copy-object-error-message").hide();
|
||||
|
||||
const packageUrl = $("#target-package").find(":selected").val();
|
||||
|
||||
if (
|
||||
packageUrl === "Select Target Package" ||
|
||||
packageUrl === "" ||
|
||||
packageUrl === null ||
|
||||
packageUrl === undefined
|
||||
) {
|
||||
return;
|
||||
}
|
||||
const formData = {
|
||||
hidden: "copy",
|
||||
object_to_copy: "{{ current_object.url }}",
|
||||
};
|
||||
|
||||
$.ajax({
|
||||
type: "post",
|
||||
data: formData,
|
||||
url: packageUrl,
|
||||
success: function (data, textStatus) {
|
||||
window.location.href = data.success;
|
||||
},
|
||||
error: function (jqXHR, textStatus, errorThrown) {
|
||||
if (jqXHR.responseJSON.error.indexOf("to the same package") > -1) {
|
||||
$("#copy-object-error-message").append(
|
||||
"<p>The target Package is the same as the source Package. Please select another target!</p>",
|
||||
);
|
||||
} else {
|
||||
$("#copy-object-error-message").append(
|
||||
"<p>" + jqXHR.responseJSON.error + "</p>",
|
||||
);
|
||||
}
|
||||
$("#copy-object-error-message").show();
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<!-- Backdrop -->
|
||||
<form method="dialog" class="modal-backdrop">
|
||||
<button :disabled="isSubmitting">close</button>
|
||||
</form>
|
||||
</dialog>
|
||||
|
||||
Reference in New Issue
Block a user