wip

Author: StanBarrows

INTERNAL_CHANGES_GUIDE.md

@@ -245,16 +245,16 @@ Numbers are: [insertions] [deletions] [path]
 ### High-Level Notes by Category
 - **Repo hygiene:** Issue/PR templates removed; internal `INTERNAL_CHANGES_GUIDE.md` added; several project policy docs removed.
 - **CI:** Multiple GitHub workflows adjusted; some workflows removed; minor 1-line tweaks in remaining workflows.
-- **Backend:** Small changes in `ClientController`, `ProjectController`, and `ShareInertiaData` middleware; minor DB config tweak; Composer dependencies updated.
+- **Backend:** Client/Project API delete flows are enabled, original guard behavior is restored, and default index ordering matches pre-disable behavior; DB read/write host split remains in place.
 - **Docker:** Local and production Docker files removed (compose, Dockerfiles, configs, scripts).
-- **Frontend:** Multiple Vue components updated across Clients/Projects tables, dropdowns, and pages; navigation and layout tweaks; utility hooks adjusted.
+- **Frontend:** Clients/Projects search is restored, delete actions are available again from row menus, and table heading/status/billable-rate UI behavior is restored.
 - **Tests:** e2e tests (`clients.spec.ts`, `projects.spec.ts`) updated.
 
 ### API Behavior Changes (Upgrade Notes)
-- Clients API: `GET /api/v1/organizations/{org}/clients` now returns clients ordered by `name` ascending (was `created_at` desc). If you rely on ordering, update your consumers accordingly.
-- Projects API: `GET /api/v1/organizations/{org}/projects` now returns projects ordered by `name` ascending (was `created_at`-based ordering in some flows). If you relied on creation-time ordering, sort client-side or use a dedicated query param in future versions.
-- Clients API: `DELETE /api/v1/organizations/{org}/clients/{client}` is disabled. It now returns `200` with `{ message: "Client deletion disabled" }` and does not delete data.
-- Projects API: `DELETE /api/v1/organizations/{org}/projects/{project}` is disabled. It now returns `200` with `{ message: "Project deletion disabled" }` and does not delete data.
+- Clients API: `GET /api/v1/organizations/{org}/clients` default ordering is `created_at` descending.
+- Projects API: `GET /api/v1/organizations/{org}/projects` keeps creation-time-first ordering semantics (`created_at` descending in the index result).
+- Clients API: `DELETE /api/v1/organizations/{org}/clients/{client}` is enabled. It returns `400` when the client is still in use by projects; otherwise it deletes and returns `204`.
+- Projects API: `DELETE /api/v1/organizations/{org}/projects/{project}` is enabled. It returns `400` when still in use by tasks/time entries; otherwise it deletes related project members and returns `204`.
 
 ### Step-by-Step Protocol (detailed)
 1) Clean and position on base (or desired) revision.

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

@@ -43,7 +43,7 @@ public function index(Organization $organization, ClientIndexRequest $request):
 
         $clientsQuery = Client::query()
             ->whereBelongsTo($organization, 'organization')
-            ->orderBy('name');
+            ->orderBy('created_at', 'desc');
 
         if (! $canViewAllClients) {
             $clientsQuery->visibleByEmployee($user);
@@ -111,7 +111,12 @@ public function destroy(Organization $organization, Client $client): JsonRespons
     {
         $this->checkPermission($organization, 'clients:delete', $client);
 
-        // Deletion disabled: return early to keep data intact
-        return response()->json(['message' => 'Client deletion disabled'], 200);
+        if ($client->projects()->exists()) {
+            throw new EntityStillInUseApiException('client', 'project');
+        }
+
+        $client->delete();
+
+        return response()->json(null, 204);
     }
 }

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

@@ -13,12 +13,14 @@
 use App\Http\Resources\V1\Project\ProjectResource;
 use App\Models\Organization;
 use App\Models\Project;
+use App\Models\ProjectMember;
 use App\Models\TimeEntry;
 use App\Service\BillableRateService;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Resources\Json\JsonResource;
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\DB;
 
 class ProjectController extends Controller
 {
@@ -46,8 +48,7 @@ public function index(Organization $organization, ProjectIndexRequest $request):
         $user = $this->user();
 
         $projectsQuery = Project::query()
-            ->whereBelongsTo($organization, 'organization')
-            ->orderBy('name');
+            ->whereBelongsTo($organization, 'organization');
 
         if (! $canViewAllProjects) {
             $projectsQuery->visibleByEmployee($user);
@@ -168,7 +169,22 @@ public function destroy(Organization $organization, Project $project): JsonRespo
     {
         $this->checkPermission($organization, 'projects:delete', $project);
 
-        // Deletion disabled: return early to keep data intact
-        return response()->json(['message' => 'Project deletion disabled'], 200);
+        if ($project->tasks()->exists()) {
+            throw new EntityStillInUseApiException('project', 'task');
+        }
+        if ($project->timeEntries()->exists()) {
+            throw new EntityStillInUseApiException('project', 'time_entry');
+        }
+
+        DB::transaction(function () use (&$project): void {
+            $project->members->each(function (ProjectMember $member): void {
+                $member->delete();
+            });
+
+            $project->delete();
+        });
+
+        return response()
+            ->json(null, 204);
     }
 }

app/Service/Dto/ReportPropertiesDto.php

@@ -107,8 +107,8 @@ public function get(Model $model, string $key, mixed $value, array $attributes):
                     }
                 }
                 $dto = new ReportPropertiesDto;
