Merge pull request #336 from PatchMon/release/1-3-5

put bash in for proxmox

backend/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "patchmon-backend",
-	"version": "1.3.5",
+	"version": "1.3.6",
 	"description": "Backend API for Linux Patch Monitoring System",
 	"license": "AGPL-3.0",
 	"main": "src/server.js",

backend/prisma/schema.prisma

@@ -103,6 +103,7 @@ model hosts {
   gateway_ip              String?
   hostname                String?
   kernel_version          String?
+  installed_kernel_version String?
   load_average             Json?
   network_interfaces      Json?
   ram_installed           Int?

backend/src/routes/hostRoutes.js

@@ -506,6 +506,10 @@ router.post(
 			.optional()
 			.isString()
 			.withMessage("Kernel version must be a string"),
+		body("installedKernelVersion")
+			.optional()
+			.isString()
+			.withMessage("Installed kernel version must be a string"),
 		body("selinuxStatus")
 			.optional()
 			.isIn(["enabled", "disabled", "permissive"])
@@ -587,6 +591,8 @@ router.post(
 			// System Information
 			if (req.body.kernelVersion)
 				updateData.kernel_version = req.body.kernelVersion;
+			if (req.body.installedKernelVersion)
+				updateData.installed_kernel_version = req.body.installedKernelVersion;
 			if (req.body.selinuxStatus)
 				updateData.selinux_status = req.body.selinuxStatus;
 			if (req.body.systemUptime)

frontend/env.example

@@ -6,5 +6,5 @@ VITE_API_URL=http://localhost:3001/api/v1
 
 # Application Metadata
 VITE_APP_NAME=PatchMon
-VITE_APP_VERSION=1.3.5
+VITE_APP_VERSION=1.3.6
 

frontend/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "patchmon-frontend",
 	"private": true,
-	"version": "1.3.5",
+	"version": "1.3.6",
 	"license": "AGPL-3.0",
 	"type": "module",
 	"scripts": {

frontend/src/pages/HostDetail.jsx

@@ -1013,29 +1013,25 @@ const HostDetail = () => {
 												</div>
 											)}
 
-											{(host.kernel_version ||
+											{host.kernel_version && (
-												host.installed_kernel_version) && (
+												<div>
-												<div className="flex flex-col gap-2">
+													<p className="text-xs text-secondary-500 dark:text-secondary-300">
-													{host.kernel_version && (
+														Running Kernel
-														<div>
+													</p>
-															<p className="text-xs text-secondary-500 dark:text-secondary-300 mb-1">
+													<p className="font-medium text-secondary-900 dark:text-white font-mono text-sm break-all">
-																Running Kernel
+														{host.kernel_version}
-															</p>
+													</p>
-															<p className="font-medium text-secondary-900 dark:text-white font-mono text-sm break-all">
+												</div>
-																{host.kernel_version}
+											)}
-															</p>
+
-														</div>
+											{host.installed_kernel_version && (
-													)}
+												<div>
-													{host.installed_kernel_version && (
+													<p className="text-xs text-secondary-500 dark:text-secondary-300">
-														<div>
+														Installed Kernel
-															<p className="text-xs text-secondary-500 dark:text-secondary-300 mb-1">
+													</p>
-																Installed Kernel
+													<p className="font-medium text-secondary-900 dark:text-white font-mono text-sm break-all">
-															</p>
+														{host.installed_kernel_version}
-															<p className="font-medium text-secondary-900 dark:text-white font-mono text-sm break-all">
+													</p>
-																{host.installed_kernel_version}
-															</p>
-														</div>
-													)}
 												</div>
 											)}
 

frontend/src/pages/Hosts.jsx

@@ -649,11 +649,27 @@ const Hosts = () => {
 		);
 	};
 
-	const handleSelectAll = () => {
+	const handleSelectAll = (hostsToSelect) => {
-		if (selectedHosts.length === hosts.length) {
+		const hostIdsToSelect = hostsToSelect.map((host) => host.id);
-			setSelectedHosts([]);
+		const allSelected = hostIdsToSelect.every((id) =>
+			selectedHosts.includes(id),
+		);
+		if (allSelected) {
+			// Deselect all hosts in this group
+			setSelectedHosts((prev) =>
+				prev.filter((id) => !hostIdsToSelect.includes(id)),
+			);
 		} else {
-			setSelectedHosts(hosts.map((host) => host.id));
+			// Select all hosts in this group (merge with existing selections)
+			setSelectedHosts((prev) => {
+				const newSelection = [...prev];
+				hostIdsToSelect.forEach((id) => {
+					if (!newSelection.includes(id)) {
+						newSelection.push(id);
+					}
+				});
+				return newSelection;
+			});
 		}
 	};
 
@@ -1655,11 +1671,14 @@ const Hosts = () => {
 																		{column.id === "select" ? (
 																			<button
 																				type="button"
-																				onClick={handleSelectAll}
+																				onClick={() =>
+																					handleSelectAll(groupHosts)
+																				}
 																				className="flex items-center gap-2 hover:text-secondary-700"
 																			>
-																				{selectedHosts.length ===
+																				{groupHosts.every((host) =>
-																				groupHosts.length ? (
+																					selectedHosts.includes(host.id),
+																				) ? (
 																					<CheckSquare className="h-4 w-4" />
 																				) : (
 																					<Square className="h-4 w-4" />

frontend/src/pages/settings/Integrations.jsx

@@ -1586,7 +1586,7 @@ const Integrations = () => {
 										<div className="flex items-center gap-2">
 											<input
 												type="text"
-												value={`curl ${curl_flags} "${getEnrollmentUrl()}" | sh`}
+												value={`curl ${curl_flags} "${getEnrollmentUrl()}" | ${selected_script_type === "proxmox-lxc" ? "bash" : "sh"}`}
 												readOnly
 												className="flex-1 px-3 py-2 border border-secondary-300 dark:border-secondary-600 rounded-md bg-secondary-50 dark:bg-secondary-900 text-secondary-900 dark:text-white font-mono text-xs"
 											/>
@@ -1594,7 +1594,7 @@ const Integrations = () => {
 												type="button"
 												onClick={() =>
 													copy_to_clipboard(
-														`curl ${curl_flags} "${getEnrollmentUrl()}" | sh`,
+														`curl ${curl_flags} "${getEnrollmentUrl()}" | ${selected_script_type === "proxmox-lxc" ? "bash" : "sh"}`,
 														"enrollment-command",
 													)
 												}

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "patchmon",
-	"version": "1.3.5",
+	"version": "1.3.6",
 	"description": "Linux Patch Monitoring System",
 	"license": "AGPL-3.0",
 	"private": true,