Fix self-service asset pagination counts

app/modules/asset/data.server.ts

@@ -160,13 +160,6 @@ export async function simpleModeLoader({
     }),
   ]);
 
-  if (isSelfService) {
-    /**
-     * For self service users we dont return the assets that are not available to book
-     */
-    assets = assets.filter((a) => a.availableToBook);
-  }
-
   assets = await updateAssetsWithBookingCustodians(assets);
 
   const header: HeaderData = {
@@ -320,6 +313,7 @@ export async function advancedModeLoader({
       settings,
       getBookings: view === "availability",
       canUseBarcodes: currentOrganization.barcodesEnabled ?? false,
+      availableToBookOnly: role === OrganizationRoles.SELF_SERVICE,
     }),
     // We need the custom fields so we can create the options for filtering
     getActiveCustomFields({
@@ -352,13 +346,6 @@ export async function advancedModeLoader({
     }),
   ]);
 
-  if (role === OrganizationRoles.SELF_SERVICE) {
-    /**
-     * For self service users we dont return the assets that are not available to book
-     */
-    assets = assets.filter((a) => a.availableToBook);
-  }
-
   const header: HeaderData = {
     title: isPersonalOrg(currentOrganization)
       ? user?.firstName

app/modules/asset/query.server.ts

@@ -19,10 +19,15 @@ export function generateWhereClause(
   organizationId: string,
   search: string | null,
   filters: Filter[],
-  assetIds?: string[]
+  assetIds?: string[],
+  availableToBookOnly = false
 ): Prisma.Sql {
   let whereClause = Prisma.sql`WHERE a."organizationId" = ${organizationId}`;
 
+  if (availableToBookOnly) {
+    whereClause = Prisma.sql`${whereClause} AND a."availableToBook" = true`;
+  }
+
   // Add asset IDs filter if provided
   if (assetIds && assetIds.length > 0) {
     whereClause = Prisma.sql`${whereClause} AND a.id = ANY(${assetIds}::text[])`;

app/modules/asset/service.server.ts

@@ -436,6 +436,7 @@ async function getAssets(params: {
    * */
   hideUnavailableToAddToKit?: boolean;
   assetKitFilter?: string | null;
+  availableToBookOnly?: boolean;
 }) {
   let {
     organizationId,
@@ -455,6 +456,7 @@ async function getAssets(params: {
     teamMemberIds,
     extraInclude,
     assetKitFilter,
+    availableToBookOnly,
   } = params;
 
   try {
@@ -463,6 +465,10 @@ async function getAssets(params: {
 
     let where: Prisma.AssetWhereInput = { organizationId };
 
+    if (availableToBookOnly) {
+      where.availableToBook = true;
+    }
+
     if (search) {
       const searchTerms = search
         .toLowerCase()
@@ -742,6 +748,7 @@ export async function getAdvancedPaginatedAndFilterableAssets({
   assetIds,
   getBookings = false,
   canUseBarcodes = false,
+  availableToBookOnly = false,
 }: {
   request: LoaderFunctionArgs["request"];
   organizationId: Organization["id"];
@@ -751,6 +758,7 @@ export async function getAdvancedPaginatedAndFilterableAssets({
   assetIds?: string[];
   getBookings?: boolean;
   canUseBarcodes?: boolean;
+  availableToBookOnly?: boolean;
 }) {
   const currentFilterParams = new URLSearchParams(filters || "");
   const searchParams = filters
@@ -778,7 +786,8 @@ export async function getAdvancedPaginatedAndFilterableAssets({
       organizationId,
       search,
       parsedFilters,
-      assetIds
+      assetIds,
+      availableToBookOnly
     );
     const { orderByClause, customFieldSortings } = parseSortingOptions(
       searchParams.getAll("sortBy")
@@ -1929,6 +1938,7 @@ export async function getPaginatedAndFilterableAssets({
       teamMemberIds,
       extraInclude,
       assetKitFilter,
+      availableToBookOnly: isSelfService,
     });
 
     const totalPages = Math.ceil(totalAssets / perPage);