-                $dto->end = $data->end !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->end) : null;
-                $dto->start = $data->start !== null ? Carbon::createFromFormat('Y-m-d\TH:i:s\Z', $data->start) : null;
+                $dto->end = $data->end !== null ? Carbon::parse($data->end, 'UTC') : null;
+                $dto->start = $data->start !== null ? Carbon::parse($data->start, 'UTC') : null;
                 $dto->active = $data->active;
                 $dto->memberIds = $data->memberIds !== null ? ReportPropertiesDto::idArrayToCollection($data->memberIds) : null;
                 $dto->billable = $data->billable;

resources/js/Components/Common/Client/ClientMoreOptionsDropdown.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { ArchiveBoxIcon, PencilSquareIcon } from '@heroicons/vue/20/solid';
+import { ArchiveBoxIcon, PencilSquareIcon, TrashIcon } from '@heroicons/vue/20/solid';
 import type { Client } from '@/packages/api/src';
-import { canUpdateClients } from '@/utils/permissions';
+import { canDeleteClients, canUpdateClients } from '@/utils/permissions';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -57,7 +57,15 @@ const props = defineProps<{
                 <ArchiveBoxIcon class="w-5 text-icon-active" />
                 <span>{{ client.is_archived ? 'Unarchive' : 'Archive' }}</span>
             </DropdownMenuItem>
-            <!-- Delete disabled intentionally -->
+            <DropdownMenuItem
+                v-if="canDeleteClients()"
+                :aria-label="'Delete Client ' + props.client.name"
+                data-testid="client_delete"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
+                @click="emit('delete')">
+                <TrashIcon class="w-5" />
+                <span>Delete</span>
+            </DropdownMenuItem>
         </DropdownMenuContent>
     </DropdownMenu>
 </template>

resources/js/Components/Common/Client/ClientTableRow.vue

@@ -14,6 +14,10 @@ const props = defineProps<{
     client: Client;
 }>();
 
+function deleteClient() {
+    useClientsStore().deleteClient(props.client.id);
+}
+
 const projectCount = computed(() => {
     return projects.value.filter((projects) => projects.client_id === props.client.id).length;
 });
@@ -56,6 +60,7 @@ const showEditModal = ref(false);
             class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium sm:pr-0 pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
             <ClientMoreOptionsDropdown
                 :client="client"
+                @delete="deleteClient"
                 @edit="showEditModal = true"
                 @archive="archiveClient"></ClientMoreOptionsDropdown>
         </div>

resources/js/Components/Common/Project/ProjectMoreOptionsDropdown.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { PencilSquareIcon, ArchiveBoxIcon } from '@heroicons/vue/20/solid';
+import { TrashIcon, PencilSquareIcon, ArchiveBoxIcon } from '@heroicons/vue/20/solid';
 import type { Project } from '@/packages/api/src';
-import { canUpdateProjects } from '@/utils/permissions';
+import { canDeleteProjects, canUpdateProjects } from '@/utils/permissions';
 import {
     DropdownMenu,
     DropdownMenuContent,
@@ -57,7 +57,15 @@ const props = defineProps<{
                 <ArchiveBoxIcon class="w-5 text-icon-active" />
                 <span>{{ project.is_archived ? 'Unarchive' : 'Archive' }}</span>
             </DropdownMenuItem>
-            <!-- Delete disabled intentionally -->
+            <DropdownMenuItem
+                v-if="canDeleteProjects()"
+                :aria-label="'Delete Project ' + props.project.name"
+                data-testid="project_delete"
+                class="flex items-center space-x-3 cursor-pointer text-destructive focus:text-destructive"
+                @click.prevent="emit('delete')">
+                <TrashIcon class="w-5" />
+                <span>Delete</span>
+            </DropdownMenuItem>
         </DropdownMenuContent>
     </DropdownMenu>
 </template>

resources/js/Components/Common/Project/ProjectTableRow.vue

@@ -32,6 +32,10 @@ const projectTasksCount = computed(() => {
     return tasks.value.filter((task) => task.project_id === props.project.id).length;
 });
 
+function deleteProject() {
+    useProjectsStore().deleteProject(props.project.id);
+}
+
 function archiveProject() {
     useProjectsStore().updateProject(props.project.id, {
         ...props.project,
@@ -125,6 +129,7 @@ const showEditProjectModal = ref(false);
             class="relative whitespace-nowrap flex items-center pl-3 text-right text-sm font-medium pr-4 sm:pr-6 lg:pr-8 3xl:pr-12">
             <ProjectMoreOptionsDropdown
                 :project="project"
+                @delete="deleteProject"
                 @edit="showEditProjectModal = true"
                 @archive="archiveProject"></ProjectMoreOptionsDropdown>
         </div>

resources/js/Components/Common/Reporting/ReportingFilterBar.vue

@@ -2,6 +2,7 @@
 import { CheckCircleIcon, TagIcon, UserGroupIcon } from '@heroicons/vue/20/solid';
 import { FolderIcon } from '@heroicons/vue/16/solid';
 import BillableIcon from '@/packages/ui/src/Icons/BillableIcon.vue';
+import InvoiceStatusIcon from '@/packages/ui/src/Icons/InvoiceStatusIcon.vue';
 import ReportingRoundingControls from '@/Components/Common/Reporting/ReportingRoundingControls.vue';
 import TaskMultiselectDropdown from '@/Components/Common/Task/TaskMultiselectDropdown.vue';
 import ClientMultiselectDropdown from '@/Components/Common/Client/ClientMultiselectDropdown.vue';
@@ -29,6 +30,7 @@ const selectedTasks = defineModel<string[]>('selectedTasks', { required: true })
 const selectedClients = defineModel<string[]>('selectedClients', { required: true });
 const selectedTags = defineModel<string[]>('selectedTags', { required: true });
 const billable = defineModel<'true' | 'false' | null>('billable', { required: true });
+const invoiced = defineModel<'true' | 'false' | null>('invoiced', { default: null });
 const roundingEnabled = defineModel<boolean>('roundingEnabled', { required: true });
 const roundingType = defineModel<TimeEntryRoundingType>('roundingType', { required: true });
 const roundingMinutes = defineModel<number>('roundingMinutes', { required: true });
@@ -126,6 +128,32 @@ async function createTag(name: string) {
                         <SelectItem value="false">Non Billable</SelectItem>
                     </SelectContent>
                 </Select>
+                <Select v-model="invoiced" @update:model-value="emit('submit')">
+                    <SelectTrigger
+                        size="sm"
+                        variant="outline"
+                        :active="invoiced !== null"
+                        :show-chevron="false">
+                        <SelectValue class="flex items-center gap-2">
+                            <InvoiceStatusIcon
+                                size="small"
+                                :invoiced="invoiced === 'true'"
+                                :class="
+                                    invoiced !== null
+                                        ? 'dark:text-accent-300/80 text-accent-400/80'
+                                        : 'text-text-quaternary'
+                                " />
+                            <span class="text-text-secondary">{{
+                                invoiced === 'false' ? 'Not Invoiced' : 'Invoiced'
+                            }}</span>
+                        </SelectValue>
+                    </SelectTrigger>
+                    <SelectContent>
+                        <SelectItem :value="null">Both</SelectItem>
+                        <SelectItem value="true">Invoiced</SelectItem>
+                        <SelectItem value="false">Not Invoiced</SelectItem>
+                    </SelectContent>
+                </Select>
                 <ReportingRoundingControls
                     v-model:enabled="roundingEnabled"
                     v-model:type="roundingType"

resources/js/Components/Common/Reporting/ReportingOverview.vue

@@ -69,6 +69,7 @@ const selectedTasks = ref<string[]>([]);
 const selectedClients = ref<string[]>([]);
 
 const billable = ref<'true' | 'false' | null>(null);
+const invoiced = ref<'true' | 'false' | null>(null);
 const roundingEnabled = ref<boolean>(false);
 const roundingType = ref<TimeEntryRoundingType>('nearest');
 const roundingMinutes = ref<number>(15);
@@ -123,6 +124,7 @@ const filterParams = computed<AggregatedTimeEntriesQueryParams>(() => {
         client_ids: selectedClients.value.length > 0 ? selectedClients.value : undefined,
         tag_ids: selectedTags.value.length > 0 ? selectedTags.value : undefined,
         billable: billable.value !== null ? billable.value : undefined,
+        invoiced: invoiced.value !== null ? invoiced.value : undefined,
         member_id: getCurrentRole() === 'employee' ? getCurrentMembershipId() : undefined,
         rounding_type: roundingEnabled.value ? roundingType.value : undefined,
         rounding_minutes: roundingEnabled.value ? roundingMinutes.value : undefined,
@@ -367,6 +369,7 @@ const tableData = computed(() => {
         v-model:selected-clients="selectedClients"
         v-model:selected-tags="selectedTags"
         v-model:billable="billable"
+        v-model:invoiced="invoiced"
         v-model:rounding-enabled="roundingEnabled"
         v-model:rounding-type="roundingType"
         v-model:rounding-minutes="roundingMinutes"