📈 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 bugs with close on outSideClick, fix settings for shareProject and more fix...
kruzhambus0d0e90a7fc95
diff --git a/src/hooks/useOnClickOutside.js b/src/hooks/useOnClickOutside.jsnew file mode 100644index 000000000..e825cfceb--- /dev/null+++ b/src/hooks/useOnClickOutside.js@@ -0,0 +1,24 @@+import { useEffect } from 'react'++const useOnClickOutside = (ref, handler) => {+ useEffect(() => {+ const func = (event) => {+ if (!ref.current || ref.current.contains(event.target)) {+ return+ }+ handler(event)+ }++ document.addEventListener('mousedown', func)+ document.addEventListener('touchstart', func)++ return () => {+ document.removeEventListener('mousedown', func)+ document.removeEventListener('touchstart', func)+ }+ }, [ref, handler])++ return [ref, handler]+}++export default useOnClickOutsidediff --git a/src/pages/Project/Settings/People/People.jsx b/src/pages/Project/Settings/People/People.jsxindex 06c6cf2f4..7b7011d86 100644--- a/src/pages/Project/Settings/People/People.jsx+++ b/src/pages/Project/Settings/People/People.jsx@@ -1,4 +1,4 @@-import React, { useState, useEffect } from 'react'+import React, { useState, useEffect, useRef } from 'react'import Button from 'ui/Button'import { ChevronDownIcon, CheckIcon } from '@heroicons/react/solid'import { TrashIcon } from '@heroicons/react/outline'@@ -14,19 +14,8 @@ import _map from 'lodash/map'import { deleteShareProjectUsers, shareProject, changeShareRole } from 'api'import _filter from 'lodash/filter'import PropTypes from 'prop-types'--const roles = [- {- name: 'Admin',- role: 'admin',- description: 'Can manage the project',- },- {- name: 'Viewer',- role: 'viewer',- description: 'Can view the project',- },-]+import { roles, roleViewer, roleAdmin } from 'redux/constants'+import useOnClickOutside from 'hooks/useOnClickOutside'const NoEvents = () => (<div className='flex flex-col py-6 sm:px-6 lg:px-8'>@@ -41,6 +30,8 @@ const NoEvents = () => (const UsersList = ({ data, onRemove }) => {const [open, setOpen] = useState(false)const [showDeleteModal, setShowDeleteModal] = useState(false)+ const openRef = useRef()+ useOnClickOutside(openRef, () => setOpen(false))const changeRole = async (role) => {await changeShareRole(data.id, { role })@@ -53,6 +44,7 @@ const UsersList = ({ data, onRemove }) => {setOpen(false)})}+return (<li className='py-4'><div className='flex justify-between'>@@ -79,7 +71,7 @@ const UsersList = ({ data, onRemove }) => {) : (<><button- onClick={() => setOpen(!open)}+ 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-500 text-sm leading-5 font-medium rounded-full bg-white dark:bg-gray-700 text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-800'>@@ -90,7 +82,7 @@ const UsersList = ({ data, onRemove }) => {/></button>{open && (- <ul className='origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg overflow-hidden bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700 focus:outline-none'>+ <ul ref={openRef} className='origin-top-right absolute z-10 right-0 mt-2 w-72 rounded-md shadow-lg overflow-hidden bg-white dark:bg-gray-800 divide-y divide-gray-200 dark:divide-gray-700 focus:outline-none'>{_map(roles, ({ name, role, description }) => (<li onClick={() => changeRole(role)} className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center' key={role}><div>@@ -307,7 +299,7 @@ const People = ({<label className='block text-sm font-medium text-gray-700 dark:text-gray-300' htmlFor='role'>Role</label><div className={cx('mt-1 bg-white rounded-md -space-y-px dark:bg-gray-800', { 'border-red-300 border': errors.role })}>{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}- <label className={cx('dark:border-gray-500 rounded-tl-md rounded-tr-md relative border p-4 flex cursor-pointer border-gray-200', { 'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': form.role === 'admin', 'border-gray-200': form.role !== 'admin' })}>+ <label className={cx('dark:border-gray-500 rounded-tl-md rounded-tr-md relative border p-4 flex cursor-pointer border-gray-200', { 'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': form.role === roleAdmin.role, 'border-gray-200': form.role !== roleAdmin.role })}><inputname='role'className='focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300'@@ -317,16 +309,16 @@ const People = ({onChange={handleInput}/><div className='ml-3 flex flex-col'>- <span className={cx('block text-sm font-medium', { 'text-indigo-900 dark:text-white': form.role === 'admin', 'text-gray-700 dark:text-gray-200': form.role !== 'admin' })}>+ <span className={cx('block text-sm font-medium', { 'text-indigo-900 dark:text-white': form.role === roleAdmin.role, 'text-gray-700 dark:text-gray-200': form.role !== roleAdmin.role })}>Admin</span>- <span className={cx('block text-sm', { 'text-indigo-700 dark:text-gray-100': form.role === 'admin', 'text-gray-700 dark:text-gray-200': form.role !== 'admin' })}>+ <span className={cx('block text-sm', { 'text-indigo-700 dark:text-gray-100': form.role === roleAdmin.role, 'text-gray-700 dark:text-gray-200': form.role !== roleAdmin.role })}>Can view stats, change site settings and invite other members</span></div></label>{/* eslint-disable-next-line jsx-a11y/label-has-associated-control */}- <label className={cx('dark:border-gray-500 rounded-bl-md rounded-br-md relative border p-4 flex cursor-pointer border-gray-200', { 'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': form.role === 'viewer', 'border-gray-200': form.role !== 'viewer' })}>+ <label className={cx('dark:border-gray-500 rounded-bl-md rounded-br-md relative border p-4 flex cursor-pointer border-gray-200', { 'bg-indigo-50 border-indigo-200 dark:bg-indigo-500 dark:border-indigo-800 z-10': form.role === roleViewer.role, 'border-gray-200': form.role !== roleViewer.role })}><inputname='role'className='focus:ring-indigo-500 h-4 w-4 text-indigo-600 border-gray-300'@@ -336,10 +328,10 @@ const People = ({onChange={handleInput}/><div className='ml-3 flex flex-col'>- <span className={cx('block text-sm font-medium', { 'text-indigo-900 dark:text-white': form.role === 'viewer', 'text-gray-700 dark:text-gray-200': form.role !== 'viewer' })}>+ <span className={cx('block text-sm font-medium', { 'text-indigo-900 dark:text-white': form.role === roleViewer.role, 'text-gray-700 dark:text-gray-200': form.role !== roleViewer.role })}>Viewer</span>- <span className={cx('block text-sm', { 'text-indigo-700 dark:text-gray-100': form.role === 'viewer', 'text-gray-700 dark:text-gray-200': form.role !== 'viewer' })}>+ <span className={cx('block text-sm', { 'text-indigo-700 dark:text-gray-100': form.role === roleViewer.role, 'text-gray-700 dark:text-gray-200': form.role !== roleViewer.role })}>Can view stats but cannot access settings or invite members</span></div>diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex 15c2b9de1..c4da6c5ba 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -39,7 +39,7 @@ import Title from 'components/Title'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'import {tbPeriodPairs, tbsFormatMapper, getProjectCacheKey, LIVE_VISITORS_UPDATE_INTERVAL, DEFAULT_TIMEZONE,- timeBucketToDays, getProjectCacheCustomKey,+ timeBucketToDays, getProjectCacheCustomKey, roleViewer,} from 'redux/constants'import Button from 'ui/Button'import Loader from 'ui/Loader'@@ -687,7 +687,7 @@ const ViewProject = ({onSelect={item => item.onClick(panelsData, t)}/></div>- {(!isProjectPublic && !(sharedRoles === 'viewer')) && (+ {(!isProjectPublic && !(sharedRoles === roleViewer.role)) && (<div className='h-full ml-3'><ButtononClick={openSettingsHandler}diff --git a/src/pages/UserSettings/UserSettings.jsx b/src/pages/UserSettings/UserSettings.jsxindex 09006aff4..256e6d4d3 100644--- a/src/pages/UserSettings/UserSettings.jsx+++ b/src/pages/UserSettings/UserSettings.jsx@@ -111,6 +111,16 @@ ProjectList.defaultProps = {deleteProjectFailed: (e) => console.log(e),}+const NoSharedProjectss = () => (+ <div className='flex flex-col py-6 sm:px-6 lg:px-8'>+ <div className='max-w-7xl w-full mx-auto text-gray-900 dark:text-gray-50'>+ <h2 className='text-2xl mb-4 text-center leading-snug'>+ You have no shared projects.+ </h2>+ </div>+ </div>+)+const UserSettings = ({onDelete, onExport, onSubmit, onEmailConfirm, onDeleteProjectCache, t, deleteProjectFailed, removeProject, removeShareProject, setUserShareData, setProjectsShareData,}) => {@@ -298,26 +308,27 @@ const UserSettings = ({Projects</h3><div>- <div className='mt-3 flex flex-col'>- <div className='-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8'>- <div className='inline-block min-w-full py-2 align-middle md:px-6 lg:px-8'>- <div className='overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg'>- <table className='min-w-full divide-y divide-gray-300 dark:divide-gray-600'>- <thead>- <tr className='dark:bg-gray-700'>- <th scope='col' className='py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 dark:text-white'>- Name projects- </th>- <th scope='col' className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-white'>- Role- </th>- <th scope='col' className='relative py-3.5 pl-3 pr-4 sm:pr-6 dark:text-white'>- <span className='sr-only'>delete</span>- </th>- </tr>- </thead>- <tbody className='divide-y divide-gray-300 dark:divide-gray-600'>- {+ { !_isEmpty(user.sharedProjects) ? (+ <div className='mt-3 flex flex-col'>+ <div className='-my-2 -mx-4 overflow-x-auto sm:-mx-6 lg:-mx-8'>+ <div className='inline-block min-w-full py-2 align-middle md:px-6 lg:px-8'>+ <div className='overflow-hidden shadow ring-1 ring-black ring-opacity-5 md:rounded-lg'>+ <table className='min-w-full divide-y divide-gray-300 dark:divide-gray-600'>+ <thead>+ <tr className='dark:bg-gray-700'>+ <th scope='col' className='py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 sm:pl-6 dark:text-white'>+ Name projects+ </th>+ <th scope='col' className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-white'>+ Role+ </th>+ <th scope='col' className='relative py-3.5 pl-3 pr-4 sm:pr-6 dark:text-white'>+ <span className='sr-only'>delete</span>+ </th>+ </tr>+ </thead>+ <tbody className='divide-y divide-gray-300 dark:divide-gray-600'>+ {_map(user.sharedProjects, (item) => (<ProjectListkey={item.id}@@ -331,12 +342,15 @@ const UserSettings = ({/>))}- </tbody>- </table>+ </tbody>+ </table>+ </div></div></div></div>- </div>+ ) : (+ <NoSharedProjectss />+ ) }</div><hr className='mt-5' />{!user.isActive && (diff --git a/src/redux/constants/index.js b/src/redux/constants/index.jsindex b71c29f07..51890c204 100644--- a/src/redux/constants/index.js+++ b/src/redux/constants/index.js@@ -149,3 +149,28 @@ export const paddleLanguageMapping = {uk: 'ru',el: 'en',}++export const roles = [+ {+ name: 'Admin',+ role: 'admin',+ description: 'Can manage the project',+ },+ {+ name: 'Viewer',+ role: 'viewer',+ description: 'Can view the project',+ },+]++export const roleViewer = {+ name: 'Viewer',+ role: 'viewer',+ description: 'Can view the project',+}++export const roleAdmin = {+ name: 'Admin',+ role: 'admin',+ description: 'Can manage the project',+}