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!

Project settings to ts

kruzhambuscce7a8d9c299
diff --git a/src/api/index.ts b/src/api/index.ts
index 9163cea59..a3687cf0f 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -284,7 +284,7 @@ export const createProject = (data: {
: error.response.data.message
})
-export const updateProject = (id: string, data: IProject) =>
+export const updateProject = (id: string, data: Partial<IProject>) =>
api
.put(`/project/${id}`, data)
.then((response): IProject => response.data)
diff --git a/src/pages/Project/Settings/ProjectSettings.container.jsx b/src/pages/Project/Settings/ProjectSettings.container.jsx
deleted file mode 100644
index 400c970ba..000000000
--- a/src/pages/Project/Settings/ProjectSettings.container.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { connect } from 'react-redux'
-import UIActions from 'redux/reducers/ui'
-import { alertsActions } from 'redux/reducers/alerts'
-import { errorsActions } from 'redux/reducers/errors'
-
-import { tabForSharedProject } from 'redux/constants'
-import ProjectSettings from './ProjectSettings'
-
-const mapStateToProps = (state) => ({
- projects: state.ui.projects.projects,
- sharedProjects: state.ui.projects.sharedProjects,
- isLoading: state.ui.projects.isLoading,
- user: state.auth.user,
- isSharedProject: state.ui.projects.dashboardTabs === tabForSharedProject,
-})
-
-const mapDispatchToProps = (dispatch) => ({
- updateProjectFailed: (message) => {
- dispatch(errorsActions.updateProjectFailed(message))
- },
- createNewProjectFailed: (message) => {
- dispatch(errorsActions.createNewProjectFailed(message))
- },
- newProject: (message) => {
- dispatch(alertsActions.newProject(message))
- },
- projectDeleted: (message) => {
- dispatch(alertsActions.projectDeleted(message))
- },
- deleteProjectFailed: (message) => {
- dispatch(errorsActions.deleteProjectFailed(message))
- },
- loadProjects: (shared) => {
- if (shared) {
- dispatch(UIActions.loadSharedProjects())
- } else {
- dispatch(UIActions.loadProjects())
- }
- },
- removeProject: (pid, shared) => {
- dispatch(UIActions.removeProject(pid, shared))
- },
- deleteProjectCache: (pid) => {
- dispatch(UIActions.deleteProjectCache(pid))
- },
- showError: (message) => {
- dispatch(errorsActions.genericError(message))
- },
-})
-
-export default connect(mapStateToProps, mapDispatchToProps)(ProjectSettings)
diff --git a/src/pages/Project/Settings/ProjectSettings.container.tsx b/src/pages/Project/Settings/ProjectSettings.container.tsx
new file mode 100644
index 000000000..5d1b1f6be
--- /dev/null
+++ b/src/pages/Project/Settings/ProjectSettings.container.tsx
@@ -0,0 +1,70 @@
+import { connect } from 'react-redux'
+import UIActions from 'redux/reducers/ui'
+import sagaActions from 'redux/sagas/actions'
+import { alertsActions } from 'redux/reducers/alerts'
+import { errorsActions } from 'redux/reducers/errors'
+import { StateType, AppDispatch } from 'redux/store'
+
+import { tabForSharedProject } from 'redux/constants'
+import ProjectSettings from './ProjectSettings'
+
+const mapStateToProps = (state: StateType) => ({
+ projects: state.ui.projects.projects,
+ sharedProjects: state.ui.projects.sharedProjects,
+ isLoading: state.ui.projects.isLoading,
+ user: state.auth.user,
+ isSharedProject: state.ui.projects.dashboardTabs === tabForSharedProject,
+})
+
+const mapDispatchToProps = (dispatch: AppDispatch) => ({
+ updateProjectFailed: (message: string) => {
+ dispatch(errorsActions.updateProjectFailed({
+ message,
+ }))
+ },
+ createNewProjectFailed: (message: string) => {
+ dispatch(errorsActions.createNewProjectFailed({
+ message,
+ }))
+ },
+ newProject: (message: string) => {
+ dispatch(alertsActions.generateAlerts({
+ message,
+ }))
+ },
+ projectDeleted: (message: string) => {
+ dispatch(alertsActions.generateAlerts({
+ message,
+ }))
+ },
+ deleteProjectFailed: (message: string) => {
+ dispatch(errorsActions.deleteProjectFailed({
+ message,
+ }))
+ },
+ loadProjects: (shared: boolean) => {
+ if (shared) {
+ dispatch(sagaActions.loadSharedProjects())
+ } else {
+ dispatch(sagaActions.loadProjects())
+ }
+ },
+ removeProject: (pid: string, shared: boolean) => {
+ dispatch(UIActions.removeProject({
+ pid,
+ shared,
+ }))
+ },
+ deleteProjectCache: (pid: string) => {
+ dispatch(UIActions.deleteProjectCache({
+ pid,
+ }))
+ },
+ showError: (message: string) => {
+ dispatch(errorsActions.genericError({
+ message,
+ }))
+ },
+})
+
+export default connect(mapStateToProps, mapDispatchToProps)(ProjectSettings)
diff --git a/src/pages/Project/Settings/ProjectSettings.jsx b/src/pages/Project/Settings/ProjectSettings.tsx
similarity index 78%
rename from src/pages/Project/Settings/ProjectSettings.jsx
rename to src/pages/Project/Settings/ProjectSettings.tsx
index dbd9e37d1..343b24cfa 100644
--- a/src/pages/Project/Settings/ProjectSettings.jsx
+++ b/src/pages/Project/Settings/ProjectSettings.tsx
@@ -21,6 +21,9 @@ import { ExclamationTriangleIcon, TrashIcon } from '@heroicons/react/24/outline'
import Title from 'components/Title'
import { withAuthentication, auth } from 'hoc/protected'
import { isSelfhosted } from 'redux/constants'
+import { IProject, IShareOwnerProject } from 'redux/models/IProject'
+import { IUser } from 'redux/models/IUser'
+import { IProjectForShared, ISharedProject } from 'redux/models/ISharedProject'
import {
createProject, updateProject, deleteProject, resetProject,
} from 'api'
@@ -39,31 +42,63 @@ const MAX_NAME_LENGTH = 50
const MAX_ORIGINS_LENGTH = 300
const MAX_IPBLACKLIST_LENGTH = 300
+interface IForm extends Partial<IProject> {
+ origins: string | null,
+ ipBlacklist: string | null,
+}
+
const ProjectSettings = ({
updateProjectFailed, createNewProjectFailed, newProject, projectDeleted, deleteProjectFailed,
loadProjects, isLoading, projects, showError, removeProject, user, isSharedProject, sharedProjects,
deleteProjectCache,
+}: {
+ updateProjectFailed: (message: string) => void,
+ createNewProjectFailed: (message: string) => void,
+ newProject: (message: string) => void,
+ projectDeleted: (message: string) => void,
+ deleteProjectFailed: (message: string) => void,
+ loadProjects: (shared: boolean) => void,
+ isLoading: boolean,
+ projects: IProject[],
+ showError: (message: string) => void,
+ removeProject: (pid: string, shared: boolean) => void,
+ user: IUser,
+ isSharedProject: boolean,
+ sharedProjects: ISharedProject[],
+ deleteProjectCache: (pid: string) => void,
}) => {
- const { t } = useTranslation('common')
+ const { t }: {
+ t: (key: string, options?: {
+ [key: string]: string | number | null
+ }) => string,
+ } = useTranslation('common')
const { pathname } = useLocation()
- const { id } = useParams()
- const project = useMemo(() => _find([...projects, ..._map(sharedProjects, (item) => item.project)], p => p.id === id) || {}, [projects, id, sharedProjects])
- const isSettings = !_isEmpty(id) && (_replace(routes.project_settings, ':id', id) === pathname)
+ const { id }: {
+ id: string,
+ } = useParams()
+ const project: IProjectForShared = useMemo(() => _find([...projects, ..._map(sharedProjects, (item) => item.project)], p => p.id === id) || {} as IProjectForShared, [projects, id, sharedProjects])
+ const isSettings: boolean = !_isEmpty(id) && (_replace(routes.project_settings, ':id', id) === pathname)
const history = useHistory()
- const [form, setForm] = useState({
+ const [form, setForm] = useState<IForm>({
name: '',
id: id || nanoid(),
public: false,
+ origins: null,
+ ipBlacklist: null,
})
- const [validated, setValidated] = useState(false)
- const [errors, setErrors] = useState({})
- const [beenSubmitted, setBeenSubmitted] = useState(false)
- const [showDelete, setShowDelete] = useState(false)
- const [showReset, setShowReset] = useState(false)
- const [projectDeleting, setProjectDeleting] = useState(false)
- const [projectResetting, setProjectResetting] = useState(false)
- const [projectSaving, setProjectSaving] = useState(false)
+ const [validated, setValidated] = useState<boolean>(false)
+ const [errors, setErrors] = useState<{
+ name?: string,
+ origins?: string,
+ ipBlacklist?: string,
+ }>({})
+ const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)
+ const [showDelete, setShowDelete] = useState<boolean>(false)
+ const [showReset, setShowReset] = useState<boolean>(false)
+ const [projectDeleting, setProjectDeleting] = useState<boolean>(false)
+ const [projectResetting, setProjectResetting] = useState<boolean>(false)
+ const [projectSaving, setProjectSaving] = useState<boolean>(false)
useEffect(() => {
if (!user.isActive && !isSelfhosted) {
@@ -85,7 +120,7 @@ const ProjectSettings = ({
}
}, [user, project, isLoading, isSettings, history, showError, projectDeleting, t])
- const onSubmit = async (data) => {
+ const onSubmit = async (data: IForm) => {
if (!projectSaving) {
setProjectSaving(true)
try {
@@ -104,10 +139,13 @@ const ProjectSettings = ({
ipBlacklist: _isEmpty(data.ipBlacklist) ? null : _split(data.ipBlacklist, ','),
}
if (isSettings) {
- await updateProject(id, formalisedData)
+ await updateProject(id, formalisedData as Partial<IProject>)
newProject(t('project.settings.updated'))
} else {
- await createProject(formalisedData)
+ await createProject({
+ id: data.id || nanoid(),
+ name: data.name || 'Untitled Project',
+ })
trackCustom('PROJECT_CREATED')
newProject(t('project.settings.created'))
}
@@ -116,9 +154,9 @@ const ProjectSettings = ({
history.push(routes.dashboard)
} catch (e) {
if (isSettings) {
- updateProjectFailed(e)
+ updateProjectFailed(e as string)
} else {
- createNewProjectFailed(e)
+ createNewProjectFailed(e as string)
}
} finally {
setProjectSaving(false)
@@ -136,7 +174,7 @@ const ProjectSettings = ({
projectDeleted(t('project.settings.deleted'))
history.push(routes.dashboard)
} catch (e) {
- deleteProjectFailed(e)
+ deleteProjectFailed(e as string)
} finally {
setProjectDeleting(false)
}
@@ -153,7 +191,7 @@ const ProjectSettings = ({
projectDeleted(t('project.settings.resetted'))
history.push(routes.dashboard)
} catch (e) {
- deleteProjectFailed(e)
+ deleteProjectFailed(e as string)
} finally {
setProjectResetting(false)
}
@@ -161,7 +199,11 @@ const ProjectSettings = ({
}
const validate = () => {
- const allErrors = {}
+ const allErrors: {
+ name?: string,
+ origins?: string,
+ ipBlacklist?: string,
+ } = {}
if (_isEmpty(form.name)) {
allErrors.name = t('project.settings.noNameError')
@@ -189,7 +231,7 @@ const ProjectSettings = ({
validate()
}, [form]) // eslint-disable-line
- const handleInput = event => {
+ const handleInput = (event: React.ChangeEvent<HTMLInputElement>) => {
const { target } = event
const value = target.type === 'checkbox' ? target.checked : target.value
@@ -199,7 +241,7 @@ const ProjectSettings = ({
}))
}
- const handleSubmit = e => {
+ const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
e.preventDefault()
e.stopPropagation()
setBeenSubmitted(true)
@@ -248,7 +290,7 @@ const ProjectSettings = ({
value={form.id}
className='mt-4'
onChange={handleInput}
- error={beenSubmitted ? errors.id : null}
+ error={null}
disabled
/>
{isSettings ? (
@@ -303,15 +345,19 @@ const ProjectSettings = ({
{t('common.save')}
</Button>
</div>
- {!project.shared && (
+ {!project?.shared && (
<div className='flex flex-wrap items-center justify-end'>
<Button onClick={() => !projectResetting && setShowReset(true)} loading={projectDeleting} semiDanger semiSmall>
- <TrashIcon className='w-5 h-5 mr-1' />
- {t('project.settings.reset')}
+ <>
+ <TrashIcon className='w-5 h-5 mr-1' />
+ {t('project.settings.reset')}
+ </>
</Button>
<Button className='ml-2' onClick={() => !projectDeleting && setShowDelete(true)} loading={projectDeleting} danger semiSmall>
- <ExclamationTriangleIcon className='w-5 h-5 mr-1' />
- {t('project.settings.delete')}
+ <>
+ <ExclamationTriangleIcon className='w-5 h-5 mr-1' />
+ {t('project.settings.delete')}
+ </>
</Button>
</div>
)}
@@ -320,7 +366,7 @@ const ProjectSettings = ({
<Emails projectId={id} projectName={project.name} />
<hr className='mt-2 sm:mt-5 border-gray-200 dark:border-gray-600' />
{
- !project.shared && (
+ !project?.shared && (
<People project={project} />
)
}
diff --git a/src/pages/Project/Settings/index.jsx b/src/pages/Project/Settings/index.tsx
similarity index 100%
rename from src/pages/Project/Settings/index.jsx
rename to src/pages/Project/Settings/index.tsx
diff --git a/src/redux/models/ISharedProject.ts b/src/redux/models/ISharedProject.ts
index 5d175f751..b6ad71a50 100644
--- a/src/redux/models/ISharedProject.ts
+++ b/src/redux/models/ISharedProject.ts
@@ -1,11 +1,15 @@
import { IProject } from './IProject'
+export interface IProjectForShared extends IProject {
+ shared?: boolean
+}
+
export interface ISharedProject {
id: string
confirmed: boolean
role: string
created: string
updated: string
- project: IProject
+ project: IProjectForShared
uiHidden: boolean
}
diff --git a/src/ui/Select.tsx b/src/ui/Select.tsx
index 8b1f72960..1694414cd 100644
--- a/src/ui/Select.tsx
+++ b/src/ui/Select.tsx
@@ -12,14 +12,14 @@ const Select = ({
label: string,
className?: string,
items: any[],
- id: string,
+ id?: string,
labelExtractor?: (item: any, index: number) => string,
keyExtractor?: (item: any, index: number) => string,
iconExtractor?: (item: any, index: number) => JSX.Element | null,
onSelect: (item: any) => void,
}): JSX.Element => (
// @ts-ignore
- <Listbox id={id} className={className} value={title} onChange={onSelect}>
+ <Listbox id={id || ''} className={className} value={title} onChange={onSelect}>
{({ open }) => (
<>
<Listbox.Label className='block text-sm whitespace-pre-line font-medium text-gray-700 dark:text-gray-100'>{label}</Listbox.Label>
@@ -112,6 +112,7 @@ Select.defaultProps = {
iconExtractor: null,
label: '',
items: [],
+ id: '',
}
export default memo(Select)