Skip to content

fix(PM-1140): show spinner when changing between projects #1647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 28, 2025
Merged

fix(PM-1140): show spinner when changing between projects #1647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions src/components/Users/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { deleteProjectMemberInvite } from '../../services/projectMemberInvites'
import ConfirmationModal from '../Modal/ConfirmationModal'
import UserAddModalContent from './user-add.modal'
import InviteUserModalContent from './invite-user.modal' // Import the new component
import Loader from '../Loader'

const theme = {
container: styles.modalContainer
Expand Down Expand Up @@ -160,7 +161,8 @@ class Users extends Component {
isEditable,
isSearchingUserProjects,
resultSearchUserProjects,
loadNextProjects
loadNextProjects,
isLoadingProject
} = this.props
const {
searchKey
Expand Down Expand Up @@ -251,7 +253,7 @@ class Users extends Component {
)
}
{
membersExist && (
!isLoadingProject && membersExist && (
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding a check for isLoadingProject before membersExist to ensure that the spinner is shown correctly when the project is loading. This change may affect the rendering logic, so ensure that isLoadingProject is correctly initialized and updated to reflect the loading state accurately.

<>
<div className={styles.header}>
<div className={cn(styles.col5)}>
Expand Down Expand Up @@ -305,6 +307,8 @@ class Users extends Component {
)
}

{isLoadingProject && <Loader />}

</div>
)
}
Expand All @@ -322,6 +326,7 @@ Users.propTypes = {
projects: PropTypes.arrayOf(PropTypes.object),
projectMembers: PropTypes.arrayOf(PropTypes.object),
invitedMembers: PropTypes.arrayOf(PropTypes.object),
isLoadingProject: PropTypes.bool.isRequired,
searchUserProjects: PropTypes.func.isRequired,
resultSearchUserProjects: PropTypes.arrayOf(PropTypes.object),
loadNextProjects: PropTypes.func.isRequired
Expand Down
13 changes: 9 additions & 4 deletions src/containers/Users/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ class Users extends Component {
loginUserRoleInProject: '',
projectMembers: null,
invitedMembers: null,
isAdmin: false
isAdmin: false,
isLoadingProject: false
}
this.loadProject = this.loadProject.bind(this)
this.updateProjectNember = this.updateProjectNember.bind(this)
Expand Down Expand Up @@ -80,9 +81,10 @@ class Users extends Component {
}

loadProject (projectId) {
this.setState({ isLoadingProject: true })
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider handling potential errors from fetchProjectById to ensure isLoadingProject is set back to false in case of a failure. This will prevent the spinner from being displayed indefinitely.

fetchProjectById(projectId).then(async (project) => {
const projectMembers = _.get(project, 'members')
const invitedMembers = _.get(project, 'invites')
const invitedMembers = _.get(project, 'invites') || []
const invitedUserIds = _.filter(_.map(invitedMembers, 'userId'))
const invitedUsers = await fetchInviteMembers(invitedUserIds)

Expand All @@ -91,7 +93,8 @@ class Users extends Component {
invitedMembers: invitedMembers.map(m => ({
...m,
email: m.email || invitedUsers[m.userId].handle
}))
})),
isLoadingProject: false
})
const { loggedInUser } = this.props
this.updateLoginUserRoleInProject(projectMembers, loggedInUser)
Expand Down Expand Up @@ -156,7 +159,8 @@ class Users extends Component {
const {
projectMembers,
invitedMembers,
isAdmin
isAdmin,
isLoadingProject
} = this.state
return (
<UsersComponent
Expand All @@ -169,6 +173,7 @@ class Users extends Component {
loadNextProjects={this.loadNextProjects}
projectMembers={projectMembers}
invitedMembers={invitedMembers}
isLoadingProject={isLoadingProject}
auth={auth}
isAdmin={isAdmin}
isEditable={this.isEditable()}
Expand Down