Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions web/src/routes/contractor/WorkItems.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ interface WorkItemsProps {
}

const typeTabs = ['All', 'Change Requests', 'Feature Requests', 'Maintenance'];
const statusTabs = ['All', 'Draft', 'In Review', 'Approved', 'Completed'];
const statusTabs = ['Open', 'All', 'Draft', 'In Review', 'Approved', 'Completed'];

export default function WorkItems({ workItems, clients, apps, settings }: WorkItemsProps) {
const [searchParams, setSearchParams] = useSearchParams();
const { insights } = useInsights();

const [search, setSearch] = useState('');
const [selectedType, setSelectedType] = useState('All');
const [selectedStatus, setSelectedStatus] = useState('All');
const [selectedStatus, setSelectedStatus] = useState('Open');
const [selectedIds, setSelectedIds] = useState<Set<string>>(new Set());
const [showNewOrder, setShowNewOrder] = useState(false);
const [bulkLoading, setBulkLoading] = useState(false);
Expand Down Expand Up @@ -104,6 +104,7 @@ export default function WorkItems({ workItems, clients, apps, settings }: WorkIt
return true;
})
.filter((i) => {
if (selectedStatus === 'Open') return i.status !== 'completed' && i.status !== 'archived';
if (selectedStatus === 'Draft') return i.status === 'draft';
if (selectedStatus === 'In Review') return i.status === 'inReview';
if (selectedStatus === 'Approved') return i.status === 'approved';
Expand Down
Loading