Skip to content

📈 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!

(improvement) Shared projects admin rights (#401)

Andrii Romasiund038255eda91
diff --git a/app/pages/Project/Settings/People/People.container.tsx b/app/pages/Project/Settings/People/People.container.tsx
index 964ab7b6a..9813f35b3 100644
--- a/app/pages/Project/Settings/People/People.container.tsx
+++ b/app/pages/Project/Settings/People/People.container.tsx
@@ -9,6 +9,7 @@ import People from './People'
const mapStateToProps = (state: StateType) => ({
isPaidTierUsed: state.auth.isPaidTierUsed,
+ user: state.auth.user,
})
const mapDispatchToProps = (dispatch: AppDispatch) => ({
diff --git a/app/pages/Project/Settings/People/People.tsx b/app/pages/Project/Settings/People/People.tsx
index 500948746..262f32145 100644
--- a/app/pages/Project/Settings/People/People.tsx
+++ b/app/pages/Project/Settings/People/People.tsx
@@ -20,6 +20,7 @@ import PaidFeature from 'modals/PaidFeature'
import { roles, roleViewer, roleAdmin, INVITATION_EXPIRES_IN } from 'redux/constants'
import useOnClickOutside from 'hooks/useOnClickOutside'
import { IProject, IShareOwnerProject } from 'redux/models/IProject'
+import { IUser } from 'redux/models/IUser'
const NoEvents = ({ t }: { t: (key: string) => string }): JSX.Element => (
<div className='flex flex-col py-6 sm:px-6 lg:px-8'>
@@ -29,17 +30,7 @@ const NoEvents = ({ t }: { t: (key: string) => string }): JSX.Element => (
</div>
)
-const UsersList = ({
- data,
- onRemove,
- t,
- share,
- setProjectShareData,
- pid,
- updateProjectFailed,
- language,
- roleUpdatedNotification,
-}: {
+interface IUsersList {
data: IShareOwnerProject
onRemove: (id: string) => void
t: (
@@ -49,14 +40,30 @@ const UsersList = ({
},
) => string
share?: IShareOwnerProject[]
- setProjectShareData: (item: Partial<IProject>, id: string) => void
+ setProjectShareData: (item: Partial<IProject>, id: string, shared: boolean) => void
pid: string
updateProjectFailed: (message: string) => void
language: string
roleUpdatedNotification: (email: string, role?: string) => void
-}) => {
- const [open, setOpen] = useState<boolean>(false)
- const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false)
+ authedUserEmail: string | undefined
+ isSharedProject: boolean
+}
+
+const UsersList = ({
+ data,
+ onRemove,
+ t,
+ share,
+ setProjectShareData,
+ pid,
+ updateProjectFailed,
+ language,
+ roleUpdatedNotification,
+ authedUserEmail,
+ isSharedProject,
+}: IUsersList) => {
+ const [open, setOpen] = useState(false)
+ const [showDeleteModal, setShowDeleteModal] = useState(false)
const openRef = useRef<HTMLDivElement>(null)
useOnClickOutside(openRef, () => setOpen(false))
const { id, created, confirmed, role, user } = data
@@ -66,11 +73,11 @@ const UsersList = ({
const results = await changeShareRole(id, { role: newRole })
const newShared: IShareOwnerProject[] = _map(share, (itShare) => {
if (itShare.id === results.id) {
- return { ...results, user: itShare.user }
+ return { ...results, user: itShare.user, role: newRole }
}
return itShare
})
- setProjectShareData({ share: newShared }, pid)
+ setProjectShareData({ share: newShared }, pid, isSharedProject)
roleUpdatedNotification(t('apiNotifications.roleUpdated'))
} catch (e) {
console.error(`[ERROR] Error while updating user's role: ${e}`)
@@ -96,7 +103,8 @@ const UsersList = ({
<button
onClick={() => setOpen(!open)}
type='button'
- className='inline-flex items-center shadow-sm pl-2 pr-1 py-0.5 border border-gray-200 dark:border-gray-600 text-sm leading-5 font-medium rounded-full bg-white dark:bg-slate-800 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-600'
+ disabled={user.email === authedUserEmail}
+ className='inline-flex disabled:opacity-80 disabled:cursor-not-allowed items-center shadow-sm pl-2 pr-1 py-0.5 border border-gray-200 dark:border-gray-600 text-sm leading-5 font-medium rounded-full bg-white dark:bg-slate-800 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-600'
>
{t(`project.settings.roles.${role}.name`)}
<ChevronDownIcon style={{ transform: open ? 'rotate(180deg)' : '' }} className='w-4 h-4 pt-px ml-0.5' />
@@ -194,6 +202,8 @@ interface IPeopleProps {
inviteUserNotification: (email: string, type?: string) => void
removeUserNotification: (email: string) => void
isPaidTierUsed: boolean
+ user: IUser
+ isSharedProject: boolean
}
const People: React.FunctionComponent<IPeopleProps> = ({
@@ -204,36 +214,25 @@ const People: React.FunctionComponent<IPeopleProps> = ({
inviteUserNotification,
removeUserNotification,
isPaidTierUsed,
+ user: currentUser,
+ isSharedProject,
}: IPeopleProps): JSX.Element => {
const [showModal, setShowModal] = useState<boolean>(false)
const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState<boolean>(false)
const {
t,
i18n: { language },
- }: {
- t: (
- key: string,
- options?: {
- [key: string]: string | number | null
- },
- ) => string
- i18n: {
- language: string
- }
} = useTranslation('common')
- const [form, setForm] = useState<{
- email: string
- role: string
- }>({
+ const [form, setForm] = useState({
email: '',
role: '',
})
- const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)
+ const [beenSubmitted, setBeenSubmitted] = useState(false)
const [errors, setErrors] = useState<{
email?: string
role?: string
}>({})
- const [validated, setValidated] = useState<boolean>(false)
+ const [validated, setValidated] = useState(false)
const { id, name, share } = project
const validate = () => {
@@ -384,6 +383,8 @@ const People: React.FunctionComponent<IPeopleProps> = ({
updateProjectFailed={updateProjectFailed}
roleUpdatedNotification={roleUpdatedNotification}
pid={id}
+ authedUserEmail={currentUser?.email}
+ isSharedProject={isSharedProject}
/>
))}
</tbody>
diff --git a/app/pages/Project/Settings/ProjectSettings.container.tsx b/app/pages/Project/Settings/ProjectSettings.container.tsx
index 62899a2c1..111fd9029 100644
--- a/app/pages/Project/Settings/ProjectSettings.container.tsx
+++ b/app/pages/Project/Settings/ProjectSettings.container.tsx
@@ -12,7 +12,8 @@ const mapStateToProps = (state: StateType) => ({
projects: state.ui.projects.projects,
sharedProjects: state.ui.projects.sharedProjects,
isLoading: state.ui.projects.isLoading,
- loading: state.auth.loading,
+ isLoadingShared: state.ui.projects.isLoadingShared,
+ authLoading: state.auth.loading,
dashboardPaginationPage: state.ui.projects.dashboardPaginationPage,
dashboardPaginationPageShared: state.ui.projects.dashboardPaginationPageShared,
user: state.auth.user,
diff --git a/app/pages/Project/Settings/ProjectSettings.tsx b/app/pages/Project/Settings/ProjectSettings.tsx
index 3df73dfa8..4cd43fdee 100644
--- a/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/app/pages/Project/Settings/ProjectSettings.tsx
@@ -69,19 +69,7 @@ const tabDeleteDataModal = [
},
]
-const ModalMessage = ({
- dateRange,
- setDateRange,
- setTab,
- t,
- tab,
- pid,
- activeFilter,
- setActiveFilter,
- filterType,
- setFilterType,
- language,
-}: {
+interface IModalMessage {
dateRange: Date[]
setDateRange: (a: Date[]) => void
setTab: (i: string) => void
@@ -98,7 +86,21 @@ const ModalMessage = ({
filterType: string
setFilterType: (a: string) => void
language: string
-}): JSX.Element => {
+}
+
+const ModalMessage = ({
+ dateRange,
+ setDateRange,
+ setTab,
+ t,
+ tab,
+ pid,
+ activeFilter,
+ setActiveFilter,
+ filterType,
+ setFilterType,
+ language,
+}: IModalMessage): JSX.Element => {
const [filterList, setFilterList] = useState<string[]>([])
const [searchList, setSearchList] = useState<string[]>([])
@@ -262,6 +264,7 @@ interface IProjectSettings {
deleteProjectFailed: (message: string) => void
loadProjects: (shared: boolean, skip: number) => void
isLoading: boolean
+ isLoadingShared: boolean
projects: IProject[]
showError: (message: string) => void
removeProject: (pid: string, shared: boolean) => void
@@ -272,7 +275,7 @@ interface IProjectSettings {
setProjectProtectedPassword: (pid: string, password: string) => void
dashboardPaginationPage: number
dashboardPaginationPageShared: number
- loading: boolean
+ authLoading: boolean
isSettings: boolean
}
@@ -284,6 +287,7 @@ const ProjectSettings = ({
deleteProjectFailed,
loadProjects,
isLoading,
+ isLoadingShared,
projects,
showError,
removeProject,
@@ -294,22 +298,12 @@ const ProjectSettings = ({
setProjectProtectedPassword,
dashboardPaginationPage,
dashboardPaginationPageShared,
- loading,
+ authLoading,
isSettings,
}: IProjectSettings) => {
const {
t,
i18n: { language },
- }: {
- t: (
- key: string,
- options?: {
- [key: string]: string | number | null
- },
- ) => string
- i18n: {
- language: string
- }
} = useTranslation('common')
// @ts-ignore
const {
@@ -360,7 +354,7 @@ const ProjectSettings = ({
: dashboardPaginationPage * ENTRIES_PER_PAGE_DASHBOARD
useEffect(() => {
- if (loading) {
+ if (authLoading) {
return
}
@@ -369,7 +363,7 @@ const ProjectSettings = ({
navigate(routes.dashboard)
}
- if (!isLoading && isSettings && !projectDeleting) {
+ if (!isLoading && !isLoadingShared && isSettings && !projectDeleting) {
if (_isEmpty(project) || project?.uiHidden) {
showError(t('project.noExist'))
navigate(routes.dashboard)
@@ -381,7 +375,7 @@ const ProjectSettings = ({
})
}
}
- }, [user, project, isLoading, isSettings, navigate, showError, projectDeleting, t, loading])
+ }, [user, project, isLoading, isSettings, navigate, showError, projectDeleting, t, authLoading, isLoadingShared])
const onSubmit = async (data: IForm) => {
if (!projectSaving) {
@@ -581,7 +575,7 @@ const ProjectSettings = ({
document.title = pageTitle
}, [form, t, isSettings])
- if (loading) {
+ if (authLoading) {
return (
<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>
<Loader />
@@ -672,7 +666,6 @@ const ProjectSettings = ({
handleInput(e)
}
}}
- disabled={form?.isPasswordProtected}
name='public'
id='public'
className='mt-4'
@@ -695,7 +688,6 @@ const ProjectSettings = ({
setShowProtected(true)
}
}}
- disabled={form?.public}
name='isPasswordProtected'
id='isPasswordProtected'
className='mt-4'
@@ -752,16 +744,16 @@ const ProjectSettings = ({
</div>
)}
</div>
- {!isSelfhosted && !project?.shared && (
+ {!isSelfhosted && (
<>
<hr className='mt-8 xs:mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />
<Emails projectId={id} projectName={project.name} />
</>
)}
- {!isSelfhosted && !project?.shared && (
+ {!isSelfhosted && (
<>
<hr className='mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />
- <People project={project} />
+ <People project={project} isSharedProject={isSharedProject} />
</>
)}
</>