chore(auditable): fix trace funnel store issue

ee/authz/openfgaschema/base.fga

@@ -2,45 +2,39 @@ module base
 
 type organisation 
   relations
-    define read: [user, serviceaccount, role#assignee]
-    define update: [user, serviceaccount, role#assignee]
+    define read: [user, role#assignee]
+    define update: [user, role#assignee]
 
 type user
   relations
-    define read: [user, serviceaccount, role#assignee]
-    define update: [user, serviceaccount, role#assignee]
-    define delete: [user, serviceaccount, role#assignee]
-
-type serviceaccount 
-  relations
-    define read: [user, serviceaccount, role#assignee]
-    define update: [user, serviceaccount, role#assignee]
-    define delete: [user, serviceaccount, role#assignee]  
+    define read: [user, role#assignee]
+    define update: [user, role#assignee]
+    define delete: [user, role#assignee]
 
 type anonymous
 
 type role 
   relations
-    define assignee: [user, serviceaccount, anonymous]
+    define assignee: [user, anonymous]
 
-    define read: [user, serviceaccount, role#assignee]
-    define update: [user, serviceaccount, role#assignee]
-    define delete: [user, serviceaccount, role#assignee]
+    define read: [user, role#assignee]
+    define update: [user, role#assignee]
+    define delete: [user, role#assignee]
 
 type metaresources
   relations
-    define create: [user, serviceaccount, role#assignee]
-    define list: [user, serviceaccount, role#assignee]
+    define create: [user, role#assignee]
+    define list: [user, role#assignee]
 
 type metaresource
   relations
-      define read: [user, serviceaccount, anonymous, role#assignee]
-      define update: [user, serviceaccount, role#assignee]
-      define delete: [user, serviceaccount, role#assignee]
+      define read: [user, anonymous, role#assignee]
+      define update: [user, role#assignee]
+      define delete: [user, role#assignee]
 
-      define block: [user, serviceaccount, role#assignee]
+      define block: [user, role#assignee]
 
 
 type telemetryresource
   relations
-      define read: [user, serviceaccount, role#assignee]
+      define read: [user, role#assignee]

frontend/src/AppRoutes/Private.tsx

@@ -128,7 +128,6 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 			isAdmin &&
 			(path === ROUTES.SETTINGS ||
 				path === ROUTES.ORG_SETTINGS ||
-				path === ROUTES.MEMBERS_SETTINGS ||
 				path === ROUTES.BILLING ||
 				path === ROUTES.MY_SETTINGS);
 

frontend/src/AppRoutes/index.tsx

@@ -321,19 +321,6 @@ function App(): JSX.Element {
 					// Session Replay
 					replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
 					replaysOnErrorSampleRate: 1.0, // If you're not already sampling the entire session, change the sample rate to 100% when sampling sessions where errors occur.
-					beforeSend(event) {
-						const sessionReplayUrl = posthog.get_session_replay_url?.({
-							withTimestamp: true,
-						});
-						if (sessionReplayUrl) {
-							// eslint-disable-next-line no-param-reassign
-							event.contexts = {
-								...event.contexts,
-								posthog: { session_replay_url: sessionReplayUrl },
-							};
-						}
-						return event;
-					},
 				});
 
 				setIsSentryInitialized(true);

frontend/src/components/SettingsSection/SettingsSection.styles.scss

@@ -1,67 +0,0 @@
-.settings-section {
-	border-top: 1px solid var(--bg-slate-500);
-}
-
-.settings-section-header {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	width: 100%;
-	padding: 12px 12px;
-	min-height: 44px;
-	background: transparent;
-	border: none;
-	outline: none;
-	cursor: pointer;
-
-	.settings-section-title {
-		display: flex;
-		align-items: center;
-		gap: 8px;
-		color: var(--bg-vanilla-400);
-		font-family: 'Space Mono';
-		font-size: 13px;
-		font-weight: 400;
-		text-transform: uppercase;
-	}
-
-	.chevron-icon {
-		color: var(--bg-vanilla-400);
-		transition: transform 0.2s ease-in-out;
-
-		&.open {
-			transform: rotate(180deg);
-		}
-	}
-}
-
-.settings-section-content {
-	padding: 0 16px 24px 16px;
-	display: flex;
-	flex-direction: column;
-	gap: 20px;
-	max-height: 0;
-	overflow: hidden;
-	opacity: 0;
-	transition: max-height 0.25s ease, opacity 0.25s ease;
-
-	&.open {
-		max-height: 1000px;
-		opacity: 1;
-	}
-}
-
-.lightMode {
-	.settings-section-header {
-		.chevron-icon {
-			color: var(--bg-ink-400);
-		}
-		.settings-section-title {
-			color: var(--bg-ink-400);
-		}
-	}
-
-	.settings-section {
-		border-top: 1px solid var(--bg-vanilla-300);
-	}
-}

frontend/src/components/SettingsSection/SettingsSection.tsx

@@ -1,51 +0,0 @@
-import { ReactNode, useState } from 'react';
-import { ChevronDown } from 'lucide-react';
-
-import './SettingsSection.styles.scss';
-
-export interface SettingsSectionProps {
-	title: string;
-	defaultOpen?: boolean;
-	children: ReactNode;
-	icon?: ReactNode;
-}
-
-function SettingsSection({
-	title,
-	defaultOpen = false,
-	children,
-	icon,
-}: SettingsSectionProps): JSX.Element {
-	const [isOpen, setIsOpen] = useState(defaultOpen);
-
-	const toggleOpen = (): void => {
-		setIsOpen((prev) => !prev);
-	};
-
-	return (
-		<section className="settings-section">
-			<button
-				type="button"
-				className="settings-section-header"
-				onClick={toggleOpen}
-			>
-				<span className="settings-section-title">
-					{icon ? icon : null} {title}
-				</span>
-				<ChevronDown
-					size={16}
-					className={isOpen ? 'chevron-icon open' : 'chevron-icon'}
-				/>
-			</button>
-			<div
-				className={
-					isOpen ? 'settings-section-content open' : 'settings-section-content'
-				}
-			>
-				{children}
-			</div>
-		</section>
-	);
-}
-
-export default SettingsSection;

frontend/src/container/CustomDomainSettings/CustomDomainEditModal.tsx

@@ -30,15 +30,14 @@ export default function CustomDomainEditModal({
 	onClearError,
 	onSubmit,
 }: CustomDomainEditModalProps): JSX.Element {
-	const initialSubdomain = customDomainSubdomain ?? '';
-	const [value, setValue] = useState(initialSubdomain);
+	const [value, setValue] = useState(customDomainSubdomain ?? '');
 	const [validationError, setValidationError] = useState<string | null>(null);
 
 	useEffect(() => {
 		if (isOpen) {
-			setValue(initialSubdomain);
+			setValue(customDomainSubdomain ?? '');
 		}
-	}, [isOpen, initialSubdomain]);
+	}, [isOpen, customDomainSubdomain]);
 
 	const handleClose = (): void => {
 		setValidationError(null);
@@ -59,11 +58,6 @@ export default function CustomDomainEditModal({
 	};
 
 	const handleSubmit = (): void => {
-		if (value === initialSubdomain) {
-			setValidationError('Input is unchanged');
-			return;
-		}
-
 		if (!value) {
 			setValidationError('This field is required');
 			return;
@@ -90,7 +84,7 @@ export default function CustomDomainEditModal({
 
 	const hasError = Boolean(errorMessage);
 
-	const statusIcon = ((): JSX.Element | null => {
+	const statusIcon = ((): JSX.Element => {
 		if (isLoading) {
 			return (
 				<LoaderCircle size={16} className="animate-spin edit-modal-status-icon" />
@@ -101,9 +95,7 @@ export default function CustomDomainEditModal({
 			return <CircleAlert size={16} color={Color.BG_CHERRY_500} />;
 		}
 
-		return value && value.length >= 3 ? (
-			<CircleCheck size={16} color={Color.BG_FOREST_500} />
-		) : null;
+		return <CircleCheck size={16} color={Color.BG_FOREST_500} />;
 	})();
 
 	return (
@@ -197,7 +189,7 @@ export default function CustomDomainEditModal({
 							color="primary"
 							className="edit-modal-apply-btn"
 							onClick={handleSubmit}
-							disabled={isLoading || value === initialSubdomain}
+							disabled={isLoading}
 							loading={isLoading}
 						>
 							Apply Changes

frontend/src/container/CustomDomainSettings/CustomDomainSettings.styles.scss

@@ -81,10 +81,6 @@
 		padding-left: 26px;
 	}
 
-	.custom-domain-card-meta-row.workspace-name-hidden {
-		padding-left: 0;
-	}
-
 	.custom-domain-card-meta-timezone {
 		display: inline-flex;
 		align-items: center;
@@ -121,6 +117,32 @@
 		background: var(--l2-border);
 		margin: 0;
 	}
+
+	.custom-domain-card-bottom {
+		display: flex;
+		align-items: center;
+		gap: var(--spacing-5);
+		padding: var(--padding-3);
+	}
+
+	.custom-domain-card-license {
+		color: var(--l1-foreground);
+		font-size: var(--paragraph-base-400-font-size);
+		line-height: var(--line-height-20);
+		letter-spacing: -0.07px;
+	}
+
+	.custom-domain-plan-badge {
+		display: inline-flex;
+		align-items: center;
+		padding: 0 2px;
+		border-radius: 2px;
+		background: var(--l2-background);
+		color: var(--l2-foreground);
+		font-family: 'SF Mono', 'Fira Code', monospace;
+		font-size: var(--paragraph-base-400-font-size);
+		line-height: var(--line-height-20);
+	}
 }
 
 .workspace-url-trigger {

frontend/src/container/CustomDomainSettings/CustomDomainSettings.tsx

@@ -69,9 +69,8 @@ function DomainUpdateToast({
 }
 
 export default function CustomDomainSettings(): JSX.Element {
-	const { org } = useAppContext();
+	const { org, activeLicense } = useAppContext();
 	const { timezone } = useTimezone();
-
 	const [isEditModalOpen, setIsEditModalOpen] = useState(false);
 	const [isPollingEnabled, setIsPollingEnabled] = useState(false);
 	const [hosts, setHosts] = useState<ZeustypesHostDTO[] | null>(null);
@@ -176,8 +175,7 @@ export default function CustomDomainSettings(): JSX.Element {
 		[hosts, activeHost],
 	);
 
-	const workspaceName =
-		org?.[0]?.displayName || customDomainSubdomain || activeHost?.name;
+	const planName = activeLicense?.plan?.name;
 
 	if (isLoadingHosts) {
 		return (
@@ -193,97 +191,105 @@ export default function CustomDomainSettings(): JSX.Element {
 
 	return (
 		<>
-			<div className="custom-domain-card-top">
-				<div className="custom-domain-card-info">
-					{!!workspaceName && (
+			<div className="custom-domain-card">
+				<div className="custom-domain-card-top">
+					<div className="custom-domain-card-info">
 						<div className="custom-domain-card-name-row">
 							<span className="beacon" />
-							<span className="custom-domain-card-org-name">{workspaceName}</span>
+							<span className="custom-domain-card-org-name">
+								{org?.[0]?.displayName ? org?.[0]?.displayName : customDomainSubdomain}
+							</span>
 						</div>
-					)}
 
-					<div
-						className={`custom-domain-card-meta-row ${
-							!workspaceName ? 'workspace-name-hidden' : ''
-						}`}
-					>
-						<Dropdown
-							trigger={['click']}
-							dropdownRender={(): JSX.Element => (
-								<div className="workspace-url-dropdown">
-									<span className="workspace-url-dropdown-header">
-										All Workspace URLs
-									</span>
-									<div className="workspace-url-dropdown-divider" />
-									{sortedHosts.map((host) => {
-										const isActive = host.name === activeHost?.name;
-										return (
-											<a
-												key={host.name}
-												href={host.url}
-												target="_blank"
-												rel="noopener noreferrer"
-												className={`workspace-url-dropdown-item${
-													isActive ? ' workspace-url-dropdown-item--active' : ''
-												}`}
-											>
-												<span className="workspace-url-dropdown-item-label">
-													{stripProtocol(host.url ?? '')}
-												</span>
-												{isActive ? (
-													<Check size={14} className="workspace-url-dropdown-item-check" />
-												) : (
-													<ExternalLink
-														size={12}
-														className="workspace-url-dropdown-item-external"
-													/>
-												)}
-											</a>
-										);
-									})}
-								</div>
-							)}
-						>
-							<Button
-								type="button"
-								size="xs"
-								className="workspace-url-trigger"
-								disabled={isFetchingHosts}
+						<div className="custom-domain-card-meta-row">
+							<Dropdown
+								trigger={['click']}
+								dropdownRender={(): JSX.Element => (
+									<div className="workspace-url-dropdown">
+										<span className="workspace-url-dropdown-header">
+											All Workspace URLs
+										</span>
+										<div className="workspace-url-dropdown-divider" />
+										{sortedHosts.map((host) => {
+											const isActive = host.name === activeHost?.name;
+											return (
+												<a
+													key={host.name}
+													href={host.url}
+													target="_blank"
+													rel="noopener noreferrer"
+													className={`workspace-url-dropdown-item${
+														isActive ? ' workspace-url-dropdown-item--active' : ''
+													}`}
+												>
+													<span className="workspace-url-dropdown-item-label">
+														{stripProtocol(host.url ?? '')}
+													</span>
+													{isActive ? (
+														<Check size={14} className="workspace-url-dropdown-item-check" />
+													) : (
+														<ExternalLink
+															size={12}
+															className="workspace-url-dropdown-item-external"
+														/>
+													)}
+												</a>
+											);
+										})}
+									</div>
+								)}
 							>
-								<Link2 size={12} />
-								<span>{stripProtocol(activeHost?.url ?? '')}</span>
-								<ChevronDown size={12} />
-							</Button>
-						</Dropdown>
-						<span className="custom-domain-card-meta-timezone">
-							<Clock size={11} />
-							{timezone.offset}
-						</span>
+								<Button
+									type="button"
+									size="xs"
+									className="workspace-url-trigger"
+									disabled={isFetchingHosts}
+								>
+									<Link2 size={12} />
+									<span>{stripProtocol(activeHost?.url ?? '')}</span>
+									<ChevronDown size={12} />
+								</Button>
+							</Dropdown>
+							<span className="custom-domain-card-meta-timezone">
+								<Clock size={11} />
+								{timezone.offset}
+							</span>
+						</div>
 					</div>
+
+					<Button
+						variant="solid"
+						size="sm"
+						className="custom-domain-edit-button"
+						prefixIcon={<FilePenLine size={12} />}
+						disabled={isFetchingHosts || isPollingEnabled}
+						onClick={(): void => setIsEditModalOpen(true)}
+					>
+						Edit workspace link
+					</Button>
 				</div>
 
-				<Button
-					variant="solid"
-					size="sm"
-					className="custom-domain-edit-button"
-					prefixIcon={<FilePenLine size={12} />}
-					disabled={isFetchingHosts || isPollingEnabled}
-					onClick={(): void => setIsEditModalOpen(true)}
-				>
-					Edit workspace link
-				</Button>
-			</div>
+				{isPollingEnabled && (
+					<Callout
+						type="info"
+						showIcon
+						className="custom-domain-callout"
+						size="small"
+						icon={<SolidAlertCircle size={13} color="primary" />}
+						message={`Updating your URL to ⎯ ${customDomainSubdomain}.${dnsSuffix}. This may take a few mins.`}
+					/>
+				)}
 
-			{isPollingEnabled && (
-				<Callout
-					type="info"
-					showIcon
-					className="custom-domain-callout"
-					size="small"
-					icon={<SolidAlertCircle size={13} color="primary" />}
-					message={`Updating your URL to ⎯ ${customDomainSubdomain}.${dnsSuffix}. This may take a few mins.`}
-				/>
-			)}
+				<div className="custom-domain-card-divider" />
+
+				<div className="custom-domain-card-bottom">
+					<span className="beacon" />
+					<span className="custom-domain-card-license">
+						{planName && <code className="custom-domain-plan-badge">{planName}</code>}{' '}
+						license is currently active
+					</span>
+				</div>
+			</div>
 
 			<CustomDomainEditModal
 				isOpen={isEditModalOpen}

frontend/src/container/CustomDomainSettings/__tests__/CustomDomainSettings.test.tsx

@@ -239,87 +239,4 @@ describe('CustomDomainSettings', () => {
 		const { container } = render(toastRenderer('test-id'));
 		expect(container).toHaveTextContent(/myteam\.test\.cloud/i);
 	});
-
-	describe('Workspace Name rendering', () => {
-		it('renders org displayName when available from appContext', async () => {
-			server.use(
-				rest.get(ZEUS_HOSTS_ENDPOINT, (_, res, ctx) =>
-					res(ctx.status(200), ctx.json(mockHostsResponse)),
-				),
-			);
-
-			render(<CustomDomainSettings />, undefined, {
-				appContextOverrides: {
-					org: [{ id: 'xyz', displayName: 'My Org Name', createdAt: 0 }],
-				},
-			});
-
-			expect(await screen.findByText('My Org Name')).toBeInTheDocument();
-		});
-
-		it('falls back to customDomainSubdomain when org displayName is missing', async () => {
-			server.use(
-				rest.get(ZEUS_HOSTS_ENDPOINT, (_, res, ctx) =>
-					res(ctx.status(200), ctx.json(mockHostsResponse)),
-				),
-			);
-
-			render(<CustomDomainSettings />, undefined, {
-				appContextOverrides: { org: [] },
-			});
-
-			expect(await screen.findByText('custom-host')).toBeInTheDocument();
-		});
-
-		it('falls back to activeHost.name when neither org name nor custom domain exists', async () => {
-			const onlyDefaultHostResponse = {
-				...mockHostsResponse,
-				data: {
-					...mockHostsResponse.data,
-					hosts: mockHostsResponse.data.hosts
-						? [mockHostsResponse.data.hosts[0]]
-						: [],
-				},
-			};
-
-			server.use(
-				rest.get(ZEUS_HOSTS_ENDPOINT, (_, res, ctx) =>
-					res(ctx.status(200), ctx.json(onlyDefaultHostResponse)),
-				),
-			);
-
-			render(<CustomDomainSettings />, undefined, {
-				appContextOverrides: { org: [] },
-			});
-
-			// 'accepted-starfish' is the default host's name
-			expect(await screen.findByText('accepted-starfish')).toBeInTheDocument();
-		});
-
-		it('does not render the card name row if workspaceName is totally falsy', async () => {
-			const emptyHostsResponse = {
-				...mockHostsResponse,
-				data: {
-					...mockHostsResponse.data,
-					hosts: [],
-				},
-			};
-
-			server.use(
-				rest.get(ZEUS_HOSTS_ENDPOINT, (_, res, ctx) =>
-					res(ctx.status(200), ctx.json(emptyHostsResponse)),
-				),
-			);
-
-			const { container } = render(<CustomDomainSettings />, undefined, {
-				appContextOverrides: { org: [] },
-			});
-
-			await screen.findByRole('button', { name: /edit workspace link/i });
-
-			expect(
-				container.querySelector('.custom-domain-card-name-row'),
-			).not.toBeInTheDocument();
-		});
-	});
 });

frontend/src/container/DashboardContainer/DashboardDescription/__tests__/DashboardDescription.test.tsx

@@ -199,6 +199,8 @@ describe('Dashboard landing page actions header tests', () => {
 			setLayouts: jest.fn(),
 			setSelectedDashboard: jest.fn(),
 			updatedTimeRef: { current: null },
+			toScrollWidgetId: '',
+			setToScrollWidgetId: jest.fn(),
 			updateLocalStorageDashboardVariables: jest.fn(),
 			dashboardQueryRangeCalled: false,
 			setDashboardQueryRangeCalled: jest.fn(),

frontend/src/container/DashboardContainer/visualization/hooks/__tests__/useScrollWidgetIntoView.test.ts

@@ -1,9 +1,9 @@
 import { renderHook } from '@testing-library/react';
-import { useScrollToWidgetIdStore } from 'providers/Dashboard/helpers/scrollToWidgetIdHelper';
+import { useDashboard } from 'providers/Dashboard/Dashboard';
 
 import { useScrollWidgetIntoView } from '../useScrollWidgetIntoView';
 
-jest.mock('providers/Dashboard/helpers/scrollToWidgetIdHelper');
+jest.mock('providers/Dashboard/Dashboard');
 
 type MockHTMLElement = {
 	scrollIntoView: jest.Mock;
@@ -18,35 +18,25 @@ function createMockElement(): MockHTMLElement {
 }
 
 describe('useScrollWidgetIntoView', () => {
-	const mockedUseScrollToWidgetIdStore = useScrollToWidgetIdStore as jest.MockedFunction<
-		typeof useScrollToWidgetIdStore
+	const mockedUseDashboard = useDashboard as jest.MockedFunction<
+		typeof useDashboard
 	>;
 
-	let mockElement: MockHTMLElement;
-	let ref: React.RefObject<HTMLDivElement>;
-	let setToScrollWidgetId: jest.Mock;
-
-	function mockStore(toScrollWidgetId: string): void {
-		const storeState = { toScrollWidgetId, setToScrollWidgetId };
-		mockedUseScrollToWidgetIdStore.mockImplementation(
-			(selector) =>
-				selector(
-					(storeState as unknown) as Parameters<typeof selector>[0],
-				) as ReturnType<typeof useScrollToWidgetIdStore>,
-		);
-	}
-
 	beforeEach(() => {
 		jest.clearAllMocks();
-		mockElement = createMockElement();
-		ref = ({
-			current: mockElement,
-		} as unknown) as React.RefObject<HTMLDivElement>;
-		setToScrollWidgetId = jest.fn();
 	});
 
 	it('scrolls into view and focuses when toScrollWidgetId matches widget id', () => {
-		mockStore('widget-id');
+		const setToScrollWidgetId = jest.fn();
+		const mockElement = createMockElement();
+		const ref = ({
+			current: mockElement,
+		} as unknown) as React.RefObject<HTMLDivElement>;
+
+		mockedUseDashboard.mockReturnValue(({
+			toScrollWidgetId: 'widget-id',
+			setToScrollWidgetId,
+		} as unknown) as ReturnType<typeof useDashboard>);
 
 		renderHook(() => useScrollWidgetIntoView('widget-id', ref));
 
@@ -59,7 +49,16 @@ describe('useScrollWidgetIntoView', () => {
 	});
 
 	it('does nothing when toScrollWidgetId does not match widget id', () => {
-		mockStore('other-widget');
+		const setToScrollWidgetId = jest.fn();
+		const mockElement = createMockElement();
+		const ref = ({
+			current: mockElement,
+		} as unknown) as React.RefObject<HTMLDivElement>;
+
+		mockedUseDashboard.mockReturnValue(({
+			toScrollWidgetId: 'other-widget',
+			setToScrollWidgetId,
+		} as unknown) as ReturnType<typeof useDashboard>);
 
 		renderHook(() => useScrollWidgetIntoView('widget-id', ref));
 

frontend/src/container/DashboardContainer/visualization/hooks/useScrollWidgetIntoView.ts

@@ -1,5 +1,5 @@
 import { RefObject, useEffect } from 'react';
-import { useScrollToWidgetIdStore } from 'providers/Dashboard/helpers/scrollToWidgetIdHelper';
+import { useDashboard } from 'providers/Dashboard/Dashboard';
 
 /**
  * Scrolls the given widget container into view when the dashboard
@@ -11,10 +11,7 @@ export function useScrollWidgetIntoView<T extends HTMLElement>(
 	widgetId: string,
 	widgetContainerRef: RefObject<T>,
 ): void {
-	const toScrollWidgetId = useScrollToWidgetIdStore((s) => s.toScrollWidgetId);
-	const setToScrollWidgetId = useScrollToWidgetIdStore(
-		(s) => s.setToScrollWidgetId,
-	);
+	const { toScrollWidgetId, setToScrollWidgetId } = useDashboard();
 
 	useEffect(() => {
 		if (toScrollWidgetId === widgetId) {

frontend/src/container/DashboardContainer/visualization/panels/BarPanel/BarPanel.tsx

@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useScrollWidgetIntoView } from 'container/DashboardContainer/visualization/hooks/useScrollWidgetIntoView';
 import { PanelWrapperProps } from 'container/PanelWrapper/panelWrapper.types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useResizeObserver } from 'hooks/useDimensions';
@@ -33,6 +34,8 @@ function BarPanel(props: PanelWrapperProps): JSX.Element {
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();
 
+	useScrollWidgetIntoView(widget.id, graphRef);
+
 	useEffect((): void => {
 		const { startTime, endTime } = getTimeRange(queryResponse);
 

frontend/src/container/DashboardContainer/visualization/panels/HistogramPanel/HistogramPanel.tsx

@@ -1,4 +1,5 @@
 import { useMemo, useRef } from 'react';
+import { useScrollWidgetIntoView } from 'container/DashboardContainer/visualization/hooks/useScrollWidgetIntoView';
 import { PanelWrapperProps } from 'container/PanelWrapper/panelWrapper.types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useResizeObserver } from 'hooks/useDimensions';
@@ -31,6 +32,8 @@ function HistogramPanel(props: PanelWrapperProps): JSX.Element {
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();
 
+	useScrollWidgetIntoView(widget.id, graphRef);
+
 	const config = useMemo(() => {
 		return prepareHistogramPanelConfig({
 			widget,

frontend/src/container/DashboardContainer/visualization/panels/TimeSeriesPanel/TimeSeriesPanel.tsx

@@ -2,6 +2,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
 import TimeSeries from 'container/DashboardContainer/visualization/charts/TimeSeries/TimeSeries';
 import ChartManager from 'container/DashboardContainer/visualization/components/ChartManager/ChartManager';
 import { usePanelContextMenu } from 'container/DashboardContainer/visualization/hooks/usePanelContextMenu';
+import { useScrollWidgetIntoView } from 'container/DashboardContainer/visualization/hooks/useScrollWidgetIntoView';
 import { PanelWrapperProps } from 'container/PanelWrapper/panelWrapper.types';
 import { useIsDarkMode } from 'hooks/useDarkMode';
 import { useResizeObserver } from 'hooks/useDimensions';
@@ -32,6 +33,8 @@ function TimeSeriesPanel(props: PanelWrapperProps): JSX.Element {
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();
 
+	useScrollWidgetIntoView(widget.id, graphRef);
+
 	useEffect((): void => {
 		const { startTime, endTime } = getTimeRange(queryResponse);
 

frontend/src/container/GeneralSettings/GeneralSettings.tsx

@@ -10,7 +10,6 @@ import setRetentionApi from 'api/settings/setRetention';
 import setRetentionApiV2 from 'api/settings/setRetentionV2';
 import TextToolTip from 'components/TextToolTip';
 import CustomDomainSettings from 'container/CustomDomainSettings';
-import LicenseKeyRow from 'container/GeneralSettings/LicenseKeyRow/LicenseKeyRow';
 import GeneralSettingsCloud from 'container/GeneralSettingsCloud';
 import useComponentPermission from 'hooks/useComponentPermission';
 import { useGetTenantLicense } from 'hooks/useGetTenantLicense';
@@ -82,7 +81,7 @@ function GeneralSettings({
 		logsTtlValuesPayload,
 	);
 
-	const { user, activeLicense } = useAppContext();
+	const { user } = useAppContext();
 
 	const [setRetentionPermission] = useComponentPermission(
 		['set_retention_period'],
@@ -681,15 +680,7 @@ function GeneralSettings({
 				</span>
 			</div>
 
-			{(showCustomDomainSettings || activeLicense?.key) && (
-				<div className="custom-domain-card">
-					{showCustomDomainSettings && <CustomDomainSettings />}
-					{showCustomDomainSettings && activeLicense?.key && (
-						<div className="custom-domain-card-divider" />
-					)}
-					{activeLicense?.key && <LicenseKeyRow />}
-				</div>
-			)}
+			{showCustomDomainSettings && <CustomDomainSettings />}
 
 			<div className="retention-controls-container">
 				<div className="retention-controls-header">

frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.styles.scss

@@ -1,65 +0,0 @@
-.license-key-row {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	padding: var(--padding-2) var(--padding-3);
-	gap: var(--spacing-5);
-
-	&__left {
-		display: inline-flex;
-		align-items: center;
-		gap: 12px;
-		color: var(--l2-foreground);
-
-		svg {
-			flex-shrink: 0;
-		}
-	}
-
-	&__label {
-		color: var(--l2-foreground);
-		font-size: var(--paragraph-base-400-font-size);
-		line-height: var(--line-height-20);
-		letter-spacing: -0.07px;
-		flex-shrink: 0;
-	}
-
-	&__value {
-		display: inline-flex;
-		align-items: stretch;
-	}
-
-	&__code {
-		display: inline-flex;
-		align-items: center;
-		padding: 1px 2px;
-		border-radius: 2px 0 0 2px;
-		background: var(--l3-background);
-		border: 1px solid var(--l2-border);
-		color: var(--l2-foreground);
-		font-family: 'SF Mono', 'Fira Code', 'Fira Mono', monospace;
-		font-size: var(--paragraph-base-400-font-size);
-		line-height: var(--line-height-20);
-		white-space: nowrap;
-		margin-right: -1px;
-	}
-
-	&__copy-btn {
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-		width: 26px;
-		padding: 1px 2px;
-		border-radius: 0 2px 2px 0;
-		background: var(--l3-background);
-		border: 1px solid var(--l2-border);
-		color: var(--l2-foreground);
-		cursor: pointer;
-		flex-shrink: 0;
-		height: 24px;
-
-		&:hover {
-			background: var(--l3-background-hover);
-		}
-	}
-}

frontend/src/container/GeneralSettings/LicenseKeyRow/LicenseKeyRow.tsx

@@ -1,48 +0,0 @@
-import { useCopyToClipboard } from 'react-use';
-import { Button } from '@signozhq/button';
-import { Copy, KeyRound } from '@signozhq/icons';
-import { toast } from '@signozhq/sonner';
-import { useAppContext } from 'providers/App/App';
-import { getMaskedKey } from 'utils/maskedKey';
-
-import './LicenseKeyRow.styles.scss';
-
-function LicenseKeyRow(): JSX.Element | null {
-	const { activeLicense } = useAppContext();
-	const [, copyToClipboard] = useCopyToClipboard();
-
-	if (!activeLicense?.key) {
-		return null;
-	}
-
-	const handleCopyLicenseKey = (text: string): void => {
-		copyToClipboard(text);
-		toast.success('License key copied to clipboard.', { richColors: true });
-	};
-
-	return (
-		<div className="license-key-row">
-			<span className="license-key-row__left">
-				<KeyRound size={14} />
-				<span className="license-key-row__label">SigNoz License Key</span>
-			</span>
-			<span className="license-key-row__value">
-				<code className="license-key-row__code">
-					{getMaskedKey(activeLicense.key)}
-				</code>
-				<Button
-					type="button"
-					size="xs"
-					aria-label="Copy license key"
-					data-testid="license-key-row-copy-btn"
-					className="license-key-row__copy-btn"
-					onClick={(): void => handleCopyLicenseKey(activeLicense.key)}
-				>
-					<Copy size={12} />
-				</Button>
-			</span>
-		</div>
-	);
-}
-
-export default LicenseKeyRow;

frontend/src/container/GeneralSettings/LicenseKeyRow/__tests__/LicenseKeyRow.test.tsx

@@ -1,61 +0,0 @@
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-import LicenseKeyRow from '../LicenseKeyRow';
-
-const mockCopyToClipboard = jest.fn();
-
-jest.mock('react-use', () => ({
-	__esModule: true,
-	useCopyToClipboard: (): [unknown, jest.Mock] => [null, mockCopyToClipboard],
-}));
-
-const mockToastSuccess = jest.fn();
-
-jest.mock('@signozhq/sonner', () => ({
-	toast: {
-		success: (...args: unknown[]): unknown => mockToastSuccess(...args),
-	},
-}));
-
-describe('LicenseKeyRow', () => {
-	afterEach(() => {
-		jest.clearAllMocks();
-	});
-
-	it('renders nothing when activeLicense key is absent', () => {
-		const { container } = render(<LicenseKeyRow />, undefined, {
-			appContextOverrides: { activeLicense: null },
-		});
-
-		expect(container).toBeEmptyDOMElement();
-	});
-
-	it('renders label and masked key when activeLicense key exists', () => {
-		render(<LicenseKeyRow />, undefined, {
-			appContextOverrides: {
-				activeLicense: { key: 'abcdefghij' } as any,
-			},
-		});
-
-		expect(screen.getByText('SigNoz License Key')).toBeInTheDocument();
-		expect(screen.getByText('ab·······ij')).toBeInTheDocument();
-	});
-
-	it('calls copyToClipboard and shows success toast when clipboard is available', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		render(<LicenseKeyRow />);
-
-		await user.click(screen.getByRole('button', { name: /copy license key/i }));
-
-		await waitFor(() => {
-			expect(mockCopyToClipboard).toHaveBeenCalledWith('test-key');
-			expect(mockToastSuccess).toHaveBeenCalledWith(
-				'License key copied to clipboard.',
-				{
-					richColors: true,
-				},
-			);
-		});
-	});
-});

frontend/src/container/GridCardLayout/GridCard/index.tsx

@@ -5,7 +5,6 @@ import logEvent from 'api/common/logEvent';
 import { DEFAULT_ENTITY_VERSION, ENTITY_VERSION_V5 } from 'constants/app';
 import { QueryParams } from 'constants/query';
 import { PANEL_TYPES } from 'constants/queryBuilder';
-import { useScrollWidgetIntoView } from 'container/DashboardContainer/visualization/hooks/useScrollWidgetIntoView';
 import { populateMultipleResults } from 'container/NewWidget/LeftContainer/WidgetGraph/util';
 import { CustomTimeType } from 'container/TopNav/DateTimeSelectionV2/types';
 import { useIsPanelWaitingOnVariable } from 'hooks/dashboard/useVariableFetchState';
@@ -68,7 +67,11 @@ function GridCardGraph({
 	const [isInternalServerError, setIsInternalServerError] = useState<boolean>(
 		false,
 	);
-	const { setDashboardQueryRangeCalled } = useDashboard();
+	const {
+		toScrollWidgetId,
+		setToScrollWidgetId,
+		setDashboardQueryRangeCalled,
+	} = useDashboard();
 
 	const {
 		minTime,
@@ -106,11 +109,20 @@ function GridCardGraph({
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, []);
 
-	const widgetContainerRef = useRef<HTMLDivElement>(null);
+	const graphRef = useRef<HTMLDivElement>(null);
 
-	const isVisible = useIntersectionObserver(widgetContainerRef, undefined, true);
+	const isVisible = useIntersectionObserver(graphRef, undefined, true);
 
-	useScrollWidgetIntoView(widget?.id || '', widgetContainerRef);
+	useEffect(() => {
+		if (toScrollWidgetId === widget.id) {
+			graphRef.current?.scrollIntoView({
+				behavior: 'smooth',
+				block: 'center',
+			});
+			graphRef.current?.focus();
+			setToScrollWidgetId('');
+		}
+	}, [toScrollWidgetId, setToScrollWidgetId, widget.id]);
 
 	const updatedQuery = widget?.query;
 
@@ -294,7 +306,7 @@ function GridCardGraph({
 			: headerMenuList;
 
 	return (
-		<div style={{ height: '100%', width: '100%' }} ref={widgetContainerRef}>
+		<div style={{ height: '100%', width: '100%' }} ref={graphRef}>
 			{isEmptyLayout ? (
 				<EmptyWidget />
 			) : (

frontend/src/container/MySettings/LicenseSection/LicenseSection.tsx

@@ -4,7 +4,6 @@ import { Typography } from 'antd';
 import { useNotifications } from 'hooks/useNotifications';
 import { Copy } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';
-import { getMaskedKey } from 'utils/maskedKey';
 
 import './LicenseSection.styles.scss';
 
@@ -13,6 +12,15 @@ function LicenseSection(): JSX.Element | null {
 	const { notifications } = useNotifications();
 	const [, handleCopyToClipboard] = useCopyToClipboard();
 
+	const getMaskedKey = (key: string): string => {
+		if (!key || key.length < 4) {
+			return key || 'N/A';
+		}
+		return `${key.substring(0, 2)}********${key
+			.substring(key.length - 2)
+			.trim()}`;
+	};
+
 	const handleCopyKey = (text: string): void => {
 		handleCopyToClipboard(text);
 		notifications.success({

frontend/src/container/MySettings/__tests__/MySettings.test.tsx

@@ -271,7 +271,7 @@ describe('MySettings Flows', () => {
 				},
 			});
 
-			expect(within(container).getByText('ab·······cd')).toBeInTheDocument();
+			expect(within(container).getByText('ab********cd')).toBeInTheDocument();
 		});
 
 		it('Should not mask license key if it is too short', () => {

frontend/src/container/NewWidget/RightContainer/ContextLinks/index.tsx

@@ -14,7 +14,7 @@ import {
 	verticalListSortingStrategy,
 } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { Button, Modal } from 'antd';
+import { Button, Modal, Typography } from 'antd';
 import OverlayScrollbar from 'components/OverlayScrollbar/OverlayScrollbar';
 import { GripVertical, Pencil, Plus, Trash2 } from 'lucide-react';
 import {
@@ -134,16 +134,11 @@ function ContextLinks({
 
 	return (
 		<div className="context-links-container">
+			<Typography.Text className="context-links-text">
+				Context Links
+			</Typography.Text>
+
 			<div className="context-links-list">
-				<Button
-					type="default"
-					className="add-context-link-button"
-					icon={<Plus size={12} />}
-					style={{ width: '100%' }}
-					onClick={handleAddContextLink}
-				>
-					Add Context Link
-				</Button>
 				<OverlayScrollbar>
 					<DndContext
 						sensors={sensors}
@@ -165,6 +160,16 @@ function ContextLinks({
 						</SortableContext>
 					</DndContext>
 				</OverlayScrollbar>
+
+				{/* button to add context link */}
+				<Button
+					type="primary"
+					className="add-context-link-button"
+					icon={<Plus size={12} />}
+					onClick={handleAddContextLink}
+				>
+					Context Link
+				</Button>
 			</div>
 
 			<Modal

frontend/src/container/NewWidget/RightContainer/ContextLinks/styles.scss

@@ -2,6 +2,7 @@
 	display: flex;
 	flex-direction: column;
 	gap: 16px;
+	margin: 12px;
 }
 
 .context-links-text {
@@ -109,7 +110,10 @@
 }
 
 .add-context-link-button {
-	width: 100%;
+	display: flex;
+	align-items: center;
+	margin: auto;
+	width: fit-content;
 }
 
 .lightMode {

frontend/src/container/NewWidget/RightContainer/RightContainer.styles.scss

@@ -24,14 +24,14 @@
 			letter-spacing: -0.07px;
 		}
 	}
-	.control-container {
-		display: flex;
-		flex-direction: column;
-		gap: 8px;
-	}
 
 	.name-description {
-		padding: 0 0 4px 0;
+		display: flex;
+		flex-direction: column;
+		padding: 12px 12px 16px 12px;
+		border-top: 1px solid var(--bg-slate-500);
+		border-bottom: 1px solid var(--bg-slate-500);
+		gap: 8px;
 
 		.typography {
 			color: var(--bg-vanilla-400);
@@ -88,6 +88,9 @@
 	.panel-config {
 		display: flex;
 		flex-direction: column;
+		padding: 12px 12px 16px 12px;
+		gap: 8px;
+		border-bottom: 1px solid var(--bg-slate-500);
 
 		.typography {
 			color: var(--bg-vanilla-400);
@@ -134,6 +137,7 @@
 		}
 
 		.fill-gaps {
+			margin-top: 16px;
 			display: flex;
 			padding: 12px;
 			justify-content: space-between;
@@ -152,24 +156,31 @@
 				letter-spacing: 0.52px;
 				text-transform: uppercase;
 			}
-			.fill-gaps-text-description {
-				color: var(--bg-vanilla-400);
-				font-family: Inter;
-				font-size: 12px;
-				font-style: normal;
-				font-weight: 400;
-				opacity: 0.6;
-				line-height: 16px; /* 133.333% */
-			}
 		}
 
 		.log-scale,
-		.decimal-precision-selector,
-		.legend-position {
+		.decimal-precision-selector {
+			margin-top: 16px;
+			display: flex;
 			justify-content: space-between;
+			flex-direction: column;
+			gap: 8px;
+		}
+
+		.legend-position {
+			margin-top: 16px;
+			display: flex;
+			justify-content: space-between;
+			flex-direction: column;
+			gap: 8px;
+		}
+
+		.legend-colors {
+			margin-top: 16px;
 		}
 
 		.panel-time-text {
+			margin-top: 16px;
 			color: var(--bg-vanilla-400);
 			font-family: 'Space Mono';
 			font-size: 13px;
@@ -182,6 +193,7 @@
 
 		.y-axis-unit-selector,
 		.y-axis-unit-selector-v2 {
+			margin-top: 16px;
 			display: flex;
 			flex-direction: column;
 			gap: 8px;
@@ -266,8 +278,11 @@
 		}
 
 		.stack-chart {
-			flex-direction: row;
+			margin-top: 16px;
+			display: flex;
 			justify-content: space-between;
+			gap: 8px;
+
 			.label {
 				color: var(--bg-vanilla-400);
 				font-family: 'Space Mono';
@@ -281,6 +296,11 @@
 		}
 
 		.bucket-config {
+			margin-top: 16px;
+			display: flex;
+			flex-direction: column;
+			gap: 8px;
+
 			.label {
 				color: var(--bg-vanilla-400);
 				font-family: 'Space Mono';
@@ -332,13 +352,16 @@
 		}
 	}
 
+	.context-links {
+		border-bottom: 1px solid var(--bg-slate-500);
+	}
+
 	.alerts {
 		display: flex;
+		padding: 12px;
 		align-items: center;
 		justify-content: space-between;
-		padding: 12px 12px 32px 12px;
-		min-height: 44px;
-		border-top: 1px solid var(--bg-slate-500);
+		border-bottom: 1px solid var(--bg-slate-500);
 		cursor: pointer;
 
 		.left-section {
@@ -364,16 +387,6 @@
 			color: var(--bg-vanilla-400);
 		}
 	}
-
-	.context-links {
-		padding: 12px 12px 16px 12px;
-		border-bottom: 1px solid var(--bg-slate-500);
-	}
-
-	.thresholds-section {
-		padding: 12px 12px 16px 12px;
-		border-top: 1px solid var(--bg-slate-500);
-	}
 }
 
 .select-option {
@@ -428,6 +441,8 @@
 		}
 
 		.panel-config {
+			border-bottom: 1px solid var(--bg-vanilla-300);
+
 			.typography {
 				color: var(--bg-ink-400);
 			}
@@ -463,9 +478,6 @@
 				.fill-gaps-text {
 					color: var(--bg-ink-400);
 				}
-				.fill-gaps-text-description {
-					color: var(--bg-ink-400);
-				}
 			}
 
 			.bucket-config {
@@ -518,7 +530,7 @@
 		}
 
 		.alerts {
-			border-top: 1px solid var(--bg-vanilla-300);
+			border-bottom: 1px solid var(--bg-vanilla-300);
 
 			.left-section {
 				.bell-icon {
@@ -537,10 +549,6 @@
 		.context-links {
 			border-bottom: 1px solid var(--bg-vanilla-300);
 		}
-
-		.thresholds-section {
-			border-top: 1px solid var(--bg-vanilla-300);
-		}
 	}
 
 	.select-option {

frontend/src/container/NewWidget/RightContainer/Threshold/ThresholdSelector.styles.scss

@@ -1,4 +1,5 @@
 .threshold-selector-container {
+	padding: 12px;
 	padding-bottom: 80px;
 
 	.threshold-select {

frontend/src/container/NewWidget/RightContainer/Threshold/ThresholdSelector.tsx

@@ -1,10 +1,10 @@
 import { useCallback } from 'react';
 import { DndProvider } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
-import { Button } from 'antd';
+import { Typography } from 'antd';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import { useGetQueryLabels } from 'hooks/useGetQueryLabels';
-import { Plus } from 'lucide-react';
+import { Antenna, Plus } from 'lucide-react';
 import { v4 as uuid } from 'uuid';
 
 import Threshold from './Threshold';
@@ -68,14 +68,11 @@ function ThresholdSelector({
 		<DndProvider backend={HTML5Backend}>
 			<div className="threshold-selector-container">
 				<div className="threshold-select" onClick={addThresholdHandler}>
-					<Button
-						type="default"
-						icon={<Plus size={14} />}
-						style={{ width: '100%' }}
-						onClick={addThresholdHandler}
-					>
-						Add Threshold
-					</Button>
+					<div className="left-section">
+						<Antenna size={14} className="icon" />
+						<Typography.Text className="text">Thresholds</Typography.Text>
+					</div>
+					<Plus size={14} onClick={addThresholdHandler} className="icon" />
 				</div>
 				{thresholds.map((threshold, idx) => (
 					<Threshold

frontend/src/container/NewWidget/RightContainer/index.tsx

@@ -14,11 +14,11 @@ import {
 	Input,
 	InputNumber,
 	Select,
+	Space,
 	Switch,
 	Typography,
 } from 'antd';
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
-import SettingsSection from 'components/SettingsSection/SettingsSection';
 import TimePreference from 'components/TimePreferenceDropDown';
 import { PANEL_TYPES, PanelDisplay } from 'constants/queryBuilder';
 import GraphTypes, {
@@ -28,14 +28,8 @@ import { useDashboardVariables } from 'hooks/dashboard/useDashboardVariables';
 import useCreateAlerts from 'hooks/queryBuilder/useCreateAlerts';
 import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
 import {
-	Antenna,
-	Axis3D,
 	ConciergeBell,
-	Layers,
-	LayoutDashboard,
 	LineChart,
-	Link,
-	Pencil,
 	Plus,
 	Spline,
 	SquareArrowOutUpRight,
@@ -269,304 +263,269 @@ function RightContainer({
 		<div className="right-container">
 			<section className="header">
 				<div className="purple-dot" />
-				<Typography.Text className="header-text">Panel Settings</Typography.Text>
+				<Typography.Text className="header-text">Panel details</Typography.Text>
 			</section>
-
-			<SettingsSection
-				title="Panel Details"
-				defaultOpen
-				icon={<Pencil size={14} />}
-			>
-				<section className="name-description control-container">
-					<Typography.Text className="typography">Name</Typography.Text>
-					<AutoComplete
-						options={dashboardVariableOptions}
-						value={inputValue}
-						onChange={onInputChange}
-						onSelect={onSelect}
-						filterOption={filterOption}
-						style={{ width: '100%' }}
-						getPopupContainer={popupContainer}
-						placeholder="Enter the panel name here..."
-						open={autoCompleteOpen}
-					>
-						<Input
-							rootClassName="name-input"
-							ref={inputRef}
-							onSelect={handleInputCursor}
-							onClick={handleInputCursor}
-							onBlur={(): void => setAutoCompleteOpen(false)}
-						/>
-					</AutoComplete>
-					<Typography.Text className="typography">Description</Typography.Text>
-					<TextArea
-						placeholder="Enter the panel description here..."
-						bordered
-						allowClear
-						value={description}
-						onChange={(event): void =>
-							onChangeHandler(setDescription, event.target.value)
-						}
-						rootClassName="description-input"
+			<section className="name-description">
+				<Typography.Text className="typography">Name</Typography.Text>
+				<AutoComplete
+					options={dashboardVariableOptions}
+					value={inputValue}
+					onChange={onInputChange}
+					onSelect={onSelect}
+					filterOption={filterOption}
+					style={{ width: '100%' }}
+					getPopupContainer={popupContainer}
+					placeholder="Enter the panel name here..."
+					open={autoCompleteOpen}
+				>
+					<Input
+						rootClassName="name-input"
+						ref={inputRef}
+						onSelect={handleInputCursor}
+						onClick={handleInputCursor}
+						onBlur={(): void => setAutoCompleteOpen(false)}
 					/>
-				</section>
-			</SettingsSection>
-
+				</AutoComplete>
+				<Typography.Text className="typography">Description</Typography.Text>
+				<TextArea
+					placeholder="Enter the panel description here..."
+					bordered
+					allowClear
+					value={description}
+					onChange={(event): void =>
+						onChangeHandler(setDescription, event.target.value)
+					}
+					rootClassName="description-input"
+				/>
+			</section>
 			<section className="panel-config">
-				<SettingsSection title="Visualization" icon={<LayoutDashboard size={14} />}>
-					<section className="panel-type control-container">
-						<Typography.Text className="typography">Panel Type</Typography.Text>
-						<Select
-							onChange={setGraphHandler}
-							value={selectedGraph}
-							style={{ width: '100%' }}
-							className="panel-type-select"
-							data-testid="panel-change-select"
-							data-stacking-state={stackedBarChart ? 'true' : 'false'}
-						>
-							{graphTypes.map((item) => (
-								<Option key={item.name} value={item.name}>
-									<div className="select-option">
-										<div className="icon">{item.icon}</div>
-										<Typography.Text className="display">{item.display}</Typography.Text>
-									</div>
-								</Option>
-							))}
-						</Select>
-					</section>
-
-					{allowStackingBarChart && (
-						<section className="stack-chart control-container">
-							<Typography.Text className="label">Stack series</Typography.Text>
-							<Switch
-								checked={stackedBarChart}
-								size="small"
-								onChange={(checked): void => setStackedBarChart(checked)}
-							/>
-						</section>
-					)}
-
-					{allowFillSpans && (
-						<section className="fill-gaps">
-							<div className="fill-gaps-text-container">
-								<Typography className="fill-gaps-text">Fill gaps</Typography>
-								<Typography.Text className="fill-gaps-text-description">
-									Fill gaps in data with 0 for continuity
-								</Typography.Text>
+				<Typography.Text className="typography">Panel Type</Typography.Text>
+				<Select
+					onChange={setGraphHandler}
+					value={selectedGraph}
+					style={{ width: '100%' }}
+					className="panel-type-select"
+					data-testid="panel-change-select"
+					data-stacking-state={stackedBarChart ? 'true' : 'false'}
+				>
+					{graphTypes.map((item) => (
+						<Option key={item.name} value={item.name}>
+							<div className="select-option">
+								<div className="icon">{item.icon}</div>
+								<Typography.Text className="display">{item.display}</Typography.Text>
 							</div>
-							<Switch
-								checked={isFillSpans}
-								size="small"
-								onChange={(checked): void => setIsFillSpans(checked)}
-							/>
-						</section>
-					)}
+						</Option>
+					))}
+				</Select>
 
-					{allowPanelTimePreference && (
-						<section className="panel-time-preference control-container">
-							<Typography.Text className="panel-time-text">
-								Panel Time Preference
-							</Typography.Text>
-							<TimePreference
-								{...{
-									selectedTime,
-									setSelectedTime,
-								}}
-							/>
-						</section>
-					)}
-
-					{allowPanelColumnPreference && (
-						<ColumnUnitSelector
-							columnUnits={columnUnits}
-							setColumnUnits={setColumnUnits}
-							isNewDashboard={isNewDashboard}
+				{allowFillSpans && (
+					<Space className="fill-gaps">
+						<Typography className="fill-gaps-text">Fill gaps</Typography>
+						<Switch
+							checked={isFillSpans}
+							size="small"
+							onChange={(checked): void => setIsFillSpans(checked)}
 						/>
-					)}
-				</SettingsSection>
-
-				{(allowYAxisUnit ||
-					allowDecimalPrecision ||
-					allowSoftMinMax ||
-					allowLogScale) && (
-					<SettingsSection title="Axis" icon={<Axis3D size={14} />}>
-						{allowYAxisUnit && (
-							<DashboardYAxisUnitSelectorWrapper
-								onSelect={setYAxisUnit}
-								value={yAxisUnit || ''}
-								fieldLabel={
-									selectedGraphType === PanelDisplay.VALUE ||
-									selectedGraphType === PanelDisplay.PIE
-										? 'Unit'
-										: 'Y Axis Unit'
-								}
-								// Only update the y-axis unit value automatically in create mode
-								shouldUpdateYAxisUnit={isNewDashboard}
-							/>
-						)}
-
-						{allowDecimalPrecision && (
-							<section className="decimal-precision-selector control-container">
-								<Typography.Text className="typography">
-									Decimal Precision
-								</Typography.Text>
-								<Select
-									options={[
-										{ label: '0 decimals', value: PrecisionOptionsEnum.ZERO },
-										{ label: '1 decimal', value: PrecisionOptionsEnum.ONE },
-										{ label: '2 decimals', value: PrecisionOptionsEnum.TWO },
-										{ label: '3 decimals', value: PrecisionOptionsEnum.THREE },
-										{ label: '4 decimals', value: PrecisionOptionsEnum.FOUR },
-										{
-											label: 'Full Precision',
-											value: PrecisionOptionsEnum.FULL,
-										},
-									]}
-									value={decimalPrecision}
-									style={{ width: '100%' }}
-									className="panel-type-select"
-									defaultValue={PrecisionOptionsEnum.TWO}
-									onChange={(val: PrecisionOption): void => setDecimalPrecision(val)}
-								/>
-							</section>
-						)}
-
-						{allowSoftMinMax && (
-							<section className="soft-min-max">
-								<section className="container">
-									<Typography.Text className="text">Soft Min</Typography.Text>
-									<InputNumber
-										type="number"
-										value={softMin}
-										onChange={softMinHandler}
-										rootClassName="input"
-									/>
-								</section>
-								<section className="container">
-									<Typography.Text className="text">Soft Max</Typography.Text>
-									<InputNumber
-										value={softMax}
-										type="number"
-										rootClassName="input"
-										onChange={softMaxHandler}
-									/>
-								</section>
-							</section>
-						)}
-
-						{allowLogScale && (
-							<section className="log-scale control-container">
-								<Typography.Text className="typography">Y Axis Scale</Typography.Text>
-								<Select
-									onChange={(value): void =>
-										setIsLogScale(value === LogScale.LOGARITHMIC)
-									}
-									value={isLogScale ? LogScale.LOGARITHMIC : LogScale.LINEAR}
-									style={{ width: '100%' }}
-									className="panel-type-select"
-									defaultValue={LogScale.LINEAR}
-								>
-									<Option value={LogScale.LINEAR}>
-										<div className="select-option">
-											<div className="icon">
-												<LineChart size={16} />
-											</div>
-											<Typography.Text className="display">Linear</Typography.Text>
-										</div>
-									</Option>
-									<Option value={LogScale.LOGARITHMIC}>
-										<div className="select-option">
-											<div className="icon">
-												<Spline size={16} />
-											</div>
-											<Typography.Text className="display">Logarithmic</Typography.Text>
-										</div>
-									</Option>
-								</Select>
-							</section>
-						)}
-					</SettingsSection>
+					</Space>
 				)}
 
-				{(allowLegendPosition || allowLegendColors) && (
-					<SettingsSection title="Legend" icon={<Layers size={14} />}>
-						{allowLegendPosition && (
-							<section className="legend-position control-container">
-								<Typography.Text className="typography">Position</Typography.Text>
-								<Select
-									onChange={(value: LegendPosition): void => setLegendPosition(value)}
-									value={legendPosition}
-									style={{ width: '100%' }}
-									className="panel-type-select"
-									defaultValue={LegendPosition.BOTTOM}
-								>
-									<Option value={LegendPosition.BOTTOM}>
-										<div className="select-option">
-											<Typography.Text className="display">Bottom</Typography.Text>
-										</div>
-									</Option>
-									<Option value={LegendPosition.RIGHT}>
-										<div className="select-option">
-											<Typography.Text className="display">Right</Typography.Text>
-										</div>
-									</Option>
-								</Select>
-							</section>
-						)}
+				{allowPanelTimePreference && (
+					<>
+						<Typography.Text className="panel-time-text">
+							Panel Time Preference
+						</Typography.Text>
+						<TimePreference
+							{...{
+								selectedTime,
+								setSelectedTime,
+							}}
+						/>
+					</>
+				)}
 
-						{allowLegendColors && (
-							<section className="legend-colors">
-								<LegendColors
-									customLegendColors={customLegendColors}
-									setCustomLegendColors={setCustomLegendColors}
-									queryResponse={queryResponse}
-								/>
-							</section>
-						)}
-					</SettingsSection>
+				{allowPanelColumnPreference && (
+					<ColumnUnitSelector
+						columnUnits={columnUnits}
+						setColumnUnits={setColumnUnits}
+						isNewDashboard={isNewDashboard}
+					/>
+				)}
+
+				{allowYAxisUnit && (
+					<DashboardYAxisUnitSelectorWrapper
+						onSelect={setYAxisUnit}
+						value={yAxisUnit || ''}
+						fieldLabel={
+							selectedGraphType === PanelDisplay.VALUE ||
+							selectedGraphType === PanelDisplay.PIE
+								? 'Unit'
+								: 'Y Axis Unit'
+						}
+						// Only update the y-axis unit value automatically in create mode
+						shouldUpdateYAxisUnit={isNewDashboard}
+					/>
+				)}
+
+				{allowDecimalPrecision && (
+					<section className="decimal-precision-selector">
+						<Typography.Text className="typography">
+							Decimal Precision
+						</Typography.Text>
+						<Select
+							options={[
+								{ label: '0 decimals', value: PrecisionOptionsEnum.ZERO },
+								{ label: '1 decimal', value: PrecisionOptionsEnum.ONE },
+								{ label: '2 decimals', value: PrecisionOptionsEnum.TWO },
+								{ label: '3 decimals', value: PrecisionOptionsEnum.THREE },
+								{ label: '4 decimals', value: PrecisionOptionsEnum.FOUR },
+								{ label: 'Full Precision', value: PrecisionOptionsEnum.FULL },
+							]}
+							value={decimalPrecision}
+							style={{ width: '100%' }}
+							className="panel-type-select"
+							defaultValue={PrecisionOptionsEnum.TWO}
+							onChange={(val: PrecisionOption): void => setDecimalPrecision(val)}
+						/>
+					</section>
+				)}
+
+				{allowSoftMinMax && (
+					<section className="soft-min-max">
+						<section className="container">
+							<Typography.Text className="text">Soft Min</Typography.Text>
+							<InputNumber
+								type="number"
+								value={softMin}
+								onChange={softMinHandler}
+								rootClassName="input"
+							/>
+						</section>
+						<section className="container">
+							<Typography.Text className="text">Soft Max</Typography.Text>
+							<InputNumber
+								value={softMax}
+								type="number"
+								rootClassName="input"
+								onChange={softMaxHandler}
+							/>
+						</section>
+					</section>
+				)}
+
+				{allowStackingBarChart && (
+					<section className="stack-chart">
+						<Typography.Text className="label">Stack series</Typography.Text>
+						<Switch
+							checked={stackedBarChart}
+							size="small"
+							onChange={(checked): void => setStackedBarChart(checked)}
+						/>
+					</section>
 				)}
 
 				{allowBucketConfig && (
-					<SettingsSection title="Histogram / Buckets">
-						<section className="bucket-config control-container">
-							<Typography.Text className="label">Number of buckets</Typography.Text>
-							<InputNumber
-								value={bucketCount || null}
-								type="number"
-								min={0}
-								rootClassName="bucket-input"
-								placeholder="Default: 30"
-								onChange={(val): void => {
-									setBucketCount(val || 0);
-								}}
-							/>
-							<Typography.Text className="label bucket-size-label">
-								Bucket width
+					<section className="bucket-config">
+						<Typography.Text className="label">Number of buckets</Typography.Text>
+						<InputNumber
+							value={bucketCount || null}
+							type="number"
+							min={0}
+							rootClassName="bucket-input"
+							placeholder="Default: 30"
+							onChange={(val): void => {
+								setBucketCount(val || 0);
+							}}
+						/>
+						<Typography.Text className="label bucket-size-label">
+							Bucket width
+						</Typography.Text>
+						<InputNumber
+							value={bucketWidth || null}
+							type="number"
+							precision={2}
+							placeholder="Default: Auto"
+							step={0.1}
+							min={0.0}
+							rootClassName="bucket-input"
+							onChange={(val): void => {
+								setBucketWidth(val || 0);
+							}}
+						/>
+						<section className="combine-hist">
+							<Typography.Text className="label">
+								Merge all series into one
 							</Typography.Text>
-							<InputNumber
-								value={bucketWidth || null}
-								type="number"
-								precision={2}
-								placeholder="Default: Auto"
-								step={0.1}
-								min={0.0}
-								rootClassName="bucket-input"
-								onChange={(val): void => {
-									setBucketWidth(val || 0);
-								}}
+							<Switch
+								checked={combineHistogram}
+								size="small"
+								onChange={(checked): void => setCombineHistogram(checked)}
 							/>
-							<section className="combine-hist">
-								<Typography.Text className="label">
-									Merge all series into one
-								</Typography.Text>
-								<Switch
-									checked={combineHistogram}
-									size="small"
-									onChange={(checked): void => setCombineHistogram(checked)}
-								/>
-							</section>
 						</section>
-					</SettingsSection>
+					</section>
+				)}
+
+				{allowLogScale && (
+					<section className="log-scale">
+						<Typography.Text className="typography">Y Axis Scale</Typography.Text>
+						<Select
+							onChange={(value): void => setIsLogScale(value === LogScale.LOGARITHMIC)}
+							value={isLogScale ? LogScale.LOGARITHMIC : LogScale.LINEAR}
+							style={{ width: '100%' }}
+							className="panel-type-select"
+							defaultValue={LogScale.LINEAR}
+						>
+							<Option value={LogScale.LINEAR}>
+								<div className="select-option">
+									<div className="icon">
+										<LineChart size={16} />
+									</div>
+									<Typography.Text className="display">Linear</Typography.Text>
+								</div>
+							</Option>
+							<Option value={LogScale.LOGARITHMIC}>
+								<div className="select-option">
+									<div className="icon">
+										<Spline size={16} />
+									</div>
+									<Typography.Text className="display">Logarithmic</Typography.Text>
+								</div>
+							</Option>
+						</Select>
+					</section>
+				)}
+
+				{allowLegendPosition && (
+					<section className="legend-position">
+						<Typography.Text className="typography">Legend Position</Typography.Text>
+						<Select
+							onChange={(value: LegendPosition): void => setLegendPosition(value)}
+							value={legendPosition}
+							style={{ width: '100%' }}
+							className="panel-type-select"
+							defaultValue={LegendPosition.BOTTOM}
+						>
+							<Option value={LegendPosition.BOTTOM}>
+								<div className="select-option">
+									<Typography.Text className="display">Bottom</Typography.Text>
+								</div>
+							</Option>
+							<Option value={LegendPosition.RIGHT}>
+								<div className="select-option">
+									<Typography.Text className="display">Right</Typography.Text>
+								</div>
+							</Option>
+						</Select>
+					</section>
+				)}
+
+				{allowLegendColors && (
+					<section className="legend-colors">
+						<LegendColors
+							customLegendColors={customLegendColors}
+							setCustomLegendColors={setCustomLegendColors}
+							queryResponse={queryResponse}
+						/>
+					</section>
 				)}
 			</section>
 
@@ -582,25 +541,17 @@ function RightContainer({
 			)}
 
 			{allowContextLinks && (
-				<SettingsSection
-					title="Context Links"
-					icon={<Link size={14} />}
-					defaultOpen={!!contextLinks.linksData.length}
-				>
+				<section className="context-links">
 					<ContextLinks
 						contextLinks={contextLinks}
 						setContextLinks={setContextLinks}
 						selectedWidget={selectedWidget}
 					/>
-				</SettingsSection>
+				</section>
 			)}
 
 			{allowThreshold && (
-				<SettingsSection
-					title="Thresholds"
-					icon={<Antenna size={14} />}
-					defaultOpen={!!thresholds.length}
-				>
+				<section>
 					<ThresholdSelector
 						thresholds={thresholds}
 						setThresholds={setThresholds}
@@ -608,7 +559,7 @@ function RightContainer({
 						selectedGraph={selectedGraph}
 						columnUnits={columnUnits}
 					/>
-				</SettingsSection>
+				</section>
 			)}
 		</div>
 	);

frontend/src/container/NewWidget/index.tsx

@@ -34,7 +34,6 @@ import { cloneDeep, defaultTo, isEmpty, isUndefined } from 'lodash-es';
 import { Check, X } from 'lucide-react';
 import { DashboardWidgetPageParams } from 'pages/DashboardWidget';
 import { useDashboard } from 'providers/Dashboard/Dashboard';
-import { useScrollToWidgetIdStore } from 'providers/Dashboard/helpers/scrollToWidgetIdHelper';
 import {
 	clearSelectedRowWidgetId,
 	getSelectedRowWidgetId,
@@ -87,12 +86,10 @@ function NewWidget({
 	enableDrillDown = false,
 }: NewWidgetProps): JSX.Element {
 	const { safeNavigate } = useSafeNavigate();
-	const setToScrollWidgetId = useScrollToWidgetIdStore(
-		(s) => s.setToScrollWidgetId,
-	);
 	const {
 		selectedDashboard,
 		setSelectedDashboard,
+		setToScrollWidgetId,
 		columnWidths,
 	} = useDashboard();
 

frontend/src/container/PanelWrapper/HistogramPanelWrapper.tsx

@@ -0,0 +1,180 @@
+import { useCallback, useEffect, useMemo, useRef } from 'react';
+import { ToggleGraphProps } from 'components/Graph/types';
+import Uplot from 'components/Uplot';
+import GraphManager from 'container/GridCardLayout/GridCard/FullView/GraphManager';
+import { getLocalStorageGraphVisibilityState } from 'container/GridCardLayout/GridCard/utils';
+import { getUplotClickData } from 'container/QueryTable/Drilldown/drilldownUtils';
+import useGraphContextMenu from 'container/QueryTable/Drilldown/useGraphContextMenu';
+import { useIsDarkMode } from 'hooks/useDarkMode';
+import { useResizeObserver } from 'hooks/useDimensions';
+import { getUplotHistogramChartOptions } from 'lib/uPlotLib/getUplotHistogramChartOptions';
+import _noop from 'lodash-es/noop';
+import { ContextMenu, useCoordinates } from 'periscope/components/ContextMenu';
+import { useDashboard } from 'providers/Dashboard/Dashboard';
+
+import { buildHistogramData } from './histogram';
+import { PanelWrapperProps } from './panelWrapper.types';
+
+function HistogramPanelWrapper({
+	queryResponse,
+	widget,
+	setGraphVisibility,
+	graphVisibility,
+	isFullViewMode,
+	onToggleModelHandler,
+	onClickHandler,
+	enableDrillDown = false,
+}: PanelWrapperProps): JSX.Element {
+	const graphRef = useRef<HTMLDivElement>(null);
+	const legendScrollPositionRef = useRef<number>(0);
+	const { toScrollWidgetId, setToScrollWidgetId } = useDashboard();
+	const isDarkMode = useIsDarkMode();
+	const containerDimensions = useResizeObserver(graphRef);
+	const {
+		coordinates,
+		popoverPosition,
+		clickedData,
+		onClose,
+		onClick,
+		subMenu,
+		setSubMenu,
+	} = useCoordinates();
+	const { menuItemsConfig } = useGraphContextMenu({
+		widgetId: widget.id || '',
+		query: widget.query,
+		graphData: clickedData,
+		onClose,
+		coordinates,
+		subMenu,
+		setSubMenu,
+		contextLinks: widget.contextLinks,
+		panelType: widget.panelTypes,
+		queryRange: queryResponse,
+	});
+
+	const clickHandlerWithContextMenu = useCallback(
+		(...args: any[]) => {
+			const [
+				,
+				,
+				,
+				,
+				metric,
+				queryData,
+				absoluteMouseX,
+				absoluteMouseY,
+				,
+				focusedSeries,
+			] = args;
+			const data = getUplotClickData({
+				metric,
+				queryData,
+				absoluteMouseX,
+				absoluteMouseY,
+				focusedSeries,
+			});
+			if (data && data?.record?.queryName) {
+				onClick(data.coord, { ...data.record, label: data.label });
+			}
+		},
+		[onClick],
+	);
+
+	const histogramData = buildHistogramData(
+		queryResponse.data?.payload.data.result,
+		widget?.bucketWidth,
+		widget?.bucketCount,
+		widget?.mergeAllActiveQueries,
+	);
+
+	useEffect(() => {
+		if (toScrollWidgetId === widget.id) {
+			graphRef.current?.scrollIntoView({
+				behavior: 'smooth',
+				block: 'center',
+			});
+			graphRef.current?.focus();
+			setToScrollWidgetId('');
+		}
+	}, [toScrollWidgetId, setToScrollWidgetId, widget.id]);
+	const lineChartRef = useRef<ToggleGraphProps>();
+
+	useEffect(() => {
+		const {
+			graphVisibilityStates: localStoredVisibilityState,
+		} = getLocalStorageGraphVisibilityState({
+			apiResponse: queryResponse.data?.payload.data.result || [],
+			name: widget.id,
+		});
+		if (setGraphVisibility) {
+			setGraphVisibility(localStoredVisibilityState);
+		}
+	}, [
+		queryResponse?.data?.payload?.data?.result,
+		setGraphVisibility,
+		widget.id,
+	]);
+
+	const histogramOptions = useMemo(
+		() =>
+			getUplotHistogramChartOptions({
+				id: widget.id,
+				dimensions: containerDimensions,
+				isDarkMode,
+				apiResponse: queryResponse.data?.payload,
+				histogramData,
+				panelType: widget.panelTypes,
+				setGraphsVisibilityStates: setGraphVisibility,
+				graphsVisibilityStates: graphVisibility,
+				mergeAllQueries: widget.mergeAllActiveQueries,
+				onClickHandler: enableDrillDown
+					? clickHandlerWithContextMenu
+					: onClickHandler ?? _noop,
+				legendScrollPosition: legendScrollPositionRef.current,
+				setLegendScrollPosition: (position: number) => {
+					legendScrollPositionRef.current = position;
+				},
+			}),
+		[
+			containerDimensions,
+			graphVisibility,
+			histogramData,
+			isDarkMode,
+			queryResponse.data?.payload,
+			setGraphVisibility,
+			widget.id,
+			widget.mergeAllActiveQueries,
+			widget.panelTypes,
+			clickHandlerWithContextMenu,
+			enableDrillDown,
+			onClickHandler,
+		],
+	);
+
+	return (
+		<div style={{ height: '100%', width: '100%' }} ref={graphRef}>
+			<Uplot options={histogramOptions} data={histogramData} ref={lineChartRef} />
+			<ContextMenu
+				coordinates={coordinates}
+				popoverPosition={popoverPosition}
+				title={menuItemsConfig.header as string}
+				items={menuItemsConfig.items}
+				onClose={onClose}
+			/>
+			{isFullViewMode && setGraphVisibility && !widget.mergeAllActiveQueries && (
+				<GraphManager
+					data={histogramData}
+					name={widget.id}
+					options={histogramOptions}
+					yAxisUnit={widget.yAxisUnit}
+					onToggleModelHandler={onToggleModelHandler}
+					setGraphsVisibilityStates={setGraphVisibility}
+					graphsVisibilityStates={graphVisibility}
+					lineChartRef={lineChartRef}
+				/>
+			)}
+		</div>
+	);
+}
+
+export default HistogramPanelWrapper;

frontend/src/container/PanelWrapper/UplotPanelWrapper.styles.scss

@@ -0,0 +1,4 @@
+.info-text {
+	margin-top: 8px;
+	padding: 8px;
+}

frontend/src/container/PanelWrapper/UplotPanelWrapper.tsx

@@ -0,0 +1,318 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { Alert } from 'antd';
+import { ToggleGraphProps } from 'components/Graph/types';
+import Uplot from 'components/Uplot';
+import { PANEL_TYPES } from 'constants/queryBuilder';
+import GraphManager from 'container/GridCardLayout/GridCard/FullView/GraphManager';
+import { getLocalStorageGraphVisibilityState } from 'container/GridCardLayout/GridCard/utils';
+import { getUplotClickData } from 'container/QueryTable/Drilldown/drilldownUtils';
+import useGraphContextMenu from 'container/QueryTable/Drilldown/useGraphContextMenu';
+import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
+import { useIsDarkMode } from 'hooks/useDarkMode';
+import { useResizeObserver } from 'hooks/useDimensions';
+import { getUPlotChartOptions } from 'lib/uPlotLib/getUplotChartOptions';
+import { getUPlotChartData } from 'lib/uPlotLib/utils/getUplotChartData';
+import { cloneDeep, isEqual, isUndefined } from 'lodash-es';
+import _noop from 'lodash-es/noop';
+import { ContextMenu, useCoordinates } from 'periscope/components/ContextMenu';
+import { useDashboard } from 'providers/Dashboard/Dashboard';
+import { useTimezone } from 'providers/Timezone';
+import { DataSource } from 'types/common/queryBuilder';
+import uPlot from 'uplot';
+import { getSortedSeriesData } from 'utils/getSortedSeriesData';
+import { getTimeRange } from 'utils/getTimeRange';
+
+import { PanelWrapperProps } from './panelWrapper.types';
+import { getTimeRangeFromStepInterval, isApmMetric } from './utils';
+
+import './UplotPanelWrapper.styles.scss';
+
+function UplotPanelWrapper({
+	queryResponse,
+	widget,
+	isFullViewMode,
+	setGraphVisibility,
+	graphVisibility,
+	onToggleModelHandler,
+	onClickHandler,
+	onDragSelect,
+	selectedGraph,
+	customTooltipElement,
+	customSeries,
+	enableDrillDown = false,
+}: PanelWrapperProps): JSX.Element {
+	const { toScrollWidgetId, setToScrollWidgetId } = useDashboard();
+	const isDarkMode = useIsDarkMode();
+	const lineChartRef = useRef<ToggleGraphProps>();
+	const graphRef = useRef<HTMLDivElement>(null);
+	const legendScrollPositionRef = useRef<{
+		scrollTop: number;
+		scrollLeft: number;
+	}>({
+		scrollTop: 0,
+		scrollLeft: 0,
+	});
+	const [minTimeScale, setMinTimeScale] = useState<number>();
+	const [maxTimeScale, setMaxTimeScale] = useState<number>();
+	const { currentQuery } = useQueryBuilder();
+
+	const [hiddenGraph, setHiddenGraph] = useState<{ [key: string]: boolean }>();
+
+	useEffect(() => {
+		if (toScrollWidgetId === widget.id) {
+			graphRef.current?.scrollIntoView({
+				behavior: 'smooth',
+				block: 'center',
+			});
+			graphRef.current?.focus();
+			setToScrollWidgetId('');
+		}
+	}, [toScrollWidgetId, setToScrollWidgetId, widget.id]);
+
+	useEffect((): void => {
+		const { startTime, endTime } = getTimeRange(queryResponse);
+
+		setMinTimeScale(startTime);
+		setMaxTimeScale(endTime);
+	}, [queryResponse]);
+
+	const containerDimensions = useResizeObserver(graphRef);
+
+	const {
+		coordinates,
+		popoverPosition,
+		clickedData,
+		onClose,
+		onClick,
+		subMenu,
+		setSubMenu,
+	} = useCoordinates();
+	const { menuItemsConfig } = useGraphContextMenu({
+		widgetId: widget.id || '',
+		query: widget.query,
+		graphData: clickedData,
+		onClose,
+		coordinates,
+		subMenu,
+		setSubMenu,
+		contextLinks: widget.contextLinks,
+		panelType: widget.panelTypes,
+		queryRange: queryResponse,
+	});
+
+	useEffect(() => {
+		const {
+			graphVisibilityStates: localStoredVisibilityState,
+		} = getLocalStorageGraphVisibilityState({
+			apiResponse: queryResponse.data?.payload.data.result || [],
+			name: widget.id,
+		});
+		if (setGraphVisibility) {
+			setGraphVisibility(localStoredVisibilityState);
+		}
+	}, [
+		queryResponse?.data?.payload?.data?.result,
+		setGraphVisibility,
+		widget.id,
+	]);
+
+	if (queryResponse.data && widget.panelTypes === PANEL_TYPES.BAR) {
+		const sortedSeriesData = getSortedSeriesData(
+			queryResponse.data?.payload.data.result,
+		);
+		queryResponse.data.payload.data.result = sortedSeriesData;
+	}
+
+	const stackedBarChart = useMemo(
+		() =>
+			(selectedGraph
+				? selectedGraph === PANEL_TYPES.BAR
+				: widget?.panelTypes === PANEL_TYPES.BAR) && widget?.stackedBarChart,
+		[selectedGraph, widget?.panelTypes, widget?.stackedBarChart],
+	);
+
+	const chartData = useMemo(
+		() =>
+			getUPlotChartData(
+				queryResponse?.data?.payload,
+				widget.fillSpans,
+				stackedBarChart,
+				hiddenGraph,
+			),
+		[
+			queryResponse?.data?.payload,
+			widget.fillSpans,
+			stackedBarChart,
+			hiddenGraph,
+		],
+	);
+
+	useEffect(() => {
+		if (widget.panelTypes === PANEL_TYPES.BAR && stackedBarChart) {
+			const graphV = cloneDeep(graphVisibility)?.slice(1);
+			const isSomeSelectedLegend = graphV?.some((v) => v === false);
+			if (isSomeSelectedLegend) {
+				const hiddenIndex = graphV?.findIndex((v) => v === true);
+				if (!isUndefined(hiddenIndex) && hiddenIndex !== -1) {
+					const updatedHiddenGraph = { [hiddenIndex]: true };
+					if (!isEqual(hiddenGraph, updatedHiddenGraph)) {
+						setHiddenGraph(updatedHiddenGraph);
+					}
+				}
+			}
+		}
+	}, [graphVisibility, hiddenGraph, widget.panelTypes, stackedBarChart]);
+
+	const { timezone } = useTimezone();
+
+	const clickHandlerWithContextMenu = useCallback(
+		(...args: any[]) => {
+			const [
+				xValue,
+				,
+				,
+				,
+				metric,
+				queryData,
+				absoluteMouseX,
+				absoluteMouseY,
+				axesData,
+				focusedSeries,
+			] = args;
+			const data = getUplotClickData({
+				metric,
+				queryData,
+				absoluteMouseX,
+				absoluteMouseY,
+				focusedSeries,
+			});
+			// Compute time range if needed and if axes data is available
+			let timeRange;
+			if (axesData && queryData?.queryName) {
+				// Get the compositeQuery from the response params
+				const compositeQuery = (queryResponse?.data?.params as any)?.compositeQuery;
+
+				if (compositeQuery?.queries) {
+					// Find the specific query by name from the queries array
+					const specificQuery = compositeQuery.queries.find(
+						(query: any) => query.spec?.name === queryData.queryName,
+					);
+
+					// Use the stepInterval from the specific query, fallback to default
+					const stepInterval = specificQuery?.spec?.stepInterval || 60;
+					timeRange = getTimeRangeFromStepInterval(
+						stepInterval,
+						metric?.clickedTimestamp || xValue, // Use the clicked timestamp if available, otherwise use the click position timestamp
+						specificQuery?.spec?.signal === DataSource.METRICS &&
+							isApmMetric(specificQuery?.spec?.aggregations[0]?.metricName),
+					);
+				}
+			}
+
+			if (data && data?.record?.queryName) {
+				onClick(data.coord, { ...data.record, label: data.label, timeRange });
+			}
+		},
+		[onClick, queryResponse],
+	);
+
+	const options = useMemo(
+		() =>
+			getUPlotChartOptions({
+				id: widget?.id,
+				apiResponse: queryResponse.data?.payload,
+				dimensions: containerDimensions,
+				isDarkMode,
+				onDragSelect,
+				yAxisUnit: widget?.yAxisUnit,
+				onClickHandler: enableDrillDown
+					? clickHandlerWithContextMenu
+					: onClickHandler ?? _noop,
+				thresholds: widget.thresholds,
+				minTimeScale,
+				maxTimeScale,
+				softMax: widget.softMax === undefined ? null : widget.softMax,
+				softMin: widget.softMin === undefined ? null : widget.softMin,
+				graphsVisibilityStates: graphVisibility,
+				setGraphsVisibilityStates: setGraphVisibility,
+				panelType: selectedGraph || widget.panelTypes,
+				currentQuery,
+				stackBarChart: stackedBarChart,
+				hiddenGraph,
+				setHiddenGraph,
+				customTooltipElement,
+				tzDate: (timestamp: number) =>
+					uPlot.tzDate(new Date(timestamp * 1e3), timezone.value),
+				timezone: timezone.value,
+				customSeries,
+				isLogScale: widget?.isLogScale,
+				colorMapping: widget?.customLegendColors,
+				enhancedLegend: true, // Enable enhanced legend
+				legendPosition: widget?.legendPosition,
+				query: widget?.query || currentQuery,
+				legendScrollPosition: legendScrollPositionRef.current,
+				setLegendScrollPosition: (position: {
+					scrollTop: number;
+					scrollLeft: number;
+				}) => {
+					legendScrollPositionRef.current = position;
+				},
+				decimalPrecision: widget.decimalPrecision,
+			}),
+		[
+			queryResponse.data?.payload,
+			containerDimensions,
+			isDarkMode,
+			onDragSelect,
+			clickHandlerWithContextMenu,
+			minTimeScale,
+			maxTimeScale,
+			graphVisibility,
+			setGraphVisibility,
+			selectedGraph,
+			currentQuery,
+			hiddenGraph,
+			customTooltipElement,
+			timezone.value,
+			customSeries,
+			enableDrillDown,
+			onClickHandler,
+			widget,
+			stackedBarChart,
+		],
+	);
+
+	return (
+		<div style={{ height: '100%', width: '100%' }} ref={graphRef}>
+			<Uplot options={options} data={chartData} ref={lineChartRef} />
+			<ContextMenu
+				coordinates={coordinates}
+				popoverPosition={popoverPosition}
+				title={menuItemsConfig.header as string}
+				items={menuItemsConfig.items}
+				onClose={onClose}
+			/>
+			{stackedBarChart && isFullViewMode && (
+				<Alert
+					message="Selecting multiple legends is currently not supported in case of stacked bar charts"
+					type="info"
+					className="info-text"
+				/>
+			)}
+			{isFullViewMode && setGraphVisibility && !stackedBarChart && (
+				<GraphManager
+					data={chartData}
+					name={widget.id}
+					options={options}
+					yAxisUnit={widget.yAxisUnit}
+					onToggleModelHandler={onToggleModelHandler}
+					setGraphsVisibilityStates={setGraphVisibility}
+					graphsVisibilityStates={graphVisibility}
+					lineChartRef={lineChartRef}
+				/>
+			)}
+		</div>
+	);
+}
+
+export default UplotPanelWrapper;

frontend/src/container/SideNav/config.ts

@@ -38,7 +38,6 @@ export const routeConfig: Record<string, QueryParams[]> = {
 	[ROUTES.MY_SETTINGS]: [QueryParams.resourceAttributes],
 	[ROUTES.NOT_FOUND]: [QueryParams.resourceAttributes],
 	[ROUTES.ORG_SETTINGS]: [QueryParams.resourceAttributes],
-	[ROUTES.MEMBERS_SETTINGS]: [QueryParams.resourceAttributes],
 	[ROUTES.PASSWORD_RESET]: [QueryParams.resourceAttributes],
 	[ROUTES.SETTINGS]: [QueryParams.resourceAttributes],
 	[ROUTES.SIGN_UP]: [QueryParams.resourceAttributes],

frontend/src/hooks/useAuthZ/permissions.type.ts

@@ -23,10 +23,10 @@ export default {
 		relations: {
 			assignee: ['role'],
 			create: ['metaresources'],
-			delete: ['user', 'serviceaccount', 'role', 'organization', 'metaresource'],
+			delete: ['user', 'role', 'organization', 'metaresource'],
 			list: ['metaresources'],
-			read: ['user', 'serviceaccount', 'role', 'organization', 'metaresource'],
-			update: ['user', 'serviceaccount', 'role', 'organization', 'metaresource'],
+			read: ['user', 'role', 'organization', 'metaresource'],
+			update: ['user', 'role', 'organization', 'metaresource'],
 		},
 	},
 } as const;

frontend/src/lib/uPlotV2/components/UPlotChart.tsx

@@ -7,7 +7,6 @@ import ErrorBoundaryFallback from 'pages/ErrorBoundaryFallback/ErrorBoundaryFall
 import uPlot, { AlignedData, Options } from 'uplot';
 
 import { usePlotContext } from '../context/PlotContext';
-import { applySpanGapsToAlignedData } from '../utils/dataUtils';
 import { UPlotChartProps } from './types';
 
 /**
@@ -85,13 +84,7 @@ export default function UPlotChart({
 		} as Options;
 
 		// Create new plot instance
-		const seriesSpanGaps = config.getSeriesSpanGapsOptions();
-		const preparedData =
-			seriesSpanGaps.length > 0
-				? applySpanGapsToAlignedData(data as AlignedData, seriesSpanGaps)
-				: (data as AlignedData);
-
-		const plot = new uPlot(plotConfig, preparedData, containerRef.current);
+		const plot = new uPlot(plotConfig, data as AlignedData, containerRef.current);
 
 		if (plotRef) {
 			plotRef(plot);
@@ -169,13 +162,7 @@ export default function UPlotChart({
 		}
 		// Update data if only data changed
 		else if (!sameData(prevProps, currentProps) && plotInstanceRef.current) {
-			const seriesSpanGaps = config.getSeriesSpanGapsOptions?.() ?? [];
-			const preparedData =
-				seriesSpanGaps.length > 0
-					? applySpanGapsToAlignedData(data as AlignedData, seriesSpanGaps)
-					: (data as AlignedData);
-
-			plotInstanceRef.current.setData(preparedData as AlignedData);
+			plotInstanceRef.current.setData(data as AlignedData);
 		}
 
 		prevPropsRef.current = currentProps;

frontend/src/lib/uPlotV2/config/UPlotConfigBuilder.ts

@@ -14,7 +14,6 @@ import {
 	STEP_INTERVAL_MULTIPLIER,
 } from '../constants';
 import { calculateWidthBasedOnStepInterval } from '../utils';
-import { SeriesSpanGapsOption } from '../utils/dataUtils';
 import {
 	ConfigBuilder,
 	ConfigBuilderProps,
@@ -162,13 +161,6 @@ export class UPlotConfigBuilder extends ConfigBuilder<
 		this.series.push(new UPlotSeriesBuilder(props));
 	}
 
-	getSeriesSpanGapsOptions(): SeriesSpanGapsOption[] {
-		return this.series.map((s) => {
-			const { spanGaps } = s.props;
-			return { spanGaps };
-		});
-	}
-
 	/**
 	 * Add a hook for extensibility
 	 */

frontend/src/lib/uPlotV2/config/UPlotSeriesBuilder.ts

@@ -201,12 +201,7 @@ export class UPlotSeriesBuilder extends ConfigBuilder<SeriesProps, Series> {
 		return {
 			scale: scaleKey,
 			label,
-			// When spanGaps is numeric, we always disable uPlot's internal
-			// spanGaps behavior and rely on data-prep to implement the
-			// threshold-based null handling. When spanGaps is boolean we
-			// map it directly. When spanGaps is undefined we fall back to
-			// the default of false.
-			spanGaps: typeof spanGaps === 'number' ? false : !!spanGaps,
+			spanGaps: typeof spanGaps === 'boolean' ? spanGaps : false,
 			value: (): string => '',
 			pxAlign: true,
 			show,

frontend/src/lib/uPlotV2/config/__tests__/UPlotSeriesBuilder.test.ts

@@ -45,37 +45,6 @@ describe('UPlotSeriesBuilder', () => {
 		expect(typeof config.value).toBe('function');
 	});
 
-	it('maps boolean spanGaps directly to uPlot spanGaps', () => {
-		const trueBuilder = new UPlotSeriesBuilder(
-			createBaseProps({
-				spanGaps: true,
-			}),
-		);
-		const falseBuilder = new UPlotSeriesBuilder(
-			createBaseProps({
-				spanGaps: false,
-			}),
-		);
-
-		const trueConfig = trueBuilder.getConfig();
-		const falseConfig = falseBuilder.getConfig();
-
-		expect(trueConfig.spanGaps).toBe(true);
-		expect(falseConfig.spanGaps).toBe(false);
-	});
-
-	it('disables uPlot spanGaps when spanGaps is a number', () => {
-		const builder = new UPlotSeriesBuilder(
-			createBaseProps({
-				spanGaps: 10000,
-			}),
-		);
-
-		const config = builder.getConfig();
-
-		expect(config.spanGaps).toBe(false);
-	});
-
 	it('uses explicit lineColor when provided, regardless of mapping', () => {
 		const builder = new UPlotSeriesBuilder(
 			createBaseProps({

frontend/src/lib/uPlotV2/config/types.ts

@@ -175,16 +175,7 @@ export interface SeriesProps extends LineConfig, PointsConfig, BarConfig {
 	pointsFilter?: Series.Points.Filter;
 	pointsBuilder?: Series.Points.Show;
 	show?: boolean;
-	/**
-	 * Controls how nulls are treated for this series.
-	 *
-	 * - boolean: mapped directly to uPlot's spanGaps behavior
-	 * - number: interpreted as an X-axis threshold (same unit as ref values),
-	 *           where gaps smaller than this threshold are spanned by
-	 *           converting short null runs to undefined during data prep
-	 *           while uPlot's internal spanGaps is kept disabled.
-	 */
-	spanGaps?: boolean | number;
+	spanGaps?: boolean;
 	fillColor?: string;
 	isDarkMode?: boolean;
 	stepInterval?: number;

frontend/src/lib/uPlotV2/utils/__tests__/dataUtils.test.ts

@@ -1,11 +1,4 @@
-import uPlot from 'uplot';
-
-import {
-	applySpanGapsToAlignedData,
-	isInvalidPlotValue,
-	normalizePlotValue,
-	SeriesSpanGapsOption,
-} from '../dataUtils';
+import { isInvalidPlotValue, normalizePlotValue } from '../dataUtils';
 
 describe('dataUtils', () => {
 	describe('isInvalidPlotValue', () => {
@@ -66,56 +59,4 @@ describe('dataUtils', () => {
 			expect(normalizePlotValue(42.5)).toBe(42.5);
 		});
 	});
-
-	describe('applyspanGapsToAlignedData', () => {
-		const xs: uPlot.AlignedData[0] = [0, 10, 20, 30];
-
-		it('returns original data when there are no series', () => {
-			const data: uPlot.AlignedData = [xs];
-			const result = applySpanGapsToAlignedData(data, []);
-
-			expect(result).toBe(data);
-		});
-
-		it('leaves data unchanged when spanGaps is undefined', () => {
-			const ys = [1, null, 2, null];
-			const data: uPlot.AlignedData = [xs, ys];
-			const options: SeriesSpanGapsOption[] = [{}];
-
-			const result = applySpanGapsToAlignedData(data, options);
-
-			expect(result[1]).toEqual(ys);
-		});
-
-		it('converts nulls to undefined when spanGaps is true', () => {
-			const ys = [1, null, 2, null];
-			const data: uPlot.AlignedData = [xs, ys];
-			const options: SeriesSpanGapsOption[] = [{ spanGaps: true }];
-
-			const result = applySpanGapsToAlignedData(data, options);
-
-			expect(result[1]).toEqual([1, undefined, 2, undefined]);
-		});
-
-		it('leaves data unchanged when spanGaps is false', () => {
-			const ys = [1, null, 2, null];
-			const data: uPlot.AlignedData = [xs, ys];
-			const options: SeriesSpanGapsOption[] = [{ spanGaps: false }];
-
-			const result = applySpanGapsToAlignedData(data, options);
-
-			expect(result[1]).toEqual(ys);
-		});
-
-		it('runs threshold-based null handling when spanGaps is numeric', () => {
-			const ys = [1, null, null, 2];
-			const data: uPlot.AlignedData = [xs, ys];
-			const options: SeriesSpanGapsOption[] = [{ spanGaps: 25 }];
-
-			const result = applySpanGapsToAlignedData(data, options);
-
-			// gap between x=0 and x=30 is 30, so with threshold 25 it should stay null
-			expect(result[1]).toEqual([1, null, null, 2]);
-		});
-	});
 });

frontend/src/lib/uPlotV2/utils/__tests__/nullHandling.test.ts

@@ -1,39 +0,0 @@
-import { nullToUndefThreshold } from '../nullHandling';
-
-describe('nullToUndefThreshold', () => {
-	it('converts short null gaps to undefined', () => {
-		const xs = [0, 10, 20, 30, 40];
-		const ys: Array<number | null | undefined> = [1, null, null, 2, 3];
-
-		const result = nullToUndefThreshold(xs, ys, 25);
-
-		expect(result).toEqual([1, undefined, undefined, 2, 3]);
-	});
-
-	it('keeps long null gaps as null', () => {
-		const xs = [0, 10, 100, 200];
-		const ys: Array<number | null | undefined> = [1, null, null, 2];
-
-		const result = nullToUndefThreshold(xs, ys, 50);
-
-		expect(result).toEqual([1, null, null, 2]);
-	});
-
-	it('leaves leading and trailing nulls as-is', () => {
-		const xs = [0, 10, 20, 30];
-		const ys: Array<number | null | undefined> = [null, null, 1, null];
-
-		const result = nullToUndefThreshold(xs, ys, 50);
-
-		expect(result).toEqual([null, null, 1, null]);
-	});
-
-	it('is a no-op when there are no nulls', () => {
-		const xs = [0, 10, 20];
-		const ys: Array<number | null | undefined> = [1, 2, 3];
-
-		const result = nullToUndefThreshold(xs, ys, 50);
-
-		expect(result).toEqual([1, 2, 3]);
-	});
-});

frontend/src/lib/uPlotV2/utils/dataUtils.ts

@@ -1,5 +1,3 @@
-import { nullToUndefThreshold } from './nullHandling';
-
 /**
  * Checks if a value is invalid for plotting
  *
@@ -53,52 +51,3 @@ export function normalizePlotValue(
 	// Already a valid number
 	return value as number;
 }
-
-export interface SeriesSpanGapsOption {
-	spanGaps?: boolean | number;
-}
-
-/**
- * Apply per-series spanGaps (boolean | threshold) handling to an aligned dataset.
- *
- * The input data is expected to be of the form:
- * [xValues, series1Values, series2Values, ...]
- */
-export function applySpanGapsToAlignedData(
-	data: uPlot.AlignedData,
-	seriesOptions: SeriesSpanGapsOption[],
-): uPlot.AlignedData {
-	const [xValues, ...seriesValues] = data;
-
-	if (!Array.isArray(xValues) || seriesValues.length === 0) {
-		return data;
-	}
-
-	const transformedSeries = seriesValues.map((ys, idx) => {
-		const { spanGaps } = seriesOptions[idx] || {};
-
-		if (spanGaps === undefined) {
-			return ys;
-		}
-
-		if (typeof spanGaps === 'boolean') {
-			if (!spanGaps) {
-				return ys;
-			}
-
-			// spanGaps === true -> treat nulls as soft gaps (convert to undefined)
-			return (ys as Array<number | null | undefined>).map((v) =>
-				v === null ? undefined : v,
-			) as uPlot.AlignedData[0];
-		}
-
-		// Numeric spanGaps: threshold-based null handling
-		return nullToUndefThreshold(
-			xValues as uPlot.AlignedData[0],
-			ys as Array<number | null | undefined>,
-			spanGaps,
-		);
-	});
-
-	return [xValues, ...transformedSeries] as uPlot.AlignedData;
-}

frontend/src/lib/uPlotV2/utils/nullHandling.ts

@@ -1,73 +0,0 @@
-import { AlignedData } from 'uplot';
-
-/**
- * Convert short runs of nulls between two defined points into undefined so that
- * uPlot treats them as "no point" but keeps the line continuous for gaps
- * smaller than the provided time threshold.
- */
-
-type AlignedXValues = AlignedData[0];
-type YValues = Array<number | null | undefined>;
-
-interface GapArgs {
-	xValues: AlignedXValues;
-	yValues: YValues;
-	maxGapThreshold: number;
-	startIndex: number;
-	endIndex: number;
-}
-
-function spanShortGap(args: GapArgs): void {
-	const { xValues, yValues, maxGapThreshold, startIndex, endIndex } = args;
-
-	const gapSize = xValues[endIndex] - xValues[startIndex];
-	if (gapSize >= maxGapThreshold) {
-		return;
-	}
-
-	for (let index = startIndex + 1; index < endIndex; index += 1) {
-		if (yValues[index] === null || yValues[index] === undefined) {
-			// Use undefined to indicate "no sample" so the line can span
-			yValues[index] = undefined;
-		}
-	}
-}
-
-export function nullToUndefThreshold(
-	xValues: AlignedXValues,
-	yValues: YValues,
-	maxGapThreshold: number,
-): YValues {
-	if (!Array.isArray(xValues) || !Array.isArray(yValues)) {
-		return yValues;
-	}
-
-	const length = Math.min(xValues.length, yValues.length);
-	if (length === 0 || maxGapThreshold <= 0) {
-		return yValues;
-	}
-
-	let previousDefinedIndex: number | null = null;
-
-	for (let index = 0; index < length; index += 1) {
-		const value = yValues[index];
-
-		if (value === null || value === undefined) {
-			continue;
-		}
-
-		if (previousDefinedIndex !== null && index - previousDefinedIndex > 1) {
-			spanShortGap({
-				xValues,
-				yValues,
-				maxGapThreshold,
-				startIndex: previousDefinedIndex,
-				endIndex: index,
-			});
-		}
-
-		previousDefinedIndex = index;
-	}
-
-	return yValues;
-}

frontend/src/pages/Settings/Settings.tsx

@@ -63,7 +63,6 @@ function SettingsPage(): JSX.Element {
 						isAdmin &&
 						(item.key === ROUTES.BILLING ||
 							item.key === ROUTES.ORG_SETTINGS ||
-							item.key === ROUTES.MEMBERS_SETTINGS ||
 							item.key === ROUTES.MY_SETTINGS ||
 							item.key === ROUTES.SHORTCUTS)
 					),

frontend/src/pages/Settings/utils.ts

@@ -36,7 +36,6 @@ export const getRoutes = (
 	if (isWorkspaceBlocked && isAdmin) {
 		settings.push(
 			...organizationSettings(t),
-			...membersSettings(t),
 			...mySettings(t),
 			...billingSettings(t),
 			...keyboardShortcuts(t),

frontend/src/providers/Dashboard/Dashboard.tsx

@@ -75,6 +75,8 @@ export const DashboardContext = createContext<IDashboardContext>({
 	setLayouts: () => {},
 	setSelectedDashboard: () => {},
 	updatedTimeRef: {} as React.MutableRefObject<Dayjs | null>,
+	toScrollWidgetId: '',
+	setToScrollWidgetId: () => {},
 	updateLocalStorageDashboardVariables: () => {},
 	dashboardQueryRangeCalled: false,
 	setDashboardQueryRangeCalled: () => {},
@@ -93,6 +95,8 @@ export function DashboardProvider({
 }: PropsWithChildren): JSX.Element {
 	const [isDashboardSliderOpen, setIsDashboardSlider] = useState<boolean>(false);
 
+	const [toScrollWidgetId, setToScrollWidgetId] = useState<string>('');
+
 	const [isDashboardLocked, setIsDashboardLocked] = useState<boolean>(false);
 
 	const [
@@ -439,6 +443,7 @@ export function DashboardProvider({
 
 	const value: IDashboardContext = useMemo(
 		() => ({
+			toScrollWidgetId,
 			isDashboardSliderOpen,
 			isDashboardLocked,
 			handleToggleDashboardSlider,
@@ -452,6 +457,7 @@ export function DashboardProvider({
 			setPanelMap,
 			setSelectedDashboard,
 			updatedTimeRef,
+			setToScrollWidgetId,
 			updateLocalStorageDashboardVariables,
 			dashboardQueryRangeCalled,
 			setDashboardQueryRangeCalled,
@@ -468,6 +474,7 @@ export function DashboardProvider({
 			dashboardId,
 			layouts,
 			panelMap,
+			toScrollWidgetId,
 			updateLocalStorageDashboardVariables,
 			currentDashboard,
 			dashboardQueryRangeCalled,

frontend/src/providers/Dashboard/helpers/scrollToWidgetIdHelper.ts

@@ -1,13 +0,0 @@
-import { create } from 'zustand';
-
-interface ScrollToWidgetIdState {
-	toScrollWidgetId: string;
-	setToScrollWidgetId: (widgetId: string) => void;
-}
-
-export const useScrollToWidgetIdStore = create<ScrollToWidgetIdState>(
-	(set) => ({
-		toScrollWidgetId: '',
-		setToScrollWidgetId: (widgetId): void => set({ toScrollWidgetId: widgetId }),
-	}),
-);

frontend/src/providers/Dashboard/types.ts

@@ -23,6 +23,8 @@ export interface IDashboardContext {
 		React.SetStateAction<Dashboard | undefined>
 	>;
 	updatedTimeRef: React.MutableRefObject<dayjs.Dayjs | null>;
+	toScrollWidgetId: string;
+	setToScrollWidgetId: React.Dispatch<React.SetStateAction<string>>;
 	updateLocalStorageDashboardVariables: (
 		id: string,
 		selectedValue:

frontend/src/utils/maskedKey.ts

@@ -1,9 +0,0 @@
-/**
- * Masks a key string, showing only the first 2 and last 2 characters.
- */
-export function getMaskedKey(key: string): string {
-	if (!key || key.length < 4) {
-		return key || 'N/A';
-	}
-	return `${key.substring(0, 2)}·······${key.slice(-2).trim()}`;
-}

pkg/alertmanager/service.go

@@ -72,7 +72,7 @@ func (service *Service) SyncServers(ctx context.Context) error {
 
 	service.serversMtx.Lock()
 	for _, org := range orgs {
-		config, _, err := service.getConfig(ctx, org.ID.StringValue())
+		config, err := service.getConfig(ctx, org.ID.StringValue())
 		if err != nil {
 			service.settings.Logger().ErrorContext(ctx, "failed to get alertmanager config for org", "org_id", org.ID.StringValue(), "error", err)
 			continue
@@ -171,7 +171,7 @@ func (service *Service) Stop(ctx context.Context) error {
 }
 
 func (service *Service) newServer(ctx context.Context, orgID string) (*alertmanagerserver.Server, error) {
-	config, storedHash, err := service.getConfig(ctx, orgID)
+	config, err := service.getConfig(ctx, orgID)
 	if err != nil {
 		return nil, err
 	}
@@ -181,16 +181,13 @@ func (service *Service) newServer(ctx context.Context, orgID string) (*alertmana
 		return nil, err
 	}
 
+	beforeCompareAndSelectHash := config.StoreableConfig().Hash
 	config, err = service.compareAndSelectConfig(ctx, config)
 	if err != nil {
 		return nil, err
 	}
 
-	// compare against the hash of the config stored in the DB (before overlays
-	// were applied by getConfig). This ensures that overlay changes (e.g. new
-	// defaults from an upstream upgrade or something similar) trigger a DB update
-	// so that other code paths reading directly from the store see the up-to-date config.
-	if storedHash == config.StoreableConfig().Hash {
+	if beforeCompareAndSelectHash == config.StoreableConfig().Hash {
 		service.settings.Logger().DebugContext(ctx, "skipping config store update for org", "org_id", orgID, "hash", config.StoreableConfig().Hash)
 		return server, nil
 	}
@@ -203,33 +200,27 @@ func (service *Service) newServer(ctx context.Context, orgID string) (*alertmana
 	return server, nil
 }
 
-// getConfig returns the config for the given orgID with overlays applied, along
-// with the hash that was stored in the DB before overlays. When no config exists
-// in the store yet the stored hash is empty.
-func (service *Service) getConfig(ctx context.Context, orgID string) (*alertmanagertypes.Config, string, error) {
+func (service *Service) getConfig(ctx context.Context, orgID string) (*alertmanagertypes.Config, error) {
 	config, err := service.configStore.Get(ctx, orgID)
-	var storedHash string
 	if err != nil {
 		if !errors.Ast(err, errors.TypeNotFound) {
-			return nil, "", err
+			return nil, err
 		}
 
 		config, err = alertmanagertypes.NewDefaultConfig(service.config.Global, service.config.Route, orgID)
 		if err != nil {
-			return nil, "", err
+			return nil, err
 		}
-	} else {
-		storedHash = config.StoreableConfig().Hash
 	}
 
 	if err := config.SetGlobalConfig(service.config.Global); err != nil {
-		return nil, "", err
+		return nil, err
 	}
 	if err := config.SetRouteConfig(service.config.Route); err != nil {
-		return nil, "", err
+		return nil, err
 	}
 
-	return config, storedHash, nil
+	return config, nil
 }
 
 func (service *Service) compareAndSelectConfig(ctx context.Context, incomingConfig *alertmanagertypes.Config) (*alertmanagertypes.Config, error) {

pkg/authz/openfgaschema/base.fga

@@ -2,11 +2,9 @@ module base
 
 type user
 
-type serviceaccount 
-
 type role 
   relations
-    define assignee: [user, serviceaccount]
+    define assignee: [user]
 
 type organisation 
   relations

pkg/modules/serviceaccount/implserviceaccount/module.go

@@ -33,7 +33,7 @@ func (module *module) Create(ctx context.Context, orgID valuer.UUID, serviceAcco
 	}
 
 	// authz actions cannot run in sql transactions
-	err = module.authz.Grant(ctx, orgID, serviceAccount.Roles, authtypes.MustNewSubject(authtypes.TypeableServiceAccount, serviceAccount.ID.String(), orgID, nil))
+	err = module.authz.Grant(ctx, orgID, serviceAccount.Roles, authtypes.MustNewSubject(authtypes.TypeableUser, serviceAccount.ID.String(), orgID, nil))
 	if err != nil {
 		return err
 	}
@@ -138,7 +138,7 @@ func (module *module) Update(ctx context.Context, orgID valuer.UUID, input *serv
 
 	// gets the role diff if any to modify grants.
 	grants, revokes := serviceAccount.PatchRoles(input)
-	err = module.authz.ModifyGrant(ctx, orgID, revokes, grants, authtypes.MustNewSubject(authtypes.TypeableServiceAccount, serviceAccount.ID.String(), orgID, nil))
+	err = module.authz.ModifyGrant(ctx, orgID, revokes, grants, authtypes.MustNewSubject(authtypes.TypeableUser, serviceAccount.ID.String(), orgID, nil))
 	if err != nil {
 		return err
 	}
@@ -203,7 +203,7 @@ func (module *module) Delete(ctx context.Context, orgID valuer.UUID, id valuer.U
 	}
 
 	// revoke from authz first as this cannot run in sql transaction
-	err = module.authz.Revoke(ctx, orgID, serviceAccount.Roles, authtypes.MustNewSubject(authtypes.TypeableServiceAccount, serviceAccount.ID.String(), orgID, nil))
+	err = module.authz.Revoke(ctx, orgID, serviceAccount.Roles, authtypes.MustNewSubject(authtypes.TypeableUser, serviceAccount.ID.String(), orgID, nil))
 	if err != nil {
 		return err
 	}
@@ -309,7 +309,7 @@ func (module *module) RevokeFactorAPIKey(ctx context.Context, serviceAccountID v
 }
 
 func (module *module) disableServiceAccount(ctx context.Context, orgID valuer.UUID, input *serviceaccounttypes.ServiceAccount) error {
-	err := module.authz.Revoke(ctx, orgID, input.Roles, authtypes.MustNewSubject(authtypes.TypeableServiceAccount, input.ID.String(), orgID, nil))
+	err := module.authz.Revoke(ctx, orgID, input.Roles, authtypes.MustNewSubject(authtypes.TypeableUser, input.ID.String(), orgID, nil))
 	if err != nil {
 		return err
 	}
@@ -337,7 +337,7 @@ func (module *module) disableServiceAccount(ctx context.Context, orgID valuer.UU
 }
 
 func (module *module) activateServiceAccount(ctx context.Context, orgID valuer.UUID, input *serviceaccounttypes.ServiceAccount) error {
-	err := module.authz.Grant(ctx, orgID, input.Roles, authtypes.MustNewSubject(authtypes.TypeableServiceAccount, input.ID.String(), orgID, nil))
+	err := module.authz.Grant(ctx, orgID, input.Roles, authtypes.MustNewSubject(authtypes.TypeableUser, input.ID.String(), orgID, nil))
 	if err != nil {
 		return err
 	}

pkg/modules/tracefunnel/impltracefunnel/handler.go

@@ -21,7 +21,7 @@ func NewHandler(module tracefunnel.Module) tracefunnel.Handler {
 	return &handler{module: module}
 }
 
-func (handler *handler) New(rw http.ResponseWriter, r *http.Request) {
+func (handler *handler) Create(rw http.ResponseWriter, r *http.Request) {
 	var req tf.PostableFunnel
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		render.Error(rw, err)
@@ -34,7 +34,7 @@ func (handler *handler) New(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	funnel, err := handler.module.Create(r.Context(), req.Timestamp, req.Name, valuer.MustNewUUID(claims.UserID), valuer.MustNewUUID(claims.OrgID))
+	funnel, err := handler.module.Create(r.Context(), req.Name, claims.Email, valuer.MustNewUUID(claims.OrgID))
 	if err != nil {
 		render.Error(rw, errors.Newf(errors.TypeInvalidInput,
 			errors.CodeInvalidInput,
@@ -42,7 +42,7 @@ func (handler *handler) New(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	response := tf.ConstructFunnelResponse(funnel, &claims)
+	response := tf.ConstructFunnelResponse(funnel)
 	render.Success(rw, http.StatusOK, response)
 }
 
@@ -59,12 +59,6 @@ func (handler *handler) UpdateSteps(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	updatedAt, err := tf.ValidateAndConvertTimestamp(req.Timestamp)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
 	funnel, err := handler.module.Get(r.Context(), req.FunnelID, valuer.MustNewUUID(claims.OrgID))
 	if err != nil {
 		render.Error(rw, errors.Newf(errors.TypeInvalidInput,
@@ -79,33 +73,15 @@ func (handler *handler) UpdateSteps(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	funnel.Steps = steps
-	funnel.UpdatedAt = updatedAt
-	funnel.UpdatedBy = claims.UserID
-
-	if req.Name != "" {
-		funnel.Name = req.Name
-	}
-	if req.Description != "" {
-		funnel.Description = req.Description
-	}
-
-	if err := handler.module.Update(r.Context(), funnel, valuer.MustNewUUID(claims.UserID)); err != nil {
+	funnel.Update(req.Name, req.Description, steps, claims.Email)
+	if err := handler.module.Update(r.Context(), funnel); err != nil {
 		render.Error(rw, errors.Newf(errors.TypeInvalidInput,
 			errors.CodeInvalidInput,
 			"failed to update funnel in database: %v", err))
 		return
 	}
 
-	updatedFunnel, err := handler.module.Get(r.Context(), funnel.ID, valuer.MustNewUUID(claims.OrgID))
-	if err != nil {
-		render.Error(rw, errors.Newf(errors.TypeInvalidInput,
-			errors.CodeInvalidInput,
-			"failed to get updated funnel: %v", err))
-		return
-	}
-
-	response := tf.ConstructFunnelResponse(updatedFunnel, &claims)
+	response := tf.ConstructFunnelResponse(funnel)
 	render.Success(rw, http.StatusOK, response)
 }
 
@@ -122,12 +98,6 @@ func (handler *handler) UpdateFunnel(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	updatedAt, err := tf.ValidateAndConvertTimestamp(req.Timestamp)
-	if err != nil {
-		render.Error(rw, err)
-		return
-	}
-
 	vars := mux.Vars(r)
 	funnelID := vars["funnel_id"]
 
@@ -139,32 +109,15 @@ func (handler *handler) UpdateFunnel(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	funnel.UpdatedAt = updatedAt
-	funnel.UpdatedBy = claims.UserID
-
-	if req.Name != "" {
-		funnel.Name = req.Name
-	}
-	if req.Description != "" {
-		funnel.Description = req.Description
-	}
-
-	if err := handler.module.Update(r.Context(), funnel, valuer.MustNewUUID(claims.UserID)); err != nil {
+	funnel.Update(req.Name, req.Description, nil, claims.Email)
+	if err := handler.module.Update(r.Context(), funnel); err != nil {
 		render.Error(rw, errors.Newf(errors.TypeInvalidInput,
 			errors.CodeInvalidInput,
 			"failed to update funnel in database: %v", err))
 		return
 	}
 
-	updatedFunnel, err := handler.module.Get(r.Context(), funnel.ID, valuer.MustNewUUID(claims.OrgID))
-	if err != nil {
-		render.Error(rw, errors.Newf(errors.TypeInvalidInput,
-			errors.CodeInvalidInput,
-			"failed to get updated funnel: %v", err))
-		return
-	}
-
-	response := tf.ConstructFunnelResponse(updatedFunnel, &claims)
+	response := tf.ConstructFunnelResponse(funnel)
 	render.Success(rw, http.StatusOK, response)
 }
 
@@ -185,7 +138,7 @@ func (handler *handler) List(rw http.ResponseWriter, r *http.Request) {
 
 	var response []tf.GettableFunnel
 	for _, f := range funnels {
-		response = append(response, tf.ConstructFunnelResponse(f, &claims))
+		response = append(response, tf.ConstructFunnelResponse(f))
 	}
 
 	render.Success(rw, http.StatusOK, response)
@@ -209,7 +162,7 @@ func (handler *handler) Get(rw http.ResponseWriter, r *http.Request) {
 			"funnel not found: %v", err))
 		return
 	}
-	response := tf.ConstructFunnelResponse(funnel, &claims)
+	response := tf.ConstructFunnelResponse(funnel)
 	render.Success(rw, http.StatusOK, response)
 }
 

pkg/modules/tracefunnel/impltracefunnel/handler_test.go

@@ -1,173 +0,0 @@
-package impltracefunnel
-
-import (
-	"context"
-	"encoding/json"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
-	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/gorilla/mux"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-type MockModule struct {
-	mock.Mock
-}
-
-func (m *MockModule) Create(ctx context.Context, timestamp int64, name string, userID valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
-	args := m.Called(ctx, timestamp, name, userID, orgID)
-	return args.Get(0).(*traceFunnels.StorableFunnel), args.Error(1)
-}
-
-func (m *MockModule) Get(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
-	args := m.Called(ctx, funnelID, orgID)
-	return args.Get(0).(*traceFunnels.StorableFunnel), args.Error(1)
-}
-
-func (m *MockModule) Update(ctx context.Context, funnel *traceFunnels.StorableFunnel, userID valuer.UUID) error {
-	args := m.Called(ctx, funnel, userID)
-	return args.Error(0)
-}
-
-func (m *MockModule) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnels.StorableFunnel, error) {
-	args := m.Called(ctx, orgID)
-	return args.Get(0).([]*traceFunnels.StorableFunnel), args.Error(1)
-}
-
-func (m *MockModule) Delete(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) error {
-	args := m.Called(ctx, funnelID, orgID)
-	return args.Error(0)
-}
-
-func (m *MockModule) Save(ctx context.Context, funnel *traceFunnels.StorableFunnel, userID valuer.UUID, orgID valuer.UUID) error {
-	args := m.Called(ctx, funnel, userID, orgID)
-	return args.Error(0)
-}
-
-func (m *MockModule) GetFunnelMetadata(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) (int64, int64, string, error) {
-	args := m.Called(ctx, funnelID, orgID)
-	return args.Get(0).(int64), args.Get(1).(int64), args.String(2), args.Error(3)
-}
-
-func TestHandler_List(t *testing.T) {
-	mockModule := new(MockModule)
-	handler := NewHandler(mockModule)
-
-	req := httptest.NewRequest(http.MethodGet, "/api/v1/trace-funnels/list", nil)
-
-	orgID := valuer.GenerateUUID()
-	claims := authtypes.Claims{
-		OrgID: orgID.String(),
-	}
-	req = req.WithContext(authtypes.NewContextWithClaims(req.Context(), claims))
-
-	rr := httptest.NewRecorder()
-
-	funnel1ID := valuer.GenerateUUID()
-	funnel2ID := valuer.GenerateUUID()
-	expectedFunnels := []*traceFunnels.StorableFunnel{
-		{
-			Identifiable: types.Identifiable{
-				ID: funnel1ID,
-			},
-			Name:  "funnel-1",
-			OrgID: orgID,
-		},
-		{
-			Identifiable: types.Identifiable{
-				ID: funnel2ID,
-			},
-			Name:  "funnel-2",
-			OrgID: orgID,
-		},
-	}
-
-	mockModule.On("List", req.Context(), orgID).Return(expectedFunnels, nil)
-
-	handler.List(rr, req)
-
-	assert.Equal(t, http.StatusOK, rr.Code)
-
-	var response struct {
-		Status string                        `json:"status"`
-		Data   []traceFunnels.GettableFunnel `json:"data"`
-	}
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
-	assert.NoError(t, err)
-	assert.Equal(t, "success", response.Status)
-	assert.Len(t, response.Data, 2)
-	assert.Equal(t, "funnel-1", response.Data[0].FunnelName)
-	assert.Equal(t, "funnel-2", response.Data[1].FunnelName)
-
-	mockModule.AssertExpectations(t)
-}
-
-func TestHandler_Get(t *testing.T) {
-	mockModule := new(MockModule)
-	handler := NewHandler(mockModule)
-
-	funnelID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-	req := httptest.NewRequest(http.MethodGet, "/api/v1/trace-funnels/"+funnelID.String(), nil)
-	req = mux.SetURLVars(req, map[string]string{"funnel_id": funnelID.String()})
-	req = req.WithContext(authtypes.NewContextWithClaims(req.Context(), authtypes.Claims{
-		OrgID: orgID.String(),
-	}))
-
-	rr := httptest.NewRecorder()
-
-	expectedFunnel := &traceFunnels.StorableFunnel{
-		Identifiable: types.Identifiable{
-			ID: funnelID,
-		},
-		Name:  "test-funnel",
-		OrgID: orgID,
-	}
-
-	mockModule.On("Get", req.Context(), funnelID, orgID).Return(expectedFunnel, nil)
-
-	handler.Get(rr, req)
-
-	assert.Equal(t, http.StatusOK, rr.Code)
-
-	var response struct {
-		Status string                      `json:"status"`
-		Data   traceFunnels.GettableFunnel `json:"data"`
-	}
-	err := json.Unmarshal(rr.Body.Bytes(), &response)
-	assert.NoError(t, err)
-	assert.Equal(t, "success", response.Status)
-	assert.Equal(t, "test-funnel", response.Data.FunnelName)
-	assert.Equal(t, expectedFunnel.OrgID.String(), response.Data.OrgID)
-
-	mockModule.AssertExpectations(t)
-}
-
-func TestHandler_Delete(t *testing.T) {
-	mockModule := new(MockModule)
-	handler := NewHandler(mockModule)
-
-	funnelID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-	req := httptest.NewRequest(http.MethodDelete, "/api/v1/trace-funnels/"+funnelID.String(), nil)
-	req = mux.SetURLVars(req, map[string]string{"funnel_id": funnelID.String()})
-	req = req.WithContext(authtypes.NewContextWithClaims(req.Context(), authtypes.Claims{
-		OrgID: orgID.String(),
-	}))
-
-	rr := httptest.NewRecorder()
-
-	mockModule.On("Delete", req.Context(), funnelID, orgID).Return(nil)
-
-	handler.Delete(rr, req)
-
-	assert.Equal(t, http.StatusOK, rr.Code)
-
-	mockModule.AssertExpectations(t)
-}

pkg/modules/tracefunnel/impltracefunnel/module.go

@@ -2,11 +2,10 @@ package impltracefunnel
 
 import (
 	"context"
-	"time"
 
 	"github.com/SigNoz/signoz/pkg/errors"
 	"github.com/SigNoz/signoz/pkg/modules/tracefunnel"
-	"github.com/SigNoz/signoz/pkg/types"
+	"github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
 	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
@@ -21,58 +20,25 @@ func NewModule(store traceFunnels.FunnelStore) tracefunnel.Module {
 	}
 }
 
-func (module *module) Create(ctx context.Context, timestamp int64, name string, userID valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
-	funnel := &traceFunnels.StorableFunnel{
-		Name:  name,
-		OrgID: orgID,
-	}
-	funnel.CreatedAt = time.Unix(0, timestamp*1000000) // Convert to nanoseconds
-	funnel.CreatedBy = userID.String()
-
-	// Set up the user relationship
-	funnel.CreatedByUser = &types.User{
-		Identifiable: types.Identifiable{
-			ID: userID,
-		},
-	}
-
-	if funnel.ID.IsZero() {
-		funnel.ID = valuer.GenerateUUID()
-	}
-
-	if funnel.CreatedAt.IsZero() {
-		funnel.CreatedAt = time.Now()
-	}
-	if funnel.UpdatedAt.IsZero() {
-		funnel.UpdatedAt = time.Now()
-	}
-
-	// Set created_by if CreatedByUser is present
-	if funnel.CreatedByUser != nil {
-		funnel.CreatedBy = funnel.CreatedByUser.Identifiable.ID.String()
-	}
-
-	err := module.store.Create(ctx, funnel)
+func (module *module) Create(ctx context.Context, name string, createdBy string, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
+	storable := tracefunneltypes.NewStorableFunnel(name, "", nil, "", createdBy, orgID)
 
+	err := module.store.Create(ctx, storable)
 	if err != nil {
 		return nil, err
 	}
 
-	return funnel, nil
+	return storable, nil
 }
 
-// Get gets a funnel by ID
-func (module *module) Get(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
-	return module.store.Get(ctx, funnelID, orgID)
+func (module *module) Get(ctx context.Context, id valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
+	return module.store.Get(ctx, id, orgID)
 }
 
-// Update updates a funnel
-func (module *module) Update(ctx context.Context, funnel *traceFunnels.StorableFunnel, userID valuer.UUID) error {
-	funnel.UpdatedBy = userID.String()
+func (module *module) Update(ctx context.Context, funnel *traceFunnels.StorableFunnel) error {
 	return module.store.Update(ctx, funnel)
 }
 
-// List lists all funnels for an organization
 func (module *module) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnels.StorableFunnel, error) {
 	funnels, err := module.store.List(ctx, orgID)
 	if err != nil {
@@ -82,14 +48,12 @@ func (module *module) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunn
 	return funnels, nil
 }
 
-// Delete deletes a funnel
-func (module *module) Delete(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) error {
-	return module.store.Delete(ctx, funnelID, orgID)
+func (module *module) Delete(ctx context.Context, id valuer.UUID, orgID valuer.UUID) error {
+	return module.store.Delete(ctx, id, orgID)
 }
 
-// GetFunnelMetadata gets metadata for a funnel
-func (module *module) GetFunnelMetadata(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) (int64, int64, string, error) {
-	funnel, err := module.store.Get(ctx, funnelID, orgID)
+func (module *module) GetFunnelMetadata(ctx context.Context, id valuer.UUID, orgID valuer.UUID) (int64, int64, string, error) {
+	funnel, err := module.store.Get(ctx, id, orgID)
 	if err != nil {
 		return 0, 0, "", err
 	}

pkg/modules/tracefunnel/impltracefunnel/store.go

@@ -66,7 +66,6 @@ func (store *store) Get(ctx context.Context, uuid valuer.UUID, orgID valuer.UUID
 		BunDB().
 		NewSelect().
 		Model(funnel).
-		Relation("CreatedByUser").
 		Where("?TableAlias.id = ? AND ?TableAlias.org_id = ?", uuid.String(), orgID.String()).
 		Scan(ctx)
 	if err != nil {
@@ -127,7 +126,6 @@ func (store *store) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnel
 		BunDB().
 		NewSelect().
 		Model(&funnels).
-		Relation("CreatedByUser").
 		Where("?TableAlias.org_id = ?", orgID.String()).
 		Scan(ctx)
 	if err != nil {

pkg/modules/tracefunnel/impltracefunnel/store_duplicate_names_test.go

@@ -1,96 +0,0 @@
-package impltracefunnel
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/SigNoz/signoz/pkg/errors"
-	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-// Test that Create method properly validates duplicate names
-func TestModule_Create_DuplicateNameValidation(t *testing.T) {
-	mockStore := new(MockStore)
-	module := NewModule(mockStore)
-
-	ctx := context.Background()
-	timestamp := int64(1234567890)
-	name := "Duplicate Funnel"
-	userID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-
-	// Mock store to return "already exists" error
-	expectedErr := errors.Wrapf(nil, errors.TypeAlreadyExists, traceFunnels.ErrFunnelAlreadyExists, "a funnel with name '%s' already exists in this organization", name)
-	mockStore.On("Create", ctx, mock.MatchedBy(func(f *traceFunnels.StorableFunnel) bool {
-		return f.Name == name && f.OrgID == orgID
-	})).Return(expectedErr)
-
-	funnel, err := module.Create(ctx, timestamp, name, userID, orgID)
-	assert.Error(t, err)
-	assert.Nil(t, funnel)
-	assert.Contains(t, err.Error(), fmt.Sprintf("a funnel with name '%s' already exists in this organization", name))
-
-	mockStore.AssertExpectations(t)
-}
-
-// Test that Update method properly validates duplicate names
-func TestModule_Update_DuplicateNameValidation(t *testing.T) {
-	mockStore := new(MockStore)
-	module := NewModule(mockStore)
-
-	ctx := context.Background()
-	userID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-	funnelName := "Duplicate Name"
-
-	funnel := &traceFunnels.StorableFunnel{
-		Name:  funnelName,
-		OrgID: orgID,
-	}
-	funnel.ID = valuer.GenerateUUID()
-
-	// Mock store to return "already exists" error
-	expectedErr := errors.Wrapf(nil, errors.TypeAlreadyExists, traceFunnels.ErrFunnelAlreadyExists, "a funnel with name '%s' already exists in this organization", funnelName)
-	mockStore.On("Update", ctx, funnel).Return(expectedErr)
-
-	err := module.Update(ctx, funnel, userID)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), fmt.Sprintf("a funnel with name '%s' already exists in this organization", funnelName))
-	assert.Equal(t, userID.String(), funnel.UpdatedBy) // Should still set UpdatedBy
-
-	mockStore.AssertExpectations(t)
-}
-
-// MockStore for testing
-type MockStore struct {
-	mock.Mock
-}
-
-func (m *MockStore) Create(ctx context.Context, funnel *traceFunnels.StorableFunnel) error {
-	args := m.Called(ctx, funnel)
-	return args.Error(0)
-}
-
-func (m *MockStore) Get(ctx context.Context, uuid valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
-	args := m.Called(ctx, uuid, orgID)
-	return args.Get(0).(*traceFunnels.StorableFunnel), args.Error(1)
-}
-
-func (m *MockStore) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnels.StorableFunnel, error) {
-	args := m.Called(ctx, orgID)
-	return args.Get(0).([]*traceFunnels.StorableFunnel), args.Error(1)
-}
-
-func (m *MockStore) Update(ctx context.Context, funnel *traceFunnels.StorableFunnel) error {
-	args := m.Called(ctx, funnel)
-	return args.Error(0)
-}
-
-func (m *MockStore) Delete(ctx context.Context, uuid valuer.UUID, orgID valuer.UUID) error {
-	args := m.Called(ctx, uuid, orgID)
-	return args.Error(0)
-}

pkg/modules/tracefunnel/tracefunnel.go

@@ -2,19 +2,20 @@ package tracefunnel
 
 import (
 	"context"
-	"github.com/SigNoz/signoz/pkg/valuer"
 	"net/http"
 
+	"github.com/SigNoz/signoz/pkg/valuer"
+
 	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
 )
 
 // Module defines the interface for trace funnel operations
 type Module interface {
-	Create(ctx context.Context, timestamp int64, name string, userID valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error)
+	Create(ctx context.Context, name string, userID string, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error)
 
 	Get(ctx context.Context, funnelID valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error)
 
-	Update(ctx context.Context, funnel *traceFunnels.StorableFunnel, userID valuer.UUID) error
+	Update(ctx context.Context, funnel *traceFunnels.StorableFunnel) error
 
 	List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnels.StorableFunnel, error)
 
@@ -24,7 +25,7 @@ type Module interface {
 }
 
 type Handler interface {
-	New(http.ResponseWriter, *http.Request)
+	Create(http.ResponseWriter, *http.Request)
 
 	UpdateSteps(http.ResponseWriter, *http.Request)
 

pkg/modules/tracefunnel/tracefunneltest/module_test.go

@@ -1,183 +0,0 @@
-package tracefunneltest
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	"github.com/SigNoz/signoz/pkg/modules/tracefunnel/impltracefunnel"
-	"github.com/SigNoz/signoz/pkg/types"
-	traceFunnels "github.com/SigNoz/signoz/pkg/types/tracefunneltypes"
-	"github.com/SigNoz/signoz/pkg/valuer"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-type MockStore struct {
-	mock.Mock
-}
-
-func (m *MockStore) Create(ctx context.Context, funnel *traceFunnels.StorableFunnel) error {
-	args := m.Called(ctx, funnel)
-	return args.Error(0)
-}
-
-func (m *MockStore) Get(ctx context.Context, uuid valuer.UUID, orgID valuer.UUID) (*traceFunnels.StorableFunnel, error) {
-	args := m.Called(ctx, uuid, orgID)
-	return args.Get(0).(*traceFunnels.StorableFunnel), args.Error(1)
-}
-
-func (m *MockStore) List(ctx context.Context, orgID valuer.UUID) ([]*traceFunnels.StorableFunnel, error) {
-	args := m.Called(ctx, orgID)
-	return args.Get(0).([]*traceFunnels.StorableFunnel), args.Error(1)
-}
-
-func (m *MockStore) Update(ctx context.Context, funnel *traceFunnels.StorableFunnel) error {
-	args := m.Called(ctx, funnel)
-	return args.Error(0)
-}
-
-func (m *MockStore) Delete(ctx context.Context, uuid valuer.UUID, orgID valuer.UUID) error {
-	args := m.Called(ctx, uuid, orgID)
-	return args.Error(0)
-}
-
-func TestModule_Create(t *testing.T) {
-	mockStore := new(MockStore)
-	module := impltracefunnel.NewModule(mockStore)
-
-	ctx := context.Background()
-	timestamp := time.Now().UnixMilli()
-	name := "test-funnel"
-	userID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-
-	mockStore.On("Create", ctx, mock.MatchedBy(func(f *traceFunnels.StorableFunnel) bool {
-		return f.Name == name &&
-			f.CreatedBy == userID.String() &&
-			f.OrgID == orgID &&
-			f.CreatedByUser != nil &&
-			f.CreatedByUser.ID == userID &&
-			f.CreatedAt.UnixNano()/1000000 == timestamp
-	})).Return(nil)
-
-	funnel, err := module.Create(ctx, timestamp, name, userID, orgID)
-	assert.NoError(t, err)
-	assert.NotNil(t, funnel)
-	assert.Equal(t, name, funnel.Name)
-	assert.Equal(t, userID.String(), funnel.CreatedBy)
-	assert.Equal(t, orgID, funnel.OrgID)
-	assert.NotNil(t, funnel.CreatedByUser)
-	assert.Equal(t, userID, funnel.CreatedByUser.ID)
-
-	mockStore.AssertExpectations(t)
-}
-
-func TestModule_Get(t *testing.T) {
-	mockStore := new(MockStore)
-	module := impltracefunnel.NewModule(mockStore)
-
-	ctx := context.Background()
-	funnelID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-	expectedFunnel := &traceFunnels.StorableFunnel{
-		Name: "test-funnel",
-	}
-
-	mockStore.On("Get", ctx, funnelID, orgID).Return(expectedFunnel, nil)
-
-	funnel, err := module.Get(ctx, funnelID, orgID)
-	assert.NoError(t, err)
-	assert.Equal(t, expectedFunnel, funnel)
-
-	mockStore.AssertExpectations(t)
-}
-
-func TestModule_Update(t *testing.T) {
-	mockStore := new(MockStore)
-	module := impltracefunnel.NewModule(mockStore)
-
-	ctx := context.Background()
-	userID := valuer.GenerateUUID()
-	funnel := &traceFunnels.StorableFunnel{
-		Name: "test-funnel",
-	}
-
-	mockStore.On("Update", ctx, funnel).Return(nil)
-
-	err := module.Update(ctx, funnel, userID)
-	assert.NoError(t, err)
-	assert.Equal(t, userID.String(), funnel.UpdatedBy)
-
-	mockStore.AssertExpectations(t)
-}
-
-func TestModule_List(t *testing.T) {
-	mockStore := new(MockStore)
-	module := impltracefunnel.NewModule(mockStore)
-
-	ctx := context.Background()
-	orgID := valuer.GenerateUUID()
-	expectedFunnels := []*traceFunnels.StorableFunnel{
-		{
-			Name:  "funnel-1",
-			OrgID: orgID,
-		},
-		{
-			Name:  "funnel-2",
-			OrgID: orgID,
-		},
-	}
-
-	mockStore.On("List", ctx, orgID).Return(expectedFunnels, nil)
-
-	funnels, err := module.List(ctx, orgID)
-	assert.NoError(t, err)
-	assert.Len(t, funnels, 2)
-	assert.Equal(t, expectedFunnels, funnels)
-
-	mockStore.AssertExpectations(t)
-}
-
-func TestModule_Delete(t *testing.T) {
-	mockStore := new(MockStore)
-	module := impltracefunnel.NewModule(mockStore)
-
-	ctx := context.Background()
-	funnelID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-
-	mockStore.On("Delete", ctx, funnelID, orgID).Return(nil)
-
-	err := module.Delete(ctx, funnelID, orgID)
-	assert.NoError(t, err)
-
-	mockStore.AssertExpectations(t)
-}
-
-func TestModule_GetFunnelMetadata(t *testing.T) {
-	mockStore := new(MockStore)
-	module := impltracefunnel.NewModule(mockStore)
-
-	ctx := context.Background()
-	funnelID := valuer.GenerateUUID()
-	orgID := valuer.GenerateUUID()
-	now := time.Now()
-	expectedFunnel := &traceFunnels.StorableFunnel{
-		Description: "test description",
-		TimeAuditable: types.TimeAuditable{
-			CreatedAt: now,
-			UpdatedAt: now,
-		},
-	}
-
-	mockStore.On("Get", ctx, funnelID, orgID).Return(expectedFunnel, nil)
-
-	createdAt, updatedAt, description, err := module.GetFunnelMetadata(ctx, funnelID, orgID)
-	assert.NoError(t, err)
-	assert.Equal(t, now.UnixNano()/1000000, createdAt)
-	assert.Equal(t, now.UnixNano()/1000000, updatedAt)
-	assert.Equal(t, "test description", description)
-
-	mockStore.AssertExpectations(t)
-}

pkg/query-service/agentConf/db.go

@@ -38,9 +38,7 @@ func (r *Repo) GetConfigHistory(
 	var c []opamptypes.AgentConfigVersion
 	err := r.store.BunDB().NewSelect().
 		Model(&c).
-		ColumnExpr("id, version, element_type, deploy_status, deploy_result, created_at").
-		ColumnExpr("COALESCE(created_by, '') as created_by").
-		ColumnExpr(`COALESCE((SELECT display_name FROM users WHERE users.id = acv.created_by), 'unknown') as created_by_name`).
+		ColumnExpr("id, version, element_type, deploy_status, deploy_result, created_at,created_by").
 		ColumnExpr("COALESCE(hash, '') as hash, COALESCE(config, '{}') as config").
 		Where("acv.element_type = ?", typ).
 		Where("acv.org_id = ?", orgId).
@@ -54,6 +52,7 @@ func (r *Repo) GetConfigHistory(
 
 	incompleteStatuses := []opamptypes.DeployStatus{opamptypes.DeployInitiated, opamptypes.Deploying}
 	for idx := 1; idx < len(c); idx++ {
+		c[idx].CreatedByName = c[idx].CreatedBy
 		if slices.Contains(incompleteStatuses, c[idx].DeployStatus) {
 			c[idx].DeployStatus = opamptypes.DeployStatusUnknown
 		}
@@ -68,9 +67,7 @@ func (r *Repo) GetConfigVersion(
 	var c opamptypes.AgentConfigVersion
 	err := r.store.BunDB().NewSelect().
 		Model(&c).
-		ColumnExpr("id, version, element_type, deploy_status, deploy_result, created_at").
-		ColumnExpr("COALESCE(created_by, '') as created_by").
-		ColumnExpr(`COALESCE((SELECT display_name FROM users WHERE users.id = acv.created_by), 'unknown') as created_by_name`).
+		ColumnExpr("id, version, element_type, deploy_status, deploy_result, created_at,created_by").
 		ColumnExpr("COALESCE(hash, '') as hash, COALESCE(config, '{}') as config").
 		Where("acv.element_type = ?", typ).
 		Where("acv.version = ?", v).
@@ -84,6 +81,7 @@ func (r *Repo) GetConfigVersion(
 		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to get config version")
 	}
 
+	c.CreatedByName = c.CreatedBy
 	return &c, nil
 }
 
@@ -93,9 +91,7 @@ func (r *Repo) GetLatestVersion(
 	var c opamptypes.AgentConfigVersion
 	err := r.store.BunDB().NewSelect().
 		Model(&c).
-		ColumnExpr("id, version, element_type, deploy_status, deploy_result, created_at").
-		ColumnExpr("COALESCE(created_by, '') as created_by").
-		ColumnExpr(`COALESCE((SELECT display_name FROM users WHERE users.id = acv.created_by), 'unknown') as created_by_name`).
+		ColumnExpr("id, version, element_type, deploy_status, deploy_result, created_at,created_by").
 		Where("acv.element_type = ?", typ).
 		Where("acv.org_id = ?", orgId).
 		Where("version = (SELECT MAX(version) FROM agent_config_version WHERE acv.element_type = ?)", typ).
@@ -108,11 +104,12 @@ func (r *Repo) GetLatestVersion(
 		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to get latest config version")
 	}
 
+	c.CreatedByName = c.CreatedBy
 	return &c, nil
 }
 
 func (r *Repo) insertConfig(
-	ctx context.Context, orgId valuer.UUID, userId valuer.UUID, c *opamptypes.AgentConfigVersion, elements []string,
+	ctx context.Context, orgId valuer.UUID, c *opamptypes.AgentConfigVersion, elements []string,
 ) error {
 
 	if c.ElementType.StringValue() == "" {

pkg/query-service/agentConf/manager.go

@@ -198,14 +198,14 @@ func GetConfigHistory(
 
 // StartNewVersion launches a new config version for given set of elements
 func StartNewVersion(
-	ctx context.Context, orgId valuer.UUID, userId valuer.UUID, eleType opamptypes.ElementType, elementIds []string,
+	ctx context.Context, orgId valuer.UUID, createdBy string, eleType opamptypes.ElementType, elementIds []string,
 ) (*opamptypes.AgentConfigVersion, error) {
 
 	// create a new version
-	cfg := opamptypes.NewAgentConfigVersion(orgId, userId, eleType)
+	cfg := opamptypes.NewAgentConfigVersion(orgId, createdBy, eleType)
 
 	// insert new config and elements into database
-	err := m.insertConfig(ctx, orgId, userId, cfg, elementIds)
+	err := m.insertConfig(ctx, orgId, cfg, elementIds)
 	if err != nil {
 		return nil, err
 	}

pkg/query-service/app/http_handler.go

@@ -4237,14 +4237,8 @@ func (aH *APIHandler) CreateLogsPipeline(w http.ResponseWriter, r *http.Request)
 		render.Error(w, errv2)
 		return
 	}
-	userID, errv2 := valuer.NewUUID(claims.UserID)
-	if errv2 != nil {
-		render.Error(w, errv2)
-		return
-	}
 
 	req := pipelinetypes.PostablePipelines{}
-
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
 		RespondError(w, model.BadRequest(err), nil)
 		return
@@ -4263,7 +4257,7 @@ func (aH *APIHandler) CreateLogsPipeline(w http.ResponseWriter, r *http.Request)
 			return nil, err
 		}
 
-		return aH.LogsParsingPipelineController.ApplyPipelines(ctx, orgID, userID, postable)
+		return aH.LogsParsingPipelineController.ApplyPipelines(ctx, orgID, claims.Email, postable)
 	}
 
 	res, err := createPipeline(r.Context(), req.Pipelines)
@@ -5138,7 +5132,7 @@ func (aH *APIHandler) RegisterTraceFunnelsRoutes(router *mux.Router, am *middlew
 
 	// API endpoints
 	traceFunnelsRouter.HandleFunc("/new",
-		am.EditAccess(aH.Signoz.Handlers.TraceFunnel.New)).
+		am.EditAccess(aH.Signoz.Handlers.TraceFunnel.Create)).
 		Methods(http.MethodPost)
 	traceFunnelsRouter.HandleFunc("/list",
 		am.ViewAccess(aH.Signoz.Handlers.TraceFunnel.List)).

pkg/query-service/app/logparsingpipeline/controller.go

@@ -58,7 +58,7 @@ type PipelinesResponse struct {
 func (ic *LogParsingPipelineController) ApplyPipelines(
 	ctx context.Context,
 	orgID valuer.UUID,
-	userID valuer.UUID,
+	createdBy string,
 	postable []pipelinetypes.PostablePipeline,
 ) (*PipelinesResponse, error) {
 	var pipelines []pipelinetypes.GettablePipeline
@@ -89,7 +89,7 @@ func (ic *LogParsingPipelineController) ApplyPipelines(
 		elements[i] = p.ID.StringValue()
 	}
 
-	cfg, err := agentConf.StartNewVersion(ctx, orgID, userID, opamptypes.ElementTypeLogPipelines, elements)
+	cfg, err := agentConf.StartNewVersion(ctx, orgID, createdBy, opamptypes.ElementTypeLogPipelines, elements)
 	if err != nil || cfg == nil {
 		return nil, model.InternalError(fmt.Errorf("failed to start new version: %w", err))
 	}

pkg/signoz/provider.go

@@ -172,6 +172,7 @@ func NewSQLMigrationProviderFactories(
 		sqlmigration.NewMigrateRulesV4ToV5Factory(sqlstore, telemetryStore),
 		sqlmigration.NewAddStatusUserFactory(sqlstore, sqlschema),
 		sqlmigration.NewDeprecateUserInviteFactory(sqlstore, sqlschema),
+		sqlmigration.NewUpdateCreatedByWithEmailFactory(sqlstore, sqlschema),
 	)
 }
 

pkg/sqlmigration/069_update_created_by_with_email.go

@@ -0,0 +1,184 @@
+package sqlmigration
+
+import (
+	"context"
+	"database/sql"
+
+	"github.com/SigNoz/signoz/pkg/factory"
+	"github.com/SigNoz/signoz/pkg/sqlschema"
+	"github.com/SigNoz/signoz/pkg/sqlstore"
+	"github.com/uptrace/bun"
+	"github.com/uptrace/bun/migrate"
+)
+
+type updateCreatedByWithEmail struct {
+	sqlstore  sqlstore.SQLStore
+	sqlschema sqlschema.SQLSchema
+}
+
+func NewUpdateCreatedByWithEmailFactory(sqlstore sqlstore.SQLStore, sqlschema sqlschema.SQLSchema) factory.ProviderFactory[SQLMigration, Config] {
+	return factory.NewProviderFactory(
+		factory.MustNewName("update_created_by_with_email"),
+		func(ctx context.Context, ps factory.ProviderSettings, c Config) (SQLMigration, error) {
+			return &updateCreatedByWithEmail{
+				sqlstore:  sqlstore,
+				sqlschema: sqlschema,
+			}, nil
+		},
+	)
+}
+
+func (migration *updateCreatedByWithEmail) Register(migrations *migrate.Migrations) error {
+	if err := migrations.Register(migration.Up, migration.Down); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (migration *updateCreatedByWithEmail) Up(ctx context.Context, db *bun.DB) error {
+	tx, err := db.BeginTx(ctx, nil)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		_ = tx.Rollback()
+	}()
+
+	type userRow struct {
+		ID    string `bun:"id"`
+		Email string `bun:"email"`
+	}
+
+	var users []userRow
+	err = tx.NewSelect().TableExpr("users").Column("id", "email").Scan(ctx, &users)
+	if err != nil && err != sql.ErrNoRows {
+		return err
+	}
+
+	userEmailMap := make(map[string]string, len(users))
+	for _, u := range users {
+		userEmailMap[u.ID] = u.Email
+	}
+
+	emails := make([]string, 0, len(userEmailMap))
+	for _, email := range userEmailMap {
+		emails = append(emails, email)
+	}
+
+	for id, email := range userEmailMap {
+		_, err = tx.NewUpdate().
+			TableExpr("agent_config_version").
+			Set("created_by = ?", email).
+			Where("created_by = ?", id).
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = tx.NewUpdate().
+			TableExpr("agent_config_version").
+			Set("updated_by = ?", email).
+			Where("updated_by = ?", id).
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	agentCreatedByQuery := tx.NewUpdate().
+		TableExpr("agent_config_version").
+		Set("created_by = ''").
+		Where("created_by != ''")
+	if len(emails) > 0 {
+		agentCreatedByQuery = agentCreatedByQuery.Where("created_by NOT IN (?)", bun.In(emails))
+	}
+	if _, err = agentCreatedByQuery.Exec(ctx); err != nil {
+		return err
+	}
+
+	agentUpdatedByQuery := tx.NewUpdate().
+		TableExpr("agent_config_version").
+		Set("updated_by = ''").
+		Where("updated_by != ''")
+	if len(emails) > 0 {
+		agentUpdatedByQuery = agentUpdatedByQuery.Where("updated_by NOT IN (?)", bun.In(emails))
+	}
+	if _, err = agentUpdatedByQuery.Exec(ctx); err != nil {
+		return err
+	}
+
+	for id, email := range userEmailMap {
+		_, err = tx.NewUpdate().
+			TableExpr("trace_funnel").
+			Set("created_by = ?", email).
+			Where("created_by = ?", id).
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+
+		_, err = tx.NewUpdate().
+			TableExpr("trace_funnel").
+			Set("updated_by = ?", email).
+			Where("updated_by = ?", id).
+			Exec(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
+	funnelCreatedByQuery := tx.NewUpdate().
+		TableExpr("trace_funnel").
+		Set("created_by = ''").
+		Where("created_by != ''")
+	if len(emails) > 0 {
+		funnelCreatedByQuery = funnelCreatedByQuery.Where("created_by NOT IN (?)", bun.In(emails))
+	}
+	if _, err = funnelCreatedByQuery.Exec(ctx); err != nil {
+		return err
+	}
+
+	funnelUpdatedByQuery := tx.NewUpdate().
+		TableExpr("trace_funnel").
+		Set("updated_by = ''").
+		Where("updated_by != ''")
+	if len(emails) > 0 {
+		funnelUpdatedByQuery = funnelUpdatedByQuery.Where("updated_by NOT IN (?)", bun.In(emails))
+	}
+	if _, err = funnelUpdatedByQuery.Exec(ctx); err != nil {
+		return err
+	}
+
+	quickFilterTable, _, err := migration.sqlschema.GetTable(ctx, sqlschema.TableName("quick_filter"))
+	if err != nil {
+		return err
+	}
+
+	sqls := [][]byte{}
+
+	createdByCol := &sqlschema.Column{Name: "created_by"}
+	dropSQLS := migration.sqlschema.Operator().DropColumn(quickFilterTable, createdByCol)
+	sqls = append(sqls, dropSQLS...)
+
+	updatedByCol := &sqlschema.Column{Name: "updated_by"}
+	dropSQLS = migration.sqlschema.Operator().DropColumn(quickFilterTable, updatedByCol)
+	sqls = append(sqls, dropSQLS...)
+
+	for _, sql := range sqls {
+		if _, err := tx.ExecContext(ctx, string(sql)); err != nil {
+			return err
+		}
+	}
+
+	if err := tx.Commit(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (migration *updateCreatedByWithEmail) Down(ctx context.Context, db *bun.DB) error {
+	return nil
+}

pkg/types/authtypes/relation.go

@@ -20,20 +20,19 @@ var (
 )
 
 var TypeableRelations = map[Type][]Relation{
-	TypeUser:           {RelationRead, RelationUpdate, RelationDelete},
-	TypeServiceAccount: {RelationRead, RelationUpdate, RelationDelete},
-	TypeRole:           {RelationAssignee, RelationRead, RelationUpdate, RelationDelete},
-	TypeOrganization:   {RelationRead, RelationUpdate, RelationDelete},
-	TypeMetaResource:   {RelationRead, RelationUpdate, RelationDelete},
-	TypeMetaResources:  {RelationCreate, RelationList},
+	TypeUser:          {RelationRead, RelationUpdate, RelationDelete},
+	TypeRole:          {RelationAssignee, RelationRead, RelationUpdate, RelationDelete},
+	TypeOrganization:  {RelationRead, RelationUpdate, RelationDelete},
+	TypeMetaResource:  {RelationRead, RelationUpdate, RelationDelete},
+	TypeMetaResources: {RelationCreate, RelationList},
 }
 
 var RelationsTypeable = map[Relation][]Type{
 	RelationCreate:   {TypeMetaResources},
-	RelationRead:     {TypeUser, TypeServiceAccount, TypeRole, TypeOrganization, TypeMetaResource},
+	RelationRead:     {TypeUser, TypeRole, TypeOrganization, TypeMetaResource},
 	RelationList:     {TypeMetaResources},
-	RelationUpdate:   {TypeUser, TypeServiceAccount, TypeRole, TypeOrganization, TypeMetaResource},
-	RelationDelete:   {TypeUser, TypeServiceAccount, TypeRole, TypeOrganization, TypeMetaResource},
+	RelationUpdate:   {TypeUser, TypeRole, TypeOrganization, TypeMetaResource},
+	RelationDelete:   {TypeUser, TypeRole, TypeOrganization, TypeMetaResource},
 	RelationAssignee: {TypeRole},
 }
 

pkg/types/authtypes/selector.go

@@ -23,12 +23,11 @@ var (
 )
 
 var (
-	typeUserSelectorRegex           = regexp.MustCompile(`^(^[0-9a-f]{8}(?:\-[0-9a-f]{4}){3}-[0-9a-f]{12}$|\*)$`)
-	typeServiceAccountSelectorRegex = regexp.MustCompile(`^(^[0-9a-f]{8}(?:\-[0-9a-f]{4}){3}-[0-9a-f]{12}$|\*)$`)
-	typeRoleSelectorRegex           = regexp.MustCompile(`^([a-z-]{1,50}|\*)$`)
-	typeAnonymousSelectorRegex      = regexp.MustCompile(`^\*$`)
-	typeOrganizationSelectorRegex   = regexp.MustCompile(`^(^[0-9a-f]{8}(?:\-[0-9a-f]{4}){3}-[0-9a-f]{12}$|\*)$`)
-	typeMetaResourceSelectorRegex   = regexp.MustCompile(`^(^[0-9a-f]{8}(?:\-[0-9a-f]{4}){3}-[0-9a-f]{12}$|\*)$`)
+	typeUserSelectorRegex         = regexp.MustCompile(`^(^[0-9a-f]{8}(?:\-[0-9a-f]{4}){3}-[0-9a-f]{12}$|\*)$`)
+	typeRoleSelectorRegex         = regexp.MustCompile(`^([a-z-]{1,50}|\*)$`)
+	typeAnonymousSelectorRegex    = regexp.MustCompile(`^\*$`)
+	typeOrganizationSelectorRegex = regexp.MustCompile(`^(^[0-9a-f]{8}(?:\-[0-9a-f]{4}){3}-[0-9a-f]{12}$|\*)$`)
+	typeMetaResourceSelectorRegex = regexp.MustCompile(`^(^[0-9a-f]{8}(?:\-[0-9a-f]{4}){3}-[0-9a-f]{12}$|\*)$`)
 	// metaresources selectors are used to select either all or none until we introduce some hierarchy here.
 	typeMetaResourcesSelectorRegex = regexp.MustCompile(`^\*$`)
 )
@@ -99,11 +98,6 @@ func IsValidSelector(typed Type, selector string) error {
 			return errors.Newf(errors.TypeInvalidInput, ErrCodeAuthZInvalidSelector, "selector must conform to regex %s", typeUserSelectorRegex.String())
 		}
 		return nil
-	case TypeServiceAccount:
-		if !typeServiceAccountSelectorRegex.MatchString(selector) {
-			return errors.Newf(errors.TypeInvalidInput, ErrCodeAuthZInvalidSelector, "selector must conform to regex %s", typeServiceAccountSelectorRegex.String())
-		}
-		return nil
 	case TypeRole:
 		if !typeRoleSelectorRegex.MatchString(selector) {
 			return errors.Newf(errors.TypeInvalidInput, ErrCodeAuthZInvalidSelector, "selector must conform to regex %s", typeRoleSelectorRegex.String())

pkg/types/authtypes/typeable.go

@@ -15,21 +15,19 @@ var (
 )
 
 var (
-	TypeUser           = Type{valuer.NewString("user")}
-	TypeServiceAccount = Type{valuer.NewString("serviceaccount")}
-	TypeAnonymous      = Type{valuer.NewString("anonymous")}
-	TypeRole           = Type{valuer.NewString("role")}
-	TypeOrganization   = Type{valuer.NewString("organization")}
-	TypeMetaResource   = Type{valuer.NewString("metaresource")}
-	TypeMetaResources  = Type{valuer.NewString("metaresources")}
+	TypeUser          = Type{valuer.NewString("user")}
+	TypeAnonymous     = Type{valuer.NewString("anonymous")}
+	TypeRole          = Type{valuer.NewString("role")}
+	TypeOrganization  = Type{valuer.NewString("organization")}
+	TypeMetaResource  = Type{valuer.NewString("metaresource")}
+	TypeMetaResources = Type{valuer.NewString("metaresources")}
 )
 
 var (
-	TypeableUser           = &typeableUser{}
-	TypeableServiceAccount = &typeableServiceAccount{}
-	TypeableAnonymous      = &typeableAnonymous{}
-	TypeableRole           = &typeableRole{}
-	TypeableOrganization   = &typeableOrganization{}
+	TypeableUser         = &typeableUser{}
+	TypeableAnonymous    = &typeableAnonymous{}
+	TypeableRole         = &typeableRole{}
+	TypeableOrganization = &typeableOrganization{}
 )
 
 type Typeable interface {
@@ -55,8 +53,6 @@ func NewType(input string) (Type, error) {
 	switch input {
 	case "user":
 		return TypeUser, nil
-	case "serviceaccount":
-		return TypeServiceAccount, nil
 	case "role":
 		return TypeRole, nil
 	case "organization":
@@ -92,8 +88,6 @@ func NewTypeableFromType(typed Type, name Name) (Typeable, error) {
 		return TypeableRole, nil
 	case TypeUser:
 		return TypeableUser, nil
-	case TypeServiceAccount:
-		return TypeableServiceAccount, nil
 	case TypeOrganization:
 		return TypeableOrganization, nil
 	case TypeMetaResource:

pkg/types/authtypes/typeable_serviceaccount.go

@@ -1,38 +0,0 @@
-package authtypes
-
-import (
-	"github.com/SigNoz/signoz/pkg/valuer"
-	openfgav1 "github.com/openfga/api/proto/openfga/v1"
-)
-
-var _ Typeable = new(typeableServiceAccount)
-
-type typeableServiceAccount struct{}
-
-func (typeableServiceAccount *typeableServiceAccount) Tuples(subject string, relation Relation, selectors []Selector, orgID valuer.UUID) ([]*openfgav1.TupleKey, error) {
-	tuples := make([]*openfgav1.TupleKey, 0)
-
-	for _, selector := range selectors {
-		object := typeableServiceAccount.Prefix(orgID) + "/" + selector.String()
-		tuples = append(tuples, &openfgav1.TupleKey{User: subject, Relation: relation.StringValue(), Object: object})
-	}
-
-	return tuples, nil
-}
-
-func (typeableServiceAccount *typeableServiceAccount) Type() Type {
-	return TypeServiceAccount
-}
-
-func (typeableServiceAccount *typeableServiceAccount) Name() Name {
-	return MustNewName("serviceaccount")
-}
-
-// example: serviceaccount:organization/0199c47d-f61b-7833-bc5f-c0730f12f046/serviceaccount
-func (typeableServiceAccount *typeableServiceAccount) Prefix(orgID valuer.UUID) string {
-	return typeableServiceAccount.Type().StringValue() + ":" + "organization" + "/" + orgID.StringValue() + "/" + typeableServiceAccount.Name().String()
-}
-
-func (typeableServiceAccount *typeableServiceAccount) Scope(relation Relation) string {
-	return typeableServiceAccount.Name().String() + ":" + relation.StringValue()
-}

pkg/types/opamptypes/agent.go

@@ -81,10 +81,7 @@ var (
 type AgentConfigVersion struct {
 	bun.BaseModel `bun:"table:agent_config_version,alias:acv"`
 
-	// this is only for reading
-	// keeping it here since we query the actual data from users table
 	CreatedByName string `json:"createdByName" bun:"created_by_name,scanonly"`
-
 	types.Identifiable
 	types.TimeAuditable
 	types.UserAuditable
@@ -98,13 +95,13 @@ type AgentConfigVersion struct {
 	Config         string       `json:"config" bun:"config,type:text"`
 }
 
-func NewAgentConfigVersion(orgId valuer.UUID, userId valuer.UUID, elementType ElementType) *AgentConfigVersion {
+func NewAgentConfigVersion(orgId valuer.UUID, createdBy string, elementType ElementType) *AgentConfigVersion {
 	return &AgentConfigVersion{
 		TimeAuditable: types.TimeAuditable{
 			CreatedAt: time.Now(),
 			UpdatedAt: time.Now(),
 		},
-		UserAuditable: types.UserAuditable{CreatedBy: userId.String(), UpdatedBy: userId.String()},
+		UserAuditable: types.UserAuditable{CreatedBy: createdBy, UpdatedBy: createdBy},
 		OrgID:         orgId,
 		Identifiable:  types.Identifiable{ID: valuer.GenerateUUID()},
 		ElementType:   elementType,

pkg/types/tracefunneltypes/tracefunnel.go

@@ -1,6 +1,8 @@
 package tracefunneltypes
 
 import (
+	"time"
+
 	"github.com/SigNoz/signoz/pkg/errors"
 	v3 "github.com/SigNoz/signoz/pkg/query-service/model/v3"
 	"github.com/SigNoz/signoz/pkg/types"
@@ -23,7 +25,6 @@ type StorableFunnel struct {
 	OrgID         valuer.UUID   `json:"org_id" bun:"org_id,type:varchar,notnull"`
 	Steps         []*FunnelStep `json:"steps" bun:"steps,type:text,notnull"`
 	Tags          string        `json:"tags" bun:"tags,type:text"`
-	CreatedByUser *types.User   `json:"user" bun:"rel:belongs-to,join:created_by=id"`
 }
 
 type FunnelStep struct {
@@ -83,12 +84,6 @@ type StepTransitionRequest struct {
 	StepEnd   int64 `json:"step_end,omitempty"`
 }
 
-// UserInfo represents basic user information
-type UserInfo struct {
-	ID    string `json:"id"`
-	Email string `json:"email"`
-}
-
 type FunnelStepFilter struct {
 	StepNumber     int
 	ServiceName    string
@@ -96,3 +91,41 @@ type FunnelStepFilter struct {
 	LatencyPointer string // "start" or "end"
 	CustomFilters  *v3.FilterSet
 }
+
+func NewStorableFunnel(name string, description string, steps []*FunnelStep, tags string, createdBy string, orgID valuer.UUID) *StorableFunnel {
+	return &StorableFunnel{
+		Identifiable: types.Identifiable{
+			ID: valuer.GenerateUUID(),
+		},
+		TimeAuditable: types.TimeAuditable{
+			CreatedAt: time.Now(),
+			UpdatedAt: time.Now(),
+		},
+		UserAuditable: types.UserAuditable{
+			CreatedBy: createdBy,
+			UpdatedBy: createdBy,
+		},
+		Name:        name,
+		Description: description,
+		Steps:       steps,
+		Tags:        tags,
+		OrgID:       orgID,
+	}
+}
+
+func (tf *StorableFunnel) Update(name string, description string, steps []*FunnelStep, updatedBy string) {
+	if name != "" {
+		tf.Name = name
+	}
+
+	if description != "" {
+		tf.Description = description
+	}
+
+	if steps != nil {
+		tf.Steps = steps
+	}
+
+	tf.UpdatedBy = updatedBy
+	tf.UpdatedAt = time.Now()
+}

pkg/types/tracefunneltypes/utils.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/errors"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 )
 
@@ -94,7 +93,7 @@ func ValidateAndConvertTimestamp(timestamp int64) (time.Time, error) {
 	return time.Unix(0, timestamp*1000000), nil // Convert to nanoseconds
 }
 
-func ConstructFunnelResponse(funnel *StorableFunnel, claims *authtypes.Claims) GettableFunnel {
+func ConstructFunnelResponse(funnel *StorableFunnel) GettableFunnel {
 	resp := GettableFunnel{
 		FunnelName:  funnel.Name,
 		FunnelID:    funnel.ID.String(),
@@ -105,12 +104,7 @@ func ConstructFunnelResponse(funnel *StorableFunnel, claims *authtypes.Claims) G
 		UpdatedBy:   funnel.UpdatedBy,
 		UpdatedAt:   funnel.UpdatedAt.UnixNano() / 1000000,
 		Description: funnel.Description,
-	}
-
-	if funnel.CreatedByUser != nil {
-		resp.UserEmail = funnel.CreatedByUser.Email.String()
-	} else if claims != nil {
-		resp.UserEmail = claims.Email
+		UserEmail:   funnel.CreatedBy,
 	}
 
 	return resp

pkg/types/tracefunneltypes/utils_test.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/SigNoz/signoz/pkg/types"
-	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/stretchr/testify/assert"
 )
@@ -419,12 +418,10 @@ func TestConstructFunnelResponse(t *testing.T) {
 	now := time.Now()
 	funnelID := valuer.GenerateUUID()
 	orgID := valuer.GenerateUUID()
-	userID := valuer.GenerateUUID()
 
 	tests := []struct {
 		name     string
 		funnel   *StorableFunnel
-		claims   *authtypes.Claims
 		expected GettableFunnel
 	}{
 		{
@@ -438,17 +435,11 @@ func TestConstructFunnelResponse(t *testing.T) {
 					UpdatedAt: now,
 				},
 				UserAuditable: types.UserAuditable{
-					CreatedBy: userID.String(),
-					UpdatedBy: userID.String(),
+					CreatedBy: valuer.MustNewEmail("funnel@example.com").String(),
+					UpdatedBy: valuer.MustNewEmail("funnel@example.com").String(),
 				},
 				Name:  "test-funnel",
 				OrgID: orgID,
-				CreatedByUser: &types.User{
-					Identifiable: types.Identifiable{
-						ID: userID,
-					},
-					Email: valuer.MustNewEmail("funnel@example.com"),
-				},
 				Steps: []*FunnelStep{
 					{
 						ID:          valuer.GenerateUUID(),
@@ -459,11 +450,6 @@ func TestConstructFunnelResponse(t *testing.T) {
 					},
 				},
 			},
-			claims: &authtypes.Claims{
-				UserID: userID.String(),
-				OrgID:  orgID.String(),
-				Email:  "claims@example.com",
-			},
 			expected: GettableFunnel{
 				FunnelName: "test-funnel",
 				FunnelID:   funnelID.String(),
@@ -476,11 +462,11 @@ func TestConstructFunnelResponse(t *testing.T) {
 					},
 				},
 				CreatedAt: now.UnixNano() / 1000000,
-				CreatedBy: userID.String(),
+				CreatedBy: valuer.MustNewEmail("funnel@example.com").String(),
 				UpdatedAt: now.UnixNano() / 1000000,
-				UpdatedBy: userID.String(),
+				UpdatedBy: valuer.MustNewEmail("funnel@example.com").String(),
 				OrgID:     orgID.String(),
-				UserEmail: "funnel@example.com",
+				UserEmail: valuer.MustNewEmail("funnel@example.com").String(),
 			},
 		},
 		{
@@ -494,8 +480,8 @@ func TestConstructFunnelResponse(t *testing.T) {
 					UpdatedAt: now,
 				},
 				UserAuditable: types.UserAuditable{
-					CreatedBy: userID.String(),
-					UpdatedBy: userID.String(),
+					CreatedBy: valuer.MustNewEmail("funnel@example.com").String(),
+					UpdatedBy: valuer.MustNewEmail("funnel@example.com").String(),
 				},
 				Name:  "test-funnel",
 				OrgID: orgID,
@@ -509,11 +495,6 @@ func TestConstructFunnelResponse(t *testing.T) {
 					},
 				},
 			},
-			claims: &authtypes.Claims{
-				UserID: userID.String(),
-				OrgID:  orgID.String(),
-				Email:  "claims@example.com",
-			},
 			expected: GettableFunnel{
 				FunnelName: "test-funnel",
 				FunnelID:   funnelID.String(),
@@ -526,18 +507,18 @@ func TestConstructFunnelResponse(t *testing.T) {
 					},
 				},
 				CreatedAt: now.UnixNano() / 1000000,
-				CreatedBy: userID.String(),
+				CreatedBy: valuer.MustNewEmail("funnel@example.com").String(),
 				UpdatedAt: now.UnixNano() / 1000000,
-				UpdatedBy: userID.String(),
+				UpdatedBy: valuer.MustNewEmail("funnel@example.com").String(),
 				OrgID:     orgID.String(),
-				UserEmail: "claims@example.com",
+				UserEmail: valuer.MustNewEmail("funnel@example.com").String(),
 			},
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result := ConstructFunnelResponse(tt.funnel, tt.claims)
+			result := ConstructFunnelResponse(tt.funnel)
 
 			// Compare top-level fields
 			assert.Equal(t, tt.expected.FunnelName, result.FunnelName)