File system and snapshots config (#926)

## Problem The file system type cannot be selected when adding or editing a file system. The file system is always created with its default file system type. * https://trello.com/c/JnSKpQnu/3418-3-storage-modify-basic-attributes-fstype-snapshots-etc-for-pre-defined-volumes ## Solution Add a selector for the file system type. * If the product allows configuring snapshots, then the selector includes both *Btrfs* and *Btrfs with snapshots* (and the rest of possible types). * If there is only an option for the file system type (e.g., *swap*), then the selector is not offered. A plain text with the unique value is shown. Follow-up: #932 ## Testing * Added new unit tests * Tested manually ## Screenshots [Screencast from 2023-12-15 14-52-33.webm](https://github.com/openSUSE/agama/assets/1112304/feac328d-8ffd-4485-be5b-997b2aad49b6)
agama-project · Dec 15, 2023 · 383c9bc · 383c9bc
2 parents 3a787ea + fcc30cb
commit 383c9bc
Show file tree

Hide file tree

Showing 12 changed files with 313 additions and 40 deletions.
diff --git a/service/lib/agama/storage/volume_outline.rb b/service/lib/agama/storage/volume_outline.rb
@@ -76,7 +76,7 @@ class VolumeOutline
 
       # Whether snapshots option can be configured
       #
-      # @return [Boolean]
+      # @return [Boolean] false by default
       attr_accessor :snapshots_configurable
       alias_method :snapshots_configurable?, :snapshots_configurable
 
@@ -93,7 +93,7 @@ class VolumeOutline
       def initialize
         @required = false
         @adjust_by_ram = false
-        @snapshots_configurable = true
+        @snapshots_configurable = false
         @filesystems = []
         @base_min_size = Y2Storage::DiskSize.zero
         @base_max_size = Y2Storage::DiskSize.unlimited

diff --git a/service/lib/agama/storage/volume_templates_builder.rb b/service/lib/agama/storage/volume_templates_builder.rb
@@ -154,7 +154,7 @@ def outline(data) # rubocop:disable Metrics/AbcSize
           outline.required = fetch(outline_data, "required", false)
           outline.filesystems = fetch(outline_data, "filesystems", [])
           outline.filesystems.map! { |fs| fs_type(fs) }
-          outline.snapshots_configurable = fetch(outline_data, "snapshots_configurable", true)
+          outline.snapshots_configurable = fetch(outline_data, "snapshots_configurable", false)
 
           size = fetch(outline_data, "auto_size", {})
           min = parse_disksize(fetch(size, :base_min))

diff --git a/service/package/rubygem-agama.changes b/service/package/rubygem-agama.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 15 15:04:43 UTC 2023 - José Iván López González <jlopez@suse.com>
+
+- Set snapshots as not configurable by default
+  (gh#openSUSE/agama#926).
+
 -------------------------------------------------------------------
 Tue Dec  5 09:49:10 UTC 2023 - José Iván López González <jlopez@suse.com>
 

diff --git a/service/test/agama/dbus/storage/manager_test.rb b/service/test/agama/dbus/storage/manager_test.rb
@@ -338,6 +338,21 @@
         }
       end
 
+      let(:config_data) do
+        { "storage" => { "volumes" => [], "volume_templates" => cfg_templates } }
+      end
+
+      let(:cfg_templates) do
+        [
+          {
+            "mount_path" => "/",
+            "outline"    => {
+              "snapshots_configurable" => true
+            }
+          }
+        ]
+      end
+
       it "calculates a proposal with settings having a volume with values from D-Bus" do
         expect(proposal).to receive(:calculate) do |settings|
           volume = settings.volumes.first
@@ -355,10 +370,6 @@
       context "and the D-Bus volume does not include some values" do
         let(:dbus_volume1) { { "MountPath" => "/" } }
 
-        let(:config_data) do
-          { "storage" => { "volumes" => [], "volume_templates" => cfg_templates } }
-        end
-
         let(:cfg_templates) do
           [
             {

diff --git a/service/test/agama/dbus/storage/proposal_settings_conversion/to_dbus_test.rb b/service/test/agama/dbus/storage/proposal_settings_conversion/to_dbus_test.rb
@@ -81,7 +81,7 @@
               "Required"              => false,
               "FsTypes"               => [],
               "SupportAutoSize"       => false,
-              "SnapshotsConfigurable" => true,
+              "SnapshotsConfigurable" => false,
               "SnapshotsAffectSizes"  => false,
               "SizeRelevantVolumes"   => []
             }

diff --git a/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb b/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb
@@ -55,7 +55,10 @@
   end
 
   let(:outline) do
-    { "filesystems" => ["xfs", "ext3", "ext4"] }
+    {
+      "filesystems"            => ["xfs", "ext3", "ext4"],
+      "snapshots_configurable" => true
+    }
   end
 
   describe "#convert" do

diff --git a/service/test/agama/dbus/storage/volume_conversion/to_dbus_test.rb b/service/test/agama/dbus/storage/volume_conversion/to_dbus_test.rb
@@ -70,7 +70,7 @@
           "Required"              => false,
           "FsTypes"               => [],
           "SupportAutoSize"       => false,
-          "SnapshotsConfigurable" => true,
+          "SnapshotsConfigurable" => false,
           "SnapshotsAffectSizes"  => false,
           "SizeRelevantVolumes"   => []
         }

diff --git a/web/package/cockpit-agama.changes b/web/package/cockpit-agama.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 15 15:03:40 UTC 2023 - José Iván López González <jlopez@suse.com>
+
+- Allow selecting file system type and configure snapshots
+  (gh#openSUSE/agama/926).
+
 -------------------------------------------------------------------
 Sat Dec  2 18:06:02 UTC 2023 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/web/src/assets/styles/global.scss b/web/src/assets/styles/global.scss
@@ -60,10 +60,6 @@ li {
   svg {
     vertical-align: middle;
   }
-
-  span {
-    margin-inline-start: var(--spacer-small);
-  }
 }
 
 // Style focus making use of :focus-visible

diff --git a/web/src/assets/styles/patternfly-overrides.scss b/web/src/assets/styles/patternfly-overrides.scss
@@ -225,3 +225,9 @@ table td > .pf-v5-c-empty-state {
     --pf-v5-c-expandable-section__content--PaddingLeft: var(--spacer-normal);
   }
 }
+
+.pf-v5-c-form__group-label-help {
+  margin: 0;
+  padding: 0;
+  vertical-align: top;
+}