HOTFIX: PSP-4092 Page-to-page function missing (#1869)

* Hotfix for PSP-4092 * bump hotfix version
bcgov · Aug 5, 2022 · dbe3cf0 · dbe3cf0
1 parent f62d297
commit dbe3cf0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/backend/api/Pims.Api.csproj b/backend/api/Pims.Api.csproj
@@ -2,8 +2,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <UserSecretsId>0ef6255f-9ea0-49ec-8c65-c172304b4926</UserSecretsId>
-    <Version>2.1.4-32.29</Version>
-    <AssemblyVersion>2.1.4.32</AssemblyVersion>
+    <Version>2.1.5-32.30</Version>
+    <AssemblyVersion>2.1.5.32</AssemblyVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <ProjectGuid>16BC0468-78F6-4C91-87DA-7403C919E646</ProjectGuid>
   </PropertyGroup>

diff --git a/frontend/package.json b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "frontend",
-  "version": "2.1.4-32.29",
+  "version": "2.1.5-32.30",
   "private": true,
   "dependencies": {
     "@bcgov/bc-sans": "1.0.1",

diff --git a/frontend/src/components/Table/Table.tsx b/frontend/src/components/Table/Table.tsx
@@ -141,6 +141,7 @@ export interface TableProps<T extends object = {}, TFilter extends object = {}>
   lockPageSize?: boolean;
   detailsPanel?: DetailsOptions<T>;
   footer?: boolean;
+  hidePagination?: boolean;
   hideToolbar?: boolean;
   tableToolbarText?: string;
   manualPagination?: boolean;
@@ -778,7 +779,7 @@ export const Table = <T extends IIdentifiedObject, TFilter extends object = {}>(
             </ColBootstrap>
           )}
           <ColBootstrap xs="auto" className="align-self-center">
-            {props.pageSize !== props.data.length && <TablePagination<T> instance={instance} />}
+            {!props.hidePagination && <TablePagination<T> instance={instance} />}
           </ColBootstrap>
         </RowBootstrap>
       )}

diff --git a/frontend/src/components/common/form/TableSelect.tsx b/frontend/src/components/common/form/TableSelect.tsx
@@ -85,11 +85,12 @@ export const TableSelect = <T extends { id?: string | number }>({
         <SelectedTableHeader selectedCount={existingItems.length} />
         <Table<T>
           name="selected-items"
+          lockPageSize
+          hidePagination
+          footer
           columns={columnsWithRemove}
           data={existingItems}
-          lockPageSize
           pageSize={existingItems.length}
-          footer
         />
       </Styled.SaveTableWrapper>
       <DisplayError field={field} />