Feedback listing pagination bug fix (#2073)

* back end updates for feedback api * update tests * update feedback test * add new migration files & update tests for backend * update enums && lint * update migrations * add missing enum * update tests * update resource * fix migration error * add dropdown * push updates * touch ups to ui * make button only visible to superusers * fix import error * add when component * update front end tests * update feedback modal test * add use effect to reload when switching between archived & regular listing * duplkicate imports * update feedback
bcgov · Aug 24, 2023 · 78d601d · 78d601d
1 parent 461666b
commit 78d601d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/met-api/migrations/versions/04e6c48187da_.py b/met-api/migrations/versions/04e6c48187da_.py
@@ -28,6 +28,7 @@ def upgrade():
 
     op.add_column('feedback', sa.Column('status', sa.Enum(
         'Unreviewed', 'Archived', name='feedbackstatustype'), nullable=True))
+    op.execute('UPDATE "feedback" SET status = \'Unreviewed\'')
     # ### end Alembic commands ###
 
 

diff --git a/met-web/src/components/feedback/listing.tsx b/met-web/src/components/feedback/listing.tsx
@@ -55,7 +55,7 @@ const FeedbackListing = () => {
                 sort_key: nested_sort_key || sort_key,
                 sort_order,
             });
-            setFeedbacks(response.items);
+            setFeedbacks(response.items.filter((feedback) => feedback.status == statusFilter));
             setPageInfo({
                 total: response.total,
             });
@@ -147,13 +147,20 @@ const FeedbackListing = () => {
                 >
                     <When condition={authorized}>
                         <PrimaryButton
-                            onClick={() =>
+                            onClick={() => {
+                                setPaginationOptions({
+                                    page: 1,
+                                    size: 10,
+                                    sort_key: 'rating',
+                                    nested_sort_key: null,
+                                    sort_order: 'asc',
+                                });
                                 setStatusFilter(
                                     statusFilter == FeedbackStatusEnum.NotReviewed
                                         ? FeedbackStatusEnum.Archived
                                         : FeedbackStatusEnum.NotReviewed,
-                                )
-                            }
+                                );
+                            }}
                         >
                             {statusFilter == FeedbackStatusEnum.NotReviewed ? 'View Archive' : 'View Feedback'}
                         </PrimaryButton>
@@ -163,7 +170,7 @@ const FeedbackListing = () => {
             <Grid item xs={12} lg={10}>
                 <MetTable
                     headCells={headCells}
-                    rows={feedbacks.filter((feedback) => feedback.status == statusFilter)}
+                    rows={feedbacks}
                     handleChangePagination={(paginationOptions: PaginationOptions<Feedback>) =>
                         setPaginationOptions(paginationOptions)
                     }