From 8bbd9829238c2d41b8c129ef2aa39b30b875e82e Mon Sep 17 00:00:00 2001
From: Brian Hanson <brian@brianhanson.net>
Date: Wed, 20 May 2026 10:39:13 -0500
Subject: [PATCH 1/2] Refactor Json wrapping

---
 src/Cp/JsonResource.php                     | 11 +++++++++++
 src/Entry/Resources/EntryTypeResource.php   |  2 +-
 src/Filesystem/Resources/FsResource.php     |  2 +-
 src/Gql/Resources/GqlTokenResource.php      |  2 +-
 src/Http/Resources/ElementIndexResource.php |  2 +-
 src/Providers/AppServiceProvider.php        |  2 --
 src/Section/Resources/SectionResource.php   |  2 +-
 7 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 src/Cp/JsonResource.php

diff --git a/src/Cp/JsonResource.php b/src/Cp/JsonResource.php
new file mode 100644
index 00000000000..40483a9d3e1
--- /dev/null
+++ b/src/Cp/JsonResource.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Cp;
+
+class JsonResource extends \Illuminate\Http\Resources\Json\JsonResource
+{
+    #[\Override]
+    public static $wrap = false;
+}
diff --git a/src/Entry/Resources/EntryTypeResource.php b/src/Entry/Resources/EntryTypeResource.php
index 0fcc96967cc..bc203158023 100644
--- a/src/Entry/Resources/EntryTypeResource.php
+++ b/src/Entry/Resources/EntryTypeResource.php
@@ -5,9 +5,9 @@
 namespace CraftCms\Cms\Entry\Resources;
 
 use CraftCms\Cms\Cp\Icons;
+use CraftCms\Cms\Cp\JsonResource;
 use CraftCms\Cms\Entry\Data\EntryType;
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 /** @mixin EntryType */
 class EntryTypeResource extends JsonResource
diff --git a/src/Filesystem/Resources/FsResource.php b/src/Filesystem/Resources/FsResource.php
index 5fe080dae83..c0fda97c253 100644
--- a/src/Filesystem/Resources/FsResource.php
+++ b/src/Filesystem/Resources/FsResource.php
@@ -4,11 +4,11 @@
 
 namespace CraftCms\Cms\Filesystem\Resources;
 
+use CraftCms\Cms\Cp\JsonResource;
 use CraftCms\Cms\Filesystem\Filesystems\Filesystem;
 use CraftCms\Cms\Filesystem\Filesystems\MissingFs;
 use CraftCms\Cms\Support\Arr;
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
  * @mixin Filesystem
diff --git a/src/Gql/Resources/GqlTokenResource.php b/src/Gql/Resources/GqlTokenResource.php
index 192c1992c0b..86a6688ba65 100644
--- a/src/Gql/Resources/GqlTokenResource.php
+++ b/src/Gql/Resources/GqlTokenResource.php
@@ -4,10 +4,10 @@
 
 namespace CraftCms\Cms\Gql\Resources;
 
