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!

added change role

kruzhambus8e5f26ac5da2
diff --git a/src/api/index.js b/src/api/index.js
index 47d04659e..1e70f4791 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -303,3 +303,14 @@ export const acceptShareProject = (id) =>
? error.response.data
: error.response.data.message
})
+
+export const changeShareRole = (id, data) =>
+ api
+ .put(`project/share/${id}`, data)
+ .then((response) => response.data)
+ .catch((error) => {
+ debug('%s', error)
+ throw _isEmpty(error.response.data?.message)
+ ? error.response.data
+ : error.response.data.message
+ })
diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsx
index bd342e01f..c9d68a0bb 100644
--- a/src/pages/Dashboard/Dashboard.jsx
+++ b/src/pages/Dashboard/Dashboard.jsx
@@ -27,7 +27,7 @@ import EventsRunningOutBanner from 'components/EventsRunningOutBanner'
import { deleteShareProject, acceptShareProject } from 'api'
const ProjectCart = ({
- name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed, sharedProjects, removeProject, removeShareProject, setProjectsShareData, setUserShareData,
+ name, created, active, overall, t, language, live, isPublic, confirmed, id, deleteProjectFailed, sharedProjects, removeProject, removeShareProject, setProjectsShareData, setUserShareData, shared,
}) => {
const statsDidGrowUp = overall?.percChange >= 0
const [showInviteModal, setShowInviteModal] = useState(false)
@@ -68,10 +68,12 @@ const ProjectCart = ({
</p>
<div className='ml-2 flex-shrink-0 flex'>
{
- confirmed ? (
- <ActivePin className='mr-2' label='Shared' />
- ) : (
- <InactivePin className='mr-2' label='Panding' />
+ shared && (
+ confirmed === false ? (
+ <InactivePin className='mr-2' label='Panding' />
+ ) : (
+ <ActivePin className='mr-2' label='Shared' />
+ )
)
}
{active ? (
@@ -229,7 +231,7 @@ const Dashboard = ({
<div className='bg-white shadow overflow-hidden sm:rounded-md mt-10'>
<ul className='divide-y divide-gray-200 dark:divide-gray-500'>
{_map(_filter(projects, ({ uiHidden }) => !uiHidden), ({
- name, id, created, active, overall, live, public: isPublic, confirmed,
+ name, id, created, active, overall, live, public: isPublic, confirmed, shared,
}) => (
<div key={confirmed ? `${id}-confirmed` : id}>
{
@@ -240,6 +242,7 @@ const Dashboard = ({
language={language}
name={name}
created={created}
+ shared={shared}
active={active}
isPublic={isPublic}
removeProject={removeProject}
@@ -259,8 +262,10 @@ const Dashboard = ({
language={language}
name={name}
created={created}
+ shared={shared}
active={active}
isPublic={isPublic}
+ confirmed={confirmed}
overall={overall}
live={_isNumber(live) ? live : 'N/A'}
/>
diff --git a/src/pages/Project/Settings/People/People.jsx b/src/pages/Project/Settings/People/People.jsx
index b57e970f2..06c6cf2f4 100644
--- a/src/pages/Project/Settings/People/People.jsx
+++ b/src/pages/Project/Settings/People/People.jsx
@@ -11,7 +11,7 @@ import _keys from 'lodash/keys'
import _isEmpty from 'lodash/isEmpty'
import cx from 'clsx'
import _map from 'lodash/map'
-import { deleteShareProjectUsers, shareProject } from 'api'
+import { deleteShareProjectUsers, shareProject, changeShareRole } from 'api'
import _filter from 'lodash/filter'
import PropTypes from 'prop-types'
@@ -42,6 +42,17 @@ const UsersList = ({ data, onRemove }) => {
const [open, setOpen] = useState(false)
const [showDeleteModal, setShowDeleteModal] = useState(false)
+ const changeRole = async (role) => {
+ await changeShareRole(data.id, { role })
+ .then((results) => {
+ console.log(results)
+ setOpen(false)
+ })
+ .catch((e) => {
+ console.log(e)
+ setOpen(false)
+ })
+ }
return (
<li className='py-4'>
<div className='flex justify-between'>
@@ -72,7 +83,7 @@ const UsersList = ({ data, onRemove }) => {
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'
>
- Viewer
+ { data.role }
<ChevronDownIcon
style={{ transform: open ? 'rotate(180deg)' : '' }}
className='w-4 h-4 pt-px ml-0.5'
@@ -81,7 +92,7 @@ const UsersList = ({ data, onRemove }) => {
{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'>
{_map(roles, ({ name, role, description }) => (
- <li onClick={() => setOpen(false)} className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center' key={role}>
+ <li onClick={() => changeRole(role)} className='p-4 hover:bg-indigo-600 group cursor-pointer flex justify-between items-center' key={role}>
<div>
<p className='font-bold text-gray-700 dark:text-gray-200 group-hover:text-gray-200'>
{name}
diff --git a/src/pages/Project/Settings/ProjectSettings.jsx b/src/pages/Project/Settings/ProjectSettings.jsx
index c91015af3..edc2917d6 100644
--- a/src/pages/Project/Settings/ProjectSettings.jsx
+++ b/src/pages/Project/Settings/ProjectSettings.jsx
@@ -174,7 +174,7 @@ const ProjectSettings = ({
return (
<Title title={title}>
- <div className='min-h-min-footer bg-gray-50 dark:bg-gray-800 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>
+ <div className='min-h-min-footer bg-gray-50 dark:bg-gray-800 flex flex-col py-6 px-4 sm:px-6 lg:px-8 mb-10'>
<form className='max-w-7xl w-full mx-auto' onSubmit={handleSubmit}>
<h2 className='mt-2 text-3xl font-extrabold text-gray-900 dark:text-gray-50'>
{title}
@@ -238,9 +238,15 @@ const ProjectSettings = ({
<hr className='mt-5' />
- <People project={project} />
+ {
+ !project.shared && (
+ <>
+ <People project={project} />
+ <hr className='mt-5' />
+ </>
+ )
+ }
- <hr className='mt-5' />
</>
) : (
<p className='text-gray-500 dark:text-gray-300 italic mt-2 text-sm'>
@@ -257,7 +263,7 @@ const ProjectSettings = ({
{t('common.save')}
</Button>
</div>
- {isSettings && (
+ {(isSettings && !project.shared) && (
<Button onClick={() => !projectDeleting && setShowDelete(true)} loading={projectDeleting} danger large>
{t('project.settings.delete')}
</Button>
diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsx
index da950ee21..15c2b9de1 100644
--- a/src/pages/Project/View/ViewProject.jsx
+++ b/src/pages/Project/View/ViewProject.jsx
@@ -365,7 +365,7 @@ const ViewProject = ({
const { name } = project
- const sharedRoles = useMemo(() => _find(user.sharedProjects, p => p.project.id === id).role || {}, [user, id])
+ const sharedRoles = useMemo(() => _find(user.sharedProjects, p => p.project.id === id)?.role || {}, [user, id])
const onErrorLoading = () => {
showError(t('project.noExist'))
diff --git a/src/redux/sagas/ui/load_projects.js b/src/redux/sagas/ui/load_projects.js
index fe83f90f4..5c42e4924 100644
--- a/src/redux/sagas/ui/load_projects.js
+++ b/src/redux/sagas/ui/load_projects.js
@@ -16,6 +16,7 @@ export default function* loadProjects() {
let { results, totalMonthlyEvents, shared } = yield call(getProjects)
const projectWithShared = [..._map(shared, (item) => {
return {
+ shared: true,
confirmed: item.confirmed,
...item.project,
}