From 85916e16be78bd3c471b0dbd669c2e4b184058ee Mon Sep 17 00:00:00 2001
From: Lunga-Ntando-Ndlovu <u22525697@tuks.co.za>
Date: Mon, 30 Sep 2024 11:54:11 +0200
Subject: [PATCH] NoAccess page for Annuncements and Workspaces

---
 src/src/routes/(app)/announcements/+page.svelte | 9 +++++++--
 src/src/routes/(app)/workspaces/+page.server.ts | 6 ++++--
 src/src/routes/(app)/workspaces/+page.svelte    | 3 +--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/src/routes/(app)/announcements/+page.svelte b/src/src/routes/(app)/announcements/+page.svelte
index 18bf4036..10ebd2bf 100644
--- a/src/src/routes/(app)/announcements/+page.svelte
+++ b/src/src/routes/(app)/announcements/+page.svelte
@@ -1,7 +1,12 @@
 <script>
 	import Announcements from '$src/lib/components/announcements/Main.svelte';
-
+	import NoAccess from '$src/lib/components/common/PageUnavailable.svelte';
 	export let data;
 </script>
 
-<Announcements {data} view={'admin'} />
+<!-- On the assumption each user has an organisation (besides admin) -->
+{#if data.organisation === undefined}
+	<NoAccess />
+{:else}
+	<Announcements {data} view={'admin'} />
+{/if}
diff --git a/src/src/routes/(app)/workspaces/+page.server.ts b/src/src/routes/(app)/workspaces/+page.server.ts
index 24f944e2..7b586a00 100644
--- a/src/src/routes/(app)/workspaces/+page.server.ts
+++ b/src/src/routes/(app)/workspaces/+page.server.ts
@@ -68,8 +68,10 @@ export async function load({ locals }) {
 				getWorkspaces(locals.user.organisation),
 				getLecturers(locals.user.organisation)
 			]);
-
-			const organisation = locals.user.organisation.toString() || null;
+			let organisation;
+			if (locals.user.organisation !== undefined) {
+				organisation = locals.user.organisation.toString() || null;
+			}
 
 			return { role: locals.user.role, lecturers, workspaces, organisation };
 		} else {
diff --git a/src/src/routes/(app)/workspaces/+page.svelte b/src/src/routes/(app)/workspaces/+page.svelte
index 36c7577f..3d5aa9c3 100644
--- a/src/src/routes/(app)/workspaces/+page.svelte
+++ b/src/src/routes/(app)/workspaces/+page.svelte
@@ -4,11 +4,10 @@
 	import NoAccess from '$src/lib/components/common/PageUnavailable.svelte';
 
 	export let data: any;
-	$: ({ organisation } = data);
 </script>
 
 {#if data.role === 'admin'}
-	{#if organisation === undefined}
+	{#if data.organisation === undefined}
 		<NoAccess />
 	{:else}
 		<AdminWorkspaces {data} />