wip

Author: StanBarrows

INTERNAL_CHANGES_GUIDE.md

@@ -25,7 +25,7 @@ class AddOrganizationMember implements AddsTeamMembers
      */
     public function add(User $owner, Organization $organization, string $email, ?string $role = null): void
     {
-        Gate::forUser($owner)->authorize('addTeamMember', $organization); // TODO: refactor after owner refactoring
+        Gate::forUser($owner)->authorize('addTeamMember', [$organization]); // TODO: refactor after owner refactoring
 
         $this->validate($organization, $email, $role);
 

INTERNAL_CHANGES_GUIDE.patch

@@ -25,7 +25,7 @@ class UpdateOrganization implements UpdatesTeamNames
      */
     public function update(User $user, Organization $organization, array $input): void
     {
-        Gate::forUser($user)->authorize('update', $organization);
+        Gate::forUser($user)->authorize('update', [$organization]);
 
         Validator::make($input, [
             'name' => [

app/Actions/Jetstream/AddOrganizationMember.php

@@ -79,10 +79,8 @@ public function handle(Request $request, Closure $next): Response
                             'currency' => $user->currentTeam->currency,
                             // Sidebar counts respecting visibility (projects assigned to the user)
                             'counts' => (function () use ($user) {
+                                /** @var Organization $organization */
                                 $organization = $user->currentTeam;
-                                if ($organization === null) {
-                                    return [];
-                                }
                                 /** @var AppPermissionStore $permissionStore */
                                 $permissionStore = app(AppPermissionStore::class);
                                 $canViewAllProjects = $permissionStore->has($organization, 'projects:view:all');

app/Actions/Jetstream/UpdateOrganization.php

@@ -7,7 +7,9 @@ async function goToProjectsOverview(page: Page) {
 }
 
 // Create new project via modal
-test.skip('test that creating and deleting a new client via the modal works (disabled - deletion no longer supported)', async ({ page }) => {
+test.skip('test that creating and deleting a new client via the modal works (disabled - deletion no longer supported)', async ({
+    page,
+}) => {
     const newClientName = 'New Project ' + Math.floor(1 + Math.random() * 10000);
     await goToProjectsOverview(page);
     await page.getByRole('button', { name: 'Create Client' }).click();

app/Http/Middleware/ShareInertiaData.php

@@ -9,7 +9,9 @@ async function goToProjectsOverview(page: Page) {
 }
 
 // Create new project via modal
-test.skip('test that creating and deleting a new project via the modal works (disabled - deletion no longer supported)', async ({ page }) => {
+test.skip('test that creating and deleting a new project via the modal works (disabled - deletion no longer supported)', async ({
+    page,
+}) => {
     const newProjectName = 'New Project ' + Math.floor(1 + Math.random() * 10000);
     await goToProjectsOverview(page);
     await page.getByRole('button', { name: 'Create Project' }).click();
@@ -102,12 +104,12 @@ test('test that updating billable rate works with existing time entries', async
                 (await response.json()).data.billable_rate === newBillableRate * 100
         ),
     ]);
-    await expect(
-        page
-            .getByRole('row')
-            .first()
-            .getByText(formatCentsWithOrganizationDefaults(newBillableRate * 100))
-    ).toBeVisible();
+
+    // UI no longer shows billable rate in the overview by default.
+    // Reopen the edit modal and verify the value was persisted.
+    await page.getByRole('row').first().getByRole('button').click();
+    await page.getByRole('menuitem').getByText('Edit').first().click();
+    await expect(page.getByPlaceholder('Billable Rate')).toHaveValue(newBillableRate.toString());
 });
 
 // Create new project with new Client

e2e/clients.spec.ts

@@ -69,18 +69,12 @@ test('test that creating and deleting a new tag in a new project works', async (
 
     const moreButton = page.locator("[aria-label='Actions for Project " + newProjectName + "']");
     moreButton.click();
-    const deleteButton = page.locator("[aria-label='Delete Project " + newProjectName + "']");
-
+    // Deletion no longer supported: archive instead.
+    const archiveButton = page.locator("[aria-label='Archive Project " + newProjectName + "']");
     await Promise.all([
-        deleteButton.click(),
-        page.waitForResponse(
-            async (response) =>
-                response.url().includes('/projects') &&
-                response.request().method() === 'DELETE' &&
-                response.status() === 204
-        ),
+        archiveButton.click(),
+        expect(page.getByTestId('project_table')).not.toContainText(newProjectName),
     ]);
-    await expect(page.getByTestId('project_table')).not.toContainText(newProjectName);
 });
 
 test('test that archiving and unarchiving tasks works', async ({ page }) => {

e2e/projects.spec.ts

@@ -187,10 +187,10 @@ test('test that entering a random value in the time range does not start the tim
 }) => {
     await goToDashboard(page);
     await page.getByTestId('time_entry_time').fill('asdasdasd');
-    await page.getByTestId('time_entry_time').press('Tab'),
+    (await page.getByTestId('time_entry_time').press('Tab'),
         await page.locator(
             '[data-testid="dashboard_timer"] [data-testid="timer_button"].bg-accent-300/70'
-        );
+        ));
 });
 
 test('test that entering a time starts the timer on enter', async ({ page }) => {

e2e/tasks.spec.ts

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { ArchiveBoxIcon, PencilSquareIcon, TrashIcon } from '@heroicons/vue/20/solid';
+import { ArchiveBoxIcon, PencilSquareIcon } from '@heroicons/vue/20/solid';
 import type { Client } from '@/packages/api/src';
-import { canDeleteClients, canUpdateClients } from '@/utils/permissions';
+import { canUpdateClients } from '@/utils/permissions';
 import {
     DropdownMenu,
     DropdownMenuContent,