+use CraftCms\Cms\Cp\JsonResource;
 use CraftCms\Cms\Gql\Data\GqlToken;
 use DateTime;
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 /**
  * @mixin GqlToken
diff --git a/src/Http/Resources/ElementIndexResource.php b/src/Http/Resources/ElementIndexResource.php
index 2d7a15035fe..04b5974de88 100644
--- a/src/Http/Resources/ElementIndexResource.php
+++ b/src/Http/Resources/ElementIndexResource.php
@@ -4,6 +4,7 @@
 
 namespace CraftCms\Cms\Http\Resources;
 
+use CraftCms\Cms\Cp\JsonResource;
 use CraftCms\Cms\Element\CurrentElementIndex;
 use CraftCms\Cms\Http\Controllers\Elements\Concerns\InteractsWithElementIndexes;
 use CraftCms\Cms\Http\Requests\ElementIndexRequest;
@@ -12,7 +13,6 @@
 use CraftCms\Cms\Support\Facades\HtmlStack;
 use CraftCms\Cms\Support\Html;
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Override;
 
 use function CraftCms\Cms\t;
diff --git a/src/Providers/AppServiceProvider.php b/src/Providers/AppServiceProvider.php
index 29725071e98..d4018d18c5d 100644
--- a/src/Providers/AppServiceProvider.php
+++ b/src/Providers/AppServiceProvider.php
@@ -29,7 +29,6 @@
 use Illuminate\Http\Client\PendingRequest;
 use Illuminate\Http\Exceptions\ThrottleRequestsException;
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Http\Response;
 use Illuminate\Routing\UrlGenerator;
 use Illuminate\Support\Carbon;
@@ -68,7 +67,6 @@ public function register(): void
 
     public function boot(): void
     {
-        JsonResource::withoutWrapping();
 
         Event::listen(LocaleUpdated::class, function (LocaleUpdated $event) {
             setlocale(
diff --git a/src/Section/Resources/SectionResource.php b/src/Section/Resources/SectionResource.php
index e9c0264040a..fcb09918a9d 100644
--- a/src/Section/Resources/SectionResource.php
+++ b/src/Section/Resources/SectionResource.php
@@ -4,11 +4,11 @@
 
 namespace CraftCms\Cms\Section\Resources;
 
+use CraftCms\Cms\Cp\JsonResource;
 use CraftCms\Cms\Entry\Resources\EntryTypeResource;
 use CraftCms\Cms\Section\Data\Section;
 use CraftCms\Cms\Section\Enums\SectionType;
 use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
 
 /** @mixin Section */
 class SectionResource extends JsonResource

From 91ccbcbe41d76e7964358d8f6969a65949025914 Mon Sep 17 00:00:00 2001
From: Brian Hanson <brian@brianhanson.net>
Date: Wed, 20 May 2026 12:37:48 -0500
Subject: [PATCH 2/2] [WIP] convert filesystem to Inertia

---
 resources/js/bootstrap/cp.ts                  |   4 +
 .../Filesystems/FilesystemSettings.vue        |  73 ++++++++++
 .../Filesystems/LocalFsSettings.vue           |  18 +++
 .../js/pages/SettingsFilesystemsEditPage.vue  | 130 ++++++++++++++++++
 .../_components/fs/Local/settings.twig        |  32 +++--
 src/Filesystem/Filesystems/Local.php          |  14 +-
 .../Settings/FilesystemsController.php        |  26 +++-
 7 files changed, 278 insertions(+), 19 deletions(-)
 create mode 100644 resources/js/components/Filesystems/FilesystemSettings.vue
 create mode 100644 resources/js/components/Filesystems/LocalFsSettings.vue
 create mode 100644 resources/js/pages/SettingsFilesystemsEditPage.vue

diff --git a/resources/js/bootstrap/cp.ts b/resources/js/bootstrap/cp.ts
index cd2808a7db9..3d8105c7409 100644
--- a/resources/js/bootstrap/cp.ts
+++ b/resources/js/bootstrap/cp.ts
@@ -15,6 +15,7 @@ import AssetIndexes from '@/components/utilities/AssetIndexes/AssetIndexes.vue';
 import SystemMessages from '@/components/utilities/SystemMessages/SystemMessages.vue';
 import DeprecationErrorsToolbar from '@/components/utilities/DeprecationErrors/DeprecationErrorsToolbar.vue';
 import {setTranslations} from '@craftcms/cp/utilities/translate.ts.mjs';
+import LocalFsSettings from '@/components/Filesystems/LocalFsSettings.vue';
 
 let bootedCallbacks: Array<(instance: any) => void> = [];
 let bootingCallbacks: Array<(instance: any) => void> = [];
@@ -98,6 +99,9 @@ const Cp = {
         app.component('ProjectConfig', ProjectConfig);
         app.component('AssetIndexes', AssetIndexes);
         app.component('SystemMessages', SystemMessages);
+        app.component('LocalFsSettings', LocalFsSettings);
+
+        // @TODO Register plugin components
       },
     });
 
