fix(dashboards): dashboards frontend should filter out prebuilt dashboards when calculating limit (#105948)

Author: DominikB2014

static/gsApp/hooks/dashboardsLimit.spec.tsx

@@ -107,7 +107,7 @@ describe('useDashboardsLimit', () => {
         {id: '2', title: 'Dashboard 2'},
         {id: '3', title: 'Dashboard 3'},
       ],
-      match: [MockApiClient.matchQuery({per_page: 11})],
+      match: [MockApiClient.matchQuery({per_page: 10, filter: 'excludePrebuilt'})],
     });
 
     const {result} = renderHookWithProviders(() => useDashboardsLimit(), {
@@ -149,7 +149,7 @@ describe('useDashboardsLimit', () => {
         {id: '2', title: 'Dashboard 2'},
         {id: '3', title: 'Dashboard 3'},
       ],
-      match: [MockApiClient.matchQuery({per_page: 4})],
+      match: [MockApiClient.matchQuery({per_page: 3, filter: 'excludePrebuilt'})],
     });
 
     const {result} = renderHookWithProviders(() => useDashboardsLimit(), {
@@ -195,7 +195,7 @@ describe('useDashboardsLimit', () => {
         {id: '2', title: 'Dashboard 2'},
         {id: '3', title: 'Dashboard 3'},
       ],
-      match: [MockApiClient.matchQuery({per_page: 3})],
+      match: [MockApiClient.matchQuery({per_page: 2, filter: 'excludePrebuilt'})],
     });
 
     const {result} = renderHookWithProviders(() => useDashboardsLimit(), {
@@ -237,7 +237,7 @@ describe('useDashboardsLimit', () => {
     const dashboardsRequest = MockApiClient.addMockResponse({
       url: '/organizations/org-slug/dashboards/',
       body: [],
-      match: [MockApiClient.matchQuery({per_page: 11})],
+      match: [MockApiClient.matchQuery({per_page: 10, filter: 'excludePrebuilt'})],
     });
 
     const {result} = renderHookWithProviders(() => useDashboardsLimit(), {
@@ -271,7 +271,7 @@ describe('useDashboardsLimit', () => {
     MockApiClient.addMockResponse({
       url: '/organizations/org-slug/dashboards/',
       statusCode: 500,
-      match: [MockApiClient.matchQuery({per_page: 11})],
+      match: [MockApiClient.matchQuery({per_page: 10, filter: 'excludePrebuilt'})],
     });
 
     const {result} = renderHookWithProviders(() => useDashboardsLimit(), {

static/gsApp/hooks/dashboardsLimit.tsx

@@ -34,8 +34,9 @@ export function useDashboardsLimit(): UseDashboardsLimitResult {
         `/organizations/${organization.slug}/dashboards/`,
         {
           query: {
+            filter: 'excludePrebuilt',
             // We only need to know there are at most the limited # of dashboards.
-            per_page: dashboardsLimit + 1, // +1 to account for the General dashboard
+            per_page: dashboardsLimit,
           },
         },
       ],
@@ -45,9 +46,8 @@ export function useDashboardsLimit(): UseDashboardsLimitResult {
       }
     );
 
-  // Add 1 to dashboardsLimit to account for the General dashboard
   const hasReachedDashboardLimit =
-    ((dashboardsTotalCount?.length ?? 0) >= dashboardsLimit + 1 &&
+    ((dashboardsTotalCount?.length ?? 0) >= dashboardsLimit &&
       dashboardsLimit !== UNLIMITED_DASHBOARDS_LIMIT) ||
     dashboardsLimit === 0;
   const limitMessage = hasReachedDashboardLimit