fetch gfix

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());

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
+        apiGet(newUrl)
-            .get(newUrl)
             .then((response) => {
-                records = response.data.records;
+                records = response.records;
-                sortParam = response.data.sortParam;
+                sortParam = response.sortParam;
-                sortField = response.data.sortField;
+                sortField = response.sortField;
-                operators = response.data.operators;
+                operators = response.operators;
-                filter = response.data.filter;
+                filter = response.filter;
-                skip = response.data.skip;
+                skip = response.skip;
-                limit = response.data.limit;
+                limit = response.limit;
-                total = response.data.total;
+                total = response.total;
-                modalUrl = response.data.modalUrl;
+                modalUrl = response.modalUrl;
                 document.querySelector("dialog h3").scrollIntoView();
             })
             .catch((error) => {

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) ?? [],
     );

front/js/svelte/dialog/Dialog.svelte

@@ -1,9 +1,8 @@
 <script>
-
+    import { createEventDispatcher, getContext } from "svelte";
-    import {createEventDispatcher, getContext} from "svelte";
     import Icon from "../common/Icon.svelte";
     import Index from "../content/Index.svelte";
-    import axios from "axios";
+    import { apiGet } from "../../helpers";
 
     let dialogEl;
 
@@ -15,21 +14,19 @@
     //     load();
     // });
 
-
     export function close(e) {
-        if(e){
+        if (e) {
             e.preventDefault();
         }
 
-        dialogEl.close()
+        dialogEl.close();
         selectedRecords = [];
     }
 
     function load(schema) {
-        axios
+        apiGet(channel.lucentUrl + "/content/" + schema)
-            .get(channel.lucentUrl + "/content/" + schema)
             .then((response) => {
-                data = response.data;
+                data = response;
             })
             .catch((error) => console.log(error));
     }
@@ -52,42 +49,41 @@
     }
 
     export function open(schema) {
-        dialogEl.showModal()
+        dialogEl.showModal();
         load(schema);
     }
-
-
 </script>
+
 <dialog bind:this={dialogEl}>
     {#if data.schema}
         <div class="dialog-header">
             <button
-                    type="button"
+                type="button"
-                    class="button"
+                class="button"
-                    on:click={insert}
+                on:click={insert}
-                    disabled={selectedRecords.length === 0}
+                disabled={selectedRecords.length === 0}
             >
                 Insert
             </button>
             <button
-                    type="button"
+                type="button"
-                    class="button"
+                class="button"
-                    on:click={replace}
+                on:click={replace}
-                    disabled={selectedRecords.length === 0}
+                disabled={selectedRecords.length === 0}
             >
                 Replace
             </button>
             {#if selectedRecords.length > 0}
-                            <span class="">
+                <span class="">
-                                {selectedRecords.length} records selected
+                    {selectedRecords.length} records selected
-                            </span>
+                </span>
             {/if}
 
             <button
-                    on:click|preventDefault={close}
+                on:click|preventDefault={close}
-                    type="button"
+                type="button"
-                    class="button close"
+                class="button close"
-                    aria-label="Close"
+                aria-label="Close"
             >
                 <Icon icon="close"></Icon>
             </button>
@@ -96,6 +92,5 @@
         <div class="dialog-body">
             <Index {...data} bind:selected={selectedRecords}></Index>
         </div>
-
     {/if}
-</dialog>
+</dialog>

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")) {