From 159428615330e768ab5f2af8021452408d48dc37 Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 09:43:56 +0200
Subject: [PATCH 1/4] Added condition for pagination

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .../app/src/components/search/SearchPage.tsx     | 16 +++++++++-------
 .../src/components/CatalogTable/CatalogTable.tsx |  3 ++-
 .../Cards/Group/MembersList/MembersListCard.tsx  |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/app/src/components/search/SearchPage.tsx b/packages/app/src/components/search/SearchPage.tsx
index cf4e610b80..9b0ae7eecf 100644
--- a/packages/app/src/components/search/SearchPage.tsx
+++ b/packages/app/src/components/search/SearchPage.tsx
@@ -83,13 +83,15 @@ const SearchResultList = ({ results }: SearchResultSet) => {
             }
           })}
       </List>
-      <Pagination
-        count={pageAmount}
-        page={page}
-        onChange={changePage}
-        showFirstButton
-        showLastButton
-      />
+      {pageAmount > 1 && (
+        <Pagination
+          count={pageAmount}
+          page={page}
+          onChange={changePage}
+          showFirstButton
+          showLastButton
+        />
+      )}
     </>
   );
 };
diff --git a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
index c85a60c7c1..f293710847 100644
--- a/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
+++ b/plugins/catalog/src/components/CatalogTable/CatalogTable.tsx
@@ -145,13 +145,14 @@ export const CatalogTable = ({ columns, actions }: CatalogTableProps) => {
   if (typeColumn) {
     typeColumn.hidden = !showTypeColumn;
   }
+  const showPagination = rows.length > 20;
 
   return (
     <Table<EntityRow>
       isLoading={loading}
       columns={columns || defaultColumns}
       options={{
-        paging: true,
+        paging: showPagination,
         pageSize: 20,
         actionsColumnIndex: -1,
         loadingType: 'linear',
diff --git a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
index 862fc51aa7..0642e80a7b 100644
--- a/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
+++ b/plugins/org/src/components/Cards/Group/MembersList/MembersListCard.tsx
@@ -174,7 +174,7 @@ export const MembersListCard = (_props: {
       <InfoCard
         title={`Members (${members?.length || 0}${paginationLabel})`}
         subheader={`of ${displayName}`}
-        actions={pagination}
+        {...(nbPages <= 1 ? {} : { actions: pagination })}
       >
         <Grid container spacing={3}>
           {members && members.length > 0 ? (

From 7e5f14dda2544888757731afed53a1be03839eeb Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 09:48:07 +0200
Subject: [PATCH 2/4] Changeset added

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 .changeset/shiny-guests-explain.md

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
new file mode 100644
index 0000000000..c2645ed6dd
--- /dev/null
+++ b/.changeset/shiny-guests-explain.md
@@ -0,0 +1,7 @@
+---
+'example-app': patch
+'@backstage/plugin-catalog': patch
+'@backstage/plugin-org': patch
+---
+
+This change hides pagination counter of search tables and group memberslist when results/items fit in one page

From 75ce44439a018d77af91ea4be7c562d0c81f0062 Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Tue, 31 Aug 2021 14:08:50 +0200
Subject: [PATCH 3/4] changeset corrected

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
index c2645ed6dd..9f4a4a5b94 100644
--- a/.changeset/shiny-guests-explain.md
+++ b/.changeset/shiny-guests-explain.md
@@ -4,4 +4,4 @@
 '@backstage/plugin-org': patch
 ---
 
-This change hides pagination counter of search tables and group memberslist when results/items fit in one page
+This change hides pagination counter of search tables and group members list when results fit in one page

From 6347fc991b65a866bb5184c1a504c5400d8d4d3a Mon Sep 17 00:00:00 2001
From: Aj-vrod <ammyvrodriguez@hotmail.com>
Date: Wed, 1 Sep 2021 09:48:22 +0200
Subject: [PATCH 4/4] removed line in changeset

Signed-off-by: Aj-vrod <ammyvrodriguez@hotmail.com>
---
 .changeset/shiny-guests-explain.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.changeset/shiny-guests-explain.md b/.changeset/shiny-guests-explain.md
index 9f4a4a5b94..6bd99e4aa6 100644
--- a/.changeset/shiny-guests-explain.md
+++ b/.changeset/shiny-guests-explain.md
@@ -1,5 +1,4 @@
 ---
-'example-app': patch
 '@backstage/plugin-catalog': patch
 '@backstage/plugin-org': patch
 ---