Hided cache dir when using SSH Slurm

Author: zonia3000

src/lib/components/v2/admin/UserEditor.svelte

@@ -517,6 +517,25 @@
 						<span class="invalid-feedback">{$settingsValidationErrors['slurm_user']}</span>
 					</div>
 				</div>
+				<div class="row mb-3 has-validation">
+					<label for="cacheDir" class="col-sm-3 col-form-label text-end">
+						<strong>Cache dir</strong>
+					</label>
+					<div class="col-sm-9">
+						<input
+							type="text"
+							class="form-control"
+							id="cacheDir"
+							bind:value={settings.cache_dir}
+							class:is-invalid={settingsFormSubmitted && $settingsValidationErrors['cache_dir']}
+						/>
+						<div class="form-text">
+							Absolute path to a user-owned folder that will be used as a cache for job-related
+							files
+						</div>
+						<span class="invalid-feedback">{$settingsValidationErrors['cache_dir']}</span>
+					</div>
+				</div>
 			{:else if runnerBackend === 'slurm_ssh'}
 				<div class="row mb-3 has-validation">
 					<label for="sshHost" class="col-sm-3 col-form-label text-end">
@@ -652,24 +671,6 @@
 					</div>
 				</div>
 			</div>
-			<div class="row mb-3 has-validation">
-				<label for="cacheDir" class="col-sm-3 col-form-label text-end">
-					<strong>Cache dir</strong>
-				</label>
-				<div class="col-sm-9">
-					<input
-						type="text"
-						class="form-control"
-						id="cacheDir"
-						bind:value={settings.cache_dir}
-						class:is-invalid={settingsFormSubmitted && $settingsValidationErrors['cache_dir']}
-					/>
-					<div class="form-text">
-						Absolute path to a user-owned folder that will be used as a cache for job-related files
-					</div>
-					<span class="invalid-feedback">{$settingsValidationErrors['cache_dir']}</span>
-				</div>
-			</div>
 			<div class="row mb-3">
 				<div class="col-sm-9 offset-sm-3">
 					<StandardDismissableAlert message={settingsUpdatedMessage} />

src/lib/types.d.ts

@@ -122,10 +122,10 @@ export type User = {
 }
 
 export type UserSettings = {
-  cache_dir: string | null
   slurm_accounts: string[]
   // Slurm
   slurm_user: string | null
+  cache_dir: string | null
   // Slurm SSH
   ssh_host: string | null
   ssh_username: string | null

src/routes/v2/admin/users/[userId]/+page.svelte

@@ -84,6 +84,10 @@
 							<th>SLURM user</th>
 							<td>{settings.slurm_user || '-'}</td>
 						</tr>
+						<tr>
+							<th>Cache dir</th>
+							<td>{settings.cache_dir || '-'}</td>
+						</tr>
 					{/if}
 					{#if runnerBackend === 'slurm_ssh'}
 						<tr>
@@ -121,10 +125,6 @@
 								{/if}
 							</td>
 						</tr>
-						<tr>
-							<th>Cache dir</th>
-							<td>{settings.cache_dir || '-'}</td>
-						</tr>
 					{/if}
 				</tbody>
 			</table>