From 8e72265aa222cbff982eb124f8e01f77ea137f7f Mon Sep 17 00:00:00 2001
From: Iwona Just <iwona@pixelandtonic.com>
Date: Fri, 19 May 2023 11:29:14 +0100
Subject: [PATCH 1/6] Render URL / Has URL fields in FS template

---
 src/base/Fs.php                               | 18 ++++++
 src/base/FsTrait.php                          | 10 +++
 src/controllers/FsController.php              |  2 -
 src/templates/settings/filesystems/_edit.twig | 62 ++++++++++++-------
 4 files changed, 67 insertions(+), 25 deletions(-)

diff --git a/src/base/Fs.php b/src/base/Fs.php
index ec851b3b0c2..c665c3f10bb 100644
--- a/src/base/Fs.php
+++ b/src/base/Fs.php
@@ -29,6 +29,24 @@ abstract class Fs extends SavableComponent implements FsInterface
     public const VISIBILITY_HIDDEN = 'hidden';
     public const VISIBILITY_PUBLIC = 'public';
 
+    /**
+     * @inheritdoc
+     *
+     * TODO: remove for Craft 5 and fully move $hasUrl and $url to FS settings
+     */
+    public function getSettings(): array
+    {
+        $settings = parent::getSettings();
+
+        // url should keep being saved top-level, not inside settings
+        // to be changed in Craft 5
+        if (isset($settings['url']) && $this->url === $settings['url']) {
+            unset($settings['url']);
+        }
+
+        return $settings;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/base/FsTrait.php b/src/base/FsTrait.php
index 7946f4099d4..23d5cac1ba8 100644
--- a/src/base/FsTrait.php
+++ b/src/base/FsTrait.php
@@ -44,4 +44,14 @@ trait FsTrait
      * @var string|null UID
      */
     public ?string $uid = null;
+
+    /**
+     * @var bool Whether to show the toggle for setting if the volume has a public URL
+     */
+    public bool $showHasUrlSetting = true;
+
+    /**
+     * @var bool Whether to show the input for setting the volume's URL
+     */
+    public bool $showUrlSetting = true;
 }
diff --git a/src/controllers/FsController.php b/src/controllers/FsController.php
index c3c5409c51b..0294dc27607 100644
--- a/src/controllers/FsController.php
+++ b/src/controllers/FsController.php
@@ -140,8 +140,6 @@ public function actionSave(): ?YiiResponse
             'name' => $this->request->getBodyParam('name'),
             'handle' => $this->request->getBodyParam('handle'),
             'oldHandle' => $this->request->getBodyParam('oldHandle'),
-            'hasUrls' => (bool)$this->request->getBodyParam('hasUrls'),
-            'url' => $this->request->getBodyParam('url'),
             'settings' => $this->request->getBodyParam("types.$type"),
         ]);
 
diff --git a/src/templates/settings/filesystems/_edit.twig b/src/templates/settings/filesystems/_edit.twig
index 0469fe07ae8..425ea984fec 100644
--- a/src/templates/settings/filesystems/_edit.twig
+++ b/src/templates/settings/filesystems/_edit.twig
@@ -1,4 +1,5 @@
 {% import '_includes/forms.twig' as forms %}
+{% import _self as macro %}
 
 {% if oldHandle %}{{ hiddenInput('oldHandle', oldHandle) }}{% endif %}
 
@@ -26,29 +27,6 @@
     required: true,
 }) }}
 
-{{ forms.lightswitchField({
-    label: 'Files in this filesystem have public URLs'|t('app'),
-    name: 'hasUrls',
-    on:   filesystem.hasUrls,
-    toggle: "url-field"
-}) }}
-
-<div id="url-field" class="{% if not filesystem.hasUrls %}hidden{% endif %}">
-    {{ forms.autosuggestField({
-        label: "Base URL"|t('app'),
-        instructions: "The base URL to the files in this filesystem."|t('app'),
-        id: 'url',
-        class: ['ltr', 'fs-url'],
-        name: 'url',
-        suggestEnvVars: true,
-        suggestAliases: true,
-        value: (filesystem is defined ? filesystem.url : null),
-        errors: (filesystem is defined ? filesystem.getErrors('url') : null),
-        required: true,
-        placeholder: "//example.com/path/to/folder"
-    }) }}
-</div>
-
 <hr>
 
 {% if fsOptions|length %}
