btrfs: show the origin of the snapshot in subvolume details

cockpit-project · Jun 21, 2024 · 334d9c6 · 334d9c6
1 parent a6073af
commit 334d9c6
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/pkg/storaged/btrfs/subvolume.jsx b/pkg/storaged/btrfs/subvolume.jsx
@@ -20,6 +20,7 @@
 import cockpit from "cockpit";
 import React from "react";
 
+import { Button } from "@patternfly/react-core/dist/esm/components/Button/index.js";
 import { Card, CardBody, CardHeader, CardTitle } from "@patternfly/react-core/dist/esm/components/Card/index.js";
 import { DescriptionList } from "@patternfly/react-core/dist/esm/components/DescriptionList/index.js";
 
@@ -384,6 +385,16 @@ function make_btrfs_subvolume_page(parent, volume, subvol, path_prefix, subvols)
  return str;
  }
 
+ let snapshot_origin = null;
+ if (subvol.id !== 5 && subvol.parent_uuid !== null) {
+ for (const sv of subvols) {
+ if (sv.uuid === subvol.parent_uuid) {
+ snapshot_origin = sv;
+ break;
+ }
+ }
+ }
+
  const card = new_card({
  title: _("btrfs subvolume"),
  next: null,
@@ -393,7 +404,7 @@ function make_btrfs_subvolume_page(parent, volume, subvol, path_prefix, subvols)
  location: mp_text,
  component: BtrfsSubvolumeCard,
  has_warning: !!mismount_warning,
- props: { subvol, mount_point, mismount_warning, block, fstab_config, forced_options },
+ props: { volume, subvol, snapshot_origin, mount_point, mismount_warning, block, fstab_config, forced_options },
  actions,
  });
 
@@ -412,8 +423,9 @@ function make_btrfs_subvolume_page(parent, volume, subvol, path_prefix, subvols)
  }
 }
 
-const BtrfsSubvolumeCard = ({ card, subvol, mismount_warning, block, fstab_config, forced_options }) => {
+const BtrfsSubvolumeCard = ({ card, volume, subvol, snapshot_origin, mismount_warning, block, fstab_config, forced_options }) => {
  const crossrefs = get_crossrefs(subvol.uuid);
+
  return (
  <StorageCard card={card} alert={mismount_warning &&
  <MismountAlert warning={mismount_warning}
@@ -423,6 +435,14 @@ const BtrfsSubvolumeCard = ({ card, subvol, mismount_warning, block, fstab_confi
  <DescriptionList className="pf-m-horizontal-on-sm">
  <StorageDescription title={_("Name")} value={subvol.pathname} />
  <StorageDescription title={_("ID")} value={subvol.id} />
+ {snapshot_origin !== null &&
+ <StorageDescription title={_("Snapshot origin")}>
+ <Button variant="link" isInline role="link"
+ onClick={() => cockpit.location.go(["btrfs", volume.data.uuid, snapshot_origin.pathname])}>
+ {snapshot_origin.pathname}
+ </Button>
+ </StorageDescription>
+ }
  <StorageDescription title={_("Mount point")}>
  <MountPoint fstab_config={fstab_config}
  backing_block={block} content_block={block}

diff --git a/test/verify/check-storage-btrfs b/test/verify/check-storage-btrfs
@@ -625,6 +625,15 @@ class TestStorageBtrfs(storagelib.StorageCase):
  b.wait_visible(self.card_row("btrfs subvolume", name="foo"))
  b.wait_not_present(self.card_row("Snapshots", name="foo"))
 
+ # Snapshot details
+ self.click_card_row("Snapshots", name="snap-1")
+ b.wait_text(self.card_desc("btrfs subvolume", "Name"), "snapshots/snap-1")
+ b.wait_text(self.card_desc("btrfs subvolume", "Snapshot origin"), "subdir")
+
+ # Origin link works
+ b.click(self.card_button("btrfs subvolume", "subdir"))
+ b.wait_text(self.card_desc("btrfs subvolume", "Name"), "subdir")
+
 
 if __name__ == '__main__':
  testlib.test_main()