setView(key)}
- items={views}
- />
+ {view}
}>
Docs
diff --git a/frontend/app/components/DataManagement/UsersEvents/UserPage.tsx b/frontend/app/components/DataManagement/UsersEvents/UserPage.tsx
index f2c0dd982..710faa6d5 100644
--- a/frontend/app/components/DataManagement/UsersEvents/UserPage.tsx
+++ b/frontend/app/components/DataManagement/UsersEvents/UserPage.tsx
@@ -118,7 +118,7 @@ function UserInfo() {
return (
<>
diff --git a/frontend/app/layout/SideMenu.tsx b/frontend/app/layout/SideMenu.tsx
index 93ee0d691..6bdebfca9 100644
--- a/frontend/app/layout/SideMenu.tsx
+++ b/frontend/app/layout/SideMenu.tsx
@@ -98,6 +98,7 @@ function SideMenu(props: Props) {
}
if (item.hidden) return item;
+ const dataAnalytics = [MENU.ACTIVITY, MENU.USERS, MENU.EVENTS]
const isHidden = [
item.key === MENU.RECOMMENDATIONS &&
modules.includes(MODULES.RECOMMENDATIONS),
@@ -109,7 +110,7 @@ function SideMenu(props: Props) {
item.key === MENU.USABILITY_TESTS && modules.includes(MODULES.USABILITY_TESTS),
item.isAdmin && !isAdmin,
item.isEnterprise && !isEnterprise,
- (item.key === MENU.ACTIVITY || item.key === MENU.USERS_EVENTS) && isMobile
+ dataAnalytics.includes(item.key) && isMobile
].some((cond) => cond);
return { ...item, hidden: isHidden };
@@ -154,7 +155,9 @@ function SideMenu(props: Props) {
[PREFERENCES_MENU.MODULES]: () => client(CLIENT_TABS.MODULES),
[MENU.HIGHLIGHTS]: () => withSiteId(routes.highlights(''), siteId),
[MENU.ACTIVITY]: () => withSiteId(routes.dataManagement.activity(), siteId),
- [MENU.USERS_EVENTS]: () => withSiteId(routes.dataManagement.usersEvents(), siteId),
+ [MENU.USERS]: () => withSiteId(routes.dataManagement.users(), siteId),
+ [MENU.EVENTS]: () => withSiteId(routes.dataManagement.events(), siteId),
+ [MENU.PROPS]: () => withSiteId(routes.dataManagement.properties(), siteId),
};
const handleClick = (item: any) => {
diff --git a/frontend/app/layout/data.ts b/frontend/app/layout/data.ts
index 5c626cb61..76ab2ce8f 100644
--- a/frontend/app/layout/data.ts
+++ b/frontend/app/layout/data.ts
@@ -54,8 +54,10 @@ export const enum MENU {
EXIT = 'exit',
SPOTS = 'spots',
ACTIVITY = 'activity',
- USER_PAGE = 'user-page',
- USERS_EVENTS = 'users-events',
+ USER = 'user-page',
+ USERS = 'data-users',
+ EVENTS = 'data-events',
+ PROPS = 'data-properties',
}
export const categories: Category[] = [
@@ -106,7 +108,12 @@ export const categories: Category[] = [
{
title: 'Data Management',
key: 'data-management',
- items: [{ label: 'Activity', key: MENU.ACTIVITY, icon: 'square-mouse-pointer' }, { label: 'Users and Events', key: MENU.USERS_EVENTS, icon: 'square-mouse-pointer' }],
+ items: [
+ { label: 'Activity', key: MENU.ACTIVITY, icon: 'square-mouse-pointer' },
+ { label: 'Users', key: MENU.USERS, icon: 'square-mouse-pointer' },
+ { label: 'Events', key: MENU.EVENTS, icon: 'square-mouse-pointer' },
+ { label: 'Properties', key: MENU.PROPS, icon: 'square-mouse-pointer' },
+ ],
},
{
title: 'Product Optimization',
diff --git a/frontend/app/routes.ts b/frontend/app/routes.ts
index fe780fa45..8260a3698 100644
--- a/frontend/app/routes.ts
+++ b/frontend/app/routes.ts
@@ -150,8 +150,10 @@ export const highlights = (): string => '/highlights';
export const dataManagement = {
activity: () => '/data-management/activity',
userPage: (id = ':userId', hash?: string | number) => hashed(`/data-management/user/${id}`, hash),
- usersEvents: () => '/data-management/users-and-events',
+ users: () => '/data-management/users',
+ events: () => '/data-management/events',
eventPage: (id = ':eventId', hash?: string | number) => hashed(`/data-management/event/${id}`, hash),
+ properties: () => '/data-management/properties',
}
const REQUIRED_SITE_ID_ROUTES = [
@@ -201,7 +203,8 @@ const REQUIRED_SITE_ID_ROUTES = [
dataManagement.activity(),
dataManagement.userPage(''),
- dataManagement.usersEvents(),
+ dataManagement.users(),
+ dataManagement.events(),
dataManagement.eventPage(''),
];
const routeNeedsSiteId = (path: string): boolean => REQUIRED_SITE_ID_ROUTES.some(r => path.startsWith(r));