bump solidtime ui package version to 0.0.13

mounting the rows mounts lots of nested components which results in a delay on the initial mount.

app/Http/Controllers/Api/V1/OrganizationController.php

@@ -46,9 +46,6 @@ class OrganizationController extends Controller
         if ($request->getEmployeesCanSeeBillableRates() !== null) {
             $organization->employees_can_see_billable_rates = $request->getEmployeesCanSeeBillableRates();
         }
-        if ($request->getEmployeesCanManageTasks() !== null) {
-            $organization->employees_can_manage_tasks = $request->getEmployeesCanManageTasks();
-        }
         if ($request->getNumberFormat() !== null) {
             $organization->number_format = $request->getNumberFormat();
         }

app/Http/Controllers/Api/V1/TaskController.php

@@ -11,7 +11,6 @@ use App\Http\Requests\V1\Task\TaskUpdateRequest;
 use App\Http\Resources\V1\Task\TaskCollection;
 use App\Http\Resources\V1\Task\TaskResource;
 use App\Models\Organization;
-use App\Models\Project;
 use App\Models\Task;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
@@ -28,26 +27,6 @@ class TaskController extends Controller
         }
     }
 
-    /**
-     * Check scoped permission and verify user has access to the project
-     *
-     * @throws AuthorizationException
-     */
-    private function checkScopedPermissionForProject(Organization $organization, Project $project, string $permission): void
-    {
-        $this->checkPermission($organization, $permission);
-
-        $user = $this->user();
-        $hasAccess = Project::query()
-            ->where('id', $project->id)
-            ->visibleByEmployee($user)
-            ->exists();
-
-        if (! $hasAccess) {
-            throw new AuthorizationException('You do not have permission to '.$permission.' in this project.');
-        }
-    }
-
     /**
      * Get tasks
      *
@@ -96,15 +75,7 @@ class TaskController extends Controller
      */
     public function store(Organization $organization, TaskStoreRequest $request): JsonResource
     {
-        /** @var Project $project */
-        $project = Project::query()->findOrFail($request->input('project_id'));
-
-        if ($this->hasPermission($organization, 'tasks:create:all')) {
-            $this->checkPermission($organization, 'tasks:create:all');
-        } else {
-            $this->checkScopedPermissionForProject($organization, $project, 'tasks:create');
-        }
-
+        $this->checkPermission($organization, 'tasks:create');
         $task = new Task;
         $task->name = $request->input('name');
         $task->project_id = $request->input('project_id');
@@ -126,17 +97,7 @@ class TaskController extends Controller
      */
     public function update(Organization $organization, Task $task, TaskUpdateRequest $request): JsonResource
     {
-        // Check task belongs to organization
-        if ($task->organization_id !== $organization->id) {
-            throw new AuthorizationException('Task does not belong to organization');
-        }
-
-        if ($this->hasPermission($organization, 'tasks:update:all')) {
-            $this->checkPermission($organization, 'tasks:update:all');
-        } else {
-            $this->checkScopedPermissionForProject($organization, $task->project, 'tasks:update');
-        }
-
+        $this->checkPermission($organization, 'tasks:update', $task);
         $task->name = $request->input('name');
         if ($this->canAccessPremiumFeatures($organization) && $request->has('estimated_time')) {
             $task->estimated_time = $request->getEstimatedTime();
@@ -158,16 +119,7 @@ class TaskController extends Controller
      */
     public function destroy(Organization $organization, Task $task): JsonResponse
     {
-        // Check task belongs to organization
-        if ($task->organization_id !== $organization->id) {
-            throw new AuthorizationException('Task does not belong to organization');
-        }
-
-        if ($this->hasPermission($organization, 'tasks:delete:all')) {
-            $this->checkPermission($organization, 'tasks:delete:all');
-        } else {
-            $this->checkScopedPermissionForProject($organization, $task->project, 'tasks:delete');
-        }
+        $this->checkPermission($organization, 'tasks:delete', $task);
 
         if ($task->timeEntries()->exists()) {
             throw new EntityStillInUseApiException('task', 'time_entry');

app/Http/Requests/V1/Organization/OrganizationUpdateRequest.php

@@ -39,9 +39,6 @@ class OrganizationUpdateRequest extends BaseFormRequest
             'employees_can_see_billable_rates' => [
                 'boolean',
             ],
-            'employees_can_manage_tasks' => [
-                'boolean',
-            ],
             'prevent_overlapping_time_entries' => [
                 'boolean',
             ],
@@ -105,11 +102,6 @@ class OrganizationUpdateRequest extends BaseFormRequest
         return $this->has('employees_can_see_billable_rates') ? $this->boolean('employees_can_see_billable_rates') : null;
     }
 
-    public function getEmployeesCanManageTasks(): ?bool
-    {
-        return $this->has('employees_can_manage_tasks') ? $this->boolean('employees_can_manage_tasks') : null;
-    }
-
     public function getPreventOverlappingTimeEntries(): ?bool
     {
         return $this->has('prevent_overlapping_time_entries') ? $this->boolean('prevent_overlapping_time_entries') : null;

app/Http/Resources/V1/Organization/OrganizationResource.php

@@ -53,8 +53,6 @@ class OrganizationResource extends BaseResource
             'billable_rate' => $this->showBillableRate ? $this->resource->billable_rate : null,
             /** @var bool $employees_can_see_billable_rates Can members of the organization with role "employee" see the billable rates */
             'employees_can_see_billable_rates' => $this->resource->employees_can_see_billable_rates,
-            /** @var bool $employees_can_manage_tasks Can members of the organization with role "employee" manage tasks in public projects and projects they are assigned to */
-            'employees_can_manage_tasks' => $this->resource->employees_can_manage_tasks,
             /** @var bool $prevent_overlapping_time_entries Prevent creating overlapping time entries (only new entries) */
             'prevent_overlapping_time_entries' => $this->resource->prevent_overlapping_time_entries,
             /** @var string $currency Currency code (ISO 4217) */

app/Models/Organization.php

@@ -35,7 +35,6 @@ use OwenIt\Auditing\Contracts\Auditable as AuditableContract;
  * @property int|null $billable_rate
  * @property string $user_id
  * @property bool $employees_can_see_billable_rates
- * @property bool $employees_can_manage_tasks
  * @property User $owner
  * @property Carbon|null $created_at
  * @property Carbon|null $updated_at
@@ -71,7 +70,6 @@ class Organization extends JetstreamTeam implements AuditableContract
         'personal_team' => 'boolean',
         'currency' => 'string',
         'employees_can_see_billable_rates' => 'boolean',
-        'employees_can_manage_tasks' => 'boolean',
         'prevent_overlapping_time_entries' => 'boolean',
         'number_format' => NumberFormat::class,
         'currency_format' => CurrencyFormat::class,

app/Providers/JetstreamServiceProvider.php

@@ -94,11 +94,8 @@ class JetstreamServiceProvider extends ServiceProvider
             'tasks:view',
             'tasks:view:all',
             'tasks:create',
-            'tasks:create:all',
             'tasks:update',
-            'tasks:update:all',
             'tasks:delete',
-            'tasks:delete:all',
             'time-entries:view:all',
             'time-entries:create:all',
             'time-entries:update:all',
@@ -161,11 +158,8 @@ class JetstreamServiceProvider extends ServiceProvider
             'tasks:view',
             'tasks:view:all',
             'tasks:create',
-            'tasks:create:all',
             'tasks:update',
-            'tasks:update:all',
             'tasks:delete',
-            'tasks:delete:all',
             'time-entries:view:all',
             'time-entries:create:all',
             'time-entries:update:all',
@@ -225,11 +219,8 @@ class JetstreamServiceProvider extends ServiceProvider
             'tasks:view',
             'tasks:view:all',
             'tasks:create',
-            'tasks:create:all',
             'tasks:update',
-            'tasks:update:all',
             'tasks:delete',
-            'tasks:delete:all',
             'time-entries:view:all',
             'time-entries:create:all',
             'time-entries:update:all',

app/Service/Export/ExportService.php

@@ -167,7 +167,7 @@ class ExportService
                             $client->id,
                             $client->name,
                             $client->organization_id,
-                            $client->archived_at?->toIso8601ZuluString() ?? '',
+                            $client->archived_at ?? '',
                             $client->created_at?->toIso8601ZuluString() ?? '',
                             $client->updated_at?->toIso8601ZuluString() ?? '',
                         ]);

app/Service/PermissionStore.php

@@ -71,19 +71,7 @@ class PermissionStore
         /** @var Role|null $roleObj */
         $roleObj = Jetstream::findRole($role);
 
-        $permissions = $roleObj->permissions ?? [];
-
-        // If the organization allows employees to manage tasks and the user is an employee,
-        // add the task management permissions for accessible projects
-        if ($role === \App\Enums\Role::Employee->value && $organization->employees_can_manage_tasks) {
-            $permissions = array_merge($permissions, [
-                'tasks:create',
-                'tasks:update',
-                'tasks:delete',
-            ]);
-        }
-
-        return $permissions;
+        return $roleObj->permissions ?? [];
     }
 
     /**

database/migrations/2025_10_24_120845_add_employees_can_manage_tasks_to_organizations_table.php

@@ -1,30 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->boolean('employees_can_manage_tasks')->default(false)->after('employees_can_see_billable_rates');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('organizations', function (Blueprint $table): void {
-            $table->dropColumn('employees_can_manage_tasks');
-        });
-    }
-};

resources/js/Pages/ReportingDetailed.vue

@@ -383,7 +383,7 @@ async function downloadExport(format: ExportFormat) {
             @submit="clearSelectionAndState"
             @select-all="selectedTimeEntries = [...timeEntries]"
             @unselect-all="selectedTimeEntries = []"></TimeEntryMassActionRow>
-        <div class="w-full relative @container">
+        <div class="w-full relative">
             <div v-for="entry in timeEntries" :key="entry.id">
                 <TimeEntryRow
                     :selected="selectedTimeEntries.includes(entry)"

resources/js/Pages/Teams/Partials/OrganizationTimeEntrySettings.vue

@@ -14,18 +14,13 @@ const { updateOrganization } = store;
 const { organization } = storeToRefs(store);
 const queryClient = useQueryClient();
 
-const form = ref<{
-    prevent_overlapping_time_entries: boolean;
-    employees_can_manage_tasks: boolean;
-}>({
+const form = ref<{ prevent_overlapping_time_entries: boolean }>({
     prevent_overlapping_time_entries: false,
-    employees_can_manage_tasks: false,
 });
 
 onMounted(async () => {
     form.value.prevent_overlapping_time_entries =
         organization.value?.prevent_overlapping_time_entries ?? false;
-    form.value.employees_can_manage_tasks = organization.value?.employees_can_manage_tasks ?? false;
 });
 
 const mutation = useMutation({
@@ -38,22 +33,22 @@ const mutation = useMutation({
 async function submit() {
     await mutation.mutateAsync({
         prevent_overlapping_time_entries: form.value.prevent_overlapping_time_entries,
-        employees_can_manage_tasks: form.value.employees_can_manage_tasks,
     });
 }
 </script>
 
 <template>
     <FormSection>
-        <template #title>Organization Settings</template>
+        <template #title>Time Entry Settings</template>
         <template #description>
-            Configure various settings for your organization, including time entry and task
-            management permissions.
+            Disallow overlapping time entries for members of this organization. When enabled, users
+            cannot create new time entries that overlap with their existing ones. This only affects
+            newly created entries.
         </template>
 
         <template #form>
             <div class="col-span-6">
-                <div class="col-span-6 sm:col-span-4 space-y-4">
+                <div class="col-span-6 sm:col-span-4">
                     <div class="flex items-center space-x-2">
                         <Checkbox
                             id="preventOverlappingTimeEntries"
@@ -62,14 +57,6 @@ async function submit() {
                             for="preventOverlappingTimeEntries"
                             value="Prevent overlapping time entries (new entries only)" />
                     </div>
-                    <div class="flex items-center space-x-2">
-                        <Checkbox
-                            id="employeesCanManageTasks"
-                            v-model:checked="form.employees_can_manage_tasks" />
-                        <InputLabel
-                            for="employeesCanManageTasks"
-                            value="Allow Employees to manage tasks" />
-                    </div>
                 </div>
             </div>
         </template>

resources/js/packages/api/src/openapi.json.client.ts

@@ -317,7 +317,6 @@ const OrganizationResource = z
         is_personal: z.boolean(),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
-        employees_can_manage_tasks: z.boolean(),
         prevent_overlapping_time_entries: z.boolean(),
         currency: z.string(),
         currency_symbol: z.string(),
@@ -333,7 +332,6 @@ const OrganizationUpdateRequest = z
         name: z.string().max(255),
         billable_rate: z.union([z.number(), z.null()]),
         employees_can_see_billable_rates: z.boolean(),
-        employees_can_manage_tasks: z.boolean(),
         prevent_overlapping_time_entries: z.boolean(),
         number_format: NumberFormat,
         currency_format: CurrencyFormat,

resources/js/packages/ui/src/FullCalendar/TimeEntryCalendar.vue

@@ -177,23 +177,16 @@ const events = computed(() => {
 // Daily totals used in day header
 const dailyTotals = computed(() => {
     const totals: Record<string, number> = {};
-    props.timeEntries.forEach((entry) => {
-        const date = getDayJsInstance()(entry.start).format('YYYY-MM-DD');
-        let duration: number;
-
-        if (entry.end !== null) {
-            // Completed entry
-            duration = getDayJsInstance()(entry.end).diff(
+    props.timeEntries
+        .filter((entry) => entry.end !== null)
+        .forEach((entry) => {
+            const date = getDayJsInstance()(entry.start).format('YYYY-MM-DD');
+            const duration = getDayJsInstance()(entry.end!).diff(
                 getDayJsInstance()(entry.start),
                 'minutes'
             );
-        } else {
-            // Running entry - use current time
-            duration = currentTime.value.diff(getDayJsInstance()(entry.start), 'minutes');
-        }
-
-        totals[date] = (totals[date] || 0) + duration;
-    });
+            totals[date] = (totals[date] || 0) + duration;
+        });
     return totals;
 });
 

resources/js/packages/ui/src/TimeEntry/TimeEntryAggregateRow.vue

@@ -93,7 +93,7 @@ function onSelectChange(checked: boolean) {
         class="border-b border-default-background-separator bg-row-background min-w-0 transition"
         data-testid="time_entry_row">
         <MainContainer class="min-w-0">
-            <div class="@xl:flex py-2 items-center min-w-0 justify-between group">
+            <div class="@sm:flex py-2 items-center min-w-0 justify-between group">
                 <div class="flex space-x-3 items-center min-w-0">
                     <Checkbox
                         :checked="

resources/js/packages/ui/src/TimeEntry/TimeEntryGroupedTable.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import type {
     CreateClientBody,
     CreateProjectBody,
@@ -38,6 +38,8 @@ const props = defineProps<{
     canCreateProject: boolean;
 }>();
 
+const maxVisibleGroups = ref(7); // Start with 10 day groups, then show all
+
 const groupedTimeEntries = computed(() => {
     const groupedEntriesByDay: Record<string, TimeEntry[]> = {};
     for (const entry of props.timeEntries) {
@@ -135,11 +137,43 @@ function unselectAllTimeEntries(value: TimeEntriesGroupedByType[]) {
         );
     });
 }
+
+const visibleGroupedEntries = computed(() => {
+    const allGroups = Object.entries(groupedTimeEntries.value);
+    return Object.fromEntries(allGroups.slice(0, maxVisibleGroups.value));
+});
+
+const totalGroups = computed(() => Object.keys(groupedTimeEntries.value).length);
+
+function startProgressiveLoading() {
+    const loadMoreGroups = () => {
+        if (maxVisibleGroups.value < totalGroups.value) {
+            maxVisibleGroups.value = Math.min(maxVisibleGroups.value + 5, totalGroups.value);
+
+            if (maxVisibleGroups.value < totalGroups.value) {
+                requestIdleCallback(loadMoreGroups);
+            }
+        }
+    };
+
+    requestIdleCallback(loadMoreGroups);
+}
+
+// Watch for changes to totalGroups and adjust maxVisibleGroups accordingly
+watch(totalGroups, (newTotal, oldTotal) => {
+    if (newTotal !== oldTotal) {
+        maxVisibleGroups.value = newTotal;
+    }
+});
+
+onMounted(() => {
+    startProgressiveLoading();
+});
 </script>
 
 <template>
     <div class="@container">
-        <div v-for="(value, key) in groupedTimeEntries" :key="key">
+        <div v-for="(value, key) in visibleGroupedEntries" :key="key">
             <TimeEntryRowHeading
                 :date="String(key)"
                 :duration="sumDuration(value)"

resources/js/packages/ui/src/TimeEntry/TimeEntryRow.vue

@@ -112,7 +112,7 @@ async function handleDeleteTimeEntry() {
         class="border-b border-default-background-separator transition min-w-0 bg-row-background"
         data-testid="time_entry_row">
         <MainContainer class="min-w-0">
-            <div class="@xl:flex py-2 min-w-0 items-center justify-between group">
+            <div class="@sm:flex py-2 min-w-0 items-center justify-between group">
                 <div class="flex items-center min-w-0">
                     <Checkbox :checked="selected" @update:checked="onSelectChange" />
                     <div v-if="indent === true" class="w-10 h-7"></div>

resources/js/packages/ui/styles.css

@@ -183,7 +183,7 @@ body {
         --popover: var(--theme-color-card-background);
         --popover-foreground: var(--color-text-primary);
         --primary: var(--color-bg-primary);
-        --primary-foreground: var(--color-text-primary);
+        --primary-foreground: var(--theme-color-button-primary-text);
         --secondary: var(--color-bg-secondary);
         --secondary-foreground: var(--color-text-primary);
         --muted: var(--color-bg-tertiary);
@@ -210,7 +210,7 @@ body {
         --popover: var(--theme-color-card-background);
         --popover-foreground: var(--color-text-primary);
         --primary: var(--color-bg-primary);
-        --primary-foreground: var(--color-text-primary);
+        --primary-foreground: var(--theme-color-button-primary-text);
         --secondary: var(--color-bg-secondary);
         --secondary-foreground: var(--color-text-primary);
         --muted: var(--color-bg-tertiary);

tests/Unit/Endpoint/Api/V1/TaskEndpointTest.php

@@ -299,7 +299,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:create:all',
+            'tasks:create',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create([
@@ -324,7 +324,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:create:all',
+            'tasks:create',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $otherProject = Project::factory()->forOrganization($data->organization)->create();
@@ -352,7 +352,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:create:all',
+            'tasks:create',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -376,7 +376,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:create:all',
+            'tasks:create',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -408,7 +408,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:create:all',
+            'tasks:create',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -465,7 +465,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:update:all',
+            'tasks:update',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $name = 'Task 1';
@@ -493,7 +493,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:update:all',
+            'tasks:update',
         ]);
         $project = Project::factory()->forOrganization($data->organization)->create();
         $otherProject = Project::factory()->forOrganization($data->organization)->create();
@@ -523,7 +523,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:update:all',
+            'tasks:update',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -547,7 +547,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
         $now = Carbon::now();
         $this->travelTo($now);
         $data = $this->createUserWithPermission([
-            'tasks:update:all',
+            'tasks:update',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -570,7 +570,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:update:all',
+            'tasks:update',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->isDone()->create();
         Passport::actingAs($data->user);
@@ -593,7 +593,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:update:all',
+            'tasks:update',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -621,7 +621,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:update:all',
+            'tasks:update',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -650,7 +650,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:delete:all',
+            'tasks:delete',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->create();
         Passport::actingAs($data->user);
@@ -669,7 +669,7 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:delete:all',
+            'tasks:delete',
         ]);
         $task = Task::factory()->forOrganization($data->organization)->create();
         TimeEntry::factory()->forMember($data->member)->forTask($task)->forOrganization($data->organization)->create();
@@ -707,10 +707,10 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'tasks:delete:all',
+            'tasks:delete',
         ]);
         $otherData = $this->createUserWithPermission([
-            'tasks:delete:all',
+            'tasks:delete',
         ]);
         $task = Task::factory()->forOrganization($otherData->organization)->create();
         Passport::actingAs($data->user);
@@ -724,274 +724,4 @@ class TaskEndpointTest extends ApiEndpointTestAbstract
             'id' => $task->getKey(),
         ]);
     }
-
-    public function test_store_endpoint_allows_employee_to_create_task_in_public_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPublic()->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.tasks.store', [$data->organization->getKey()]), [
-            'name' => 'Employee Task',
-            'project_id' => $project->getKey(),
-        ]);
-
-        // Assert
-        $response->assertStatus(201);
-        $this->assertDatabaseHas(Task::class, [
-            'name' => 'Employee Task',
-            'project_id' => $project->getKey(),
-            'organization_id' => $data->organization->getKey(),
-        ]);
-    }
-
-    public function test_store_endpoint_allows_employee_to_create_task_in_accessible_private_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPrivate()->create();
-        ProjectMember::factory()->forProject($project)->forMember($data->member)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.tasks.store', [$data->organization->getKey()]), [
-            'name' => 'Employee Task',
-            'project_id' => $project->getKey(),
-        ]);
-
-        // Assert
-        $response->assertStatus(201);
-        $this->assertDatabaseHas(Task::class, [
-            'name' => 'Employee Task',
-            'project_id' => $project->getKey(),
-            'organization_id' => $data->organization->getKey(),
-        ]);
-    }
-
-    public function test_store_endpoint_fails_for_employee_creating_task_in_inaccessible_private_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPrivate()->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.tasks.store', [$data->organization->getKey()]), [
-            'name' => 'Employee Task',
-            'project_id' => $project->getKey(),
-        ]);
-
-        // Assert
-        $response->assertForbidden();
-        $this->assertDatabaseMissing(Task::class, [
-            'name' => 'Employee Task',
-            'project_id' => $project->getKey(),
-        ]);
-    }
-
-    public function test_store_endpoint_fails_for_employee_when_employees_can_manage_tasks_is_disabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = false;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPublic()->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->postJson(route('api.v1.tasks.store', [$data->organization->getKey()]), [
-            'name' => 'Employee Task',
-            'project_id' => $project->getKey(),
-        ]);
-
-        // Assert
-        $response->assertForbidden();
-        $this->assertDatabaseMissing(Task::class, [
-            'name' => 'Employee Task',
-        ]);
-    }
-
-    public function test_update_endpoint_allows_employee_to_update_task_in_public_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPublic()->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.tasks.update', [$data->organization->getKey(), $task->getKey()]), [
-            'name' => 'Updated by Employee',
-        ]);
-
-        // Assert
-        $response->assertStatus(200);
-        $this->assertDatabaseHas(Task::class, [
-            'id' => $task->getKey(),
-            'name' => 'Updated by Employee',
-        ]);
-    }
-
-    public function test_update_endpoint_allows_employee_to_update_task_in_accessible_private_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPrivate()->create();
-        ProjectMember::factory()->forProject($project)->forMember($data->member)->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.tasks.update', [$data->organization->getKey(), $task->getKey()]), [
-            'name' => 'Updated by Employee',
-        ]);
-
-        // Assert
-        $response->assertStatus(200);
-        $this->assertDatabaseHas(Task::class, [
-            'id' => $task->getKey(),
-            'name' => 'Updated by Employee',
-        ]);
-    }
-
-    public function test_update_endpoint_fails_for_employee_updating_task_in_inaccessible_private_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPrivate()->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        $originalName = $task->name;
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.tasks.update', [$data->organization->getKey(), $task->getKey()]), [
-            'name' => 'Updated by Employee',
-        ]);
-
-        // Assert
-        $response->assertForbidden();
-        $this->assertDatabaseHas(Task::class, [
-            'id' => $task->getKey(),
-            'name' => $originalName,
-        ]);
-    }
-
-    public function test_update_endpoint_fails_for_employee_when_employees_can_manage_tasks_is_disabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = false;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPublic()->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        $originalName = $task->name;
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->putJson(route('api.v1.tasks.update', [$data->organization->getKey(), $task->getKey()]), [
-            'name' => 'Updated by Employee',
-        ]);
-
-        // Assert
-        $response->assertForbidden();
-        $this->assertDatabaseHas(Task::class, [
-            'id' => $task->getKey(),
-            'name' => $originalName,
-        ]);
-    }
-
-    public function test_delete_endpoint_allows_employee_to_delete_task_in_public_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPublic()->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.tasks.destroy', [$data->organization->getKey(), $task->getKey()]));
-
-        // Assert
-        $response->assertStatus(204);
-        $this->assertDatabaseMissing(Task::class, [
-            'id' => $task->getKey(),
-        ]);
-    }
-
-    public function test_delete_endpoint_allows_employee_to_delete_task_in_accessible_private_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPrivate()->create();
-        ProjectMember::factory()->forProject($project)->forMember($data->member)->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.tasks.destroy', [$data->organization->getKey(), $task->getKey()]));
-
-        // Assert
-        $response->assertStatus(204);
-        $this->assertDatabaseMissing(Task::class, [
-            'id' => $task->getKey(),
-        ]);
-    }
-
-    public function test_delete_endpoint_fails_for_employee_deleting_task_in_inaccessible_private_project_when_employees_can_manage_tasks_is_enabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = true;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPrivate()->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.tasks.destroy', [$data->organization->getKey(), $task->getKey()]));
-
-        // Assert
-        $response->assertForbidden();
-        $this->assertDatabaseHas(Task::class, [
-            'id' => $task->getKey(),
-        ]);
-    }
-
-    public function test_delete_endpoint_fails_for_employee_when_employees_can_manage_tasks_is_disabled(): void
-    {
-        // Arrange
-        $data = $this->createUserWithRole(\App\Enums\Role::Employee);
-        $data->organization->employees_can_manage_tasks = false;
-        $data->organization->save();
-        $project = Project::factory()->forOrganization($data->organization)->isPublic()->create();
-        $task = Task::factory()->forOrganization($data->organization)->forProject($project)->create();
-        Passport::actingAs($data->user);
-
-        // Act
-        $response = $this->deleteJson(route('api.v1.tasks.destroy', [$data->organization->getKey(), $task->getKey()]));
-
-        // Assert
-        $response->assertForbidden();
-        $this->assertDatabaseHas(Task::class, [
-            'id' => $task->getKey(),
-        ]);
-    }
 }

tests/Unit/Service/PermissionStoreTest.php

@@ -124,88 +124,4 @@ class PermissionStoreTest extends TestCase
         // Assert
         $this->assertSame(Jetstream::findRole(Role::Employee->value)->permissions, $result);
     }
-
-    public function test_employee_does_not_have_task_permissions_by_default(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create([
-            'employees_can_manage_tasks' => false,
-        ]);
-        $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => Role::Employee->value]);
-        $permissionStore = new PermissionStore;
-        $this->actingAs($user);
-
-        // Act & Assert
-        $this->assertFalse($permissionStore->has($organization, 'tasks:create'));
-        $this->assertFalse($permissionStore->has($organization, 'tasks:update'));
-        $this->assertFalse($permissionStore->has($organization, 'tasks:delete'));
-        $this->assertFalse($permissionStore->has($organization, 'tasks:create:all'));
-        $this->assertFalse($permissionStore->has($organization, 'tasks:update:all'));
-        $this->assertFalse($permissionStore->has($organization, 'tasks:delete:all'));
-    }
-
-    public function test_employee_has_task_permissions_when_organization_allows_it(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create([
-            'employees_can_manage_tasks' => true,
-        ]);
-        $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => Role::Employee->value]);
-        $permissionStore = new PermissionStore;
-        $this->actingAs($user);
-
-        // Act & Assert
-        $this->assertTrue($permissionStore->has($organization, 'tasks:create'));
-        $this->assertTrue($permissionStore->has($organization, 'tasks:update'));
-        $this->assertTrue($permissionStore->has($organization, 'tasks:delete'));
-        // Should NOT have the :all permissions
-        $this->assertFalse($permissionStore->has($organization, 'tasks:create:all'));
-        $this->assertFalse($permissionStore->has($organization, 'tasks:update:all'));
-        $this->assertFalse($permissionStore->has($organization, 'tasks:delete:all'));
-    }
-
-    public function test_non_employee_roles_are_not_affected_by_employees_can_manage_tasks_setting(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create([
-            'employees_can_manage_tasks' => false,
-        ]);
-        $admin = User::factory()->create();
-        $organization->users()->attach($admin, ['role' => Role::Admin->value]);
-        $permissionStore = new PermissionStore;
-        $this->actingAs($admin);
-
-        // Act & Assert - Admin should have task permissions regardless of the setting
-        $this->assertTrue($permissionStore->has($organization, 'tasks:create'));
-        $this->assertTrue($permissionStore->has($organization, 'tasks:update'));
-        $this->assertTrue($permissionStore->has($organization, 'tasks:delete'));
-        $this->assertTrue($permissionStore->has($organization, 'tasks:create:all'));
-        $this->assertTrue($permissionStore->has($organization, 'tasks:update:all'));
-        $this->assertTrue($permissionStore->has($organization, 'tasks:delete:all'));
-    }
-
-    public function test_get_permissions_includes_task_permissions_for_employee_when_enabled(): void
-    {
-        // Arrange
-        $organization = Organization::factory()->create([
-            'employees_can_manage_tasks' => true,
-        ]);
-        $user = User::factory()->create();
-        $organization->users()->attach($user, ['role' => Role::Employee->value]);
-        $permissionStore = new PermissionStore;
-        $this->actingAs($user);
-
-        // Act
-        $result = $permissionStore->getPermissions($organization);
-
-        // Assert
-        $this->assertContains('tasks:create', $result);
-        $this->assertContains('tasks:update', $result);
-        $this->assertContains('tasks:delete', $result);
-        $this->assertNotContains('tasks:create:all', $result);
-        $this->assertNotContains('tasks:update:all', $result);
-        $this->assertNotContains('tasks:delete:all', $result);
-    }
 }