diff --git a/resources/js/components/Filesystems/FilesystemSettings.vue b/resources/js/components/Filesystems/FilesystemSettings.vue
new file mode 100644
index 00000000000..86349c08cf2
--- /dev/null
+++ b/resources/js/components/Filesystems/FilesystemSettings.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/cp';
+  import {computed} from 'vue';
+  import {usePage} from '@inertiajs/vue3';
+  import type {Filesystem} from '@/pages/SettingsFilesystemsEditPage.vue';
+  import VarDump from '@/components/VarDump.vue';
+  import CraftSwitch from '@craftcms/cp/vue/CraftSwitch.vue';
+  import CraftCombobox from '@/components/form/CraftCombobox.vue';
+  import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
+
+  const hasUrls = defineModel<boolean>('hasUrls');
+  const url = defineModel<string>('url');
+  withDefaults(
+    defineProps<{
+      filesystem?: Filesystem;
+    }>(),
+    {
+      filesystem: {
+        errors: () => [],
+        name: null,
+        handle: null,
+        oldHandle: null,
+        hasUrls: false,
+        url: null,
+        uid: null,
+        rootUrl: null,
+        id: null,
+        dateCreated: null,
+        dateUpdated: null,
+        settingsHtml: null,
+        rootPath: null,
+        path: null,
+      },
+    }
+  );
+
+  const page = usePage<{
+    readOnly: boolean;
+    baseUrlSuggestions?: Array<any>;
+  }>();
+</script>
+
+<template>
+  <div v-if="filesystem" :id="filesystem.type">
+    <template v-if="filesystem.showHasUrlSetting">
+      <CraftSwitch
+        :label="t('Files in this filesystem have public URLs')"
+        name="hasUrls"
+        id="has-urls"
+        v-model="hasUrls"
+        :disabled="page.props.readOnly"
+      />
+
+      <template v-if="hasUrls && filesystem.showUrlSetting">
+        <CraftCombobox
+          :label="t('Base URL')"
+          :help-text="t('The base URL to the files in this filesystem.')"
+          v-model="url"
+          :options="page.props.baseUrlSuggestions"
+          name="url"
+          :required="true"
+          placeholder="//example.com/path/to/folder"
+          data-error-key="url"
+          :disabled="page.props.readOnly"
+        ></CraftCombobox>
+      </template>
+    </template>
+    <DynamicHtmlRenderer :html="filesystem.settingsHtml"/>
+    <!--<div v-html="filesystem.settingsHtml" />-->
+  </div>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/resources/js/components/Filesystems/LocalFsSettings.vue b/resources/js/components/Filesystems/LocalFsSettings.vue
new file mode 100644
index 00000000000..c30f94d82f9
--- /dev/null
+++ b/resources/js/components/Filesystems/LocalFsSettings.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+  import {computed} from 'vue';
+  import VarDump from '@/components/VarDump.vue';
+
+  const props = defineProps<{
+    filesystem?: string;
+  }>();
+
+  const fs = computed(() => props.filesystem ? JSON.parse(props.filesystem) : null);
+</script>
+
+<template>
+  <h2>Roundabout LocalFsSettings</h2>
+
+  <VarDump :data="{props}" />
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/resources/js/pages/SettingsFilesystemsEditPage.vue b/resources/js/pages/SettingsFilesystemsEditPage.vue
new file mode 100644
index 00000000000..f0fca56f7fd
--- /dev/null
+++ b/resources/js/pages/SettingsFilesystemsEditPage.vue
@@ -0,0 +1,130 @@
+<script setup lang="ts">
+  import {t, toHandle} from '@craftcms/cp';
+  import AppLayout from '@/layout/AppLayout.vue';
+  import VarDump from '@/components/VarDump.vue';
+  import type {SelectItem, SelectOption} from '@/types';
+  import Pane from '@/components/Pane.vue';
+  import CraftInput from '@craftcms/cp/vue/CraftInput.vue';
+  import CraftInputHandle from '@craftcms/cp/vue/CraftInputHandle.vue';
+  import Select from '@/components/form/Select.vue';
+  import {useForm} from '@inertiajs/vue3';
+  import {useInputGenerator} from '@/composables/useInputGenerator';
+  import DynamicHtmlRenderer from '@/components/DynamicHtmlRenderer.vue';
+  import FilesystemSettings from '@/components/Filesystems/FilesystemSettings.vue';
+
+  export type Filesystem = {
+    errors: any[];
+    name: string | null;
+    handle: string | null;
+    oldHandle: any;
+    hasUrls: boolean;
+    url: any;
+    uid: any;
+    rootUrl: any;
+    id: any;
+    dateCreated: any;
+    dateUpdated: any;
+    settingsHtml: string;
+    rootPath: string;
+    path: any;
+    type: string;
+    showHasUrlSetting: boolean;
+    showUrlSetting: boolean;
+  };
+
+  const props = defineProps<{
+    oldHandle: string | null;
+    filesystem: Filesystem;
+    fsOptions: Array<SelectOption>;
+    fsInstances: Record<string, Filesystem>;
+    fsTypes: Array<string>;
+    readOnly: boolean;
+  }>();
+
+  const form = useForm({
+    name: props.filesystem.name ?? '',
+    handle: props.filesystem.handle ?? '',
+    type: props.filesystem.type ?? '',
+    hasUrls: props.filesystem.hasUrls ?? false,
+    url: props.filesystem.url ?? '',
+  });
+
+  useInputGenerator(
+    () => form.name,
+    (v) => (form.handle = toHandle(v))
+  );
+
+  function handleSubmit() {
+    const form = event.target as HTMLFormElement;
+
+    form.transform(() => {
+      return {
+        ...(new FormData(form)),
+        ...form
+      }
+    }).submit();
+  }
+
+  function getFs(fsType: string): Filesystem | null {
+    if (fsType === form.type) {
+      return props.filesystem;
+    }
+
+    return props.fsInstances[fsType] ?? null;
+  }
+</script>
+
+<template>
+  <AppLayout>
+    <Pane appearance="raised">
+      <div class="grid gap-3">
+        <CraftInput
+          v-model="form.name"
+          :label="t('Name')"
+          id="name"
+          name="name"
+          :autofocus="true"
+          :required="true"
+          :error="form.errors?.name"
+          data-error-key="name"
+          :disabled="readOnly"
+        />
+
+        <CraftInputHandle
+          :label="t('Handle')"
+          id="handle"
+          name="handle"
+          v-model="form.handle"
+          :required="true"
+          :error="form.errors?.handle"
+          data-error-key="handle"
+          :disabled="readOnly"
+        />
+
+        <hr />
+
+        <template v-if="fsOptions.length">
+          <Select
+            id="type"
+            name="type"
+            :label="t('Filesystem Type')"
+            :help-text="t('What type of filesystem is this?')"
+            :options="fsOptions"
+            v-model="form.type"
+            :disabled="readOnly"
+          />
+        </template>
+
+        <template v-for="fsType in fsTypes">
+          <FilesystemSettings
+            v-model:has-urls="form.hasUrls"
+            v-model:url="form.url"
+            :filesystem="fsInstances[fsType]"
+          />
+        </template>
+      </div>
+    </Pane>
+  </AppLayout>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/resources/templates/_components/fs/Local/settings.twig b/resources/templates/_components/fs/Local/settings.twig
index e790bc638ee..587bce0cfbd 100644
--- a/resources/templates/_components/fs/Local/settings.twig
+++ b/resources/templates/_components/fs/Local/settings.twig
@@ -1,17 +1,23 @@
 {% from "_includes/forms" import autosuggestField %}
 
