fix: drop filtering by-resources

Author: drankou

spec/openapi.dashboard-api.yaml

@@ -41,8 +41,6 @@ export const templatesRouter = createTRPCRouter({
       z.object({
         cursor: z.string().optional(),
         limit: z.number().int().min(1).max(100).default(50),
-        cpuCount: z.number().int().positive().optional(),
-        memoryMB: z.number().int().positive().optional(),
         public: z.boolean().optional(),
         search: z.string().optional(),
         sort: z
@@ -61,8 +59,6 @@ export const templatesRouter = createTRPCRouter({
       const result = await ctx.templatesRepository.listTeamTemplates({
         cursor: input.cursor,
         limit: input.limit,
-        cpuCount: input.cpuCount,
-        memoryMB: input.memoryMB,
         public: input.public,
         search: input.search,
         sort: input.sort,

src/core/server/api/routers/templates.ts

@@ -12,12 +12,8 @@ interface TemplatesHeaderProps {
 export default function TemplatesHeader({ table }: TemplatesHeaderProps) {
   'use no memo'
 
-  const { globalFilter, cpuCount, memoryMB, isPublic } = useTemplateTableStore()
-  const isFiltered =
-    Boolean(globalFilter) ||
-    cpuCount !== undefined ||
-    memoryMB !== undefined ||
-    isPublic !== undefined
+  const { globalFilter, isPublic } = useTemplateTableStore()
+  const isFiltered = Boolean(globalFilter) || isPublic !== undefined
 
   // With server-side pagination we only know how many rows are currently
   // loaded, not the grand total.

src/core/shared/contracts/dashboard-api.types.ts

@@ -35,8 +35,7 @@ export function TemplatesTableBody({
 }: TemplatesTableBodyProps) {
   'use no memo'
 
-  const { resetFilters, globalFilter, cpuCount, memoryMB, isPublic } =
-    useTemplateTableStore()
+  const { resetFilters, globalFilter, isPublic } = useTemplateTableStore()
 
   const centerRows = table.getCenterRows()
   const {
@@ -57,11 +56,7 @@ export function TemplatesTableBody({
 
   const isEmpty = templates && centerRows.length === 0
 
-  const hasFilter =
-    Boolean(globalFilter) ||
-    cpuCount !== undefined ||
-    memoryMB !== undefined ||
-    isPublic !== undefined
+  const hasFilter = Boolean(globalFilter) || isPublic !== undefined
 
   if (isEmpty) {
     if (hasFilter) {

src/features/dashboard/templates/list/header.tsx

@@ -61,7 +61,6 @@ export const useColumns = (deps: unknown[]) => {
         size: 64,
         enableResizing: false,
         cell: CpuCell,
-        filterFn: 'equals',
         enableSorting: false,
       },
       {
@@ -70,7 +69,6 @@ export const useColumns = (deps: unknown[]) => {
         size: 80,
         enableResizing: false,
         cell: MemoryCell,
-        filterFn: 'equals',
         enableSorting: false,
       },
       {

src/features/dashboard/templates/list/table-body.tsx

@@ -23,8 +23,9 @@ import { Separator } from '@/ui/primitives/separator'
 import { TableFilterButton } from '@/ui/table-filter-button'
 import { useTemplateTableStore } from './stores/table-store'
 
-// Components
-const ResourcesFilter = () => {
+// Currently unused on the templates page (server-side resource filtering was
+// dropped from the dropdown); kept exported for reuse on the builds page.
+export const ResourcesFilter = () => {
   const { cpuCount, setCpuCount, memoryMB, setMemoryMB } =
     useTemplateTableStore()
 
@@ -132,15 +133,9 @@ const TemplatesTableFilters = React.forwardRef<
   TemplatesTableFiltersProps
 >(({ className, ...props }, ref) => {
   const {
-    globalFilter,
-    cpuCount,
-    memoryMB,
     isPublic,
     createdAfter,
     createdBefore,
-    setGlobalFilter,
-    setCpuCount,
-    setMemoryMB,
     setIsPublic,
     setCreatedAfter,
     setCreatedBefore,
@@ -161,14 +156,6 @@ const TemplatesTableFilters = React.forwardRef<
         <DropdownMenuContent>
           <DropdownMenuGroup>
             <DropdownMenuLabel>Filters</DropdownMenuLabel>
-            <DropdownMenuSub>
-              <DropdownMenuSubTrigger>Resources</DropdownMenuSubTrigger>
-              <DropdownMenuPortal>
-                <DropdownMenuSubContent>
-                  <ResourcesFilter />
-                </DropdownMenuSubContent>
-              </DropdownMenuPortal>
-            </DropdownMenuSub>
             <DropdownMenuSub>
               <DropdownMenuSubTrigger>Visibility</DropdownMenuSubTrigger>
               <DropdownMenuPortal>
@@ -207,20 +194,6 @@ const TemplatesTableFilters = React.forwardRef<
       </DropdownMenu>
 
       {/* Filter Pills */}
-      {cpuCount && (
-        <TableFilterButton
-          label="CPU"
-          value={`${cpuCount} cores`}
-          onClick={() => setCpuCount(undefined)}
-        />
-      )}
-      {memoryMB && (
-        <TableFilterButton
-          label="Memory"
-          value={`${memoryMB} MB`}
-          onClick={() => setMemoryMB(undefined)}
-        />
-      )}
       {isPublic !== undefined && (
         <TableFilterButton
           label="Visibility"

src/features/dashboard/templates/list/table-config.tsx

@@ -55,7 +55,7 @@ export default function TemplatesTable() {
 
   const { sorting, setSorting, globalFilter, setGlobalFilter } =
     useTemplateTableStore()
-  const { cpuCount, memoryMB, isPublic } = useTemplateTableStore()
+  const { isPublic } = useTemplateTableStore()
 
   // Persisted state (URL hash) may still reference columns that are no longer sortable.
   const activeSorting = useMemo(
@@ -85,8 +85,6 @@ export default function TemplatesTable() {
       {
         teamSlug,
         limit: TEMPLATES_PAGE_SIZE,
-        cpuCount,
-        memoryMB,
         public: isPublic,
         search: globalFilter || undefined,
         sort,
@@ -107,8 +105,6 @@ export default function TemplatesTable() {
   const { isRefetching, clearRefetching } = useTemplatesRefetchTracking(
     sort,
     globalFilter,
-    cpuCount,
-    memoryMB,
     isPublic
   )
 
@@ -155,7 +151,7 @@ export default function TemplatesTable() {
       scrollRef.current.scrollTop = 0
       scrollRef.current.scrollLeft = 0
     }
-  }, [sort, globalFilter, cpuCount, memoryMB, isPublic])
+  }, [sort, globalFilter, isPublic])
 
   if (templatesError) {
     return (
@@ -243,8 +239,6 @@ export default function TemplatesTable() {
 function useTemplatesRefetchTracking(
   sort: string,
   globalFilter: string,
-  cpuCount: number | undefined,
-  memoryMB: number | undefined,
   isPublic: boolean | undefined
 ) {
   const [isRefetching, setIsRefetching] = useState(false)
@@ -257,7 +251,7 @@ function useTemplatesRefetchTracking(
       return
     }
     setIsRefetching(true)
-  }, [sort, globalFilter, cpuCount, memoryMB, isPublic])
+  }, [sort, globalFilter, isPublic])
 
   const clearRefetching = useCallback(() => setIsRefetching(false), [])