📈 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
Revert "(improvement) Shared projects admin rights (#399)" (#400)
Andrii Romasiun735896fe2f2e
diff --git a/app/pages/Project/Settings/People/People.container.tsx b/app/pages/Project/Settings/People/People.container.tsxindex 9813f35b3..964ab7b6a 100644--- a/app/pages/Project/Settings/People/People.container.tsx+++ b/app/pages/Project/Settings/People/People.container.tsx@@ -9,7 +9,6 @@ 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.tsxindex 262f32145..500948746 100644--- a/app/pages/Project/Settings/People/People.tsx+++ b/app/pages/Project/Settings/People/People.tsx@@ -20,7 +20,6 @@ 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'>@@ -30,7 +29,17 @@ const NoEvents = ({ t }: { t: (key: string) => string }): JSX.Element => (</div>)-interface IUsersList {+const UsersList = ({+ data,+ onRemove,+ t,+ share,+ setProjectShareData,+ pid,+ updateProjectFailed,+ language,+ roleUpdatedNotification,+}: {data: IShareOwnerProjectonRemove: (id: string) => voidt: (@@ -40,30 +49,14 @@ interface IUsersList {},) => stringshare?: IShareOwnerProject[]- setProjectShareData: (item: Partial<IProject>, id: string, shared: boolean) => void+ setProjectShareData: (item: Partial<IProject>, id: string) => voidpid: stringupdateProjectFailed: (message: string) => voidlanguage: stringroleUpdatedNotification: (email: string, role?: string) => void- 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 [open, setOpen] = useState<boolean>(false)+ const [showDeleteModal, setShowDeleteModal] = useState<boolean>(false)const openRef = useRef<HTMLDivElement>(null)useOnClickOutside(openRef, () => setOpen(false))const { id, created, confirmed, role, user } = data@@ -73,11 +66,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, role: newRole }+ return { ...results, user: itShare.user }}return itShare})- setProjectShareData({ share: newShared }, pid, isSharedProject)+ setProjectShareData({ share: newShared }, pid)roleUpdatedNotification(t('apiNotifications.roleUpdated'))} catch (e) {console.error(`[ERROR] Error while updating user's role: ${e}`)@@ -103,8 +96,7 @@ const UsersList = ({<buttononClick={() => setOpen(!open)}type='button'- 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'+ 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'>{t(`project.settings.roles.${role}.name`)}<ChevronDownIcon style={{ transform: open ? 'rotate(180deg)' : '' }} className='w-4 h-4 pt-px ml-0.5' />@@ -202,8 +194,6 @@ interface IPeopleProps {inviteUserNotification: (email: string, type?: string) => voidremoveUserNotification: (email: string) => voidisPaidTierUsed: boolean- user: IUser- isSharedProject: boolean}const People: React.FunctionComponent<IPeopleProps> = ({@@ -214,25 +204,36 @@ 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({+ const [form, setForm] = useState<{+ email: string+ role: string+ }>({email: '',role: '',})- const [beenSubmitted, setBeenSubmitted] = useState(false)+ const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)const [errors, setErrors] = useState<{email?: stringrole?: string}>({})- const [validated, setValidated] = useState(false)+ const [validated, setValidated] = useState<boolean>(false)const { id, name, share } = projectconst validate = () => {@@ -383,8 +384,6 @@ 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.tsxindex 111fd9029..62899a2c1 100644--- a/app/pages/Project/Settings/ProjectSettings.container.tsx+++ b/app/pages/Project/Settings/ProjectSettings.container.tsx@@ -12,8 +12,7 @@ const mapStateToProps = (state: StateType) => ({projects: state.ui.projects.projects,sharedProjects: state.ui.projects.sharedProjects,isLoading: state.ui.projects.isLoading,- isLoadingShared: state.ui.projects.isLoadingShared,- authLoading: state.auth.loading,+ loading: 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.tsxindex 138b4c647..3df73dfa8 100644--- a/app/pages/Project/Settings/ProjectSettings.tsx+++ b/app/pages/Project/Settings/ProjectSettings.tsx@@ -69,7 +69,19 @@ const tabDeleteDataModal = [},]-interface IModalMessage {+const ModalMessage = ({+ dateRange,+ setDateRange,+ setTab,+ t,+ tab,+ pid,+ activeFilter,+ setActiveFilter,+ filterType,+ setFilterType,+ language,+}: {dateRange: Date[]setDateRange: (a: Date[]) => voidsetTab: (i: string) => void@@ -86,21 +98,7 @@ interface IModalMessage {filterType: stringsetFilterType: (a: string) => voidlanguage: string-}--const ModalMessage = ({- dateRange,- setDateRange,- setTab,- t,- tab,- pid,- activeFilter,- setActiveFilter,- filterType,- setFilterType,- language,-}: IModalMessage): JSX.Element => {+}): JSX.Element => {const [filterList, setFilterList] = useState<string[]>([])const [searchList, setSearchList] = useState<string[]>([])@@ -264,7 +262,6 @@ interface IProjectSettings {deleteProjectFailed: (message: string) => voidloadProjects: (shared: boolean, skip: number) => voidisLoading: boolean- isLoadingShared: booleanprojects: IProject[]showError: (message: string) => voidremoveProject: (pid: string, shared: boolean) => void@@ -275,7 +272,7 @@ interface IProjectSettings {setProjectProtectedPassword: (pid: string, password: string) => voiddashboardPaginationPage: numberdashboardPaginationPageShared: number- authLoading: boolean+ loading: booleanisSettings: boolean}@@ -287,7 +284,6 @@ const ProjectSettings = ({deleteProjectFailed,loadProjects,isLoading,- isLoadingShared,projects,showError,removeProject,@@ -298,12 +294,22 @@ const ProjectSettings = ({setProjectProtectedPassword,dashboardPaginationPage,dashboardPaginationPageShared,- authLoading,+ loading,isSettings,}: IProjectSettings) => {const {t,i18n: { language },+ }: {+ t: (+ key: string,+ options?: {+ [key: string]: string | number | null+ },+ ) => string+ i18n: {+ language: string+ }} = useTranslation('common')// @ts-ignoreconst {@@ -354,7 +360,7 @@ const ProjectSettings = ({: dashboardPaginationPage * ENTRIES_PER_PAGE_DASHBOARDuseEffect(() => {- if (authLoading) {+ if (loading) {return}@@ -363,7 +369,7 @@ const ProjectSettings = ({navigate(routes.dashboard)}- if (!isLoading && !isLoadingShared && isSettings && !projectDeleting) {+ if (!isLoading && isSettings && !projectDeleting) {if (_isEmpty(project) || project?.uiHidden) {showError(t('project.noExist'))navigate(routes.dashboard)@@ -375,7 +381,7 @@ const ProjectSettings = ({})}}- }, [user, project, isLoading, isSettings, navigate, showError, projectDeleting, t, authLoading, isLoadingShared])+ }, [user, project, isLoading, isSettings, navigate, showError, projectDeleting, t, loading])const onSubmit = async (data: IForm) => {if (!projectSaving) {@@ -575,7 +581,7 @@ const ProjectSettings = ({document.title = pageTitle}, [form, t, isSettings])- if (authLoading || isLoading || isLoadingShared) {+ if (loading) {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 />@@ -666,6 +672,7 @@ const ProjectSettings = ({handleInput(e)}}}+ disabled={form?.isPasswordProtected}name='public'id='public'className='mt-4'@@ -688,6 +695,7 @@ const ProjectSettings = ({setShowProtected(true)}}}+ disabled={form?.public}name='isPasswordProtected'id='isPasswordProtected'className='mt-4'@@ -744,16 +752,16 @@ const ProjectSettings = ({</div>)}</div>- {!isSelfhosted && (+ {!isSelfhosted && !project?.shared && (<><hr className='mt-8 xs:mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' /><Emails projectId={id} projectName={project.name} /></>)}- {!isSelfhosted && (+ {!isSelfhosted && !project?.shared && (<><hr className='mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />- <People project={project} isSharedProject={isSharedProject} />+ <People project={project} /></>)}</>