+<craft-input
+  label="{{ "Base Path"|t('app') }}"
+  :help-text="{{ "The base folder path that should be used as the root of the filesystem."|t('app') }}"
+  name="path"
+></craft-input>
+
 {{ autosuggestField({
-    label: "Base Path"|t('app'),
-    instructions: "The base folder path that should be used as the root of the filesystem."|t('app'),
-    id: 'path',
-    class: 'ltr',
-    name: 'path',
-    suggestEnvVars: true,
-    suggestAliases: true,
-    value: filesystem.path,
-    required: true,
-    placeholder: "/path/to/folder"|t('app'),
-    errors: filesystem.errors.get('path'),
-    data: {'error-key': 'path'},
-    disabled: readOnly,
+  label: "Base Path"|t('app'),
+  instructions: "The base folder path that should be used as the root of the filesystem."|t('app'),
+  id: 'path',
+  class: 'ltr',
+  name: 'path',
+  suggestEnvVars: true,
+  suggestAliases: true,
+  value: filesystem.path,
+  required: true,
+  placeholder: "/path/to/folder"|t('app'),
+  errors: filesystem.errors.get('path'),
+  data: {'error-key': 'path'},
+  disabled: readOnly,
 }) }}
diff --git a/src/Filesystem/Filesystems/Local.php b/src/Filesystem/Filesystems/Local.php
index f1d71e84fdb..4a43059de40 100644
--- a/src/Filesystem/Filesystems/Local.php
+++ b/src/Filesystem/Filesystems/Local.php
@@ -9,6 +9,7 @@
 use CraftCms\Cms\Support\Env;
 use CraftCms\Cms\Support\Facades\Security;
 use CraftCms\Cms\Support\File;
