📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
fix: keep member lists in sync after role changes
Blue Mouse3f061dc88144
diff --git a/web/app/pages/Organisations/Settings/People.tsx b/web/app/pages/Organisations/Settings/People.tsxindex 310c1e9c9..111af3635 100644--- a/web/app/pages/Organisations/Settings/People.tsx+++ b/web/app/pages/Organisations/Settings/People.tsx@@ -7,6 +7,7 @@ import {Transition,} from '@headlessui/react'import dayjs from 'dayjs'+import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'@@ -244,12 +245,19 @@ const People = ({ organisation }: PeopleProps) => {DetailedOrganisation['members'][number] | null>(null)- const { name, members } = organisation+ const { name, members: organisationMembers } = organisation+ const [members, setMembers] = useState<DetailedOrganisation['members']>(+ () => organisationMembers,+ )const isSubmitting = fetcher.state === 'submitting'const isDeleting =isSubmitting && fetcher.formData?.get('intent') === 'remove-member'+ useEffect(() => {+ setMembers(organisationMembers)+ }, [organisationMembers])+const closeModal = () => {setShowModal(false)setTimeout(() => setForm({ email: '', role: 'viewer' }), 300)@@ -274,15 +282,30 @@ const People = ({ organisation }: PeopleProps) => {toast.success(t('apiNotifications.userInvited'))closeModal()} else if (intent === 'remove-member') {+ const removedMemberId = fetcher.data.memberId || memberToRemove?.id+ if (removedMemberId) {+ setMembers((current) =>+ _filter(current, (member) => member.id !== removedMemberId),+ )+ }toast.success(t('apiNotifications.orgUserRemoved'))closeRemoveUserModal()} else if (intent === 'update-member-role') {+ if (fetcher.data.memberId && fetcher.data.role) {+ setMembers((current) =>+ _map(current, (member) =>+ member.id === fetcher.data!.memberId+ ? { ...member, role: fetcher.data!.role as Role }+ : member,+ ),+ )+ }toast.success(t('apiNotifications.roleUpdated'))}} else if (fetcher.data?.error) {toast.error(fetcher.data.error)}- }, [fetcher.data, t])+ }, [fetcher.data, memberToRemove?.id, t])/* eslint-enable react-hooks/set-state-in-effect */const validate = () => {diff --git a/web/app/pages/Organisations/Settings/Projects.tsx b/web/app/pages/Organisations/Settings/Projects.tsxindex 8ba2326f9..281d4060d 100644--- a/web/app/pages/Organisations/Settings/Projects.tsx+++ b/web/app/pages/Organisations/Settings/Projects.tsx@@ -199,6 +199,7 @@ interface ProjectsProps {export const Projects = ({ organisation }: ProjectsProps) => {const { t } = useTranslation('common')+ const { user } = useAuth()const fetcher = useFetcher<OrganisationSettingsActionData>()const [showDeleteModal, setShowDeleteModal] = useState(false)@@ -212,7 +213,10 @@ export const Projects = ({ organisation }: ProjectsProps) => {const [currentPage, setCurrentPage] = useState(1)const [search, setSearch] = useState('')const [isSearchActive, setIsSearchActive] = useState(false)- const { projects } = organisation+ const { projects: organisationProjects } = organisation+ const [projects, setProjects] = useState<DetailedOrganisation['projects']>(+ () => organisationProjects,+ )const isSubmitting = fetcher.state === 'submitting'const isAddingProject =@@ -220,6 +224,10 @@ export const Projects = ({ organisation }: ProjectsProps) => {const isRemovingProject =isSubmitting && fetcher.formData?.get('intent') === 'remove-project'+ useEffect(() => {+ setProjects(organisationProjects)+ }, [organisationProjects])+/* eslint-disable react-hooks/set-state-in-effect */useEffect(() => {if (!fetcher.data) return@@ -229,10 +237,32 @@ export const Projects = ({ organisation }: ProjectsProps) => {if (fetcher.data?.success) {const { intent } = fetcher.dataif (intent === 'add-project') {+ if (selectedProject) {+ setProjects((current) =>+ current.some((project) => project.id === selectedProject.id)+ ? current+ : [+ ...current,+ {+ id: selectedProject.id,+ name: selectedProject.name,+ admin: {+ email: selectedProject.admin?.email || user?.email || '',+ },+ },+ ],+ )+ }toast.success(t('apiNotifications.projectAddedToOrganisation'))setShowAddProjectModal(false)setSelectedProject(null)} else if (intent === 'remove-project') {+ const removedProjectId = fetcher.data.projectId || projectToRemove?.id+ if (removedProjectId) {+ setProjects((current) =>+ _filter(current, (project) => project.id !== removedProjectId),+ )+ }toast.success(t('apiNotifications.projectRemovedFromOrganisation'))setShowDeleteModal(false)setProjectToRemove(null)@@ -240,7 +270,7 @@ export const Projects = ({ organisation }: ProjectsProps) => {} else if (fetcher.data?.error) {toast.error(fetcher.data.error)}- }, [fetcher.data, t])+ }, [fetcher.data, projectToRemove?.id, selectedProject, t, user?.email])/* eslint-enable react-hooks/set-state-in-effect */const filteredProjects = useMemo(() => {diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsxindex f03cec794..a469ee1eb 100644--- a/web/app/pages/Project/Settings/People/People.tsx+++ b/web/app/pages/Project/Settings/People/People.tsx@@ -6,6 +6,7 @@ import {Transition,} from '@headlessui/react'import dayjs from 'dayjs'+import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import _keys from 'lodash/keys'import _map from 'lodash/map'@@ -71,6 +72,7 @@ const NoPeople = ({ onInvite }: { onInvite: () => void }) => {interface TableUserRowProps {data: ShareOwnerProjectonRemove: () => void+ onRoleUpdated: (shareId: string, role: string) => voidlanguage: stringauthedUserEmail: string | undefinedprojectId: string@@ -79,6 +81,7 @@ interface TableUserRowProps {const TableUserRow = ({data,onRemove,+ onRoleUpdated,language,authedUserEmail,projectId,@@ -95,12 +98,15 @@ const TableUserRow = ({if (fetcher.data.intent === 'change-share-role') {if (fetcher.data.success) {+ if (fetcher.data.shareId && fetcher.data.role) {+ onRoleUpdated(fetcher.data.shareId, fetcher.data.role)+ }toast.success(t('apiNotifications.roleUpdated'))} else if (fetcher.data.error) {toast.error(fetcher.data.error)}}- }, [fetcher.state, fetcher.data, t])+ }, [fetcher.state, fetcher.data, onRoleUpdated, t])const changeRole = (newRole: string) => {if (newRole === role || fetcher.state !== 'idle') return@@ -225,6 +231,7 @@ interface PeopleProps {const People = ({ project }: PeopleProps) => {const { user: currentUser } = useAuth()const fetcher = useFetcher<ProjectSettingsActionData>()+ const { id, name, share } = projectconst [showModal, setShowModal] = useState(false)const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)@@ -246,15 +253,18 @@ const People = ({ project }: PeopleProps) => {}>({})const [validated, setValidated] = useState(false)const lastHandledData = useRef<ProjectSettingsActionData | null>(null)+ const [members, setMembers] = useState<ShareOwnerProject[]>(() => share || [])const [showDeleteModal, setShowDeleteModal] = useState(false)const [memberToRemove, setMemberToRemove] =useState<ShareOwnerProject | null>(null)- const { id, name, share } = project-const isSubmitting = fetcher.state !== 'idle'+ useEffect(() => {+ setMembers(share || [])+ }, [share])+useEffect(() => {if (fetcher.state !== 'idle' || !fetcher.data) returnif (lastHandledData.current === fetcher.data) return@@ -262,6 +272,9 @@ const People = ({ project }: PeopleProps) => {if (fetcher.data.intent === 'share-project') {if (fetcher.data.success) {+ if (fetcher.data.project?.share) {+ setMembers(fetcher.data.project.share)+ }toast.success(t('apiNotifications.userInvited'))setTimeout(() => {setShowModal(false)@@ -275,6 +288,12 @@ const People = ({ project }: PeopleProps) => {}} else if (fetcher.data.intent === 'delete-share-user') {if (fetcher.data.success) {+ const removedShareId = fetcher.data.shareId || memberToRemove?.id+ if (removedShareId) {+ setMembers((current) =>+ _filter(current, (member) => member.id !== removedShareId),+ )+ }toast.success(t('apiNotifications.userRemoved'))setTimeout(() => {setShowDeleteModal(false)@@ -284,7 +303,7 @@ const People = ({ project }: PeopleProps) => {toast.error(fetcher.data.error)}}- }, [fetcher.state, fetcher.data, t])+ }, [fetcher.state, fetcher.data, memberToRemove?.id, t])const validate = () => {const allErrors: {@@ -372,7 +391,7 @@ const People = ({ project }: PeopleProps) => {</Button></div><div>- {_isEmpty(share) ? (+ {_isEmpty(members) ? (<NoPeople onInvite={() => setShowModal(true)} />) : (<div className='overflow-hidden rounded-lg border border-gray-200 dark:border-slate-800'>@@ -395,7 +414,7 @@ const People = ({ project }: PeopleProps) => {</tr></thead><tbody className='divide-y divide-gray-200 bg-white dark:divide-slate-800 dark:bg-slate-950'>- {_map(share, (data) => (+ {_map(members, (data) => (<TableUserRowdata={data}key={data.id}@@ -406,6 +425,13 @@ const People = ({ project }: PeopleProps) => {language={language}authedUserEmail={currentUser?.email}projectId={id}+ onRoleUpdated={(shareId, role) => {+ setMembers((current) =>+ _map(current, (member) =>+ member.id === shareId ? { ...member, role } : member,+ ),+ )+ }}/>))}</tbody>diff --git a/web/app/routes/organisations.$id.tsx b/web/app/routes/organisations.$id.tsxindex 3d011b838..d95dc6ead 100644--- a/web/app/routes/organisations.$id.tsx+++ b/web/app/routes/organisations.$id.tsx@@ -90,6 +90,9 @@ export interface OrganisationSettingsActionData {}organisation?: DetailedOrganisationavailableProjects?: AvailableProjectsResponse+ memberId?: string+ projectId?: string+ role?: string}export async function action({ request, params }: ActionFunctionArgs) {@@ -221,7 +224,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}return data<OrganisationSettingsActionData>(- { intent, success: true },+ { intent, success: true, memberId },{ headers: createHeadersWithCookies(result.cookies) },)}@@ -247,7 +250,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}return data<OrganisationSettingsActionData>(- { intent, success: true },+ { intent, success: true, memberId, role },{ headers: createHeadersWithCookies(result.cookies) },)}@@ -275,7 +278,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}return data<OrganisationSettingsActionData>(- { intent, success: true },+ { intent, success: true, projectId },{ headers: createHeadersWithCookies(result.cookies) },)}@@ -306,7 +309,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}return data<OrganisationSettingsActionData>(- { intent, success: true },+ { intent, success: true, projectId },{ headers: createHeadersWithCookies(result.cookies) },)}diff --git a/web/app/routes/projects.settings.$id.tsx b/web/app/routes/projects.settings.$id.tsxindex 4a6fbc80f..aa9b3dc64 100644--- a/web/app/routes/projects.settings.$id.tsx+++ b/web/app/routes/projects.settings.$id.tsx@@ -99,6 +99,8 @@ export interface ProjectSettingsActionData {proxyDomains?: ProxyDomain[]proxyDomain?: ProxyDomainproxyDomainKeywordWarning?: boolean+ shareId?: string+ role?: string}export async function action({ request, params }: ActionFunctionArgs) {@@ -544,7 +546,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}return data<ProjectSettingsActionData>(- { intent, success: true },+ { intent, success: true, shareId },{ headers: createHeadersWithCookies(result.cookies) },)}@@ -573,7 +575,7 @@ export async function action({ request, params }: ActionFunctionArgs) {}return data<ProjectSettingsActionData>(- { intent, success: true },+ { intent, success: true, shareId, role },{ headers: createHeadersWithCookies(result.cookies) },)}