@@ -69,8 +47,16 @@
     <div id="{{ fsType|id }}"{% if not isCurrent %} class="hidden"{% endif %}>
         {% namespace 'types['~fsType~']' %}
             {% if isCurrent %}
+                {% if filesystem.showHasUrlSetting %}
+                    {{ macro.fsUrlFields(filesystem) }}
+                {% endif %}
+
                 {{ filesystem.getSettingsHtml()|raw }}
             {% else %}
+                {% if fsInstances[fsType].showHasUrlSetting %}
+                    {{ macro.fsUrlFields(fsInstances[fsType]) }}
+                {% endif %}
+
                 {{ fsInstances[fsType].getSettingsHtml()|raw }}
             {% endif %}
         {% endnamespace %}
@@ -83,3 +69,33 @@
         new Craft.HandleGenerator("#{{ 'name'|namespaceInputId }}", "#{{ 'handle'|namespaceInputId }}");
     {% endjs %}
 {% endif %}
+
+
+{% macro fsUrlFields(filesystem) %}
+    {{ forms.lightswitchField({
+        label: 'Files in this filesystem have public URLs'|t('app'),
+        name: 'hasUrls',
+        on:   filesystem.hasUrls,
+        toggle: filesystem.showUrlSetting ? "url-field" : null
+    }) }}
+
+    {% if filesystem.showUrlSetting %}
+        <div id="url-field" class="{% if not filesystem.hasUrls %}hidden{% endif %}">
+            {{ forms.autosuggestField({
+                label: "Base URL"|t('app'),
+                instructions: "The base URL to the files in this filesystem."|t('app'),
+                id: 'url',
+                class: ['ltr', 'fs-url'],
+                name: 'url',
+                suggestEnvVars: true,
+                suggestAliases: true,
+                value: (filesystem is defined ? filesystem.url : null),
+                errors: (filesystem is defined ? filesystem.getErrors('url') : null),
+                required: true,
+                placeholder: "//example.com/path/to/folder"
+            }) }}
+        </div>
+    {% endif %}
+
+    <hr />
+{% endmacro %}

From 063a186012cca756d7e6b983a6f14e2653850eef Mon Sep 17 00:00:00 2001
From: Iwona Just <iwona@pixelandtonic.com>
Date: Fri, 19 May 2023 11:45:40 +0100
Subject: [PATCH 2/6] change new attrs to protected

---
 src/base/Fs.php                               | 56 +++++++++++++------
 src/base/FsTrait.php                          |  4 +-
 src/templates/settings/filesystems/_edit.twig |  8 +--
 3 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/src/base/Fs.php b/src/base/Fs.php
index c665c3f10bb..5a58726f308 100644
--- a/src/base/Fs.php
+++ b/src/base/Fs.php
@@ -29,24 +29,6 @@ abstract class Fs extends SavableComponent implements FsInterface
     public const VISIBILITY_HIDDEN = 'hidden';
     public const VISIBILITY_PUBLIC = 'public';
 
-    /**
-     * @inheritdoc
-     *
-     * TODO: remove for Craft 5 and fully move $hasUrl and $url to FS settings
-     */
-    public function getSettings(): array
-    {
-        $settings = parent::getSettings();
-
-        // url should keep being saved top-level, not inside settings
-        // to be changed in Craft 5
-        if (isset($settings['url']) && $this->url === $settings['url']) {
-            unset($settings['url']);
-        }
-
-        return $settings;
-    }
-
     /**
      * @inheritdoc
      */
@@ -75,6 +57,44 @@ public function attributeLabels(): array
         ];
     }
 
