[DEV-365] Remove page size selector from ticket list in user view

fiftin · Jun 2, 2022 · 68b2d2b · 68b2d2b
1 parent 36c5f32
commit 68b2d2b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/client/src/app-components/ticket-list.js b/client/src/app-components/ticket-list.js
@@ -60,14 +60,14 @@ class TicketList extends React.Component {
                 <div className="ticket-list__filters">
                    <div className="ticket-list__main-filters">
                         {(type === 'primary') ? this.renderMessage() : null}
-                            {
-                                ((type === 'secondary') && showDepartmentDropdown) ?
-                                    this.renderDepartmentsDropDown() :
-                                    null
-                            }
+                        {
+                            ((type === 'secondary') && showDepartmentDropdown) ?
+                                this.renderDepartmentsDropDown() :
+                                null
+                        }
                         {onClosedTicketsShownChange ? this.renderFilterCheckbox() : null}
                    </div>
-                    {
+                   {
                         showPageSizeDropdown ?
                             <PageSizeDropdown className="ticket-list__page-dropdown" pages={pages} onChange={(event) => this.pageSizeChange(event)} /> : 
                             null

diff --git a/client/src/app-components/ticket-list.scss b/client/src/app-components/ticket-list.scss
@@ -17,6 +17,7 @@
     &__main-filters {
         display: flex;
         align-items: center;
+        width: 100%;
     }
 
     &__department-selector {
@@ -62,3 +63,7 @@
     }
 
 }
+
+.create-ticket-form__message {
+    width: 100%;
+}
diff --git a/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js b/client/src/app/main/dashboard/dashboard-list-tickets/dashboard-list-tickets-page.js
@@ -56,6 +56,7 @@ class DashboardListTicketsPage extends React.Component {
                     page={page}
                     pages={pages}
                     tickets={tickets}
+                    showPageSizeDropdown={false}
                     type={userUsers.length ? "secondary" : "primary"} />
                 {
                     message ?