Просмотр исходного кода

Remove unused variables and fix useless assignments in settings and service pages (#83)

* Useless conditional

* removed unused vars

* vars assignment

* permissions
Bernt Christian Egeland 6 месяцев назад
Родитель
Сommit
04b36f34be

+ 5 - 7
src/app/(authenticated)/settings/layout.tsx

@@ -20,15 +20,12 @@ export default async function SettingsLayout({
 
   // Check if user has settings access and edit permission
   const isOwnerOrAdmin = data.role === "owner" || data.role === "admin" || data.role === "super_admin";
-  let canReadSettings = isOwnerOrAdmin;
-  let canEditSettings = isOwnerOrAdmin;
+  let canReadSettings = true;
+  let canEditSettings = true;
   if (!isOwnerOrAdmin) {
     const membership = await getCachedMembership(data.userId);
-    // Members without a custom role have full access
-    if (!membership?.roleId) {
-      canReadSettings = true;
-      canEditSettings = true;
-    } else {
+    // Members with a custom role have restricted access based on permissions
+    if (membership?.roleId) {
       const userPermissions = membership?.customRole?.permissions ?? [];
       canReadSettings = hasPermission(userPermissions, {
         action: PermissionAction.READ,
@@ -40,6 +37,7 @@ export default async function SettingsLayout({
       });
       if (!canReadSettings) redirect("/");
     }
+    // Members without a custom role keep full access (defaults to true)
   }
 
   const features = await getFeatures(data.organizationId);

+ 1 - 7
src/app/(authenticated)/vehicles/[id]/service/[serviceId]/page.tsx

@@ -85,13 +85,7 @@ export default async function ServiceDetailPage({
     : null;
   const orgId = membership?.organizationId;
 
-  const [members, currentUser, features, aiSettings] = await Promise.all([
-    orgId
-      ? db.organizationMember.findMany({
-          where: { organizationId: orgId },
-          select: { id: true, user: { select: { name: true } } },
-        })
-      : Promise.resolve([]),
+  const [currentUser, features, aiSettings] = await Promise.all([
     session?.user?.id
       ? db.user.findUnique({
           where: { id: session.user.id },

+ 1 - 1
src/app/(public)/share/invoice/[orgId]/[token]/invoice-view.tsx

@@ -922,7 +922,7 @@ export function InvoiceView({
             case 'general': {
               const generalCfs = layoutConfig
                 ? getCustomFieldsForSection(layoutConfig, 'general', customFields)
-                : getUnassignedCustomFields(layoutConfig ?? null, customFields)
+                : getUnassignedCustomFields(null, customFields)
               if (generalCfs.length === 0) return null
               return (
                 <div key="general" className="mt-6 rounded-lg bg-gray-50 p-4 dark:bg-gray-800">

+ 1 - 1
src/app/(public)/share/quote/[orgId]/[token]/quote-view.tsx

@@ -661,7 +661,7 @@ export function QuoteView({
             case 'general': {
               const generalCfs = layoutConfig
                 ? getCustomFieldsForSection(layoutConfig, 'general', customFields)
-                : getUnassignedCustomFields(layoutConfig ?? null, customFields);
+                : getUnassignedCustomFields(null, customFields);
               if (generalCfs.length === 0) return null;
               return (
                 <div key="general" className="mt-6 rounded-lg bg-gray-50 p-4 dark:bg-gray-800">

+ 1 - 1
src/features/vehicles/Components/invoice-pdf/InfoSection.tsx

@@ -60,7 +60,7 @@ interface CustomerRenderCtx {
 }
 
 function renderCustomerField(fieldId: string, ctx: CustomerRenderCtx): React.ReactNode {
-  const { data, styles, labels } = ctx
+  const { data, styles } = ctx
   const c = data.vehicle.customer
   if (!c) return null