Skip to content

Commit fd46145

Browse files
fix: Pagination Issue in LearnerActivityTable
* fix: fix pagination issue for learner activity table * fix: added autoResetPage option for DataTable --------- Co-authored-by: irfanuddinahmad <[email protected]>
1 parent 065aaa6 commit fd46145

File tree

5 files changed

+13
-7
lines changed

5 files changed

+13
-7
lines changed

package-lock.json

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"html-react-parser": "3.0.16",
6161
"jest-environment-jsdom": "29.7.0",
6262
"lodash-es": "^4.17.21",
63+
"lodash.debounce": "^4.0.8",
6364
"plotly.js": "^2.33.0",
6465
"prop-types": "15.8.1",
6566
"react": "17.0.2",

src/components/Admin/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class Admin extends React.Component {
163163
defaultMessage: 'Top Active Learners',
164164
description: 'Report subtitle for learners active in the past week',
165165
}),
166-
component: <LearnerActivityTable id="learners-active-week" activity="active_past_week" />,
166+
component: <LearnerActivityTable key="learners-active-week" id="learners-active-week" activity="active_past_week" />,
167167
csvFetchMethod: () => (
168168
EnterpriseDataApiService.fetchCourseEnrollments(
169169
enterpriseId,
@@ -184,7 +184,7 @@ class Admin extends React.Component {
184184
defaultMessage: 'Not Active in Past Week',
185185
description: 'Report subtitle for learners inactive in the past week',
186186
}),
187-
component: <LearnerActivityTable id="learners-inactive-week" activity="inactive_past_week" />,
187+
component: <LearnerActivityTable key="learners-inactive-week" id="learners-inactive-week" activity="inactive_past_week" />,
188188
csvFetchMethod: () => (
189189
EnterpriseDataApiService.fetchCourseEnrollments(
190190
enterpriseId,
@@ -205,7 +205,7 @@ class Admin extends React.Component {
205205
defaultMessage: 'Not Active in Past Month',
206206
description: 'Report subtitle for learners inactive in the past month',
207207
}),
208-
component: <LearnerActivityTable id="learners-inactive-month" activity="inactive_past_month" />,
208+
component: <LearnerActivityTable key="learners-inactive-month" id="learners-inactive-month" activity="inactive_past_month" />,
209209
csvFetchMethod: () => (
210210
EnterpriseDataApiService.fetchCourseEnrollments(
211211
enterpriseId,

src/components/AdminV2/index.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ const Admin = ({
192192
defaultMessage: 'Top Active Learners',
193193
description: 'Report subtitle for learners active in the past week',
194194
}),
195-
component: <LearnerActivityTable id="learners-active-week" activity="active_past_week" />,
195+
component: <LearnerActivityTable key="learners-active-week" id="learners-active-week" activity="active_past_week" />,
196196
csvFetchMethod: () => (
197197
EnterpriseDataApiService.fetchCourseEnrollments(
198198
enterpriseId,
@@ -213,7 +213,7 @@ const Admin = ({
213213
defaultMessage: 'Not Active in Past Week',
214214
description: 'Report subtitle for learners inactive in the past week',
215215
}),
216-
component: <LearnerActivityTable id="learners-inactive-week" activity="inactive_past_week" />,
216+
component: <LearnerActivityTable key="learners-inactive-week" id="learners-inactive-week" activity="inactive_past_week" />,
217217
csvFetchMethod: () => (
218218
EnterpriseDataApiService.fetchCourseEnrollments(
219219
enterpriseId,
@@ -234,7 +234,7 @@ const Admin = ({
234234
defaultMessage: 'Not Active in Past Month',
235235
description: 'Report subtitle for learners inactive in the past month',
236236
}),
237-
component: <LearnerActivityTable id="learners-inactive-month" activity="inactive_past_month" />,
237+
component: <LearnerActivityTable key="learners-inactive-month" id="learners-inactive-month" activity="inactive_past_month" />,
238238
csvFetchMethod: () => (
239239
EnterpriseDataApiService.fetchCourseEnrollments(
240240
enterpriseId,

src/components/LearnerActivityTable/index.jsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,9 @@ const LearnerActivityTable = ({ id, enterpriseId, activity }) => {
183183
FilterStatusComponent={FilterStatus}
184184
defaultColumnValues={{ Filter: TextFilter }}
185185
columns={columns}
186+
initialTableOptions={{
187+
autoResetPage: true,
188+
}}
186189
initialState={{
187190
pageIndex: currentPageFromUrl, // Use page from URL
188191
pageSize: PAGE_SIZE,

0 commit comments

Comments
 (0)