diff --git a/front/js/helpers.js b/front/js/helpers.js index 4fb5427..666fda6 100644 --- a/front/js/helpers.js +++ b/front/js/helpers.js @@ -65,6 +65,7 @@ export function apiPost(url, body, options = {}) { body: JSON.stringify(body), headers: { "Content-Type": "application/json", + "X-Requested-With": "XMLHttpRequest", "X-CSRF-TOKEN": document.querySelector('meta[name="csrf-token"]').content, ...options.headers, }, @@ -77,6 +78,7 @@ export function apiGet(url, options = {}) { method: "GET", headers: { "X-CSRF-TOKEN": document.querySelector('meta[name="csrf-token"]').content, + "X-Requested-With": "XMLHttpRequest", ...options.headers, }, }).then((r) => r.json()); diff --git a/front/js/svelte/content/Index.svelte b/front/js/svelte/content/Index.svelte index 1b2a639..280feb9 100644 --- a/front/js/svelte/content/Index.svelte +++ b/front/js/svelte/content/Index.svelte @@ -4,8 +4,8 @@ import ActionsOnSelected from "./ActionsOnSelected.svelte"; import Table from "./Table.svelte"; import { getContext } from "svelte"; + import { apiGet } from "../../helpers"; - const axios = getContext("axios"); export let schema; export let users; export let records; @@ -26,18 +26,17 @@ function refresh(e) { const newUrl = e.detail; - axios - .get(newUrl) + apiGet(newUrl) .then((response) => { - records = response.data.records; - sortParam = response.data.sortParam; - sortField = response.data.sortField; - operators = response.data.operators; - filter = response.data.filter; - skip = response.data.skip; - limit = response.data.limit; - total = response.data.total; - modalUrl = response.data.modalUrl; + records = response.records; + sortParam = response.sortParam; + sortField = response.sortField; + operators = response.operators; + filter = response.filter; + skip = response.skip; + limit = response.limit; + total = response.total; + modalUrl = response.modalUrl; document.querySelector("dialog h3").scrollIntoView(); }) .catch((error) => { diff --git a/front/js/svelte/content/Table.svelte b/front/js/svelte/content/Table.svelte index 0347720..be58ef8 100644 --- a/front/js/svelte/content/Table.svelte +++ b/front/js/svelte/content/Table.svelte @@ -26,7 +26,7 @@ function select(record) { selected = selectRecord(record, selected); } - + console.log(schema); $: visibleColumns = schema.fields.filter( (c) => schema.visible?.includes(c.name) ?? [], ); diff --git a/front/js/svelte/dialog/Dialog.svelte b/front/js/svelte/dialog/Dialog.svelte index 13dd87e..a24381b 100644 --- a/front/js/svelte/dialog/Dialog.svelte +++ b/front/js/svelte/dialog/Dialog.svelte @@ -1,9 +1,8 @@ + {#if data.schema}
{#if selectedRecords.length > 0} - - {selectedRecords.length} records selected - + + {selectedRecords.length} records selected + {/if} @@ -96,6 +92,5 @@
- {/if} -
\ No newline at end of file + diff --git a/src/Http/Controller/RecordController.php b/src/Http/Controller/RecordController.php index 955c2e4..50ca041 100644 --- a/src/Http/Controller/RecordController.php +++ b/src/Http/Controller/RecordController.php @@ -56,6 +56,7 @@ class RecordController extends Controller $users = $this->accountService->all(); $schema = $this->channelService->getSchema($schemaName)->get(); + $urlParams = $request->all(); $sort = data_get($urlParams, "sort") ?? $schema->sortBy; $filter = data_get($urlParams, "filter") ?? []; @@ -114,7 +115,6 @@ class RecordController extends Controller $this->accountService->currentWritableSchemas(), ), ]; - if ($request->ajax()) { $data["modalUrl"] = $request->fullUrl(); if (str_starts_with(config("lucent.url"), "https")) {