Updates

frontend/src/routes/mixes/+page.ts

@@ -1,5 +1,7 @@
+import { redirect } from '@sveltejs/kit';
 import { getStoredClientSession, hasModuleAccess, hasStoredClientSession } from '$lib/session';
 import { api } from '$lib/api';
+import { canOpenMixMaster, getWorkspaceHomeHref } from '$lib/workspace-access';
 
 export async function load({ fetch }) {
   if (!hasStoredClientSession()) {
@@ -9,10 +11,13 @@ export async function load({ fetch }) {
   }
 
   const session = getStoredClientSession();
+  if (!canOpenMixMaster(session)) {
+    throw redirect(307, getWorkspaceHomeHref(session));
+  }
 
   try {
     return {
-      mixes: hasModuleAccess(session, 'mix_master') ? await api.mixes(fetch) : []
+      mixes: hasModuleAccess(session, 'mix_master') || session?.role === 'internal' ? await api.mixes(fetch) : []
     };
   } catch {
     return {

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 {

frontend/src/routes/mixes/new/+page.ts

@@ -1,5 +1,7 @@
+import { redirect } from '@sveltejs/kit';
 import { getStoredClientSession, hasModuleAccess, hasStoredClientSession } from '$lib/session';
 import { api } from '$lib/api';
+import { canCreateMixWorksheet, getWorkspaceHomeHref } from '$lib/workspace-access';
 
 export async function load({ fetch }) {
   if (!hasStoredClientSession()) {
@@ -9,10 +11,16 @@ export async function load({ fetch }) {
   }
 
   const session = getStoredClientSession();
+  if (!canCreateMixWorksheet(session)) {
+    throw redirect(307, getWorkspaceHomeHref(session));
+  }
 
   try {
     return {
-      rawMaterials: hasModuleAccess(session, 'mix_master') && hasModuleAccess(session, 'raw_materials') ? await api.rawMaterials(fetch) : []
+      rawMaterials:
+        (hasModuleAccess(session, 'mix_master') && hasModuleAccess(session, 'raw_materials')) || session?.role === 'internal'
+          ? await api.rawMaterials(fetch)
+          : []
     };
   } catch {
     return {