+use CraftCms\Cms\Support\Html;
 use CraftCms\Cms\View\TemplateMode;
 use Override;
 
@@ -124,10 +125,17 @@ public function getReadOnlySettingsHtml(): ?string
 
     private function settingsHtml(bool $readOnly): string
     {
-        return template('_components/fs/Local/settings', [
-            'filesystem' => $this,
+        return Html::tag('LocalFsSettings', attributes: [
+            // ':filesystem' => json_encode([
+            //     'name' => $this->name,
+            //     'handle' => $this->handle,
+            // ]),
             'readOnly' => $readOnly,
-        ], TemplateMode::Cp);
+        ]);
+        // return template('_components/fs/Local/settings', [
+        //     'filesystem' => $this,
+        //     'readOnly' => $readOnly,
+        // ], TemplateMode::Cp);
     }
 
     #[Override]
diff --git a/src/Http/Controllers/Settings/FilesystemsController.php b/src/Http/Controllers/Settings/FilesystemsController.php
index 5b9b65bf611..290d48403fc 100644
--- a/src/Http/Controllers/Settings/FilesystemsController.php
+++ b/src/Http/Controllers/Settings/FilesystemsController.php
@@ -6,6 +6,7 @@
 
 use CraftCms\Cms\Config\GeneralConfig;
 use CraftCms\Cms\Cp\Html\ContentHtml;
+use CraftCms\Cms\Cp\SelectOptions;
 use CraftCms\Cms\Filesystem\Contracts\FsInterface;
 use CraftCms\Cms\Filesystem\Filesystems;
 use CraftCms\Cms\Filesystem\Resources\FsResource;
@@ -13,6 +14,7 @@
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\Html;
+use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\Support\Url;
 use Illuminate\Http\Request;
 use Inertia\Inertia;
@@ -93,18 +95,36 @@ public function edit(?string $handle = null): CpScreenResponse
             $title = t('Create a new filesystem');
         }
 
+        $isValidUrl = fn ($value) => Str::isUrl($value);
+
         return new CpScreenResponse()
             ->title($title)
             ->addCrumb(t('Settings'), 'settings')
             ->addCrumb(t('Filesystems'), 'settings/filesystems')
-            ->contentTemplate('settings/filesystems/_edit.twig', [
+            ->inertiaPage('SettingsFilesystemsEditPage', [
                 'oldHandle' => $handle,
-                'filesystem' => $filesystem,
+                'filesystem' => [
+                    ...$filesystem,
+                    'type' => $filesystem::class,
+                    'settingsHtml' => $this->readOnly ? $filesystem->getReadOnlySettingsHtml() : $filesystem->getSettingsHtml(),
+                    'showHasUrlSetting' => $filesystem->getShowHasUrlSetting(),
+                    'showUrlSetting' => $filesystem->getShowUrlSetting(),
+                ],
                 'fsOptions' => $fsOptions,
                 'fsInstances' => $fsInstances,
                 'fsTypes' => $allFsTypes,
-                'readOnly' => $this->readOnly,
+
+                // @TODO this should probably be its own item on SelectOptions
+                'baseUrlSuggestions' => SelectOptions::getEnvSuggestions(true, $isValidUrl),
             ])
+            // ->contentTemplate('settings/filesystems/_edit.twig', [
+            //     'oldHandle' => $handle,
+            //     'filesystem' => $filesystem,
+            //     'fsOptions' => $fsOptions,
+            //     'fsInstances' => $fsInstances,
+            //     'fsTypes' => $allFsTypes,
+            //     'readOnly' => $this->readOnly,
+            // ])
             ->unless(
                 $this->readOnly,
                 function (CpScreenResponse $response) {