Fix pagination #5605 #5607

kinjalravel · 2022-04-01T09:06:35Z

Summary

Change page size, fixed second page empty issue, fixed users table sort issue and sort users and location data from server

Checklist

Pre-push checks pass npm run check
- Linter passing via npm run lint
- Unit & Integration tests passing via npm run test:packages
- Docker build process passing via npm run build-client
If this PR is still a WIP, convert to a draft
When this PR is ready, mark it as "Ready for review"
Changes have been manually QA'd
Changes reviewed by at least 2 approved reviewers

References

closes #5605

QA Steps

git checkout pr_branch_name
npm install
npm run dev-reinit
npm run dev

List any additional steps required to QA the changes of this PR, as well as any supplemental images or videos.

Reviewers

Reviewers for this PR

…rt issue and sort users and location data from server #5605

zulqarnainhanif · 2022-04-01T10:59:11Z

@kinjalravel as far as I understood the 4th point of the issue; We need sorting on multiple fields and every table of admin panel. Currently it's only done for name field of User and Location Table.

@HexaField Please let us know if my understanding is correct or not.

kinjalravel · 2022-04-04T05:51:28Z

@kinjalravel as far as I understood the 4th point of the issue; We need sorting on multiple fields and every table of admin panel. Currently it's only done for name field of User and Location Table.

@HexaField Please let us know if my understanding is correct or not.

@HexaField ?

HexaField · 2022-04-04T06:35:04Z

@kinjalravel as far as I understood the 4th point of the issue; We need sorting on multiple fields and every table of admin panel. Currently it's only done for name field of User and Location Table.
@HexaField Please let us know if my understanding is correct or not.

@HexaField ?

no, this is referring to the fact that at least one of the tables is sorting the data it has been given from the server, rather than sending the feathers database query information for the pagination

zulqarnainhanif · 2022-04-06T08:14:34Z

packages/client-core/src/admin/common/Table.tsx

