utils: downloader: keep torrent files post download, ui: fix selectbox placement

internal/handlers/routes.go

@@ -474,7 +474,6 @@ func RegisterRoutes(r *gin.Engine,
 		utilities.GET("/downloads", utilitiesHandlers.ListDownloads(utilitiesService))
 		utilities.GET("/downloads/paths", utilitiesHandlers.GetDownloadPaths())
 		utilities.GET("/downloads/utype", utilitiesHandlers.ListDownloadsByUType(utilitiesService))
-		utilities.GET("/downloads/:uuid", utilitiesHandlers.DownloadFileFromSignedURL(utilitiesService))
 		utilities.DELETE("/downloads/:id", utilitiesHandlers.DeleteDownload(utilitiesService))
 		utilities.POST("/downloads/bulk-delete", utilitiesHandlers.BulkDeleteDownload(utilitiesService))
 		utilities.POST("/downloads/signed-url", utilitiesHandlers.GetSignedDownloadURL(utilitiesService))
@@ -485,6 +484,8 @@ func RegisterRoutes(r *gin.Engine,
 		utilities.DELETE("/cloud-init/templates/:id", utilitiesHandlers.DeleteCloudInitTemplate(utilitiesService))
 	}
 
+	api.GET("/utilities/downloads/:uuid", utilitiesHandlers.DownloadFileFromSignedURL(utilitiesService))
+
 	auth := api.Group("/auth")
 	auth.Use(middleware.EnsureAuthenticated(authService))
 	auth.Use(middleware.RequestLoggerMiddleware(telemetryDB, authService))

internal/services/utilities/downloads.go

@@ -738,7 +738,7 @@ func (s *Service) syncTorrent(download *utilitiesModels.Downloads) {
 	if isFinished {
 		download.Status = utilitiesModels.DownloadStatusDone
 		download.Progress = 100
-		if err := s.BTTClient.RemoveTorrent(download.UUID, false); err != nil {
+		if err := s.BTTClient.RemoveTorrent(download.UUID, true); err != nil {
 			logger.L.Error().Err(err).Msgf("Failed to remove completed torrent %s", download.UUID)
 			return
 		}

web/src/locales/en.po

@@ -7521,10 +7521,8 @@ msgstr "Network detached"
 msgid "VM must be shut off to attach storage"
 msgstr "VM must be shut off to attach storage"
 
-#. 0: properties.detach.name; 1: vm.current.name
 #. 0: properties.detach.name; 1: vm.current.name
 #: src/routes/[node]/vm/[node]/storage/+page.svelte
-#: src/routes/[node]/vm/[rid]/storage/+page.svelte
 msgid "This will detach the storage {0} from the VM <b>{1}</b>"
 msgstr "This will detach the storage {0} from the VM <b>{1}</b>"
 
@@ -13119,3 +13117,8 @@ msgstr "Time Machine Max Size (GB)"
 #: src/lib/components/custom/Samba/Share.svelte
 msgid "Set to 0 for unlimited size"
 msgstr "Set to 0 for unlimited size"
+
+#. 0: properties.detach.name; 1: vm.current.name
+#: src/routes/[node]/vm/[rid]/storage/+page.svelte
+msgid "This will detach the storage {0} from the VM <b>{1}</b>. The underlying disk dataset/file will NOT be deleted."
+msgstr "This will detach the storage {0} from the VM <b>{1}</b>. The underlying disk dataset/file will NOT be deleted."

web/src/locales/hi.po

@@ -7521,10 +7521,8 @@ msgstr "नेटवर्क अलग कर दिया गया"
 msgid "VM must be shut off to attach storage"
 msgstr "स्टोरेज जोड़ने के लिए VM बंद होना चाहिए"
 
-#. 0: properties.detach.name; 1: vm.current.name
 #. 0: properties.detach.name; 1: vm.current.name
 #: src/routes/[node]/vm/[node]/storage/+page.svelte
-#: src/routes/[node]/vm/[rid]/storage/+page.svelte
 msgid "This will detach the storage {0} from the VM <b>{1}</b>"
 msgstr "यह VM <b>{1}</b> से स्टोरेज {0} को अलग कर देगा"
 
@@ -13119,3 +13117,8 @@ msgstr ""
 #: src/lib/components/custom/Samba/Share.svelte
 msgid "Set to 0 for unlimited size"
 msgstr ""
+
+#. 0: properties.detach.name; 1: vm.current.name
+#: src/routes/[node]/vm/[rid]/storage/+page.svelte
+msgid "This will detach the storage {0} from the VM <b>{1}</b>. The underlying disk dataset/file will NOT be deleted."
+msgstr ""

web/src/locales/mal.po

@@ -7521,10 +7521,8 @@ msgstr "നെറ്റ്‌വർക്ക് വേർപെടുത്ത
 msgid "VM must be shut off to attach storage"
 msgstr "സ്റ്റോറേജ് ചേർക്കുന്നതിന് VM ഷട്ട് ഓഫ് ചെയ്തിരിക്കണം"
 
-#. 0: properties.detach.name; 1: vm.current.name
 #. 0: properties.detach.name; 1: vm.current.name
 #: src/routes/[node]/vm/[node]/storage/+page.svelte
-#: src/routes/[node]/vm/[rid]/storage/+page.svelte
 msgid "This will detach the storage {0} from the VM <b>{1}</b>"
 msgstr "ഇത് VM <b>{1}</b>-ൽ നിന്ന് സ്റ്റോറേജ് {0} വേർപെടുത്തും"
 
@@ -13119,3 +13117,8 @@ msgstr ""
 #: src/lib/components/custom/Samba/Share.svelte
 msgid "Set to 0 for unlimited size"
 msgstr ""
+
+#. 0: properties.detach.name; 1: vm.current.name
+#: src/routes/[node]/vm/[rid]/storage/+page.svelte
+msgid "This will detach the storage {0} from the VM <b>{1}</b>. The underlying disk dataset/file will NOT be deleted."
+msgstr ""

web/src/routes/[node]/utilities/downloader/+page.svelte

@@ -480,8 +480,8 @@
 								{ value: 'cloud-init', label: 'Cloud-Init' }
 							]}
 							classes={{
-								parent: 'mt-2.5 flex-1 space-y-1 w-full',
-								label: 'mb-2',
+								parent: 'mt-2 flex-1 space-y-1 w-full',
+								label: 'flex h-7 items-center text-sm',
 								trigger: 'w-full'
 							}}
 							bind:value={modalState.downloadType}