From 4c00d70848968c8a0daff8fdf48edb69f769bcd9 Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Mon, 24 Apr 2023 15:20:08 +0200
Subject: [PATCH] baculum: Add volstatus filter to volumes endpoint

---
 gui/baculum/protected/API/Pages/API/Volumes.php |  7 +++++++
 gui/baculum/protected/API/openapi_baculum.json  | 10 ++++++++++
 2 files changed, 17 insertions(+)

diff --git a/gui/baculum/protected/API/Pages/API/Volumes.php b/gui/baculum/protected/API/Pages/API/Volumes.php
index efe08b0b7..090ec6bdb 100644
--- a/gui/baculum/protected/API/Pages/API/Volumes.php
+++ b/gui/baculum/protected/API/Pages/API/Volumes.php
@@ -40,6 +40,7 @@ class Volumes extends BaculumAPIServer {
 		if ($this->Request->contains('enabled') && $misc->isValidBoolean($this->Request['enabled'])) {
 			$enabled = $misc->isValidBooleanTrue($this->Request['enabled']) ? 1 : 0;
 		}
+		$volstatus = $this->Request->contains('volstatus') && $misc->isValidState($this->Request['volstatus']) ? $this->Request['volstatus'] : null;
 		$voltype = $this->Request->contains('voltype') && $misc->isValidVolType($this->Request['voltype']) ? $this->Request['voltype'] : null;
 		$pool = $this->Request->contains('pool') && $misc->isValidName($this->Request['pool']) ? $this->Request['pool'] : null;
 		$storage = $this->Request->contains('storage') && $misc->isValidName($this->Request['storage']) ? $this->Request['storage'] : null;
@@ -58,6 +59,12 @@ class Volumes extends BaculumAPIServer {
 			];
 		}
 
+		if (is_string($volstatus)) {
+			$params['Media.VolStatus'][] = [
+				'vals' => $volstatus
+			];
+		}
+
 		if (is_string($voltype)) {
 			$props['voltype'] = $voltype;
 		}
diff --git a/gui/baculum/protected/API/openapi_baculum.json b/gui/baculum/protected/API/openapi_baculum.json
index 73a4668aa..6a8883010 100644
--- a/gui/baculum/protected/API/openapi_baculum.json
+++ b/gui/baculum/protected/API/openapi_baculum.json
@@ -3998,6 +3998,16 @@
 						"schema": {
 							"type": "boolean"
 						}
+					},
+					{
+						"name": "volstatus",
+						"in": "query",
+						"description": "Volume status.",
+						"required": false,
+						"schema": {
+							"type": "string",
+							"enum": ["Append", "Archive", "Disabled", "Full", "Used", "Cleaning", "Purged", "Recycle", "Read-Only", "Error"]
+						}
 					}
 				]
 			}
-- 
2.47.3