Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@itwin/manage-versions-react",
"comment": "Fetch next user batch if current view has user that are not fetched yet.",
"type": "patch"
}
],
"packageName": "@itwin/manage-versions-react"
}
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ export class ChangesetClient {
.then((resp) => resp.changesets);
}

public async getUsers(imodelId: string): Promise<User[]> {
public async getUsers(
imodelId: string,
requestOptions: RequestOptions = {}
): Promise<{ users: User[]; hasMore: boolean }> {
return this._http
.get(
`${UrlBuilder.buildGetUsersUrl(
imodelId,
this._serverEnvironmentPrefix
)}`,
)}${UrlBuilder.getQuery(requestOptions)}`,
{
headers: {
[HttpHeaderNames.Prefer]: "return=representation",
Expand All @@ -58,7 +61,10 @@ export class ChangesetClient {
},
}
)
.then((resp) => resp.users);
.then((resp) => ({
users: resp.users,
hasMore: !!resp._links?.next?.href,
}));
}

public async getChangesetCheckpoint(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ describe("ManageVersions", () => {
jest.clearAllMocks();
mockGetVersions.mockResolvedValue(MockedVersionList());
mockGetChangesets.mockResolvedValue(MockedChangesetList());
mockGetUsers.mockResolvedValue(MockedUsers());
mockGetUsers.mockResolvedValue({ users: MockedUsers(), hasMore: false });
});

it("should show versions table with data", async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ export enum ManageVersionsTabs {

const NAMED_VERSION_TOP = 100;
const CHANGESET_TOP = 100;
const USERS_TOP = 100;

const initialChangeset: Changeset = {
id: "",
Expand Down Expand Up @@ -231,18 +232,26 @@ const ManageVersionsComponent = (props: ManageVersionsProps) => {
const usersRef = React.useRef<{ [key: string]: string } | undefined>(
undefined
);
const hasMoreUsersRef = React.useRef<boolean>(true);

const getUsers = React.useCallback(async () => {
const users = await changesetClient.getUsers(imodelId);
const userMapData = users.reduce((acc, user) => {
const userFullName = [user.givenName, user.surname].filter(Boolean);
acc[user.id] = userFullName.length
? userFullName.join(" ")
: user.displayName;
return acc;
}, {} as { [key: string]: string });
usersRef.current = userMapData;
}, [changesetClient, imodelId]);
const getUsers = React.useCallback(
async (skip?: number) => {
const { users, hasMore } = await changesetClient.getUsers(imodelId, {
top: USERS_TOP,
skip,
});
const userMapData = users.reduce((acc, user) => {
const userFullName = [user.givenName, user.surname].filter(Boolean);
acc[user.id] = userFullName.length
? userFullName.join(" ")
: user.displayName;
return acc;
}, {} as { [key: string]: string });
usersRef.current = { ...usersRef.current, ...userMapData };
hasMoreUsersRef.current = hasMore;
},
[changesetClient, imodelId]
);

React.useEffect(() => {
setCurrentTab(currentTab);
Expand Down Expand Up @@ -446,9 +455,26 @@ const ManageVersionsComponent = (props: ManageVersionsProps) => {

React.useEffect(() => {
const loadUsers = async () => {
await getUsers();
if (!hasMoreUsersRef.current) {
return;
}

if (!usersRef.current) {
hasMoreUsersRef.current = false;
await getUsers();
} else {
const hasMissingUsers =
versionsTableData?.some((td) => !td.version.createdBy) ||
changesets?.some((cs) => !cs.createdBy);

if (hasMissingUsers) {
hasMoreUsersRef.current = false;
await getUsers(Object.keys(usersRef.current).length);
}
}
};
if (!usersRef.current) {

if (!usersRef.current || versionsTableData || changesets) {
loadUsers()
.then(() => {
const updatedVersionsTableData = versionsTableData?.map((td) => {
Expand Down