Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Hide save as segment button on public, shared and embedded dashboards if user not logged in (#6212)

Artur Pata8bc18f22d1a5
diff --git a/assets/js/dashboard/filtering/segments.ts b/assets/js/dashboard/filtering/segments.ts
index e25dfdeac3..705f73bc95 100644
--- a/assets/js/dashboard/filtering/segments.ts
+++ b/assets/js/dashboard/filtering/segments.ts
@@ -186,6 +186,15 @@ export function resolveFilters(
})
}
+export const canSeeSaveAsSegmentAction = ({
+ user
+}: {
+ user: UserContextValue
+}) =>
+ user.loggedIn &&
+ (ROLES_WITH_MAYBE_SITE_SEGMENTS.includes(user.role) ||
+ ROLES_WITH_PERSONAL_SEGMENTS.includes(user.role))
+
export function canExpandSegment({
segment,
user
diff --git a/assets/js/dashboard/nav-menu/filters-bar.tsx b/assets/js/dashboard/nav-menu/filters-bar.tsx
index 976e11b17e..8b04abd212 100644
--- a/assets/js/dashboard/nav-menu/filters-bar.tsx
+++ b/assets/js/dashboard/nav-menu/filters-bar.tsx
@@ -6,9 +6,13 @@ import { useDashboardStateContext } from '../dashboard-state-context'
import { AppNavigationLink } from '../navigation/use-app-navigate'
import { Popover, Transition } from '@headlessui/react'
import { popover, BlurMenuButtonOnEscape } from '../components/popover'
-import { isSegmentFilter } from '../filtering/segments'
+import {
+ canSeeSaveAsSegmentAction,
+ isSegmentFilter
+} from '../filtering/segments'
import { useRoutelessModalsContext } from '../navigation/routeless-modals-context'
import { DashboardState } from '../dashboard-state'
+import { useUserContext } from '../user-context'
// Component structure is
// `..[ filter (x) ]..[ filter (x) ]..[ three dot menu ]..`
@@ -121,14 +125,16 @@ export const FiltersBar = ({ accessors }: FiltersBarProps) => {
const pillsRef = useRef<HTMLDivElement>(null)
const [visibility, setVisibility] = useState<null | VisibilityState>(null)
const { dashboardState, expandedSegment } = useDashboardStateContext()
+ const user = useUserContext()
const showingClearAll = canShowClearAllAction({
filters: dashboardState.filters
})
- const showingSaveAsSegment = canShowSaveAsSegmentAction({
- filters: dashboardState.filters,
- isEditingSegment: !!expandedSegment
- })
+ const showingSaveAsSegment =
+ canShowSaveAsSegmentAction({
+ filters: dashboardState.filters,
+ isEditingSegment: !!expandedSegment
+ }) && canSeeSaveAsSegmentAction({ user })
const actionsInSeeMoreMenu = [
showingSaveAsSegment && ('save as segment' as const),