feat(organization): implement organization settings management, including slug updates for owners and leave organization functionality for members

Author: maartenbode

app/Domains/Organization/Contracts/Data/OrganizationWithRoleData.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Domains\Organization\Contracts\Data;
+
+use App\Models\Organization;
+use App\Models\Pivots\OrganizationUserPivot;
+use App\Models\User;
+use Spatie\LaravelData\Data;
+use Spatie\TypeScriptTransformer\Attributes\TypeScript;
+
+#[TypeScript]
+class OrganizationWithRoleData extends Data
+{
+    public function __construct(
+        public OrganizationData $organization,
+        public string $role,
+        public bool $isOwner,
+        public string $pivotUuid,
+    ) {}
+
+    public static function fromOrganizationAndPivot(
+        Organization $organization,
+        OrganizationUserPivot $pivot,
+        User $user
+    ): self {
+        return new self(
+            organization: OrganizationData::fromModel($organization),
+            role: $pivot->role,
+            isOwner: $organization->owner_uuid === $user->uuid,
+            pivotUuid: $pivot->uuid,
+        );
+    }
+}

app/Domains/Organization/Http/Controllers/SettingsController.php

@@ -23,16 +23,30 @@ public function general(Organization $organization): Response
     {
         $this->authorize('viewSettings', $organization);
 
+        $user = auth()->user();
+        $isOwner = $user !== null && $organization->owner_uuid === $user->uuid;
+
         return Inertia::render('organizations/settings/general', [
             'organization' => OrganizationData::from($organization),
+            'isOwner' => $isOwner,
         ]);
     }
 
     public function update(UpdateOrganizationRequest $request, Organization $organization): RedirectResponse
     {
-        $organization->update([
+        $user = $request->user();
+        $isOwner = $user !== null && $organization->owner_uuid === $user->uuid;
+
+        $updateData = [
             'name' => $request->validated('name'),
-        ]);
+        ];
+
+        if ($isOwner && $request->has('slug')) {
+            $updateData['slug'] = $request->validated('slug');
+        }
+
+        $organization->update($updateData);
+        $organization->refresh();
 
         return redirect()
             ->route('organizations.settings.general', $organization)

app/Domains/Organization/Requests/UpdateOrganizationRequest.php

@@ -3,6 +3,7 @@
 namespace App\Domains\Organization\Requests;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
 class UpdateOrganizationRequest extends FormRequest
 {
@@ -18,12 +19,29 @@ public function authorize(): bool
     }
 
     /**
-     * @return array<string, array<int, string>>
+     * @return array<string, array<int, string|Rule>>
      */
     public function rules(): array
     {
-        return [
+        /** @var \App\Models\Organization|null $organization */
+        $organization = $this->route('organization');
+        $user = $this->user();
+        $isOwner = $organization !== null && $user !== null && $organization->owner_uuid === $user->uuid;
+
+        $rules = [
             'name' => ['required', 'string', 'max:255'],
         ];
+
+        if ($isOwner) {
+            $rules['slug'] = [
+                'required',
+                'string',
+                'max:255',
+                'regex:/^[a-z0-9]+(?:-[a-z0-9]+)*$/',
+                Rule::unique('organizations', 'slug')->ignore($organization->uuid, 'uuid'),
+            ];
+        }
+
+        return $rules;
     }
 }

app/Http/Controllers/Settings/LeaveOrganizationController.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Controllers\Settings;
+
+use App\Http\Controllers\Controller;
+use App\Models\Organization;
+use App\Models\OrganizationUser;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+
+class LeaveOrganizationController extends Controller
+{
+    public function __invoke(Request $request, Organization $organization): RedirectResponse
+    {
+        $user = $request->user();
+
+        if ($user === null) {
+            abort(401);
+        }
+
+        if ($organization->owner_uuid === $user->uuid) {
+            return redirect()
+                ->route('settings.organizations')
+                ->with('error', 'You cannot leave an organization you own.');
+        }
+
+        $organizationUser = OrganizationUser::where('organization_uuid', $organization->uuid)
+            ->where('user_uuid', $user->uuid)
+            ->first();
+
+        if ($organizationUser === null) {
+            return redirect()
+                ->route('settings.organizations')
+                ->with('error', 'You are not a member of this organization.');
+        }
+
+        $organizationUser->delete();
+
+        return redirect()
+            ->route('settings.organizations')
+            ->with('success', 'You have left the organization successfully.');
+    }
+}

app/Http/Controllers/Settings/OrganizationsController.php

@@ -0,0 +1,41 @@
+<?php
+
+namespace App\Http\Controllers\Settings;
+
+use App\Domains\Organization\Contracts\Data\OrganizationWithRoleData;
+use App\Http\Controllers\Controller;
+use App\Models\Organization;
+use App\Models\Pivots\OrganizationUserPivot;
+use Illuminate\Http\Request;
+use Inertia\Inertia;
+use Inertia\Response;
+
+class OrganizationsController extends Controller
+{
+    public function index(Request $request): Response
+    {
+        $user = $request->user();
+
+        if ($user === null) {
+            abort(401);
+        }
+
+        $organizations = $user
+            ->organizations()
+            ->withPivot('role', 'uuid')
+            ->get()
+            ->map(function (Organization $org) use ($user) {
+                $pivot = $org->pivot;
+
+                if (! $pivot instanceof OrganizationUserPivot) {
+                    throw new \RuntimeException('Pivot is not an instance of OrganizationUserPivot');
+                }
+
+                return OrganizationWithRoleData::fromOrganizationAndPivot($org, $pivot, $user);
+            });
+
+        return Inertia::render('settings/organizations', [
+            'organizations' => $organizations,
+        ]);
+    }
+}

app/Models/User.php

@@ -100,12 +100,13 @@ public function ownedOrganizations(): HasMany
     }
 
     /**
-     * @return BelongsToMany<Organization, $this>
+     * @return BelongsToMany<Organization, $this, OrganizationUserPivot, 'pivot'>
      */
     public function organizations(): BelongsToMany
     {
         return $this->belongsToMany(Organization::class, 'organization_users', 'user_uuid', 'organization_uuid', 'uuid', 'uuid')
-            ->withPivot('role')
+            ->using(OrganizationUserPivot::class)
+            ->withPivot('role', 'uuid')
             ->withTimestamps();
     }
 

