Updates

frontend/src/routes/mix-calculator/+page.ts

@@ -2,6 +2,7 @@ import { redirect } from '@sveltejs/kit';
 import { api } from '$lib/api';
 import { featureFlags } from '$lib/features';
 import { getStoredClientSession, hasModuleAccess, hasStoredClientSession } from '$lib/session';
+import { canOpenMixCalculator, getWorkspaceHomeHref } from '$lib/workspace-access';
 
 export async function load({ fetch }) {
   if (!featureFlags.mixCalculatorSessionHistory) {
@@ -15,10 +16,13 @@ export async function load({ fetch }) {
   }
 
   const session = getStoredClientSession();
+  if (!canOpenMixCalculator(session)) {
+    throw redirect(307, getWorkspaceHomeHref(session));
+  }
 
   try {
     return {
-      sessions: hasModuleAccess(session, 'mix_calculator') ? await api.mixCalculatorSessions(fetch) : []
+      sessions: hasModuleAccess(session, 'mix_calculator') || session?.role === 'internal' ? await api.mixCalculatorSessions(fetch) : []
     };
   } catch {
     return {

frontend/src/routes/mix-calculator/[id]/+page.ts

@@ -1,5 +1,7 @@
+import { redirect } from '@sveltejs/kit';
 import { api } from '$lib/api';
 import { getStoredClientSession, hasModuleAccess, hasStoredClientSession } from '$lib/session';
+import { canCreateMixSession, canOpenMixCalculator, getWorkspaceHomeHref } from '$lib/workspace-access';
 
 export async function load({ params, fetch }) {
   if (!hasStoredClientSession()) {
@@ -10,20 +12,17 @@ export async function load({ params, fetch }) {
   }
 
   const session = getStoredClientSession();
-  const canView = hasModuleAccess(session, 'mix_calculator');
-  const canEdit = hasModuleAccess(session, 'mix_calculator', 'edit');
+  const canView = canOpenMixCalculator(session);
+  const canEdit = canCreateMixSession(session);
 
   if (!canView) {
-    return {
-      session: null,
-      options: { clients: [], products: [] }
-    };
+    throw redirect(307, getWorkspaceHomeHref(session));
   }
 
   try {
     const [savedSession, options] = await Promise.all([
       api.mixCalculatorSession(Number(params.id), fetch),
-      canEdit ? api.mixCalculatorOptions(fetch) : Promise.resolve({ clients: [], products: [] })
+      canEdit || session?.role === 'internal' ? api.mixCalculatorOptions(fetch) : Promise.resolve({ clients: [], products: [] })
     ]);
 
     return {

frontend/src/routes/mix-calculator/[id]/print/+page.ts

@@ -1,5 +1,7 @@
+import { redirect } from '@sveltejs/kit';
 import { api } from '$lib/api';
 import { getStoredClientSession, hasModuleAccess, hasStoredClientSession } from '$lib/session';
+import { canOpenMixCalculator, getWorkspaceHomeHref } from '$lib/workspace-access';
 
 export async function load({ params, fetch }) {
   if (!hasStoredClientSession()) {
@@ -10,10 +12,8 @@ export async function load({ params, fetch }) {
 
   const session = getStoredClientSession();
 
-  if (!hasModuleAccess(session, 'mix_calculator')) {
-    return {
-      session: null
-    };
+  if (!canOpenMixCalculator(session)) {
+    throw redirect(307, getWorkspaceHomeHref(session));
   }
 
   try {

frontend/src/routes/mix-calculator/new/+page.ts

@@ -1,5 +1,7 @@
+import { redirect } from '@sveltejs/kit';
 import { api } from '$lib/api';
 import { getStoredClientSession, hasModuleAccess, hasStoredClientSession } from '$lib/session';
+import { canCreateMixSession, 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 (!canCreateMixSession(session)) {
+    throw redirect(307, getWorkspaceHomeHref(session));
+  }
 
   try {
     return {
-      options: hasModuleAccess(session, 'mix_calculator', 'edit')
+      options: hasModuleAccess(session, 'mix_calculator', 'edit') || session?.role === 'internal'
         ? await api.mixCalculatorOptions(fetch)
         : { clients: [], products: [] }
     };