Feature/1129 fs url fields part of fs settings

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

src/base/Fs.php

@@ -57,6 +57,22 @@ public function attributeLabels(): array
         ];
     }
 
+    /**
+     * @inheritdoc
+     */
+    public function getShowHasUrlSetting(): bool
+    {
+        return static::$showHasUrlSetting;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getShowUrlSetting(): bool
+    {
+        return static::$showUrlSetting;
+    }
+
     /**
      * @inheritdoc
      */

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;
 }

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
      */

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

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;
     }
 
     /**

src/templates/settings/filesystems/_edit.twig

@@ -26,29 +26,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 +46,10 @@
     <div id="{{ fsType|id }}"{% if not isCurrent %} class="hidden"{% endif %}>
         {% namespace 'types['~fsType~']' %}
             {% if isCurrent %}
+                {{ _self.fsUrlFields(filesystem) }}
                 {{ filesystem.getSettingsHtml()|raw }}
             {% else %}
+                {{ _self.fsUrlFields(fsInstances[fsType]) }}
                 {{ fsInstances[fsType].getSettingsHtml()|raw }}
             {% endif %}
         {% endnamespace %}
@@ -83,3 +62,35 @@
         new Craft.HandleGenerator("#{{ 'name'|namespaceInputId }}", "#{{ 'handle'|namespaceInputId }}");
     {% endjs %}
 {% endif %}
+
+
+{% macro fsUrlFields(filesystem) %}
+    {% 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.getShowUrlSetting() %}
+        <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 %}