app/Policies/OrganizationPolicy.php

@@ -38,4 +38,9 @@ public function manageMembers(User $user, Organization $organization): bool
     {
         return $this->viewSettings($user, $organization);
     }
+
+    public function updateSlug(User $user, Organization $organization): bool
+    {
+        return $organization->owner_uuid === $user->uuid;
+    }
 }

resources/js/components/app-logo.tsx

@@ -2,15 +2,15 @@ import AppLogoIcon from './app-logo-icon';
 
 export default function AppLogo() {
     return (
-        <>
+        <div className="flex w-full items-center justify-center gap-2">
             <div className="flex aspect-square size-6 items-center justify-center rounded-md text-sidebar-primary-foreground">
                 <AppLogoIcon className="size-6 fill-current text-white dark:text-black" />
             </div>
-            <div className="ml-1 grid flex-1 text-left text-sm group-data-[collapsible=icon]:hidden">
+            <div className="grid text-center text-lg group-data-[collapsible=icon]:hidden">
                 <span className="mb-0.5 truncate leading-tight font-semibold">
                     Pricore
                 </span>
             </div>
-        </>
+        </div>
     );
 }

resources/js/components/app-sidebar.tsx

@@ -84,7 +84,7 @@ export function AppSidebar() {
                         <SidebarMenuButton
                             size="lg"
                             asChild
-                            className="group-data-[collapsible=icon]:justify-center"
+                            className="justify-center"
                         >
                             <Link href={dashboard()} prefetch>
                                 <AppLogo />

resources/js/components/info-box.tsx

@@ -10,7 +10,7 @@ export default function InfoBox({
     children,
 }: InfoBoxProps) {
     return (
-        <div className="rounded-md border border-b-2 border-neutral-200 bg-neutral-50 p-4 dark:border-neutral-800 dark:bg-neutral-950">
+        <div className="rounded-md border border-b-2 border-neutral-200 bg-neutral-50 p-5 dark:border-neutral-800 dark:bg-neutral-950">
             <p className="text-sm font-medium text-neutral-900 dark:text-neutral-100">
                 {title}
             </p>
@@ -21,4 +21,3 @@ export default function InfoBox({
         </div>
     );
 }
-