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!

Ability to select organisation on project creation

Blue Mousea35b988020ae
diff --git a/web/app/pages/Dashboard/Dashboard.tsx b/web/app/pages/Dashboard/Dashboard.tsx
index 048916070..da167693e 100644
--- a/web/app/pages/Dashboard/Dashboard.tsx
+++ b/web/app/pages/Dashboard/Dashboard.tsx
@@ -582,11 +582,8 @@ const Dashboard = ({
items={dashboardLocTabs}
keyExtractor={(item) => item.id}
labelExtractor={(item) => item.label}
- onSelect={(label) => {
- const nameTab = _find(dashboardLocTabs, (tab) => t(tab.label) === label)?.name
- if (nameTab) {
- setActiveTab(nameTab)
- }
+ onSelect={(item) => {
+ setActiveTab(item.name)
}}
title={activeTabLabel}
capitalise
diff --git a/web/app/pages/Project/New/index.tsx b/web/app/pages/Project/New/index.tsx
index 28f3ae894..43794d2a7 100644
--- a/web/app/pages/Project/New/index.tsx
+++ b/web/app/pages/Project/New/index.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, memo } from 'react'
+import React, { useState, useEffect, memo, useMemo } from 'react'
import { useNavigate } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import { useSelector, useDispatch } from 'react-redux'
@@ -18,6 +18,7 @@ import { trackCustom } from 'utils/analytics'
import routes from 'utils/routes'
import { useAppDispatch, StateType } from 'redux/store'
import sagaActions from 'redux/sagas/actions'
+import Select from 'ui/Select'
const MAX_NAME_LENGTH = 50
@@ -33,6 +34,7 @@ const NewProject = () => {
const [form, setForm] = useState<Partial<IProject>>({
name: '',
+ organisationId: undefined,
})
const [validated, setValidated] = useState<boolean>(false)
const [errors, setErrors] = useState<{
@@ -41,6 +43,17 @@ const NewProject = () => {
const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)
const [projectSaving, setProjectSaving] = useState<boolean>(false)
+ const organisations = useMemo(
+ () => [
+ {
+ id: undefined,
+ name: t('common.notSet'),
+ },
+ ...(user.manageableOrganisations || []),
+ ],
+ [user.manageableOrganisations, t],
+ )
+
useEffect(() => {
if (loading) {
return
@@ -144,6 +157,31 @@ const NewProject = () => {
onChange={handleInput}
error={beenSubmitted ? errors.name : null}
/>
+
+ {organisations.length > 1 && (
+ <div className='mt-4'>
+ <Select
+ items={organisations}
+ keyExtractor={(item) => item.id || 'not-set'}
+ labelExtractor={(item) => {
+ if (item.id === undefined) {
+ return <span className='italic text-gray-600 dark:text-gray-200'>{t('common.notSet')}</span>
+ }
+
+ return item.name
+ }}
+ onSelect={(item) => {
+ setForm((oldForm) => ({
+ ...oldForm,
+ organisationId: item.id,
+ }))
+ }}
+ label={t('project.settings.organisation')}
+ title={organisations.find((org) => org.id === form.organisationId)?.name}
+ />
+ </div>
+ )}
+
<p className='mb-4 mt-1 text-sm italic text-gray-500 dark:text-gray-300'>{t('project.settings.createHint')}</p>
<div>
diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsx
index 9e395c67c..24e232a11 100644
--- a/web/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx
@@ -640,11 +640,9 @@ const ProjectSettings = ({
title={_find(botsProtectionLevels, (predicate) => predicate.name === form.botsProtectionLevel)?.title || ''}
labelExtractor={(item: any) => item.title}
onSelect={(item) => {
- const key = _find(botsProtectionLevels, (predicate) => predicate.title === item)?.name || 'basic'
-
setForm((prevForm) => ({
...prevForm,
- botsProtectionLevel: key,
+ botsProtectionLevel: item.name,
}))
}}
capitalise
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index d77ffb3dc..b633edc3e 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -3368,17 +3368,14 @@ const ViewProject = ({
items={tabs}
keyExtractor={(item) => item.id}
labelExtractor={(item) => item.label}
- onSelect={(label) => {
- const selected = _find(tabs, (tab) => tab.label === label)
- if (selected) {
- if (selected.id === 'settings') {
- openSettingsHandler()
- return
- }
-
- setProjectTab(selected?.id)
- setActiveTab(selected?.id)
+ onSelect={(item) => {
+ if (item.id === 'settings') {
+ openSettingsHandler()
+ return
}
+
+ setProjectTab(item?.id)
+ setActiveTab(item?.id)
}}
title={activeTabLabel}
capitalise
diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsx
index b5866c91d..64e7f4e1c 100644
--- a/web/app/pages/Project/View/components/AddAViewModal.tsx
+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx
@@ -166,10 +166,8 @@ const EditMetric = ({ metric, onChange, onDelete, errors, setErrors }: IEditMetr
items={customEventTypes}
keyExtractor={(item) => item.key}
labelExtractor={(item) => item.label}
- onSelect={(selectedLabel) => {
- const key = _find(customEventTypes, ({ label }) => label === selectedLabel)?.key
-
- onChange('metaValueType', key)
+ onSelect={(item) => {
+ onChange('metaValueType', item.key)
}}
label={t('project.metrics.metricType.title')}
hint={t('project.metrics.metricType.description')}
@@ -384,7 +382,7 @@ const AddAViewModal = ({
label={t('project.selectCategoryOptional')}
items={FILTERS_PANELS_ORDER}
labelExtractor={(item) => t(`project.mapping.${item}`)}
- onSelect={(item: string) => setFilterType(labelToTypeMap[item])}
+ onSelect={(item) => setFilterType(labelToTypeMap[item])}
title={
_isEmpty(filterType) ? t('project.settings.reseted.selectFilters') : t(`project.mapping.${filterType}`)
}
diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsx
index 3028560fa..4863f1aa6 100644
--- a/web/app/pages/Project/View/components/SearchFilters.tsx
+++ b/web/app/pages/Project/View/components/SearchFilters.tsx
@@ -1,7 +1,6 @@
-import React, { useState, useEffect, useMemo, useCallback } from 'react'
+import React, { useState, useEffect, useCallback } from 'react'
import { useTranslation } from 'react-i18next'
import _isEmpty from 'lodash/isEmpty'
-import _reduce from 'lodash/reduce'
import _filter from 'lodash/filter'
import _map from 'lodash/map'
import _find from 'lodash/find'
@@ -27,16 +26,6 @@ interface ISearchFilters {
type: 'traffic' | 'errors'
}
-const getLabelToTypeMap = (t: any, type: 'traffic' | 'errors') =>
- _reduce(
- type === 'traffic' ? FILTERS_PANELS_ORDER : ERRORS_FILTERS_PANELS_ORDER,
- (acc, curr) => ({
- ...acc,
- [t(`project.mapping.${curr}`)]: curr,
- }),
- {},
- )
-
const SearchFilters = ({
setProjectFilter,
pid,
@@ -56,8 +45,6 @@ const SearchFilters = ({
const [activeFilters, setActiveFilters] = useState<IFilter[]>([])
const [override, setOverride] = useState(false)
- const labelToTypeMap = useMemo(() => getLabelToTypeMap(t, type), [t, type])
-
const getFiltersList = useCallback(
async (category: string) => {
let result: any[]
@@ -128,8 +115,7 @@ const SearchFilters = ({
label={t('project.selectCategory')}
items={type === 'traffic' ? FILTERS_PANELS_ORDER : ERRORS_FILTERS_PANELS_ORDER}
labelExtractor={(item) => t(`project.mapping.${item}`)}
- // @ts-ignore
- onSelect={(item: string) => setFilterType(labelToTypeMap[item])}
+ onSelect={(item) => setFilterType(item)}
title={
_isEmpty(filterType) ? t('project.settings.reseted.selectFilters') : t(`project.mapping.${filterType}`)
}
diff --git a/web/app/pages/UserSettings/UserSettings.tsx b/web/app/pages/UserSettings/UserSettings.tsx
index 5feee4c15..8b72ee31c 100644
--- a/web/app/pages/UserSettings/UserSettings.tsx
+++ b/web/app/pages/UserSettings/UserSettings.tsx
@@ -497,11 +497,8 @@ const UserSettings = ({
items={tabs}
keyExtractor={(item) => item.id}
labelExtractor={(item) => item.label}
- onSelect={(label) => {
- const selected = _find(tabs, (tab) => tab.label === label)
- if (selected) {
- setActiveTab(selected?.id)
- }
+ onSelect={(item) => {
+ setActiveTab(item.id)
}}
title={activeTabLabel}
capitalise
diff --git a/web/app/redux/models/IProject.ts b/web/app/redux/models/IProject.ts
index 5031503f6..d3d6f5bd3 100644
--- a/web/app/redux/models/IProject.ts
+++ b/web/app/redux/models/IProject.ts
@@ -88,6 +88,7 @@ export interface IProject {
isPublic?: boolean
isTransferring?: boolean
isPasswordProtected?: boolean
+ organisationId?: string
password?: string
isLocked: boolean
isDataExists: boolean
diff --git a/web/app/redux/models/IUser.ts b/web/app/redux/models/IUser.ts
index 25d05c020..581350d7e 100644
--- a/web/app/redux/models/IUser.ts
+++ b/web/app/redux/models/IUser.ts
@@ -66,4 +66,8 @@ export interface IUser {
planExceedContactedAt: Date
dashboardBlockReason: DashboardBlockReason
isAccountBillingSuspended: boolean
+ manageableOrganisations?: {
+ id: string
+ name: string
+ }[]
}
diff --git a/web/app/ui/Select.tsx b/web/app/ui/Select.tsx
index 71590fa31..e00272758 100644
--- a/web/app/ui/Select.tsx
+++ b/web/app/ui/Select.tsx
@@ -22,10 +22,10 @@ interface ISelect<T> {
capitalise?: boolean
items: T[]
id?: string
- labelExtractor?: (item: T, index: number) => string
+ labelExtractor?: (item: T, index: number) => React.ReactNode
keyExtractor?: (item: T, index: number) => string
iconExtractor?: (item: T, index: number) => React.ReactNode | null
- onSelect: (item: string) => void
+ onSelect: (item: T) => void
}
function Select<T>({
@@ -90,7 +90,7 @@ function Select<T>({
'text-gray-900': !active,
})
}
- value={labelExtractor ? labelExtractor(item, index) : item}
+ value={item}
>
{({ selected, active }) => (
<>
diff --git a/web/app/ui/TimezonePicker.tsx b/web/app/ui/TimezonePicker.tsx
index d1c9031db..4c1cc146e 100644
--- a/web/app/ui/TimezonePicker.tsx
+++ b/web/app/ui/TimezonePicker.tsx
@@ -52,9 +52,8 @@ const TimezoneSelect = ({ value, onChange }: ITimezoneSelect): JSX.Element => {
const labelExtractor = (option: { label: string }) => option?.label
const keyExtractor = (option: { value: string }) => option?.value
- const handleChange = (label: string) => {
- const tz = _find(options, (timezone) => labelExtractor(timezone) === label)
- const key = keyExtractor(tz)
+ const handleChange = (item: any) => {
+ const key = keyExtractor(item)
onChange(key)
}
diff --git a/web/public/locales/en.json b/web/public/locales/en.json
index ed0251871..8e4b79210 100644
--- a/web/public/locales/en.json
+++ b/web/public/locales/en.json
@@ -107,7 +107,8 @@
"general": "General",
"fixIt": "Fix it",
"errorOccured": "An error occurred: {{error}}",
- "name": "Name"
+ "name": "Name",
+ "notSet": "Not set"
},
"performance": {
"slogan": "End user <span>performance monitoring</span> to deliver fast websites.",
@@ -958,6 +959,7 @@
"barChart": "Bar chart",
"lineChart": "Line chart",
"settings": {
+ "organisation": "Organisation",
"shields": "Shields",
"access": "Access settings",
"botsProtectionLevel": {