Merge branch 'main' into ci/backend-migrations-check

intuitem · Oct 11, 2024 · e3302de · e3302de
2 parents e630e64 + 5cf1ac3
commit e3302de
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/backend/iam/views.py b/backend/iam/views.py
@@ -78,6 +78,7 @@ def get(self, request) -> Response:
             "roles": request.user.get_roles(),
             "permissions": request.user.permissions,
             "is_third_party": request.user.is_third_party,
+            "is_admin": request.user.is_admin(),
         }
         return Response(res_data, status=HTTP_200_OK)
 

diff --git a/frontend/messages/en.json b/frontend/messages/en.json
@@ -765,5 +765,6 @@
 	"associatedEntities": "Associated entities",
 	"noMailerConfigured": "No mailer configured",
 	"errorLicenseSeatsExceeded": "The number of license seats is exceeded, you will not be able to grant editing rights to this user. Please contact your administrator.",
-	"availableSeats": "Available seats"
+	"availableSeats": "Available seats",
+	"librariesCanOnlyBeLoadedByAdmin": "Libraries can only be loaded by an administrator"
 }
diff --git a/frontend/src/lib/components/ModelTable/LibraryActions.svelte b/frontend/src/lib/components/ModelTable/LibraryActions.svelte
@@ -3,6 +3,7 @@
 	import { invalidateAll } from '$app/navigation';
 	import type { ActionResult } from '@sveltejs/kit';
 	import * as m from '$paraglide/messages';
+	import { page } from '$app/stores';
 
 	export let meta: any;
 	export let actionsURLModel: string;
@@ -46,7 +47,7 @@
 				/>
 			</svg>
 		</div>
-	{:else}
+	{:else if $page.data.user.is_admin}
 		<span class="hover:text-primary-500">
 			<form
 				method="post"

diff --git a/frontend/src/routes/(app)/(internal)/libraries/+page.svelte b/frontend/src/routes/(app)/(internal)/libraries/+page.svelte
@@ -7,6 +7,7 @@
 	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
 	import { superValidate } from 'sveltekit-superforms';
 	import { zod } from 'sveltekit-superforms/adapters';
+	import { page } from '$app/stores';
 
 	export let data;
 
@@ -32,6 +33,10 @@
 		<svelte:fragment slot="panel">
 			<!-- storedlibraries -->
 			{#if tabSet === 0}
+				<div class="flex items-center mb-2 px-2 text-xs space-x-2">
+					<i class="fa-solid fa-info-circle" />
+					<p>{m.librariesCanOnlyBeLoadedByAdmin()}</p>
+				</div>
 				<ModelTable
 					source={data.storedLibrariesTable}
 					URLModel="libraries"
@@ -54,7 +59,7 @@
 		</svelte:fragment>
 	</TabGroup>
 </div>
-{#if tabSet === 0}
+{#if tabSet === 0 && $page.data.user.is_admin}
 	<div class="card bg-white p-4 mt-4 shadow">
 		{#await superValidate(zod(LibraryUploadSchema))}
 			<h1>{m.loadingLibraryUploadButton()}...</h1>

diff --git a/frontend/src/routes/(app)/(internal)/libraries/[id=uuid]/+page.svelte b/frontend/src/routes/(app)/(internal)/libraries/[id=uuid]/+page.svelte
@@ -5,6 +5,7 @@
 	import Dropdown from '$lib/components/Dropdown/Dropdown.svelte';
 	import TreeViewItemContent from '../../frameworks/[id=uuid]/TreeViewItemContent.svelte';
 	import * as m from '$paraglide/messages';
+	import { page } from '$app/stores';
 
 	export let data;
 	let loading = { form: false, library: '' };
@@ -122,9 +123,11 @@
 							}}
 							on:submit={handleSubmit}
 						>
-							<button type="submit" class="p-1 btn text-xl hover:text-primary-500">
-								<i class="fa-solid fa-file-import" />
-							</button>
+							{#if $page.data.user.is_admin}
+								<button type="submit" class="p-1 btn text-xl hover:text-primary-500">
+									<i class="fa-solid fa-file-import" />
+								</button>
+							{/if}
 						</form>
 					{/if}
 				{/if}