@@ -19,6 +19,10 @@ interface Props {
  page: number
  rowsPerPage: number
  count: number
+  orderby?: string


proper camel case would be orderBy

zulqarnainhanif · 2022-04-06T08:14:47Z

packages/client-core/src/admin/common/Table.tsx

+  orderby?: string
+  allowSort?: boolean
+  setSortField?: (fueld: string) => void
+  setOrderby?: (order: string) => void


proper camel case would be setOrderBy

zulqarnainhanif · 2022-04-06T08:17:12Z

packages/client-core/src/admin/common/Table.tsx

@@ -143,7 +161,7 @@ const TableComponent = (props: Props) => {
            columns={column}
          />
          <TableBody>
-            {stableSort(rows, getComparator(order, orderBy))
+            {(allowSort === false ? rows : stableSort(rows, getComparator(order, orderBy)))


allowSort ? stableSort(rows, getComparator(order, orderBy) : rows

zulqarnainhanif · 2022-04-06T08:17:36Z

packages/client-core/src/admin/common/hooks/Location.hooks.ts

-    LocationService.fetchAdminLocations('increment', search)
-    // }
+    //if (user?.id?.value && adminLocationState.updateNeeded.value && !adminScopeReadErrMsg?.value) {
+    //  LocationService.fetchAdminLocations(search, 0, orderby)


remove commented code if it isn't required anymore.

zulqarnainhanif · 2022-04-06T08:17:41Z

packages/client-core/src/admin/common/hooks/User.hooks.ts

-    }
-    UserService.fetchUsersAsAdmin('increment', search)
+    //if (user?.id.value && adminUserState.updateNeeded.value) {
+    // UserService.fetchUsersAsAdmin(search, 0, orderby)


remove commented code if it isn't required anymore.

zulqarnainhanif · 2022-04-06T08:17:45Z

packages/client-core/src/admin/common/hooks/party.hooks.ts

-    }
-    PartyService.fetchAdminParty('increment', search)
+    //if (user?.id?.value && adminParty.updateNeeded.value) {
+    //PartyService.fetchAdminParty('increment', null)


remove commented code if it isn't required anymore.

zulqarnainhanif · 2022-04-06T08:18:51Z

packages/client-core/src/admin/components/Avatars/AvatarTable.tsx

@@ -36,15 +36,23 @@ const AvatarTable = (props: Props) => {
  const [popConfirmOpen, setPopConfirmOpen] = useState(false)
  const [avatarId, setAvatarId] = useState('')
  const [avatarName, setAvatarName] = useState('')
+  const [orderby, setOrderby] = useState('asc')


fix camelcase here as well

zulqarnainhanif · 2022-04-06T08:19:30Z

packages/client-core/src/admin/components/Group/GroupTable.tsx

@@ -24,18 +24,26 @@ const GroupTable = (props: Props) => {
  const [rowsPerPage, setRowsPerPage] = useState(GROUP_PAGE_LIMIT)
  const [groupId, setGroupId] = useState('')
  const [groupName, setGroupName] = useState('')
+  const [orderby, setOrderby] = useState('asc')


fix camelcase here as well

zulqarnainhanif · 2022-04-06T08:19:45Z

packages/client-core/src/admin/components/Instance/InstanceTable.tsx

+  const [popConfirmOpen, setPopConfirmOpen] = useState(false)
+  const [instanceId, setInstanceId] = useState('')
+  const [instanceName, setInstanceName] = useState('')
+  const [orderby, setOrderby] = useState('asc')


fix camelcase here as well

zulqarnainhanif · 2022-04-06T08:21:23Z

packages/client-core/src/admin/components/Location/LocationTable.tsx

@@ -42,22 +44,28 @@ const LocationTable = (props: LocationProps) => {
  // Call custom hooks
  const { t } = useTranslation()
  const adminUserState = useUserState()
-  useFetchLocation(user, adminLocationState, adminScopeReadErrMsg, search, LocationService)
+  useFetchLocation(user, adminLocationState, adminScopeReadErrMsg, search, LocationService, sortField, orderby)


this line is failing pipeline due to extra params in functions

zulqarnainhanif · 2022-04-06T08:24:07Z

packages/client-core/src/admin/components/Users/UserTable.tsx

@@ -19,6 +19,8 @@ const UserTable = (props: UserProps) => {
  const [popConfirmOpen, setPopConfirmOpen] = useState(false)
  const [userId, setUserId] = useState('')
  const [userName, setUserName] = useState('')
+  const [orderby, setOrderby] = useState('asc')


fix camelcase here as well

zulqarnainhanif · 2022-04-06T08:24:12Z

packages/client-core/src/admin/components/Party/PartyTable.tsx

@@ -20,6 +20,8 @@ const PartyTable = (props: PartyPropsTable) => {
  const [popConfirmOpen, setPopConfirmOpen] = useState(false)
  const [partyName, setPartyName] = useState('')
  const [partyId, setPartyId] = useState('')
+  const [orderby, setOrderby] = useState('asc')


fix camelcase here as well

zulqarnainhanif · 2022-04-06T08:25:55Z

packages/client-core/src/admin/components/Location/LocationTable.tsx

+  const [popConfirmOpen, setPopConfirmOpen] = useState(false)
+  const [locationId, setLocationId] = useState('')
+  const [locationName, setLocationName] = useState('')
+  const [orderby, setOrderby] = useState('asc')


fix camelcase here as well

zulqarnainhanif · 2022-04-06T08:34:52Z

getting this error on Sorting Location Table Type column

similar is happening with instanceMediaChatEnabled and videoEnabled field

change page size, fixed second page empty issue, fixed users table so…

9710661

…rt issue and sort users and location data from server #5605

zulqarnainhanif self-requested a review April 1, 2022 10:31

kinjalravel and others added 2 commits April 1, 2022 20:38

sort Avatar and group data from server

22b2709

Merge branch 'dev' into #5605

93a67c4

kinjalravel added 2 commits April 4, 2022 12:46

fixed merge conflicts

06369b3

partial commit

672ec4e

HexaField requested review from barankyle and HexaField April 6, 2022 03:52

HexaField and others added 3 commits April 6, 2022 13:54

Merge branch 'dev' into #5605

138fe7d

clean up logging

bc57f49

Merge branch 'dev' into #5605

b88c0a4

zulqarnainhanif reviewed Apr 6, 2022

View reviewed changes

kinjalravel added 2 commits April 6, 2022 14:44

fixed locations field sort issue

d77ce9b

Merge branch '#5605' of github.com:XRFoundation/XREngine into #5605

494cca9

zulqarnainhanif approved these changes Apr 6, 2022

View reviewed changes

zulqarnainhanif merged commit 081691b into dev Apr 6, 2022

zulqarnainhanif deleted the #5605 branch April 6, 2022 16:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix pagination #5605 #5607

Fix pagination #5605 #5607

kinjalravel commented Apr 1, 2022 •

edited by HexaField

Loading

zulqarnainhanif commented Apr 1, 2022

kinjalravel commented Apr 4, 2022

HexaField commented Apr 4, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif Apr 6, 2022

zulqarnainhanif commented Apr 6, 2022 •

edited

Loading

Fix pagination #5605 #5607

Fix pagination #5605 #5607

Conversation

kinjalravel commented Apr 1, 2022 • edited by HexaField Loading

Summary

Checklist

References

QA Steps

Reviewers

zulqarnainhanif commented Apr 1, 2022

kinjalravel commented Apr 4, 2022

HexaField commented Apr 4, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zulqarnainhanif commented Apr 6, 2022 • edited Loading

kinjalravel commented Apr 1, 2022 •

edited by HexaField

Loading

zulqarnainhanif commented Apr 6, 2022 •

edited

Loading