+    /**
+     * Return value of $showHasUrlSetting
+     *
+     * @return bool
+     */
+    public function showHasUrlSetting(): bool
+    {
+        return $this->showHasUrlSetting;
+    }
+
+    /**
+     * Return value of $showUrlSetting
+     *
+     * @return bool
+     */
+    public function showUrlSetting(): bool
+    {
+        return $this->showUrlSetting;
+    }
+
+    /**
+     * @inheritdoc
+     *
+     * TODO: remove for Craft 5 and fully move $hasUrl and $url to FS settings
+     */
+    public function getSettings(): array
+    {
+        $settings = parent::getSettings();
+
+        // url should keep being saved top-level, not inside settings
+        // to be changed in Craft 5
+        if (isset($settings['url']) && $this->url === $settings['url']) {
+            unset($settings['url']);
+        }
+
+        return $settings;
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/base/FsTrait.php b/src/base/FsTrait.php
index 23d5cac1ba8..97c369d904b 100644
--- a/src/base/FsTrait.php
+++ b/src/base/FsTrait.php
@@ -48,10 +48,10 @@ trait FsTrait
     /**
      * @var bool Whether to show the toggle for setting if the volume has a public URL
      */
-    public bool $showHasUrlSetting = true;
+    protected bool $showHasUrlSetting = true;
 
     /**
      * @var bool Whether to show the input for setting the volume's URL
      */
-    public bool $showUrlSetting = true;
+    protected bool $showUrlSetting = true;
 }
diff --git a/src/templates/settings/filesystems/_edit.twig b/src/templates/settings/filesystems/_edit.twig
index 425ea984fec..c71a2209115 100644
--- a/src/templates/settings/filesystems/_edit.twig
+++ b/src/templates/settings/filesystems/_edit.twig
@@ -47,13 +47,13 @@
     <div id="{{ fsType|id }}"{% if not isCurrent %} class="hidden"{% endif %}>
         {% namespace 'types['~fsType~']' %}
             {% if isCurrent %}
-                {% if filesystem.showHasUrlSetting %}
+                {% if filesystem.showHasUrlSetting() %}
                     {{ macro.fsUrlFields(filesystem) }}
                 {% endif %}
 
                 {{ filesystem.getSettingsHtml()|raw }}
             {% else %}
-                {% if fsInstances[fsType].showHasUrlSetting %}
+                {% if fsInstances[fsType].showHasUrlSetting() %}
                     {{ macro.fsUrlFields(fsInstances[fsType]) }}
                 {% endif %}
 
@@ -76,10 +76,10 @@
         label: 'Files in this filesystem have public URLs'|t('app'),
         name: 'hasUrls',
         on:   filesystem.hasUrls,
-        toggle: filesystem.showUrlSetting ? "url-field" : null
+        toggle: filesystem.showUrlSetting() ? "url-field" : null
     }) }}
 
