Updates

frontend/src/routes/mixes/[id]/+page.ts

@@ -1,6 +1,7 @@
-import { error } from '@sveltejs/kit';
+import { error, redirect } from '@sveltejs/kit';
 import { api } from '$lib/api';
 import { getStoredClientSession, hasModuleAccess, hasStoredClientSession } from '$lib/session';
+import { canOpenMixMaster, getWorkspaceHomeHref } from '$lib/workspace-access';
 
 export async function load({ params, fetch }) {
   const mixId = Number(params.id);
@@ -17,17 +18,14 @@ export async function load({ params, fetch }) {
   }
 
   const session = getStoredClientSession();
-  if (!hasModuleAccess(session, 'mix_master')) {
-    return {
-      mix: null,
-      rawMaterials: []
-    };
+  if (!canOpenMixMaster(session)) {
+    throw redirect(307, getWorkspaceHomeHref(session));
   }
 
   try {
     const [mix, rawMaterials] = await Promise.all([
       api.mix(mixId, fetch),
-      hasModuleAccess(session, 'raw_materials') ? api.rawMaterials(fetch) : Promise.resolve([])
+      hasModuleAccess(session, 'raw_materials') || session?.role === 'internal' ? api.rawMaterials(fetch) : Promise.resolve([])
     ]);
 
     return {