Fix initial page size and listing limit

Signed-off-by: abbyhu2000 <[email protected]>
opensearch-project · May 31, 2023 · 34c0e74 · 34c0e74
1 parent 1332d43
commit 34c0e74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/plugins/dashboard/public/application/components/dashboard_listing.tsx b/src/plugins/dashboard/public/application/components/dashboard_listing.tsx
@@ -55,7 +55,8 @@ export const DashboardListing = () => {
   const dashboardProvidersForListing = dashboardProviders() || {};
 
   const dashboardListTypes = Object.keys(dashboardProvidersForListing);
-  const initialPageSize = savedObjectsPublic.settings.getListingLimit();
+  const initialPageSize = savedObjectsPublic.settings.getPerPage();
+  const listingLimit = savedObjectsPublic.settings.getListingLimit();
 
   const mapListAttributesToDashboardProvider = (obj: any) => {
     const provider = dashboardProvidersForListing[obj.type];
@@ -138,7 +139,7 @@ export const DashboardListing = () => {
       deleteItems={hideWriteControls ? undefined : deleteItems}
       editItem={hideWriteControls ? undefined : editItem}
       tableColumns={tableColumns}
-      listingLimit={savedObjectsPublic.settings.getListingLimit()}
+      listingLimit={listingLimit}
       initialFilter={''}
       initialPageSize={initialPageSize}
       noItemsFragment={noItemsFragment}

diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts
@@ -241,7 +241,7 @@ export interface DashboardServices extends CoreStart {
   navigation: NavigationStart;
   savedObjectsClient: SavedObjectsClientContract;
   savedDashboards: SavedObjectLoader;
-  dashboardProviders?: () => { [key: string]: DashboardProvider };
+  dashboardProviders: () => { [key: string]: DashboardProvider } | undefined;
   dashboardConfig: OpenSearchDashboardsLegacyStart['dashboardConfig'];
   dashboardCapabilities: DashboardCapabilities;
   embeddableCapabilities: {