-    {% if filesystem.showUrlSetting %}
+    {% if filesystem.showUrlSetting() %}
         <div id="url-field" class="{% if not filesystem.hasUrls %}hidden{% endif %}">
             {{ forms.autosuggestField({
                 label: "Base URL"|t('app'),

From df0ae13a5d99c30cb8623199bf614667c8c4dd0c Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Fri, 26 May 2023 14:13:20 -0700
Subject: [PATCH 3/6] Cleanup

---
 src/base/Fs.php                               | 16 +++++------
 src/base/FsInterface.php                      | 15 +++++++++++
 src/base/FsTrait.php                          | 22 ++++++++-------
 src/templates/settings/filesystems/_edit.twig | 27 ++++++++-----------
 4 files changed, 44 insertions(+), 36 deletions(-)

diff --git a/src/base/Fs.php b/src/base/Fs.php
index 5a58726f308..4883c52a300 100644
--- a/src/base/Fs.php
+++ b/src/base/Fs.php
@@ -58,23 +58,19 @@ public function attributeLabels(): array
     }
 
     /**
-     * Return value of $showHasUrlSetting
-     *
-     * @return bool
+     * @inheritdoc
      */
-    public function showHasUrlSetting(): bool
+    public function getShowHasUrlSetting(): bool
     {
-        return $this->showHasUrlSetting;
+        return static::$showHasUrlSetting;
     }
 
     /**
-     * Return value of $showUrlSetting
-     *
-     * @return bool
+     * @inheritdoc
      */
-    public function showUrlSetting(): bool
+    public function getShowUrlSetting(): bool
     {
-        return $this->showUrlSetting;
+        return static::$showUrlSetting;
     }
 
     /**
diff --git a/src/base/FsInterface.php b/src/base/FsInterface.php
index 89d7f522d0c..84ea97f9c10 100644
--- a/src/base/FsInterface.php
+++ b/src/base/FsInterface.php
@@ -17,4 +17,19 @@
  */
 interface FsInterface extends BaseFsInterface, SavableComponentInterface
 {
+    /**
+     * Returns whether the “Files in this filesystem have public URLs” setting should be shown.
+     *
+     * @return bool
+     * @since 4.5.0
+     */
+    public function getShowHasUrlSetting(): bool;
+
+    /**
+     * Returns whether the “Base URL” setting should be shown.
+     *
+     * @return bool
+     * @since 4.5.0
+     */
+    public function getShowUrlSetting(): bool;
 }
diff --git a/src/base/FsTrait.php b/src/base/FsTrait.php
index 97c369d904b..e4da471c30c 100644
--- a/src/base/FsTrait.php
+++ b/src/base/FsTrait.php
@@ -15,6 +15,18 @@
  */
 trait FsTrait
 {
+    /**
+     * @var bool Whether the “Files in this filesystem have public URLs” setting should be shown.
+     * @since 4.5.0
+     */
+    protected static bool $showHasUrlSetting = true;
+
+    /**
+     * @var bool Whether the “Base URL” setting should be shown.
+     * @since 4.5.0
+     */
+    protected static bool $showUrlSetting = true;
+
     /**
      * @var string|null Name
      */
@@ -44,14 +56,4 @@ trait FsTrait
      * @var string|null UID
      */
     public ?string $uid = null;
-
-    /**
-     * @var bool Whether to show the toggle for setting if the volume has a public URL
-     */
-    protected bool $showHasUrlSetting = true;
-
-    /**
-     * @var bool Whether to show the input for setting the volume's URL
-     */
-    protected bool $showUrlSetting = true;
 }
diff --git a/src/templates/settings/filesystems/_edit.twig b/src/templates/settings/filesystems/_edit.twig
index c71a2209115..d9d6ad2af8c 100644
--- a/src/templates/settings/filesystems/_edit.twig
+++ b/src/templates/settings/filesystems/_edit.twig
@@ -1,5 +1,4 @@
 {% import '_includes/forms.twig' as forms %}
-{% import _self as macro %}
 
 {% if oldHandle %}{{ hiddenInput('oldHandle', oldHandle) }}{% endif %}
 
@@ -47,16 +46,10 @@
     <div id="{{ fsType|id }}"{% if not isCurrent %} class="hidden"{% endif %}>
         {% namespace 'types['~fsType~']' %}
             {% if isCurrent %}
-                {% if filesystem.showHasUrlSetting() %}
-                    {{ macro.fsUrlFields(filesystem) }}
-                {% endif %}
-
+                {{ _self.fsUrlFields(filesystem) }}
                 {{ filesystem.getSettingsHtml()|raw }}
             {% else %}
-                {% if fsInstances[fsType].showHasUrlSetting() %}
-                    {{ macro.fsUrlFields(fsInstances[fsType]) }}
-                {% endif %}
-
+                {{ _self.fsUrlFields(fsInstances[fsType]) }}
                 {{ fsInstances[fsType].getSettingsHtml()|raw }}
             {% endif %}
         {% endnamespace %}
@@ -72,14 +65,16 @@
 
 
 {% macro fsUrlFields(filesystem) %}
-    {{ forms.lightswitchField({
-        label: 'Files in this filesystem have public URLs'|t('app'),
-        name: 'hasUrls',
-        on:   filesystem.hasUrls,
-        toggle: filesystem.showUrlSetting() ? "url-field" : null
-    }) }}
+    {% if filesystem.getShowHasUrlSetting() %}
+        {{ forms.lightswitchField({
+            label: 'Files in this filesystem have public URLs'|t('app'),
+            name: 'hasUrls',
+            on:   filesystem.hasUrls,
+            toggle: filesystem.getShowUrlSetting() ? "url-field" : null
+        }) }}
+    {% endif %}
 
-    {% if filesystem.showUrlSetting() %}
+    {% if filesystem.getShowUrlSetting() %}
         <div id="url-field" class="{% if not filesystem.hasUrls %}hidden{% endif %}">
             {{ forms.autosuggestField({
                 label: "Base URL"|t('app'),

From 5397f76819b396e5a2a2f4528ed66ed3654c5bf4 Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Fri, 26 May 2023 14:28:45 -0700
Subject: [PATCH 4/6] This doesn't seem to be necessary

---
 src/base/Fs.php | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/base/Fs.php b/src/base/Fs.php
index 4883c52a300..5d147b2cba0 100644
--- a/src/base/Fs.php
+++ b/src/base/Fs.php
@@ -73,24 +73,6 @@ public function getShowUrlSetting(): bool
         return static::$showUrlSetting;
     }
 
-    /**
-     * @inheritdoc
-     *
-     * TODO: remove for Craft 5 and fully move $hasUrl and $url to FS settings
-     */
-    public function getSettings(): array
-    {
-        $settings = parent::getSettings();
-
-        // url should keep being saved top-level, not inside settings
-        // to be changed in Craft 5
-        if (isset($settings['url']) && $this->url === $settings['url']) {
-            unset($settings['url']);
-        }
-
-        return $settings;
-    }
-
     /**
      * @inheritdoc
      */

From 72637a2cbc7530120dc1d38676e4a0f5a235d84c Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Fri, 26 May 2023 14:45:22 -0700
Subject: [PATCH 5/6] Release notes

[ci skip]
---
 CHANGELOG-WIP.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
index 27564f45441..adefb595383 100644
--- a/CHANGELOG-WIP.md
+++ b/CHANGELOG-WIP.md
@@ -32,6 +32,10 @@
 - Added `craft\base\ElementInterface::setDirtyFields()`.
 - Added `craft\base\ElementInterface::setFieldValueFromRequest()`. ([#12935](https://github.com/craftcms/cms/issues/12935))
 - Added `craft\base\FieldInterface::normalizeValueFromRequest()`. ([#12935](https://github.com/craftcms/cms/issues/12935))
+- Added `craft\base\FsInterface::getShowHasUrlSetting()`. ([#13224](https://github.com/craftcms/cms/pull/13224))
+- Added `craft\base\FsInterface::getShowUrlSetting()`. ([#13224](https://github.com/craftcms/cms/pull/13224))
+- Added `craft\base\FsTrait::$showHasUrlSetting`. ([#13224](https://github.com/craftcms/cms/pull/13224))
+- Added `craft\base\FsTrait::$showUrlSetting`. ([#13224](https://github.com/craftcms/cms/pull/13224))
 - Added `craft\helpers\StringHelper::escapeShortcodes()`. ([#12935](https://github.com/craftcms/cms/issues/12935))
 - Added `craft\helpers\StringHelper::unescapeShortcodes()`. ([#12935](https://github.com/craftcms/cms/issues/12935))
 - Added `craft\web\CpScreenResponseBehavior::$pageSidebar`, `pageSidebar()`, and `pageSidebarTemplate()`. ([#13019](https://github.com/craftcms/cms/pull/13019), [#12795](https://github.com/craftcms/cms/issues/12795))

From f2e7fe7394dfc309199fdd4c39de3a5bad0cd6ac Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Fri, 26 May 2023 14:55:31 -0700
Subject: [PATCH 6/6] Don't include hasUrls / url in the FS config if not shown

---
 src/services/Fs.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/services/Fs.php b/src/services/Fs.php
index edeea380bf0..0ca245256fb 100644
--- a/src/services/Fs.php
+++ b/src/services/Fs.php
@@ -70,13 +70,21 @@ public function __serialize(): array
      */
     public function createFilesystemConfig(FsInterface $fs): array
     {
-        return [
+        $config = [
             'name' => $fs->name,
             'type' => get_class($fs),
-            'hasUrls' => $fs->hasUrls,
-            'url' => $fs->url,
             'settings' => ProjectConfigHelper::packAssociativeArrays($fs->getSettings()),
         ];
+
+        if ($fs->getShowHasUrlSetting()) {
+            $config['hasUrls'] = $fs->hasUrls;
+        }
+
+        if ($fs->getShowUrlSetting()) {
+            $config['url'] = $fs->url;
+        }
+
+        return $config;
     }
 
     /**