Merge branch 'main' into in-progress-agent-config

deploy/docker-swarm/docker-compose.ha.yaml

@@ -190,7 +190,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.114.0
+    image: signoz/signoz:v0.113.0
     ports:
       - "8080:8080" # signoz port
     #   - "6060:6060"     # pprof port
@@ -213,7 +213,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.2
+    image: signoz/signoz-otel-collector:v0.144.1
     entrypoint:
       - /bin/sh
     command:
@@ -241,7 +241,7 @@ services:
       replicas: 3
   signoz-telemetrystore-migrator:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.2
+    image: signoz/signoz-otel-collector:v0.144.1
     environment:
       - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000
       - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_CLUSTER=cluster

deploy/docker-swarm/docker-compose.yaml

@@ -117,7 +117,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:v0.114.0
+    image: signoz/signoz:v0.113.0
     ports:
       - "8080:8080" # signoz port
     volumes:
@@ -139,7 +139,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.2
+    image: signoz/signoz-otel-collector:v0.144.1
     entrypoint:
       - /bin/sh
     command:
@@ -167,7 +167,7 @@ services:
       replicas: 3
   signoz-telemetrystore-migrator:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:v0.144.2
+    image: signoz/signoz-otel-collector:v0.144.1
     environment:
       - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000
       - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_CLUSTER=cluster

deploy/docker/docker-compose.ha.yaml

@@ -181,7 +181,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.114.0}
+    image: signoz/signoz:${VERSION:-v0.113.0}
     container_name: signoz
     ports:
       - "8080:8080" # signoz port
@@ -204,7 +204,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.1}
     container_name: signoz-otel-collector
     entrypoint:
       - /bin/sh
@@ -229,7 +229,7 @@ services:
       - "4318:4318" # OTLP HTTP receiver
   signoz-telemetrystore-migrator:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.1}
     container_name: signoz-telemetrystore-migrator
     environment:
       - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000

deploy/docker/docker-compose.yaml

@@ -109,7 +109,7 @@ services:
       # - ../common/clickhouse/storage.xml:/etc/clickhouse-server/config.d/storage.xml
   signoz:
     !!merge <<: *db-depend
-    image: signoz/signoz:${VERSION:-v0.114.0}
+    image: signoz/signoz:${VERSION:-v0.113.0}
     container_name: signoz
     ports:
       - "8080:8080" # signoz port
@@ -132,7 +132,7 @@ services:
       retries: 3
   otel-collector:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.1}
     container_name: signoz-otel-collector
     entrypoint:
       - /bin/sh
@@ -157,7 +157,7 @@ services:
       - "4318:4318" # OTLP HTTP receiver
   signoz-telemetrystore-migrator:
     !!merge <<: *db-depend
-    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.2}
+    image: signoz/signoz-otel-collector:${OTELCOL_TAG:-v0.144.1}
     container_name: signoz-telemetrystore-migrator
     environment:
       - SIGNOZ_OTEL_COLLECTOR_CLICKHOUSE_DSN=tcp://clickhouse:9000

frontend/jest.config.ts

@@ -23,7 +23,29 @@ const config: Config.InitialOptions = {
 			'<rootDir>/node_modules/@signozhq/icons/dist/index.esm.js',
 		'^react-syntax-highlighter/dist/esm/(.*)$':
 			'<rootDir>/node_modules/react-syntax-highlighter/dist/cjs/$1',
-		'^@signozhq/([^/]+)$': '<rootDir>/node_modules/@signozhq/$1/dist/$1.js',
+		'^@signozhq/sonner$':
+			'<rootDir>/node_modules/@signozhq/sonner/dist/sonner.js',
+		'^@signozhq/button$':
+			'<rootDir>/node_modules/@signozhq/button/dist/button.js',
+		'^@signozhq/calendar$':
+			'<rootDir>/node_modules/@signozhq/calendar/dist/calendar.js',
+		'^@signozhq/badge': '<rootDir>/node_modules/@signozhq/badge/dist/badge.js',
+		'^@signozhq/checkbox':
+			'<rootDir>/node_modules/@signozhq/checkbox/dist/checkbox.js',
+		'^@signozhq/switch': '<rootDir>/node_modules/@signozhq/switch/dist/switch.js',
+		'^@signozhq/callout':
+			'<rootDir>/node_modules/@signozhq/callout/dist/callout.js',
+		'^@signozhq/combobox':
+			'<rootDir>/node_modules/@signozhq/combobox/dist/combobox.js',
+		'^@signozhq/input': '<rootDir>/node_modules/@signozhq/input/dist/input.js',
+		'^@signozhq/command':
+			'<rootDir>/node_modules/@signozhq/command/dist/command.js',
+		'^@signozhq/radio-group':
+			'<rootDir>/node_modules/@signozhq/radio-group/dist/radio-group.js',
+		'^@signozhq/toggle-group$':
+			'<rootDir>/node_modules/@signozhq/toggle-group/dist/toggle-group.js',
+		'^@signozhq/dialog$':
+			'<rootDir>/node_modules/@signozhq/dialog/dist/dialog.js',
 	},
 	extensionsToTreatAsEsm: ['.ts'],
 	testMatch: ['<rootDir>/src/**/*?(*.)(test).(ts|js)?(x)'],

frontend/jest.setup.ts

@@ -7,10 +7,9 @@
  */
 import '@testing-library/jest-dom';
 import 'jest-styled-components';
+import './src/styles.scss';
 
 import { server } from './src/mocks-server/server';
-
-import './src/styles.scss';
 // Establish API mocking before all tests.
 
 // Mock window.matchMedia

frontend/package.json

@@ -55,7 +55,6 @@
     "@signozhq/command": "0.0.0",
     "@signozhq/design-tokens": "2.1.1",
     "@signozhq/dialog": "^0.0.2",
-    "@signozhq/drawer": "0.0.4",
     "@signozhq/icons": "0.1.0",
     "@signozhq/input": "0.0.2",
     "@signozhq/popover": "0.0.0",

frontend/public/locales/en-GB/routes.json

@@ -14,6 +14,5 @@
 	"archives": "Archives",
 	"logs_to_metrics": "Logs To Metrics",
 	"roles": "Roles",
-	"role_details": "Role Details",
-	"members": "Members"
+	"role_details": "Role Details"
 }

frontend/public/locales/en/routes.json

@@ -14,6 +14,5 @@
 	"archives": "Archives",
 	"logs_to_metrics": "Logs To Metrics",
 	"roles": "Roles",
-	"role_details": "Role Details",
-	"members": "Members"
+	"role_details": "Role Details"
 }

frontend/public/locales/en/titles.json

@@ -74,6 +74,5 @@
 	"METER_EXPLORER": "SigNoz | Meter Explorer",
 	"METER_EXPLORER_VIEWS": "SigNoz | Meter Explorer Views",
 	"METER": "SigNoz | Meter",
-	"ROLES_SETTINGS": "SigNoz | Roles",
-	"MEMBERS_SETTINGS": "SigNoz | Members"
+	"ROLES_SETTINGS": "SigNoz | Roles"
 }

frontend/src/auto-import-registry.d.ts

@@ -19,7 +19,6 @@ import '@signozhq/combobox';
 import '@signozhq/command';
 import '@signozhq/design-tokens';
 import '@signozhq/dialog';
-import '@signozhq/drawer';
 import '@signozhq/icons';
 import '@signozhq/input';
 import '@signozhq/popover';

frontend/src/components/CustomTimePicker/CustomTimePicker.test.tsx

@@ -1,279 +0,0 @@
-import { useState } from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
-import dayjs from 'dayjs';
-import * as timeUtils from 'utils/timeUtils';
-
-import CustomTimePicker from './CustomTimePicker';
-
-jest.mock('react-router-dom', () => {
-	const actual = jest.requireActual('react-router-dom');
-
-	return {
-		...actual,
-		useLocation: jest.fn().mockReturnValue({
-			pathname: '/test-path',
-		}),
-	};
-});
-
-jest.mock('providers/Timezone', () => {
-	const actual = jest.requireActual('providers/Timezone');
-
-	return {
-		...actual,
-		useTimezone: jest.fn().mockReturnValue({
-			timezone: {
-				value: 'UTC',
-				offset: '+00:00',
-				name: 'UTC',
-			},
-			browserTimezone: {
-				value: 'UTC',
-				offset: '+00:00',
-				name: 'UTC',
-			},
-		}),
-	};
-});
-
-interface WrapperProps {
-	initialValue?: string;
-	showLiveLogs?: boolean;
-	onValidCustomDateChange?: () => void;
-	onError?: () => void;
-	onSelect?: (value: string) => void;
-	onCustomDateHandler?: () => void;
-	onCustomTimeStatusUpdate?: () => void;
-}
-
-function Wrapper({
-	initialValue = '2024-01-01 00:00:00 - 2024-01-01 01:00:00',
-	showLiveLogs = false,
-	onValidCustomDateChange = (): void => {},
-	onError = (): void => {},
-	onSelect = (): void => {},
-	onCustomDateHandler = (): void => {},
-	onCustomTimeStatusUpdate = (): void => {},
-}: WrapperProps): JSX.Element {
-	const [open, setOpen] = useState(false);
-	const [selectedTime, setSelectedTime] = useState('custom');
-	const [selectedValue, setSelectedValue] = useState(initialValue);
-
-	const handleSelect = (value: string): void => {
-		setSelectedTime(value);
-		onSelect(value);
-	};
-
-	return (
-		<CustomTimePicker
-			open={open}
-			setOpen={setOpen}
-			onSelect={handleSelect}
-			onError={onError}
-			selectedTime={selectedTime}
-			selectedValue={selectedValue}
-			onValidCustomDateChange={({ timeStr }): void => {
-				setSelectedValue(timeStr);
-				onValidCustomDateChange();
-			}}
-			onCustomDateHandler={(): void => {
-				onCustomDateHandler();
-			}}
-			onCustomTimeStatusUpdate={(): void => {
-				onCustomTimeStatusUpdate();
-			}}
-			items={[
-				{ label: 'Last 5 minutes', value: '5m' },
-				{ label: 'Custom', value: 'custom' },
-			]}
-			minTime={dayjs('2024-01-01 00:00:00').valueOf() * 1000_000}
-			maxTime={dayjs('2024-01-01 01:00:00').valueOf() * 1000_000}
-			showLiveLogs={showLiveLogs}
-		/>
-	);
-}
-
-describe('CustomTimePicker', () => {
-	it('does not close or reset when clicking input while open', () => {
-		render(<Wrapper />);
-
-		const input = screen.getByRole('textbox');
-
-		// Open popover
-		fireEvent.focus(input);
-
-		// Type some text
-		fireEvent.change(input, { target: { value: '5m' } });
-
-		// Click the input again while open
-		fireEvent.mouseDown(input);
-		fireEvent.click(input);
-
-		// Value should remain as typed
-		expect((input as HTMLInputElement).value).toBe('5m');
-	});
-
-	it('applies valid shorthand on Enter', () => {
-		const onValid = jest.fn();
-		const onError = jest.fn();
-
-		render(<Wrapper onValidCustomDateChange={onValid} onError={onError} />);
-
-		const input = screen.getByRole('textbox');
-
-		fireEvent.focus(input);
-		fireEvent.change(input, { target: { value: '5m' } });
-		fireEvent.keyDown(input, { key: 'Enter', code: 'Enter' });
-
-		expect(onValid).toHaveBeenCalledTimes(1);
-		// onError(false) may be called by internal reset logic; we only assert that
-		// it was never called with a truthy error state
-		expect(onError).not.toHaveBeenCalledWith(true);
-	});
-
-	it('sets error and updates custom time status for invalid shorthand exceeding max allowed window', () => {
-		const onValid = jest.fn();
-		const onError = jest.fn();
-		const onCustomTimeStatusUpdate = jest.fn();
-
-		render(
-			<Wrapper
-				onValidCustomDateChange={onValid}
-				onError={onError}
-				onCustomTimeStatusUpdate={onCustomTimeStatusUpdate}
-			/>,
-		);
-
-		const input = screen.getByRole('textbox');
-
-		fireEvent.focus(input);
-		// large number of days to ensure it exceeds the 15 months allowed window
-		fireEvent.change(input, { target: { value: '9999d' } });
-		fireEvent.keyDown(input, { key: 'Enter', code: 'Enter' });
-
-		expect(onError).toHaveBeenCalledWith(true);
-		expect(onCustomTimeStatusUpdate).toHaveBeenCalledWith();
-		expect(onValid).not.toHaveBeenCalled();
-	});
-
-	it('treats close after change like pressing Enter (blur + chevron)', () => {
-		const onValid = jest.fn();
-		const onError = jest.fn();
-
-		render(<Wrapper onValidCustomDateChange={onValid} onError={onError} />);
-
-		const input = screen.getByRole('textbox');
-
-		// Open and change value so "changed since open" is true
-		fireEvent.focus(input);
-		fireEvent.change(input, { target: { value: '5m' } });
-		fireEvent.blur(input);
-
-		// Click the chevron (which triggers handleClose)
-		const chevron = document.querySelector(
-			'.time-input-suffix-icon-badge',
-		) as HTMLElement;
-
-		fireEvent.click(chevron);
-
-		// Should have applied the value (same as Enter)
-		expect(onValid).toHaveBeenCalledTimes(1);
-		expect(onError).not.toHaveBeenCalledWith(true);
-	});
-
-	it('applies epoch start/end range on Enter via onCustomDateHandler', () => {
-		const onCustomDateHandler = jest.fn();
-		const onError = jest.fn();
-
-		render(
-			<Wrapper onCustomDateHandler={onCustomDateHandler} onError={onError} />,
-		);
-
-		const now = dayjs().valueOf();
-		const later = dayjs().add(1, 'hour').valueOf();
-		const input = screen.getByRole('textbox');
-
-		fireEvent.focus(input);
-		fireEvent.change(input, {
-			target: { value: `${now} - ${later}` },
-		});
-		fireEvent.keyDown(input, { key: 'Enter', code: 'Enter' });
-
-		expect(onCustomDateHandler).toHaveBeenCalledTimes(1);
-		expect(onError).not.toHaveBeenCalledWith(true);
-	});
-
-	it('uses validateTimeRange result for generic formatted ranges (valid case)', () => {
-		const validateTimeRangeSpy = jest.spyOn(timeUtils, 'validateTimeRange');
-		const onCustomDateHandler = jest.fn();
-		const onError = jest.fn();
-
-		validateTimeRangeSpy.mockReturnValue({
-			isValid: true,
-			errorDetails: undefined,
-			startTimeMs: dayjs('2024-01-01 00:00:00').valueOf(),
-			endTimeMs: dayjs('2024-01-01 01:00:00').valueOf(),
-		});
-
-		render(
-			<Wrapper onCustomDateHandler={onCustomDateHandler} onError={onError} />,
-		);
-
-		const input = screen.getByRole('textbox');
-
-		fireEvent.focus(input);
-		fireEvent.change(input, {
-			target: { value: 'foo - bar' },
-		});
-		fireEvent.keyDown(input, { key: 'Enter', code: 'Enter' });
-
-		expect(validateTimeRangeSpy).toHaveBeenCalled();
-		expect(onCustomDateHandler).toHaveBeenCalledTimes(1);
-		expect(onError).not.toHaveBeenCalledWith(true);
-
-		validateTimeRangeSpy.mockRestore();
-	});
-
-	it('uses validateTimeRange result for generic formatted ranges (invalid case)', () => {
-		const validateTimeRangeSpy = jest.spyOn(timeUtils, 'validateTimeRange');
-		const onValid = jest.fn();
-		const onError = jest.fn();
-
-		validateTimeRangeSpy.mockReturnValue({
-			isValid: false,
-			errorDetails: {
-				message: 'Invalid range',
-				code: 'INVALID_RANGE',
-				description: 'Start must be before end',
-			},
-			startTimeMs: 0,
-			endTimeMs: 0,
-		});
-
-		render(<Wrapper onValidCustomDateChange={onValid} onError={onError} />);
-
-		const input = screen.getByRole('textbox');
-
-		fireEvent.focus(input);
-		fireEvent.change(input, {
-			target: { value: 'foo - bar' },
-		});
-		fireEvent.keyDown(input, { key: 'Enter', code: 'Enter' });
-
-		expect(validateTimeRangeSpy).toHaveBeenCalled();
-		expect(onError).toHaveBeenCalledWith(true);
-		expect(onValid).not.toHaveBeenCalled();
-
-		validateTimeRangeSpy.mockRestore();
-	});
-
-	it('opens live mode with correct label', () => {
-		render(<Wrapper showLiveLogs />);
-
-		const input = screen.getByRole('textbox');
-
-		fireEvent.focus(input);
-
-		expect((input as HTMLInputElement).value).toBe('Live');
-	});
-});

frontend/src/components/CustomTimePicker/CustomTimePicker.tsx

@@ -104,10 +104,6 @@ function CustomTimePicker({
 	const location = useLocation();
 
 	const inputRef = useRef<InputRef>(null);
-	const initialInputValueOnOpenRef = useRef<string>('');
-	const hasChangedSinceOpenRef = useRef<boolean>(false);
-	// Tracks if the last pointer down was on the input so we don't close the popover when user clicks the input again
-	const isClickFromInputRef = useRef(false);
 
 	const [activeView, setActiveView] = useState<ViewType>(DEFAULT_VIEW);
 
@@ -242,21 +238,6 @@ function CustomTimePicker({
 	};
 
 	const handleOpenChange = (newOpen: boolean): void => {
-		// Don't close when the user clicked the input (trigger); Ant Design treats trigger as "outside" overlay
-		if (!newOpen && isClickFromInputRef.current) {
-			isClickFromInputRef.current = false;
-			return;
-		}
-		isClickFromInputRef.current = false;
-
-		// If the popover is trying to close and the value changed since opening,
-		// treat it as if the user pressed Enter (attempt to apply the value)
-		if (!newOpen && hasChangedSinceOpenRef.current) {
-			hasChangedSinceOpenRef.current = false;
-			handleInputPressEnter();
-			return;
-		}
-
 		setOpen(newOpen);
 
 		if (!newOpen) {
@@ -425,18 +406,10 @@ function CustomTimePicker({
 	const handleOpen = (e?: React.SyntheticEvent): void => {
 		e?.stopPropagation?.();
 
-		// If the popover is already open, avoid resetting the input value
-		// so that any in-progress edits are preserved.
-		if (open) {
-			return;
-		}
-
 		if (showLiveLogs) {
 			setOpen(true);
 			setSelectedTimePlaceholderValue('Live');
 			setInputValue('Live');
-			initialInputValueOnOpenRef.current = 'Live';
-			hasChangedSinceOpenRef.current = false;
 			return;
 		}
 
@@ -451,21 +424,11 @@ function CustomTimePicker({
 			.tz(timezone.value)
 			.format(DATE_TIME_FORMATS.UK_DATETIME_SECONDS);
 
-		const nextValue = `${startTime} - ${endTime}`;
-		setInputValue(nextValue);
-		initialInputValueOnOpenRef.current = nextValue;
-		hasChangedSinceOpenRef.current = false;
+		setInputValue(`${startTime} - ${endTime}`);
 	};
 
 	const handleClose = (e: React.MouseEvent): void => {
 		e.stopPropagation();
-		// If the value changed since opening, treat this like pressing Enter
-		if (hasChangedSinceOpenRef.current) {
-			hasChangedSinceOpenRef.current = false;
-			handleInputPressEnter();
-			return;
-		}
-
 		setOpen(false);
 		setCustomDTPickerVisible?.(false);
 
@@ -487,9 +450,6 @@ function CustomTimePicker({
 	}, [location.pathname]);
 
 	const handleInputBlur = (): void => {
-		// Track whether the value was changed since the input was opened for editing
-		hasChangedSinceOpenRef.current =
-			inputValue !== initialInputValueOnOpenRef.current;
 		resetErrorStatus();
 	};
 
@@ -592,12 +552,6 @@ function CustomTimePicker({
 						readOnly={!open || showLiveLogs}
 						placeholder={selectedTimePlaceholderValue}
 						value={inputValue}
-						onMouseDown={(e): void => {
-							// Only treat as "click from input" when the actual input element is clicked (not suffix/chevron)
-							if (e.target === inputRef.current?.input) {
-								isClickFromInputRef.current = true;
-							}
-						}}
 						onFocus={handleOpen}
 						onClick={handleOpen}
 						onChange={handleInputChange}

frontend/src/components/EditMemberDrawer/EditMemberDrawer.styles.scss

@@ -1,304 +0,0 @@
-.edit-member-drawer {
-	&__layout {
-		display: flex;
-		flex-direction: column;
-		height: calc(100vh - 48px);
-	}
-
-	&__body {
-		flex: 1;
-		overflow-y: auto;
-		display: flex;
-		flex-direction: column;
-		gap: var(--spacing-8);
-		padding: var(--padding-5) var(--padding-4);
-	}
-
-	&__field {
-		display: flex;
-		flex-direction: column;
-		gap: var(--spacing-4);
-	}
-
-	&__label {
-		font-size: var(--font-size-sm);
-		font-weight: var(--font-weight-normal);
-		color: var(--foreground);
-		line-height: var(--line-height-20);
-		letter-spacing: -0.07px;
-		cursor: default;
-	}
-
-	&__input {
-		height: 32px;
-		background: var(--l2-background);
-		border-color: var(--border);
-		color: var(--l1-foreground);
-		box-shadow: none;
-
-		&::placeholder {
-			color: var(--l3-foreground);
-		}
-	}
-
-	&__input-wrapper {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		height: 32px;
-		padding: 0 var(--padding-2);
-		border-radius: 2px;
-		background: var(--l2-background);
-		border: 1px solid var(--border);
-
-		&--disabled {
-			cursor: not-allowed;
-			opacity: 0.8;
-		}
-	}
-
-	&__email-text {
-		font-size: var(--font-size-sm);
-		font-weight: var(--font-weight-normal);
-		color: var(--foreground);
-		line-height: var(--line-height-18);
-		letter-spacing: -0.07px;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		flex: 1;
-	}
-
-	&__lock-icon {
-		color: var(--foreground);
-		flex-shrink: 0;
-		margin-left: 6px;
-		opacity: 0.6;
-	}
-
-	&__role-select {
-		width: 100%;
-		height: 32px;
-
-		.ant-select-selector {
-			background-color: var(--l2-background) !important;
-			border-color: var(--border) !important;
-			border-radius: 2px;
-			padding: 0 var(--padding-2) !important;
-			display: flex;
-			align-items: center;
-		}
-
-		.ant-select-selection-item {
-			font-size: var(--font-size-sm);
-			color: var(--l1-foreground);
-			line-height: 32px;
-			letter-spacing: -0.07px;
-		}
-
-		.ant-select-arrow {
-			color: var(--foreground);
-		}
-
-		&:not(.ant-select-disabled):hover .ant-select-selector {
-			border-color: var(--foreground);
-		}
-	}
-
-	&__meta {
-		display: flex;
-		flex-direction: column;
-		gap: var(--spacing-8);
-		margin-top: var(--margin-1);
-	}
-
-	&__meta-item {
-		display: flex;
-		flex-direction: column;
-		gap: var(--spacing-2);
-
-		[data-slot='badge'] {
-			padding: var(--padding-1) var(--padding-2);
-			align-items: center;
-			font-size: var(--uppercase-small-500-font-size);
-			font-weight: var(--uppercase-small-500-font-weight);
-			line-height: 100%;
-			letter-spacing: 0.44px;
-			text-transform: uppercase;
-		}
-	}
-
-	&__meta-label {
-		font-size: var(--font-size-xs);
-		font-weight: var(--font-weight-medium);
-		color: var(--foreground);
-		line-height: var(--line-height-20);
-		letter-spacing: 0.48px;
-		text-transform: uppercase;
-	}
-
-	&__footer {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		width: 100%;
-		height: 56px;
-		padding: 0 var(--padding-4);
-		border-top: 1px solid var(--border);
-		flex-shrink: 0;
-		background: var(--card);
-	}
-
-	&__footer-left {
-		display: flex;
-		align-items: center;
-		gap: var(--spacing-8);
-	}
-
-	&__footer-right {
-		display: flex;
-		align-items: center;
-		gap: var(--spacing-6);
-	}
-
-	&__footer-divider {
-		width: 1px;
-		height: 21px;
-		background: var(--border);
-		flex-shrink: 0;
-	}
-
-	&__footer-btn {
-		display: inline-flex;
-		align-items: center;
-		gap: var(--spacing-3);
-		padding: 0;
-		background: transparent;
-		border: none;
-		cursor: pointer;
-		font-family: Inter, sans-serif;
-		font-size: var(--label-small-400-font-size);
-		font-weight: var(--label-small-400-font-weight);
-		line-height: var(--label-small-400-line-height);
-		letter-spacing: var(--label-small-400-letter-spacing);
-		transition: opacity 0.15s ease;
-
-		&:disabled {
-			opacity: 0.5;
-			cursor: not-allowed;
-		}
-
-		&:not(:disabled):hover {
-			opacity: 0.8;
-		}
-
-		&--danger {
-			color: var(--destructive);
-		}
-
-		&--warning {
-			color: var(--accent-amber);
-		}
-	}
-}
-
-.delete-dialog {
-	background: var(--l2-background);
-	border: 1px solid var(--l2-border);
-
-	[data-slot='dialog-title'] {
-		color: var(--l1-foreground);
-	}
-
-	&__body {
-		font-size: var(--paragraph-base-400-font-size);
-		font-weight: var(--paragraph-base-400-font-weight);
-		color: var(--l2-foreground);
-		line-height: var(--paragraph-base-400-line-height);
-		letter-spacing: -0.065px;
-		margin: 0;
-
-		strong {
-			font-weight: var(--font-weight-medium);
-			color: var(--l1-foreground);
-		}
-	}
-
-	&__footer {
-		display: flex;
-		justify-content: flex-end;
-		gap: var(--spacing-4);
-		margin-top: var(--margin-6);
-	}
-}
-
-.reset-link-dialog {
-	background: var(--l2-background);
-	border: 1px solid var(--l2-border);
-
-	[data-slot='dialog-header'] {
-		border-color: var(--l2-border);
-		color: var(--l1-foreground);
-	}
-
-	[data-slot='dialog-description'] {
-		width: 510px;
-	}
-
-	&__content {
-		display: flex;
-		flex-direction: column;
-		gap: var(--spacing-8);
-	}
-
-	&__description {
-		font-size: var(--paragraph-base-400-font-size);
-		font-weight: var(--paragraph-base-400-font-weight);
-		color: var(--l2-foreground);
-		line-height: var(--paragraph-base-400-line-height);
-		letter-spacing: -0.065px;
-		margin: 0;
-		white-space: normal;
-		word-break: break-word;
-	}
-
-	&__link-row {
-		display: flex;
-		align-items: center;
-		height: 32px;
-		overflow: hidden;
-		background: var(--l2-background);
-		border: 1px solid var(--border);
-		border-radius: 2px;
-	}
-
-	&__link-text-wrap {
-		flex: 1;
-		min-width: 0;
-		overflow: hidden;
-	}
-
-	&__link-text {
-		display: block;
-		white-space: nowrap;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		padding: 0 var(--padding-2);
-		font-size: var(--paragraph-base-400-font-size);
-		font-weight: var(--paragraph-base-400-font-weight);
-		color: var(--l2-foreground);
-		line-height: var(--line-height-18);
-		letter-spacing: -0.07px;
-	}
-
-	&__copy-btn {
-		flex-shrink: 0;
-		height: 32px;
-		border-radius: 0 2px 2px 0;
-		border-top: none;
-		border-right: none;
-		border-bottom: none;
-		border-left: 1px solid var(--border);
-		min-width: 64px;
-	}
-}

frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx

@@ -1,472 +0,0 @@
-import { useCallback, useEffect, useState } from 'react';
-import { Badge } from '@signozhq/badge';
-import { Button } from '@signozhq/button';
-import { DialogFooter, DialogWrapper } from '@signozhq/dialog';
-import { DrawerWrapper } from '@signozhq/drawer';
-import {
-	Check,
-	ChevronDown,
-	Copy,
-	Link,
-	LockKeyhole,
-	RefreshCw,
-	Trash2,
-	X,
-} from '@signozhq/icons';
-import { Input } from '@signozhq/input';
-import { toast } from '@signozhq/sonner';
-import { Select } from 'antd';
-import getResetPasswordToken from 'api/v1/factor_password/getResetPasswordToken';
-import sendInvite from 'api/v1/invite/create';
-import cancelInvite from 'api/v1/invite/id/delete';
-import deleteUser from 'api/v1/user/id/delete';
-import update from 'api/v1/user/id/update';
-import { MemberRow } from 'components/MembersTable/MembersTable';
-import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import ROUTES from 'constants/routes';
-import { INVITE_PREFIX, MemberStatus } from 'container/MembersSettings/utils';
-import { capitalize } from 'lodash-es';
-import { useTimezone } from 'providers/Timezone';
-import { ROLES } from 'types/roles';
-
-import './EditMemberDrawer.styles.scss';
-
-export interface EditMemberDrawerProps {
-	member: MemberRow | null;
-	open: boolean;
-	onClose: () => void;
-	onSuccess: () => void;
-}
-
-// eslint-disable-next-line sonarjs/cognitive-complexity
-function EditMemberDrawer({
-	member,
-	open,
-	onClose,
-	onSuccess,
-}: EditMemberDrawerProps): JSX.Element {
-	const { formatTimezoneAdjustedTimestamp } = useTimezone();
-
-	const [displayName, setDisplayName] = useState('');
-	const [selectedRole, setSelectedRole] = useState<ROLES>('VIEWER');
-	const [isSaving, setIsSaving] = useState(false);
-	const [isDeleting, setIsDeleting] = useState(false);
-	const [isGeneratingLink, setIsGeneratingLink] = useState(false);
-	const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
-	const [resetLink, setResetLink] = useState<string | null>(null);
-	const [showResetLinkDialog, setShowResetLinkDialog] = useState(false);
-	const [hasCopiedResetLink, setHasCopiedResetLink] = useState(false);
-
-	const isInvited = member?.status === MemberStatus.Invited;
-	// Invited member IDs are prefixed with 'invite-'; strip it to get the real invite ID
-	const inviteId =
-		isInvited && member ? member.id.slice(INVITE_PREFIX.length) : null;
-
-	useEffect(() => {
-		if (member) {
-			setDisplayName(member.name ?? '');
-			setSelectedRole(member.role);
-		}
-	}, [member]);
-
-	const isDirty =
-		member !== null &&
-		(displayName !== member.name || selectedRole !== member.role);
-
-	const formatTimestamp = useCallback(
-		(ts: string | null | undefined): string => {
-			if (!ts) {
-				return '—';
-			}
-			const d = new Date(ts);
-			if (Number.isNaN(d.getTime())) {
-				return '—';
-			}
-			return formatTimezoneAdjustedTimestamp(ts, DATE_TIME_FORMATS.DASH_DATETIME);
-		},
-		[formatTimezoneAdjustedTimestamp],
-	);
-
-	const handleSave = useCallback(async (): Promise<void> => {
-		if (!member || !isDirty) {
-			return;
-		}
-		setIsSaving(true);
-		try {
-			if (isInvited && inviteId) {
-				await cancelInvite({ id: inviteId });
-				await sendInvite({
-					email: member.email,
-					name: displayName,
-					role: selectedRole,
-					frontendBaseUrl: window.location.origin,
-				});
-				toast.success('Invite updated successfully', { richColors: true });
-			} else {
-				await update({
-					userId: member.id,
-					displayName,
-					role: selectedRole,
-				});
-				toast.success('Member details updated successfully', { richColors: true });
-			}
-			onSuccess();
-			onClose();
-		} catch {
-			toast.error(
-				isInvited ? 'Failed to update invite' : 'Failed to update member details',
-				{ richColors: true },
-			);
-		} finally {
-			setIsSaving(false);
-		}
-	}, [
-		member,
-		isDirty,
-		isInvited,
-		inviteId,
-		displayName,
-		selectedRole,
-		onSuccess,
-		onClose,
-	]);
-
-	const handleDelete = useCallback(async (): Promise<void> => {
-		if (!member) {
-			return;
-		}
-		setIsDeleting(true);
-		try {
-			if (isInvited && inviteId) {
-				await cancelInvite({ id: inviteId });
-				toast.success('Invitation cancelled successfully', { richColors: true });
-			} else {
-				await deleteUser({ userId: member.id });
-				toast.success('Member deleted successfully', { richColors: true });
-			}
-			setShowDeleteConfirm(false);
-			onSuccess();
-			onClose();
-		} catch {
-			toast.error(
-				isInvited ? 'Failed to cancel invitation' : 'Failed to delete member',
-				{ richColors: true },
-			);
-		} finally {
-			setIsDeleting(false);
-		}
-	}, [member, isInvited, inviteId, onSuccess, onClose]);
-
-	const handleGenerateResetLink = useCallback(async (): Promise<void> => {
-		if (!member) {
-			return;
-		}
-		setIsGeneratingLink(true);
-		try {
-			const response = await getResetPasswordToken({ userId: member.id });
-			if (response?.data?.token) {
-				const link = `${window.location.origin}/password-reset?token=${response.data.token}`;
-				setResetLink(link);
-				setHasCopiedResetLink(false);
-				setShowResetLinkDialog(true);
-				onClose();
-			}
-		} catch {
-			toast.error('Failed to generate password reset link', {
-				richColors: true,
-				position: 'top-right',
-			});
-		} finally {
-			setIsGeneratingLink(false);
-		}
-	}, [member, onClose]);
-
-	const handleCopyResetLink = useCallback(async (): Promise<void> => {
-		if (!resetLink) {
-			return;
-		}
-		try {
-			await navigator.clipboard.writeText(resetLink);
-			setHasCopiedResetLink(true);
-			setTimeout(() => setHasCopiedResetLink(false), 2000);
-			toast.success('Reset link copied to clipboard', { richColors: true });
-		} catch {
-			toast.error('Failed to copy link', {
-				richColors: true,
-			});
-		}
-	}, [resetLink]);
-
-	const handleCopyInviteLink = useCallback(async (): Promise<void> => {
-		if (!member?.token) {
-			toast.error('Invite link is not available', {
-				richColors: true,
-				position: 'top-right',
-			});
-			return;
-		}
-		const inviteLink = `${window.location.origin}${ROUTES.SIGN_UP}?token=${member.token}`;
-		try {
-			await navigator.clipboard.writeText(inviteLink);
-			toast.success('Invite link copied to clipboard', {
-				richColors: true,
-				position: 'top-right',
-			});
-		} catch {
-			toast.error('Failed to copy invite link', {
-				richColors: true,
-				position: 'top-right',
-			});
-		}
-	}, [member]);
-
-	const handleClose = useCallback((): void => {
-		setShowDeleteConfirm(false);
-		onClose();
-	}, [onClose]);
-
-	const joinedOnLabel = isInvited ? 'Invited On' : 'Joined On';
-
-	const drawerContent = (
-		<div className="edit-member-drawer__layout">
-			<div className="edit-member-drawer__body">
-				<div className="edit-member-drawer__field">
-					<label className="edit-member-drawer__label" htmlFor="member-name">
-						Name
-					</label>
-					<Input
-						id="member-name"
-						value={displayName}
-						onChange={(e): void => setDisplayName(e.target.value)}
-						className="edit-member-drawer__input"
-						placeholder="Enter name"
-					/>
-				</div>
-
-				<div className="edit-member-drawer__field">
-					<label className="edit-member-drawer__label" htmlFor="member-email">
-						Email Address
-					</label>
-					<div className="edit-member-drawer__input-wrapper edit-member-drawer__input-wrapper--disabled">
-						<span className="edit-member-drawer__email-text">
-							{member?.email || '—'}
-						</span>
-						<LockKeyhole size={16} className="edit-member-drawer__lock-icon" />
-					</div>
-				</div>
-
-				<div className="edit-member-drawer__field">
-					<label className="edit-member-drawer__label" htmlFor="member-role">
-						Roles
-					</label>
-					<Select
-						id="member-role"
-						value={selectedRole}
-						onChange={(role): void => setSelectedRole(role as ROLES)}
-						className="edit-member-drawer__role-select"
-						suffixIcon={<ChevronDown size={14} />}
-						getPopupContainer={(triggerNode): HTMLElement =>
-							(triggerNode?.closest('.edit-member-drawer') as HTMLElement) ||
-							document.body
-						}
-					>
-						<Select.Option value="ADMIN">{capitalize('ADMIN')}</Select.Option>
-						<Select.Option value="EDITOR">{capitalize('EDITOR')}</Select.Option>
-						<Select.Option value="VIEWER">{capitalize('VIEWER')}</Select.Option>
-					</Select>
-				</div>
-
-				<div className="edit-member-drawer__meta">
-					<div className="edit-member-drawer__meta-item">
-						<span className="edit-member-drawer__meta-label">Status</span>
-						{member?.status === MemberStatus.Active ? (
-							<Badge color="forest" variant="outline">
-								ACTIVE
-							</Badge>
-						) : (
-							<Badge color="amber" variant="outline">
-								INVITED
-							</Badge>
-						)}
-					</div>
-
-					<div className="edit-member-drawer__meta-item">
-						<span className="edit-member-drawer__meta-label">{joinedOnLabel}</span>
-						<Badge color="vanilla">{formatTimestamp(member?.joinedOn)}</Badge>
-					</div>
-					{!isInvited && (
-						<div className="edit-member-drawer__meta-item">
-							<span className="edit-member-drawer__meta-label">Last Modified</span>
-							<Badge color="vanilla">{formatTimestamp(member?.updatedAt)}</Badge>
-						</div>
-					)}
-				</div>
-			</div>
-
-			<div className="edit-member-drawer__footer">
-				<div className="edit-member-drawer__footer-left">
-					<Button
-						className="edit-member-drawer__footer-btn edit-member-drawer__footer-btn--danger"
-						onClick={(): void => setShowDeleteConfirm(true)}
-					>
-						<Trash2 size={12} />
-						{isInvited ? 'Cancel Invite' : 'Delete Member'}
-					</Button>
-
-					<div className="edit-member-drawer__footer-divider" />
-
-					{isInvited ? (
-						<Button
-							className="edit-member-drawer__footer-btn edit-member-drawer__footer-btn--warning"
-							onClick={handleCopyInviteLink}
-							disabled={!member?.token}
-						>
-							<Link size={12} />
-							Copy Invite Link
-						</Button>
-					) : (
-						<Button
-							className="edit-member-drawer__footer-btn edit-member-drawer__footer-btn--warning"
-							onClick={handleGenerateResetLink}
-							disabled={isGeneratingLink}
-						>
-							<RefreshCw size={12} />
-							{isGeneratingLink ? 'Generating...' : 'Generate Password Reset Link'}
-						</Button>
-					)}
-				</div>
-
-				<div className="edit-member-drawer__footer-right">
-					<Button variant="solid" color="secondary" size="sm" onClick={handleClose}>
-						<X size={14} />
-						Cancel
-					</Button>
-
-					<Button
-						variant="solid"
-						color="primary"
-						size="sm"
-						disabled={!isDirty || isSaving}
-						onClick={handleSave}
-					>
-						{isSaving ? 'Saving...' : 'Save Member Details'}
-					</Button>
-				</div>
-			</div>
-		</div>
-	);
-
-	const deleteDialogTitle = isInvited ? 'Cancel Invitation' : 'Delete Member';
-	const deleteDialogBody = isInvited ? (
-		<>
-			Are you sure you want to cancel the invitation for{' '}
-			<strong>{member?.email}</strong>? They will no longer be able to join the
-			workspace using this invite.
-		</>
-	) : (
-		<>
-			Are you sure you want to delete{' '}
-			<strong>{member?.name || member?.email}</strong>? This will permanently
-			remove their access to the workspace.
-		</>
-	);
-	const deleteConfirmLabel = isInvited ? 'Cancel Invite' : 'Delete Member';
-
-	return (
-		<>
-			<DrawerWrapper
-				open={open}
-				onOpenChange={(isOpen): void => {
-					if (!isOpen) {
-						handleClose();
-					}
-				}}
-				direction="right"
-				type="panel"
-				showCloseButton
-				showOverlay={false}
-				allowOutsideClick
-				header={{ title: 'Member Details' }}
-				content={drawerContent}
-				className="edit-member-drawer"
-			/>
-
-			<DialogWrapper
-				open={showResetLinkDialog}
-				onOpenChange={(isOpen): void => {
-					if (!isOpen) {
-						setShowResetLinkDialog(false);
-					}
-				}}
-				title="Password Reset Link"
-				showCloseButton
-				width="base"
-				className="reset-link-dialog"
-			>
-				<div className="reset-link-dialog__content">
-					<p className="reset-link-dialog__description">
-						This creates a one-time link the team member can use to set a new password
-						for their SigNoz account.
-					</p>
-					<div className="reset-link-dialog__link-row">
-						<div className="reset-link-dialog__link-text-wrap">
-							<span className="reset-link-dialog__link-text">{resetLink}</span>
-						</div>
-						<Button
-							variant="outlined"
-							color="secondary"
-							size="sm"
-							onClick={handleCopyResetLink}
-							prefixIcon={
-								hasCopiedResetLink ? <Check size={12} /> : <Copy size={12} />
-							}
-							className="reset-link-dialog__copy-btn"
-						>
-							{hasCopiedResetLink ? 'Copied!' : 'Copy'}
-						</Button>
-					</div>
-				</div>
-			</DialogWrapper>
-
-			<DialogWrapper
-				open={showDeleteConfirm}
-				onOpenChange={(isOpen): void => {
-					if (!isOpen) {
-						setShowDeleteConfirm(false);
-					}
-				}}
-				title={deleteDialogTitle}
-				width="narrow"
-				className="alert-dialog delete-dialog"
-				showCloseButton={false}
-				disableOutsideClick={false}
-			>
-				<p className="delete-dialog__body">{deleteDialogBody}</p>
-
-				<DialogFooter className="delete-dialog__footer">
-					<Button
-						variant="solid"
-						color="secondary"
-						size="sm"
-						onClick={(): void => setShowDeleteConfirm(false)}
-					>
-						<X size={12} />
-						Cancel
-					</Button>
-					<Button
-						variant="solid"
-						color="destructive"
-						size="sm"
-						disabled={isDeleting}
-						onClick={handleDelete}
-					>
-						<Trash2 size={12} />
-						{isDeleting ? 'Processing...' : deleteConfirmLabel}
-					</Button>
-				</DialogFooter>
-			</DialogWrapper>
-		</>
-	);
-}
-
-export default EditMemberDrawer;

frontend/src/components/EditMemberDrawer/__tests__/EditMemberDrawer.test.tsx

@@ -1,277 +0,0 @@
-import type { ReactNode } from 'react';
-import { toast } from '@signozhq/sonner';
-import getResetPasswordToken from 'api/v1/factor_password/getResetPasswordToken';
-import cancelInvite from 'api/v1/invite/id/delete';
-import deleteUser from 'api/v1/user/id/delete';
-import update from 'api/v1/user/id/update';
-import { MemberStatus } from 'container/MembersSettings/utils';
-import {
-	fireEvent,
-	render,
-	screen,
-	userEvent,
-	waitFor,
-} from 'tests/test-utils';
-import { ROLES } from 'types/roles';
-
-import EditMemberDrawer, { EditMemberDrawerProps } from '../EditMemberDrawer';
-
-jest.mock('@signozhq/drawer', () => ({
-	DrawerWrapper: ({
-		content,
-		open,
-	}: {
-		content?: ReactNode;
-		open: boolean;
-	}): JSX.Element | null => (open ? <div>{content}</div> : null),
-}));
-
-jest.mock('@signozhq/dialog', () => ({
-	DialogWrapper: ({
-		children,
-		open,
-		title,
-	}: {
-		children?: ReactNode;
-		open: boolean;
-		title?: string;
-	}): JSX.Element | null =>
-		open ? (
-			<div role="dialog" aria-label={title}>
-				{children}
-			</div>
-		) : null,
-	DialogFooter: ({ children }: { children?: ReactNode }): JSX.Element => (
-		<div>{children}</div>
-	),
-}));
-
-jest.mock('api/v1/user/id/update');
-jest.mock('api/v1/user/id/delete');
-jest.mock('api/v1/invite/id/delete');
-jest.mock('api/v1/invite/create');
-jest.mock('api/v1/factor_password/getResetPasswordToken');
-jest.mock('@signozhq/sonner', () => ({
-	toast: {
-		success: jest.fn(),
-		error: jest.fn(),
-	},
-}));
-
-const mockUpdate = jest.mocked(update);
-const mockDeleteUser = jest.mocked(deleteUser);
-const mockCancelInvite = jest.mocked(cancelInvite);
-const mockGetResetPasswordToken = jest.mocked(getResetPasswordToken);
-
-const activeMember = {
-	id: 'user-1',
-	name: 'Alice Smith',
-	email: 'alice@signoz.io',
-	role: 'ADMIN' as ROLES,
-	status: MemberStatus.Active,
-	joinedOn: '1700000000000',
-	updatedAt: '1710000000000',
-};
-
-const invitedMember = {
-	id: 'invite-abc123',
-	name: '',
-	email: 'bob@signoz.io',
-	role: 'VIEWER' as ROLES,
-	status: MemberStatus.Invited,
-	joinedOn: '1700000000000',
-	token: 'tok-xyz',
-};
-
-function renderDrawer(
-	props: Partial<EditMemberDrawerProps> = {},
-): ReturnType<typeof render> {
-	return render(
-		<EditMemberDrawer
-			member={activeMember}
-			open
-			onClose={jest.fn()}
-			onSuccess={jest.fn()}
-			{...props}
-		/>,
-	);
-}
-
-describe('EditMemberDrawer', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockUpdate.mockResolvedValue({ httpStatusCode: 200, data: null });
-		mockDeleteUser.mockResolvedValue({ httpStatusCode: 200, data: null });
-		mockCancelInvite.mockResolvedValue({ httpStatusCode: 200, data: null });
-	});
-
-	it('renders active member details and disables Save when form is not dirty', () => {
-		renderDrawer();
-
-		expect(screen.getByDisplayValue('Alice Smith')).toBeInTheDocument();
-		expect(screen.getByText('alice@signoz.io')).toBeInTheDocument();
-		expect(screen.getByText('ACTIVE')).toBeInTheDocument();
-		expect(
-			screen.getByRole('button', { name: /save member details/i }),
-		).toBeDisabled();
-	});
-
-	it('enables Save after editing name and calls update API on confirm', async () => {
-		const onSuccess = jest.fn();
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		renderDrawer({ onSuccess });
-
-		const nameInput = screen.getByDisplayValue('Alice Smith');
-		await user.clear(nameInput);
-		await user.type(nameInput, 'Alice Updated');
-
-		const saveBtn = screen.getByRole('button', { name: /save member details/i });
-		await waitFor(() => expect(saveBtn).not.toBeDisabled());
-
-		await user.click(saveBtn);
-
-		await waitFor(() => {
-			expect(mockUpdate).toHaveBeenCalledWith(
-				expect.objectContaining({
-					userId: 'user-1',
-					displayName: 'Alice Updated',
-				}),
-			);
-			expect(onSuccess).toHaveBeenCalled();
-		});
-	});
-
-	it('shows delete confirm dialog and calls deleteUser for active members', async () => {
-		const onSuccess = jest.fn();
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		renderDrawer({ onSuccess });
-
-		await user.click(screen.getByRole('button', { name: /delete member/i }));
-
-		expect(
-			await screen.findByText(/are you sure you want to delete/i),
-		).toBeInTheDocument();
-
-		const confirmBtns = screen.getAllByRole('button', { name: /delete member/i });
-		await user.click(confirmBtns[confirmBtns.length - 1]);
-
-		await waitFor(() => {
-			expect(mockDeleteUser).toHaveBeenCalledWith({ userId: 'user-1' });
-			expect(onSuccess).toHaveBeenCalled();
-		});
-	});
-
-	it('shows Cancel Invite and Copy Invite Link for invited members; hides Last Modified', () => {
-		renderDrawer({ member: invitedMember });
-
-		expect(
-			screen.getByRole('button', { name: /cancel invite/i }),
-		).toBeInTheDocument();
-		expect(
-			screen.getByRole('button', { name: /copy invite link/i }),
-		).toBeInTheDocument();
-		expect(screen.getByText('Invited On')).toBeInTheDocument();
-		expect(screen.queryByText('Last Modified')).not.toBeInTheDocument();
-	});
-
-	it('calls cancelInvite after confirming Cancel Invite for invited members', async () => {
-		const onSuccess = jest.fn();
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		renderDrawer({ member: invitedMember, onSuccess });
-
-		await user.click(screen.getByRole('button', { name: /cancel invite/i }));
-
-		expect(
-			await screen.findByText(/are you sure you want to cancel the invitation/i),
-		).toBeInTheDocument();
-
-		const confirmBtns = screen.getAllByRole('button', { name: /cancel invite/i });
-		await user.click(confirmBtns[confirmBtns.length - 1]);
-
-		await waitFor(() => {
-			expect(mockCancelInvite).toHaveBeenCalledWith({ id: 'abc123' });
-			expect(onSuccess).toHaveBeenCalled();
-		});
-	});
-
-	describe('Generate Password Reset Link', () => {
-		const mockWriteText = jest.fn().mockResolvedValue(undefined);
-		let clipboardSpy: jest.SpyInstance | undefined;
-
-		beforeAll(() => {
-			Object.defineProperty(navigator, 'clipboard', {
-				value: { writeText: (): Promise<void> => Promise.resolve() },
-				configurable: true,
-				writable: true,
-			});
-		});
-
-		beforeEach(() => {
-			mockWriteText.mockClear();
-			clipboardSpy = jest
-				.spyOn(navigator.clipboard, 'writeText')
-				.mockImplementation(mockWriteText);
-			mockGetResetPasswordToken.mockResolvedValue({
-				httpStatusCode: 200,
-				data: { token: 'reset-tok-abc', userId: 'user-1' },
-			});
-		});
-
-		afterEach(() => {
-			clipboardSpy?.mockRestore();
-		});
-
-		it('calls getResetPasswordToken and opens the reset link dialog with the generated link', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			renderDrawer();
-
-			await user.click(
-				screen.getByRole('button', { name: /generate password reset link/i }),
-			);
-
-			const dialog = await screen.findByRole('dialog', {
-				name: /password reset link/i,
-			});
-			expect(mockGetResetPasswordToken).toHaveBeenCalledWith({
-				userId: 'user-1',
-			});
-			expect(dialog).toBeInTheDocument();
-			expect(dialog).toHaveTextContent('reset-tok-abc');
-		});
-
-		it('copies the link to clipboard and shows "Copied!" on the button', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-			const mockToast = jest.mocked(toast);
-
-			renderDrawer();
-
-			await user.click(
-				screen.getByRole('button', { name: /generate password reset link/i }),
-			);
-
-			const dialog = await screen.findByRole('dialog', {
-				name: /password reset link/i,
-			});
-			expect(dialog).toHaveTextContent('reset-tok-abc');
-
-			fireEvent.click(screen.getByRole('button', { name: /^copy$/i }));
-
-			// Verify success path: writeText called with the correct link
-			await waitFor(() => {
-				expect(mockToast.success).toHaveBeenCalledWith(
-					'Reset link copied to clipboard',
-					expect.anything(),
-				);
-			});
-
-			expect(mockWriteText).toHaveBeenCalledWith(
-				expect.stringContaining('reset-tok-abc'),
-			);
-			expect(screen.getByRole('button', { name: /copied!/i })).toBeInTheDocument();
-		});
-	});
-});

frontend/src/components/InviteMembersModal/InviteMembersModal.styles.scss

@@ -1,264 +0,0 @@
-.invite-members-modal {
-	max-width: 700px;
-	background: var(--popover);
-	border: 1px solid var(--secondary);
-	border-radius: 4px;
-	box-shadow: 0 4px 9px 0 rgba(0, 0, 0, 0.04);
-
-	[data-slot='dialog-header'] {
-		padding: var(--padding-4);
-		border-bottom: 1px solid var(--secondary);
-		flex-shrink: 0;
-		background: transparent;
-		margin: 0;
-	}
-
-	[data-slot='dialog-title'] {
-		font-family: Inter, sans-serif;
-		font-size: var(--label-base-400-font-size);
-		font-weight: var(--label-base-400-font-weight);
-		line-height: var(--label-base-400-line-height);
-		letter-spacing: -0.065px;
-		color: var(--bg-base-white);
-		margin: 0;
-	}
-
-	[data-slot='dialog-description'] {
-		padding: 0;
-
-		.invite-members-modal__content {
-			display: flex;
-			flex-direction: column;
-			gap: var(--spacing-8);
-			padding: var(--padding-4);
-		}
-	}
-}
-
-.invite-members-modal__table {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-4);
-	width: 100%;
-}
-
-.invite-members-modal__table-header {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-8);
-	width: 100%;
-
-	.email-header {
-		flex: 0 0 240px;
-	}
-
-	.role-header {
-		flex: 1 0 0;
-		min-width: 0;
-	}
-
-	.action-header {
-		flex: 0 0 32px;
-	}
-
-	.table-header-cell {
-		font-family: Inter, sans-serif;
-		font-size: var(--paragraph-base-400-font-size);
-		font-weight: var(--paragraph-base-400-font-weight);
-		line-height: var(--paragraph-base-400-line-height);
-		letter-spacing: -0.07px;
-		color: var(--foreground);
-	}
-}
-
-.invite-members-modal__container {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-8);
-	width: 100%;
-}
-
-.team-member-row {
-	display: flex;
-	align-items: flex-start;
-	gap: var(--spacing-8);
-	width: 100%;
-
-	> .email-cell {
-		flex: 0 0 240px;
-	}
-
-	> .role-cell {
-		flex: 1 0 0;
-		min-width: 0;
-	}
-
-	> .action-cell {
-		flex: 0 0 32px;
-	}
-}
-
-.team-member-cell {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-2);
-
-	&.action-cell {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		height: 32px;
-	}
-}
-
-.team-member-email-input {
-	width: 100%;
-	height: 32px;
-	color: var(--l1-foreground);
-	background-color: var(--l2-background);
-	border-color: var(--border);
-	font-size: var(--paragraph-base-400-font-size);
-
-	&::placeholder {
-		color: var(--l3-foreground);
-	}
-
-	&:focus {
-		border-color: var(--primary);
-		box-shadow: none;
-	}
-}
-.team-member-role-select {
-	width: 100%;
-
-	.ant-select-selector {
-		height: 32px;
-		border-radius: 2px;
-		background-color: var(--l2-background) !important;
-		border: 1px solid var(--border) !important;
-		padding: 0 var(--padding-2) !important;
-
-		.ant-select-selection-placeholder {
-			color: var(--l3-foreground);
-			opacity: 0.4;
-			font-size: var(--paragraph-base-400-font-size);
-			letter-spacing: -0.07px;
-			line-height: 32px;
-		}
-
-		.ant-select-selection-item {
-			font-size: var(--paragraph-base-400-font-size);
-			letter-spacing: -0.07px;
-			color: var(--bg-base-white);
-			line-height: 32px;
-		}
-	}
-
-	.ant-select-arrow {
-		color: var(--foreground);
-	}
-
-	&.ant-select-focused .ant-select-selector,
-	&:not(.ant-select-disabled):hover .ant-select-selector {
-		border-color: var(--primary);
-	}
-}
-
-.remove-team-member-button {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	width: 32px;
-	height: 32px;
-	min-width: 32px;
-	border: none;
-	border-radius: 2px;
-	background: transparent;
-	color: var(--destructive);
-	opacity: 0.6;
-	padding: 0;
-	transition: background-color 0.2s, opacity 0.2s;
-	box-shadow: none;
-
-	&:hover {
-		background: rgba(229, 72, 77, 0.1);
-		opacity: 0.9;
-	}
-}
-
-.email-error-message {
-	display: block;
-	font-family: Inter, sans-serif;
-	font-size: var(--font-size-xs);
-	font-weight: var(--font-weight-normal);
-	line-height: var(--line-height-18);
-	color: var(--destructive);
-}
-
-.invite-team-members-error-callout {
-	background: rgba(229, 72, 77, 0.1);
-	border: 1px solid rgba(229, 72, 77, 0.2);
-	border-radius: 4px;
-	animation: horizontal-shaking 300ms ease-out;
-}
-
-@keyframes horizontal-shaking {
-	0% {
-		transform: translateX(0);
-	}
-	25% {
-		transform: translateX(5px);
-	}
-	50% {
-		transform: translateX(-5px);
-	}
-	75% {
-		transform: translateX(5px);
-	}
-	100% {
-		transform: translateX(0);
-	}
-}
-
-.invite-members-modal__footer {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 var(--padding-4);
-	height: 56px;
-	min-height: 56px;
-	border-top: 1px solid var(--secondary);
-	gap: 0;
-	flex-shrink: 0;
-}
-
-.invite-members-modal__footer-right {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-6);
-}
-
-.add-another-member-button {
-	&:hover {
-		border-color: var(--primary);
-		border-style: dashed;
-		color: var(--l1-foreground);
-	}
-}
-
-.lightMode {
-	.invite-members-modal {
-		[data-slot='dialog-title'] {
-			color: var(--bg-base-black);
-		}
-	}
-
-	.team-member-role-select {
-		.ant-select-selector {
-			.ant-select-selection-item {
-				color: var(--bg-base-black);
-			}
-		}
-	}
-}

frontend/src/components/InviteMembersModal/InviteMembersModal.tsx

@@ -1,336 +0,0 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
-import { Button } from '@signozhq/button';
-import { Callout } from '@signozhq/callout';
-import { Style } from '@signozhq/design-tokens';
-import { DialogFooter, DialogWrapper } from '@signozhq/dialog';
-import { ChevronDown, CircleAlert, Plus, Trash2, X } from '@signozhq/icons';
-import { Input } from '@signozhq/input';
-import { toast } from '@signozhq/sonner';
-import { Select } from 'antd';
-import inviteUsers from 'api/v1/invite/bulk/create';
-import sendInvite from 'api/v1/invite/create';
-import { cloneDeep, debounce } from 'lodash-es';
-import APIError from 'types/api/error';
-import { ROLES } from 'types/roles';
-import { EMAIL_REGEX } from 'utils/app';
-import { v4 as uuid } from 'uuid';
-
-import './InviteMembersModal.styles.scss';
-
-interface InviteRow {
-	id: string;
-	email: string;
-	role: ROLES | '';
-}
-
-export interface InviteMembersModalProps {
-	open: boolean;
-	onClose: () => void;
-	onSuccess?: () => void;
-}
-
-const EMPTY_ROW = (): InviteRow => ({ id: uuid(), email: '', role: '' });
-
-const isRowTouched = (row: InviteRow): boolean =>
-	row.email.trim() !== '' || Boolean(row.role && row.role.trim() !== '');
-
-function InviteMembersModal({
-	open,
-	onClose,
-	onSuccess,
-}: InviteMembersModalProps): JSX.Element {
-	const [rows, setRows] = useState<InviteRow[]>([]);
-	const [isSubmitting, setIsSubmitting] = useState(false);
-	const [emailValidity, setEmailValidity] = useState<Record<string, boolean>>(
-		{},
-	);
-	const [hasInvalidEmails, setHasInvalidEmails] = useState<boolean>(false);
-	const [hasInvalidRoles, setHasInvalidRoles] = useState<boolean>(false);
-
-	const resetAndClose = useCallback((): void => {
-		setRows([EMPTY_ROW(), EMPTY_ROW(), EMPTY_ROW()]);
-		setEmailValidity({});
-		setHasInvalidEmails(false);
-		setHasInvalidRoles(false);
-		onClose();
-	}, [onClose]);
-
-	useEffect(() => {
-		if (open) {
-			setRows([EMPTY_ROW(), EMPTY_ROW(), EMPTY_ROW()]);
-		}
-	}, [open]);
-
-	const getValidationErrorMessage = (): string => {
-		if (hasInvalidEmails && hasInvalidRoles) {
-			return 'Please enter valid emails and select roles for team members';
-		}
-		if (hasInvalidEmails) {
-			return 'Please enter valid emails for team members';
-		}
-		return 'Please select roles for team members';
-	};
-
-	const validateAllUsers = useCallback((): boolean => {
-		let isValid = true;
-		let hasEmailErrors = false;
-		let hasRoleErrors = false;
-
-		const updatedEmailValidity: Record<string, boolean> = {};
-
-		const touchedRows = rows.filter(isRowTouched);
-
-		touchedRows.forEach((row) => {
-			const emailValid = EMAIL_REGEX.test(row.email);
-			const roleValid = Boolean(row.role && row.role.trim() !== '');
-
-			if (!emailValid || !row.email) {
-				isValid = false;
-				hasEmailErrors = true;
-			}
-			if (!roleValid) {
-				isValid = false;
-				hasRoleErrors = true;
-			}
-
-			if (row.id) {
-				updatedEmailValidity[row.id] = emailValid;
-			}
-		});
-
-		setEmailValidity(updatedEmailValidity);
-		setHasInvalidEmails(hasEmailErrors);
-		setHasInvalidRoles(hasRoleErrors);
-
-		return isValid;
-	}, [rows]);
-
-	const debouncedValidateEmail = useMemo(
-		() =>
-			debounce((email: string, rowId: string) => {
-				const isValid = EMAIL_REGEX.test(email);
-				setEmailValidity((prev) => ({ ...prev, [rowId]: isValid }));
-			}, 500),
-		[],
-	);
-
-	const updateEmail = (id: string, email: string): void => {
-		const updatedRows = cloneDeep(rows);
-		const rowToUpdate = updatedRows.find((r) => r.id === id);
-		if (rowToUpdate) {
-			rowToUpdate.email = email;
-			setRows(updatedRows);
-
-			if (hasInvalidEmails) {
-				setHasInvalidEmails(false);
-			}
-			if (emailValidity[id] === false) {
-				setEmailValidity((prev) => ({ ...prev, [id]: true }));
-			}
-
-			debouncedValidateEmail(email, id);
-		}
-	};
-
-	const updateRole = (id: string, role: ROLES): void => {
-		const updatedRows = cloneDeep(rows);
-		const rowToUpdate = updatedRows.find((r) => r.id === id);
-		if (rowToUpdate) {
-			rowToUpdate.role = role;
-			setRows(updatedRows);
-
-			if (hasInvalidRoles) {
-				setHasInvalidRoles(false);
-			}
-		}
-	};
-
-	const addRow = (): void => {
-		setRows((prev) => [...prev, EMPTY_ROW()]);
-	};
-
-	const removeRow = (id: string): void => {
-		setRows((prev) => prev.filter((r) => r.id !== id));
-	};
-
-	const handleSubmit = useCallback(async (): Promise<void> => {
-		if (!validateAllUsers()) {
-			return;
-		}
-
-		const touchedRows = rows.filter(isRowTouched);
-		if (touchedRows.length === 0) {
-			return;
-		}
-
-		setIsSubmitting(true);
-		try {
-			if (touchedRows.length === 1) {
-				const row = touchedRows[0];
-				await sendInvite({
-					email: row.email.trim(),
-					name: '',
-					role: row.role as ROLES,
-					frontendBaseUrl: window.location.origin,
-				});
-			} else {
-				await inviteUsers({
-					invites: touchedRows.map((row) => ({
-						email: row.email.trim(),
-						name: '',
-						role: row.role,
-						frontendBaseUrl: window.location.origin,
-					})),
-				});
-			}
-			toast.success('Invites sent successfully', { richColors: true });
-			resetAndClose();
-			onSuccess?.();
-		} catch (err) {
-			const apiErr = err as APIError;
-			if (apiErr?.getHttpStatusCode() === 409) {
-				toast.error(
-					touchedRows.length === 1
-						? `${touchedRows[0].email} is already a member`
-						: 'Invite for one or more users already exists',
-					{ richColors: true },
-				);
-			} else {
-				const errorMessage = apiErr?.getErrorMessage?.() ?? 'An error occurred';
-				toast.error(`Failed to send invites: ${errorMessage}`, {
-					richColors: true,
-				});
-			}
-		} finally {
-			setIsSubmitting(false);
-		}
-	}, [rows, onSuccess, resetAndClose, validateAllUsers]);
-
-	const touchedRows = rows.filter(isRowTouched);
-	const isSubmitDisabled = isSubmitting || touchedRows.length === 0;
-
-	return (
-		<DialogWrapper
-			title="Invite Team Members"
-			open={open}
-			onOpenChange={(isOpen): void => {
-				if (!isOpen) {
-					resetAndClose();
-				}
-			}}
-			showCloseButton
-			width="wide"
-			className="invite-members-modal"
-			disableOutsideClick={false}
-		>
-			<div className="invite-members-modal__content">
-				<div className="invite-members-modal__table">
-					<div className="invite-members-modal__table-header">
-						<div className="table-header-cell email-header">Email address</div>
-						<div className="table-header-cell role-header">Roles</div>
-						<div className="table-header-cell action-header" />
-					</div>
-					<div className="invite-members-modal__container">
-						{rows.map(
-							(row): JSX.Element => (
-								<div key={row.id} className="team-member-row">
-									<div className="team-member-cell email-cell">
-										<Input
-											type="email"
-											placeholder="john@signoz.io"
-											value={row.email}
-											onChange={(e): void => updateEmail(row.id, e.target.value)}
-											className="team-member-email-input"
-										/>
-										{emailValidity[row.id] === false && row.email.trim() !== '' && (
-											<span className="email-error-message">Invalid email address</span>
-										)}
-									</div>
-									<div className="team-member-cell role-cell">
-										<Select
-											value={row.role || undefined}
-											onChange={(role): void => updateRole(row.id, role as ROLES)}
-											className="team-member-role-select"
-											placeholder="Select roles"
-											suffixIcon={<ChevronDown size={14} />}
-											getPopupContainer={(triggerNode): HTMLElement =>
-												(triggerNode?.closest('.invite-members-modal') as HTMLElement) ||
-												document.body
-											}
-										>
-											<Select.Option value="VIEWER">Viewer</Select.Option>
-											<Select.Option value="EDITOR">Editor</Select.Option>
-											<Select.Option value="ADMIN">Admin</Select.Option>
-										</Select>
-									</div>
-									<div className="team-member-cell action-cell">
-										{rows.length > 1 && (
-											<Button
-												variant="ghost"
-												color="destructive"
-												className="remove-team-member-button"
-												onClick={(): void => removeRow(row.id)}
-												aria-label="Remove row"
-											>
-												<Trash2 size={12} />
-											</Button>
-										)}
-									</div>
-								</div>
-							),
-						)}
-					</div>
-				</div>
-
-				{(hasInvalidEmails || hasInvalidRoles) && (
-					<Callout
-						type="error"
-						size="small"
-						showIcon
-						icon={<CircleAlert size={12} />}
-						className="invite-team-members-error-callout"
-						description={getValidationErrorMessage()}
-					/>
-				)}
-			</div>
-
-			<DialogFooter className="invite-members-modal__footer">
-				<Button
-					variant="dashed"
-					color="secondary"
-					size="sm"
-					className="add-another-member-button"
-					prefixIcon={<Plus size={12} color={Style.L1_FOREGROUND} />}
-					onClick={addRow}
-				>
-					Add another
-				</Button>
-
-				<div className="invite-members-modal__footer-right">
-					<Button
-						type="button"
-						variant="solid"
-						color="secondary"
-						size="sm"
-						onClick={resetAndClose}
-					>
-						<X size={12} />
-						Cancel
-					</Button>
-
-					<Button
-						variant="solid"
-						color="primary"
-						size="sm"
-						onClick={handleSubmit}
-						disabled={isSubmitDisabled}
-					>
-						{isSubmitting ? 'Inviting...' : 'Invite Team Members'}
-					</Button>
-				</div>
-			</DialogFooter>
-		</DialogWrapper>
-	);
-}
-
-export default InviteMembersModal;

frontend/src/components/InviteMembersModal/__tests__/InviteMembersModal.test.tsx

@@ -1,177 +0,0 @@
-import inviteUsers from 'api/v1/invite/bulk/create';
-import sendInvite from 'api/v1/invite/create';
-import { render, screen, userEvent, waitFor } from 'tests/test-utils';
-
-import InviteMembersModal from '../InviteMembersModal';
-
-jest.mock('api/v1/invite/create');
-jest.mock('api/v1/invite/bulk/create');
-jest.mock('@signozhq/sonner', () => ({
-	toast: {
-		success: jest.fn(),
-		error: jest.fn(),
-	},
-}));
-
-const mockSendInvite = jest.mocked(sendInvite);
-const mockInviteUsers = jest.mocked(inviteUsers);
-
-const defaultProps = {
-	open: true,
-	onClose: jest.fn(),
-	onSuccess: jest.fn(),
-};
-
-describe('InviteMembersModal', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockSendInvite.mockResolvedValue({
-			httpStatusCode: 200,
-			data: { data: 'test', status: 'success' },
-		});
-		mockInviteUsers.mockResolvedValue({ httpStatusCode: 200, data: null });
-	});
-
-	it('renders 3 initial empty rows and disables the submit button', () => {
-		render(<InviteMembersModal {...defaultProps} />);
-
-		const emailInputs = screen.getAllByPlaceholderText('john@signoz.io');
-		expect(emailInputs).toHaveLength(3);
-
-		expect(
-			screen.getByRole('button', { name: /invite team members/i }),
-		).toBeDisabled();
-	});
-
-	it('adds a row when "Add another" is clicked and removes a row via trash button', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		render(<InviteMembersModal {...defaultProps} />);
-
-		await user.click(screen.getByRole('button', { name: /add another/i }));
-		expect(screen.getAllByPlaceholderText('john@signoz.io')).toHaveLength(4);
-
-		const removeButtons = screen.getAllByRole('button', { name: /remove row/i });
-		await user.click(removeButtons[0]);
-		expect(screen.getAllByPlaceholderText('john@signoz.io')).toHaveLength(3);
-	});
-
-	describe('validation callout messages', () => {
-		it('shows combined message when email is invalid and role is missing', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			render(<InviteMembersModal {...defaultProps} />);
-
-			await user.type(
-				screen.getAllByPlaceholderText('john@signoz.io')[0],
-				'not-an-email',
-			);
-			await user.click(
-				screen.getByRole('button', { name: /invite team members/i }),
-			);
-
-			expect(
-				await screen.findByText(
-					'Please enter valid emails and select roles for team members',
-				),
-			).toBeInTheDocument();
-		});
-
-		it('shows email-only message when email is invalid but role is selected', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			render(<InviteMembersModal {...defaultProps} />);
-
-			const emailInputs = screen.getAllByPlaceholderText('john@signoz.io');
-			await user.type(emailInputs[0], 'not-an-email');
-
-			await user.click(screen.getAllByText('Select roles')[0]);
-			await user.click(await screen.findByText('Viewer'));
-
-			await user.click(
-				screen.getByRole('button', { name: /invite team members/i }),
-			);
-
-			expect(
-				await screen.findByText('Please enter valid emails for team members'),
-			).toBeInTheDocument();
-		});
-
-		it('shows role-only message when email is valid but role is missing', async () => {
-			const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-			render(<InviteMembersModal {...defaultProps} />);
-
-			await user.type(
-				screen.getAllByPlaceholderText('john@signoz.io')[0],
-				'valid@signoz.io',
-			);
-			await user.click(
-				screen.getByRole('button', { name: /invite team members/i }),
-			);
-
-			expect(
-				await screen.findByText('Please select roles for team members'),
-			).toBeInTheDocument();
-		});
-	});
-
-	it('uses sendInvite (single) when only one row is filled', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onSuccess = jest.fn();
-
-		render(<InviteMembersModal {...defaultProps} onSuccess={onSuccess} />);
-
-		const emailInputs = screen.getAllByPlaceholderText('john@signoz.io');
-		await user.type(emailInputs[0], 'single@signoz.io');
-
-		const roleSelects = screen.getAllByText('Select roles');
-		await user.click(roleSelects[0]);
-		await user.click(await screen.findByText('Viewer'));
-
-		await user.click(
-			screen.getByRole('button', { name: /invite team members/i }),
-		);
-
-		await waitFor(() => {
-			expect(mockSendInvite).toHaveBeenCalledWith(
-				expect.objectContaining({ email: 'single@signoz.io', role: 'VIEWER' }),
-			);
-			expect(mockInviteUsers).not.toHaveBeenCalled();
-			expect(onSuccess).toHaveBeenCalled();
-		});
-	});
-
-	it('uses inviteUsers (bulk) when multiple rows are filled', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-		const onSuccess = jest.fn();
-
-		render(<InviteMembersModal {...defaultProps} onSuccess={onSuccess} />);
-
-		const emailInputs = screen.getAllByPlaceholderText('john@signoz.io');
-
-		await user.type(emailInputs[0], 'alice@signoz.io');
-		await user.click(screen.getAllByText('Select roles')[0]);
-		await user.click(await screen.findByText('Viewer'));
-
-		await user.type(emailInputs[1], 'bob@signoz.io');
-		await user.click(screen.getAllByText('Select roles')[0]);
-		const editorOptions = await screen.findAllByText('Editor');
-		await user.click(editorOptions[editorOptions.length - 1]);
-
-		await user.click(
-			screen.getByRole('button', { name: /invite team members/i }),
-		);
-
-		await waitFor(() => {
-			expect(mockInviteUsers).toHaveBeenCalledWith({
-				invites: expect.arrayContaining([
-					expect.objectContaining({ email: 'alice@signoz.io', role: 'VIEWER' }),
-					expect.objectContaining({ email: 'bob@signoz.io', role: 'EDITOR' }),
-				]),
-			});
-			expect(mockSendInvite).not.toHaveBeenCalled();
-			expect(onSuccess).toHaveBeenCalled();
-		});
-	});
-});

frontend/src/components/MembersTable/MembersTable.styles.scss

@@ -1,204 +0,0 @@
-.members-table-wrapper {
-	display: flex;
-	flex-direction: column;
-	flex: 1;
-	min-height: 0;
-	overflow: hidden;
-	border-radius: 4px;
-}
-
-.members-table {
-	.ant-table {
-		background: transparent;
-		font-size: 13px;
-	}
-
-	.ant-table-container {
-		border-radius: 0 !important;
-		border: none !important;
-	}
-
-	.ant-table-thead {
-		> tr > th,
-		> tr > td {
-			background: var(--background);
-			font-size: var(--paragraph-small-600-font-size);
-			font-weight: var(--paragraph-small-600-font-weight);
-			line-height: var(--paragraph-small-600-line-height);
-			letter-spacing: 0.44px;
-			text-transform: uppercase;
-			color: var(--foreground);
-			padding: var(--padding-2) var(--padding-4);
-			border-bottom: none !important;
-			border-top: none !important;
-
-			&::before {
-				display: none !important;
-			}
-			.ant-table-column-sorter {
-				color: var(--foreground);
-				opacity: 0.6;
-			}
-
-			.ant-table-column-sorter-up.active,
-			.ant-table-column-sorter-down.active {
-				color: var(--bg-base-white);
-				opacity: 1;
-			}
-		}
-	}
-
-	.ant-table-tbody {
-		> tr > td {
-			border-bottom: none !important;
-			padding: var(--padding-2) var(--padding-4);
-			background: transparent;
-			transition: none;
-		}
-
-		> tr.members-table-row--tinted > td {
-			background: rgba(171, 189, 255, 0.02);
-		}
-		> tr:hover > td {
-			background: rgba(171, 189, 255, 0.04) !important;
-		}
-	}
-
-	.ant-table-wrapper,
-	.ant-table-container,
-	.ant-spin-nested-loading,
-	.ant-spin-container {
-		border: none !important;
-		box-shadow: none !important;
-	}
-
-	.member-status-cell {
-		[data-slot='badge'] {
-			padding: var(--padding-1) var(--padding-2);
-			align-items: center;
-			font-size: var(--uppercase-small-500-font-size);
-			font-weight: var(--uppercase-small-500-font-weight);
-			line-height: 100%;
-			letter-spacing: 0.44px;
-			text-transform: uppercase;
-		}
-	}
-}
-.member-name-email-cell {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2);
-	height: 22px;
-	overflow: hidden;
-
-	.member-name {
-		font-size: var(--paragraph-base-500-font-size);
-		font-weight: var(--paragraph-base-500-font-weight);
-		color: var(--foreground);
-		line-height: var(--paragraph-base-500-line-height);
-		letter-spacing: -0.07px;
-		white-space: nowrap;
-		flex-shrink: 0;
-	}
-
-	.member-email {
-		font-size: var(--paragraph-base-400-font-size);
-		font-weight: var(--paragraph-base-400-font-weight);
-		color: var(--l3-foreground-hover);
-		line-height: var(--paragraph-base-400-line-height);
-		letter-spacing: -0.07px;
-		flex: 1 0 0;
-		min-width: 0;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-}
-
-.member-joined-date {
-	font-size: var(--paragraph-base-400-font-size);
-	font-weight: var(--paragraph-base-400-font-weight);
-	color: var(--foreground);
-	line-height: var(--line-height-18);
-	letter-spacing: -0.07px;
-	white-space: nowrap;
-}
-
-.member-joined-dash {
-	font-size: var(--paragraph-base-400-font-size);
-	color: var(--l3-foreground-hover);
-	line-height: var(--line-height-18);
-	letter-spacing: -0.07px;
-}
-
-.members-empty-state {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	justify-content: center;
-	padding: var(--padding-12) var(--padding-4);
-	gap: var(--spacing-4);
-	color: var(--foreground);
-
-	&__emoji {
-		font-size: var(--font-size-2xl);
-		line-height: 1;
-	}
-
-	&__text {
-		font-size: var(--paragraph-base-400-font-size);
-		font-weight: var(--paragraph-base-400-font-weight);
-		color: var(--foreground);
-		margin: 0;
-		line-height: var(--paragraph-base-400-font-height);
-
-		strong {
-			font-weight: var(--font-weight-medium);
-			color: var(--bg-base-white);
-		}
-	}
-}
-
-.members-table-pagination {
-	display: flex;
-	align-items: center;
-	justify-content: flex-end;
-	padding: var(--padding-2) var(--padding-4);
-
-	.ant-pagination-total-text {
-		margin-right: auto;
-	}
-
-	.members-pagination-range {
-		font-size: var(--font-size-xs);
-		color: var(--foreground);
-	}
-
-	.members-pagination-total {
-		font-size: var(--font-size-xs);
-		color: var(--foreground);
-		opacity: 0.5;
-	}
-}
-
-.lightMode {
-	.members-table {
-		.ant-table-tbody {
-			> tr.members-table-row--tinted > td {
-				background: rgba(0, 0, 0, 0.015);
-			}
-
-			> tr:hover > td {
-				background: rgba(0, 0, 0, 0.03) !important;
-			}
-		}
-	}
-
-	.members-empty-state {
-		&__text {
-			strong {
-				color: var(--bg-base-black);
-			}
-		}
-	}
-}

frontend/src/components/MembersTable/MembersTable.tsx

@@ -1,236 +0,0 @@
-import type React from 'react';
-import { Badge } from '@signozhq/badge';
-import { Pagination, Table, Tooltip } from 'antd';
-import type { ColumnsType, SorterResult } from 'antd/es/table/interface';
-import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import { MemberStatus } from 'container/MembersSettings/utils';
-import { capitalize } from 'lodash-es';
-import { useTimezone } from 'providers/Timezone';
-import { ROLES } from 'types/roles';
-
-import './MembersTable.styles.scss';
-
-export interface MemberRow {
-	id: string;
-	name?: string;
-	email: string;
-	role: ROLES;
-	status: MemberStatus;
-	joinedOn: string | null;
-	updatedAt?: string | null;
-	token?: string | null;
-}
-
-interface MembersTableProps {
-	data: MemberRow[];
-	loading: boolean;
-	total: number;
-	currentPage: number;
-	pageSize: number;
-	searchQuery: string;
-	onPageChange: (page: number) => void;
-	onRowClick?: (member: MemberRow) => void;
-	onSortChange?: (
-		sorter: SorterResult<MemberRow> | SorterResult<MemberRow>[],
-	) => void;
-}
-
-function NameEmailCell({
-	name,
-	email,
-}: {
-	name?: string;
-	email: string;
-}): JSX.Element {
-	return (
-		<div className="member-name-email-cell">
-			{name && (
-				<span className="member-name" title={name}>
-					{name}
-				</span>
-			)}
-			<Tooltip title={email} overlayClassName="member-tooltip">
-				<span className="member-email">{email}</span>
-			</Tooltip>
-		</div>
-	);
-}
-
-function StatusBadge({ status }: { status: MemberRow['status'] }): JSX.Element {
-	if (status === MemberStatus.Active) {
-		return (
-			<Badge color="forest" variant="outline">
-				ACTIVE
-			</Badge>
-		);
-	}
-	return (
-		<Badge color="amber" variant="outline">
-			INVITED
-		</Badge>
-	);
-}
-
-function MembersEmptyState({
-	searchQuery,
-}: {
-	searchQuery: string;
-}): JSX.Element {
-	return (
-		<div className="members-empty-state">
-			<span
-				className="members-empty-state__emoji"
-				role="img"
-				aria-label="monocle face"
-			>
-				🧐
-			</span>
-			{searchQuery ? (
-				<p className="members-empty-state__text">
-					No results for <strong>{searchQuery}</strong>
-				</p>
-			) : (
-				<p className="members-empty-state__text">No members found</p>
-			)}
-		</div>
-	);
-}
-
-function MembersTable({
-	data,
-	loading,
-	total,
-	currentPage,
-	pageSize,
-	searchQuery,
-	onPageChange,
-	onRowClick,
-	onSortChange,
-}: MembersTableProps): JSX.Element {
-	const { formatTimezoneAdjustedTimestamp } = useTimezone();
-
-	const formatJoinedOn = (date: string | null): string => {
-		if (!date) {
-			return '—';
-		}
-		const d = new Date(date);
-		if (Number.isNaN(d.getTime())) {
-			return '—';
-		}
-		return formatTimezoneAdjustedTimestamp(date, DATE_TIME_FORMATS.DASH_DATETIME);
-	};
-
-	const columns: ColumnsType<MemberRow> = [
-		{
-			title: 'Name / Email',
-			dataIndex: 'name',
-			key: 'name',
-			render: (_, record): JSX.Element => (
-				<NameEmailCell name={record.name} email={record.email} />
-			),
-		},
-		{
-			title: 'Roles',
-			dataIndex: 'role',
-			key: 'role',
-			width: 180,
-			render: (role: ROLES): JSX.Element => (
-				<Badge color="vanilla">{capitalize(role)}</Badge>
-			),
-		},
-
-		{
-			title: 'Status',
-			dataIndex: 'status',
-			key: 'status',
-			width: 100,
-			align: 'right' as const,
-			className: 'member-status-cell',
-			sorter: (a, b): number => a.status.localeCompare(b.status),
-			render: (status: MemberRow['status']): JSX.Element => (
-				<StatusBadge status={status} />
-			),
-		},
-		{
-			title: 'Joined On',
-			dataIndex: 'joinedOn',
-			key: 'joinedOn',
-			width: 250,
-			align: 'right' as const,
-			sorter: (a, b): number => {
-				if (!a.joinedOn && !b.joinedOn) {
-					return 0;
-				}
-				if (!a.joinedOn) {
-					return 1;
-				}
-				if (!b.joinedOn) {
-					return -1;
-				}
-				return new Date(a.joinedOn).getTime() - new Date(b.joinedOn).getTime();
-			},
-			render: (joinedOn: string | null): JSX.Element => {
-				const formatted = formatJoinedOn(joinedOn);
-				const isDash = formatted === '—';
-				return (
-					<span className={isDash ? 'member-joined-dash' : 'member-joined-date'}>
-						{formatted}
-					</span>
-				);
-			},
-		},
-	];
-
-	const showPaginationTotal = (_total: number, range: number[]): JSX.Element => (
-		<>
-			<span className="members-pagination-range">
-				{range[0]} &#8212; {range[1]}
-			</span>
-			<span className="members-pagination-total"> of {_total}</span>
-		</>
-	);
-
-	return (
-		<div className="members-table-wrapper">
-			<Table<MemberRow>
-				columns={columns}
-				dataSource={data}
-				rowKey="id"
-				loading={loading}
-				pagination={false}
-				rowClassName={(_, index): string =>
-					index % 2 === 0 ? 'members-table-row--tinted' : ''
-				}
-				onRow={(record): React.HTMLAttributes<HTMLElement> => ({
-					onClick: (): void => onRowClick?.(record),
-					style: onRowClick ? { cursor: 'pointer' } : undefined,
-				})}
-				onChange={(_, __, sorter): void => {
-					if (onSortChange) {
-						onSortChange(
-							sorter as SorterResult<MemberRow> | SorterResult<MemberRow>[],
-						);
-					}
-				}}
-				showSorterTooltip={false}
-				locale={{
-					emptyText: <MembersEmptyState searchQuery={searchQuery} />,
-				}}
-				className="members-table"
-			/>
-			{total > pageSize && (
-				<Pagination
-					current={currentPage}
-					pageSize={pageSize}
-					total={total}
-					showTotal={showPaginationTotal}
-					showSizeChanger={false}
-					onChange={onPageChange}
-					className="members-table-pagination"
-				/>
-			)}
-		</div>
-	);
-}
-
-export default MembersTable;

frontend/src/components/MembersTable/__tests__/MembersTable.test.tsx

@@ -1,143 +0,0 @@
-import { MemberStatus } from 'container/MembersSettings/utils';
-import { render, screen, userEvent } from 'tests/test-utils';
-import { ROLES } from 'types/roles';
-
-import MembersTable, { MemberRow } from '../MembersTable';
-
-const mockActiveMembers: MemberRow[] = [
-	{
-		id: 'user-1',
-		name: 'Alice Smith',
-		email: 'alice@signoz.io',
-		role: 'ADMIN' as ROLES,
-		status: MemberStatus.Active,
-		joinedOn: '1700000000000',
-	},
-	{
-		id: 'user-2',
-		name: 'Bob Jones',
-		email: 'bob@signoz.io',
-		role: 'VIEWER' as ROLES,
-		status: MemberStatus.Active,
-		joinedOn: null,
-	},
-];
-
-const mockInvitedMember: MemberRow = {
-	id: 'invite-abc',
-	name: '',
-	email: 'charlie@signoz.io',
-	role: 'EDITOR' as ROLES,
-	status: MemberStatus.Invited,
-	joinedOn: null,
-	token: 'tok-123',
-};
-
-const defaultProps = {
-	loading: false,
-	total: 2,
-	currentPage: 1,
-	pageSize: 20,
-	searchQuery: '',
-	onPageChange: jest.fn(),
-	onRowClick: jest.fn(),
-};
-
-describe('MembersTable', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-	});
-
-	it('renders member rows with name, email, role badge, and ACTIVE status', () => {
-		render(<MembersTable {...defaultProps} data={mockActiveMembers} />);
-
-		expect(screen.getByText('Alice Smith')).toBeInTheDocument();
-		expect(screen.getByText('alice@signoz.io')).toBeInTheDocument();
-		expect(screen.getByText('Admin')).toBeInTheDocument();
-		expect(screen.getAllByText('ACTIVE')).toHaveLength(2);
-	});
-
-	it('renders INVITED badge for pending invite members', () => {
-		render(
-			<MembersTable
-				{...defaultProps}
-				data={[...mockActiveMembers, mockInvitedMember]}
-				total={3}
-			/>,
-		);
-
-		expect(screen.getByText('INVITED')).toBeInTheDocument();
-		expect(screen.getByText('charlie@signoz.io')).toBeInTheDocument();
-		expect(screen.getByText('Editor')).toBeInTheDocument();
-	});
-
-	it('calls onRowClick with the member data when a row is clicked', async () => {
-		const onRowClick = jest.fn() as jest.MockedFunction<
-			(member: MemberRow) => void
-		>;
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		render(
-			<MembersTable
-				{...defaultProps}
-				data={mockActiveMembers}
-				onRowClick={onRowClick}
-			/>,
-		);
-
-		await user.click(screen.getByText('Alice Smith'));
-
-		expect(onRowClick).toHaveBeenCalledTimes(1);
-		expect(onRowClick).toHaveBeenCalledWith(
-			expect.objectContaining({ id: 'user-1', email: 'alice@signoz.io' }),
-		);
-	});
-
-	it('shows "No members found" empty state when no data and no search query', () => {
-		render(<MembersTable {...defaultProps} data={[]} total={0} searchQuery="" />);
-
-		expect(screen.getByText('No members found')).toBeInTheDocument();
-	});
-
-	it('shows "No results for X" when no data and a search query is set', () => {
-		render(
-			<MembersTable {...defaultProps} data={[]} total={0} searchQuery="unknown" />,
-		);
-
-		expect(screen.getByText(/No results for/i)).toBeInTheDocument();
-		expect(screen.getByText('unknown')).toBeInTheDocument();
-	});
-
-	it('hides pagination when total does not exceed pageSize', () => {
-		const { container } = render(
-			<MembersTable
-				{...defaultProps}
-				data={mockActiveMembers}
-				total={2}
-				pageSize={20}
-			/>,
-		);
-
-		expect(
-			container.querySelector('.members-table-pagination'),
-		).not.toBeInTheDocument();
-	});
-
-	it('shows pagination when total exceeds pageSize', () => {
-		const { container } = render(
-			<MembersTable
-				{...defaultProps}
-				data={mockActiveMembers}
-				total={25}
-				pageSize={20}
-			/>,
-		);
-
-		expect(
-			container.querySelector('.members-table-pagination'),
-		).toBeInTheDocument();
-		expect(
-			container.querySelector('.members-pagination-total'),
-		).toBeInTheDocument();
-	});
-});

frontend/src/constants/routes.ts

@@ -56,7 +56,6 @@ const ROUTES = {
 	BILLING: '/settings/billing',
 	ROLES_SETTINGS: '/settings/roles',
 	ROLE_DETAILS: '/settings/roles/:roleId',
-	MEMBERS_SETTINGS: '/settings/members',
 	SUPPORT: '/support',
 	LOGS_SAVE_VIEWS: '/logs/saved-views',
 	TRACES_SAVE_VIEWS: '/traces/saved-views',

frontend/src/container/DashboardContainer/visualization/charts/BarChart/BarChart.tsx

@@ -10,15 +10,7 @@ import { useBarChartStacking } from '../../hooks/useBarChartStacking';
 import { BarChartProps } from '../types';
 
 export default function BarChart(props: BarChartProps): JSX.Element {
-	const {
-		children,
-		isStackedBarChart,
-		customTooltip,
-		config,
-		data,
-		pinnedTooltipElement,
-		...rest
-	} = props;
+	const { children, isStackedBarChart, config, data, ...rest } = props;
 
 	const chartData = useBarChartStacking({
 		data,
@@ -28,9 +20,6 @@ export default function BarChart(props: BarChartProps): JSX.Element {
 
 	const renderTooltip = useCallback(
 		(props: TooltipRenderArgs): React.ReactNode => {
-			if (customTooltip) {
-				return customTooltip(props);
-			}
 			const tooltipProps: BarTooltipProps = {
 				...props,
 				timezone: rest.timezone,
@@ -40,13 +29,7 @@ export default function BarChart(props: BarChartProps): JSX.Element {
 			};
 			return <BarChartTooltip {...tooltipProps} />;
 		},
-		[
-			customTooltip,
-			rest.timezone,
-			rest.yAxisUnit,
-			rest.decimalPrecision,
-			isStackedBarChart,
-		],
+		[rest.timezone, rest.yAxisUnit, rest.decimalPrecision, isStackedBarChart],
 	);
 
 	return (
@@ -54,8 +37,7 @@ export default function BarChart(props: BarChartProps): JSX.Element {
 			{...rest}
 			config={config}
 			data={chartData}
-			customTooltip={renderTooltip}
-			pinnedTooltipElement={pinnedTooltipElement}
+			renderTooltip={renderTooltip}
 		>
 			{children}
 		</ChartWrapper>

frontend/src/container/DashboardContainer/visualization/charts/ChartWrapper/ChartWrapper.tsx

@@ -30,8 +30,7 @@ export default function ChartWrapper({
 	onDestroy = noop,
 	children,
 	layoutChildren,
-	customTooltip,
-	pinnedTooltipElement,
+	renderTooltip,
 	'data-testid': testId,
 }: ChartProps): JSX.Element {
 	const plotInstanceRef = useRef<uPlot | null>(null);
@@ -54,12 +53,12 @@ export default function ChartWrapper({
 
 	const renderTooltipCallback = useCallback(
 		(args: TooltipRenderArgs): React.ReactNode => {
-			if (customTooltip) {
-				return customTooltip(args);
+			if (renderTooltip) {
+				return renderTooltip(args);
 			}
 			return null;
 		},
-		[customTooltip],
+		[renderTooltip],
 	);
 
 	return (
@@ -100,7 +99,6 @@ export default function ChartWrapper({
 								)}
 								syncKey={syncKey}
 								render={renderTooltipCallback}
-								pinnedTooltipElement={pinnedTooltipElement}
 							/>
 						)}
 					</UPlotChart>

frontend/src/container/DashboardContainer/visualization/charts/Histogram/Histogram.tsx

@@ -11,16 +11,15 @@ import { HistogramChartProps } from '../types';
 export default function Histogram(props: HistogramChartProps): JSX.Element {
 	const {
 		children,
-		customTooltip,
+		renderTooltip: customRenderTooltip,
 		isQueriesMerged,
-		pinnedTooltipElement,
 		...rest
 	} = props;
 
 	const renderTooltip = useCallback(
 		(props: TooltipRenderArgs): React.ReactNode => {
-			if (customTooltip) {
-				return customTooltip(props);
+			if (customRenderTooltip) {
+				return customRenderTooltip(props);
 			}
 			const tooltipProps: HistogramTooltipProps = {
 				...props,
@@ -30,15 +29,14 @@ export default function Histogram(props: HistogramChartProps): JSX.Element {
 			};
 			return <HistogramTooltip {...tooltipProps} />;
 		},
-		[customTooltip, rest.timezone, rest.yAxisUnit, rest.decimalPrecision],
+		[customRenderTooltip, rest.timezone, rest.yAxisUnit, rest.decimalPrecision],
 	);
 
 	return (
 		<ChartWrapper
 			showLegend={!isQueriesMerged}
 			{...rest}
-			customTooltip={renderTooltip}
-			pinnedTooltipElement={pinnedTooltipElement}
+			renderTooltip={renderTooltip}
 		>
 			{children}
 		</ChartWrapper>

frontend/src/container/DashboardContainer/visualization/charts/TimeSeries/TimeSeries.tsx

@@ -9,12 +9,12 @@ import {
 import { TimeSeriesChartProps } from '../types';
 
 export default function TimeSeries(props: TimeSeriesChartProps): JSX.Element {
-	const { children, customTooltip, pinnedTooltipElement, ...rest } = props;
+	const { children, renderTooltip: customRenderTooltip, ...rest } = props;
 
 	const renderTooltip = useCallback(
 		(props: TooltipRenderArgs): React.ReactNode => {
-			if (customTooltip) {
-				return customTooltip(props);
+			if (customRenderTooltip) {
+				return customRenderTooltip(props);
 			}
 			const tooltipProps: TimeSeriesTooltipProps = {
 				...props,
@@ -24,15 +24,11 @@ export default function TimeSeries(props: TimeSeriesChartProps): JSX.Element {
 			};
 			return <TimeSeriesTooltip {...tooltipProps} />;
 		},
-		[customTooltip, rest.timezone, rest.yAxisUnit, rest.decimalPrecision],
+		[customRenderTooltip, rest.timezone, rest.yAxisUnit, rest.decimalPrecision],
 	);
 
 	return (
-		<ChartWrapper
-			{...rest}
-			customTooltip={renderTooltip}
-			pinnedTooltipElement={pinnedTooltipElement}
-		>
+		<ChartWrapper {...rest} renderTooltip={renderTooltip}>
 			{children}
 		</ChartWrapper>
 	);

frontend/src/container/DashboardContainer/visualization/charts/types.ts

@@ -2,10 +2,7 @@ import { Timezone } from 'components/CustomTimePicker/timezoneUtils';
 import { PrecisionOption } from 'components/Graph/types';
 import { LegendConfig, TooltipRenderArgs } from 'lib/uPlotV2/components/types';
 import { UPlotConfigBuilder } from 'lib/uPlotV2/config/UPlotConfigBuilder';
-import {
-	DashboardCursorSync,
-	TooltipClickData,
-} from 'lib/uPlotV2/plugins/TooltipPlugin/types';
+import { DashboardCursorSync } from 'lib/uPlotV2/plugins/TooltipPlugin/types';
 
 interface BaseChartProps {
 	width: number;
@@ -16,8 +13,7 @@ interface BaseChartProps {
 	canPinTooltip?: boolean;
 	yAxisUnit?: string;
 	decimalPrecision?: PrecisionOption;
-	pinnedTooltipElement?: (clickData: TooltipClickData) => React.ReactNode;
-	customTooltip?: (props: TooltipRenderArgs) => React.ReactNode;
+	renderTooltip?: (props: TooltipRenderArgs) => React.ReactNode;
 	'data-testid'?: string;
 }
 interface UPlotBasedChartProps {

frontend/src/container/DashboardContainer/visualization/panels/TimeSeriesPanel/utils.ts

@@ -66,7 +66,7 @@ export const prepareUPlotConfig = ({
 	widget: Widgets;
 	isDarkMode: boolean;
 	currentQuery: Query;
-	onClick?: OnClickPluginOpts['onClick'];
+	onClick: OnClickPluginOpts['onClick'];
 	onDragSelect: (startTime: number, endTime: number) => void;
 	apiResponse: MetricRangePayloadProps;
 	timezone: Timezone;

frontend/src/container/GeneralSettings/GeneralSettings.tsx

@@ -674,7 +674,7 @@ function GeneralSettings({
 	return (
 		<div className="general-settings-page">
 			<div className="general-settings-header">
-				<span className="general-settings-title">Workspace</span>
+				<span className="general-settings-title">General</span>
 				<span className="general-settings-subtitle">
 					Manage your workspace settings.
 				</span>

frontend/src/container/MembersSettings/MembersSettings.styles.scss

@@ -1,120 +0,0 @@
-.members-settings {
-	display: flex;
-	flex-direction: column;
-	gap: var(--spacing-8);
-	padding: var(--padding-4) var(--padding-2) var(--padding-6) var(--padding-4);
-	height: 100%;
-
-	&__header {
-		display: flex;
-		flex-direction: column;
-		gap: var(--spacing-2);
-	}
-
-	&__title {
-		font-size: var(--label-large-500-font-size);
-		font-weight: var(--label-large-500-font-weight);
-		color: var(--text-base-white);
-		letter-spacing: -0.09px;
-		line-height: var(--line-height-normal);
-		margin: 0;
-	}
-
-	&__subtitle {
-		font-size: var(--paragraph-base-400-font-size);
-		font-weight: var(--paragraph-base-400-font-weight);
-		color: var(--foreground);
-		letter-spacing: -0.07px;
-		line-height: var(--paragraph-base-400-line-height);
-		margin: 0;
-	}
-
-	&__controls {
-		display: flex;
-		align-items: center;
-		gap: var(--spacing-4);
-	}
-
-	&__search {
-		flex: 1;
-		min-width: 0;
-	}
-}
-
-.members-filter-trigger {
-	display: flex;
-	align-items: center;
-	gap: var(--spacing-2);
-	border: 1px solid var(--border);
-	border-radius: 2px;
-	background-color: var(--l2-background);
-
-	> span {
-		color: var(--foreground);
-	}
-
-	&__chevron {
-		flex-shrink: 0;
-		color: var(--foreground);
-	}
-}
-
-.members-filter-dropdown {
-	.ant-dropdown-menu {
-		padding: var(--padding-3) 14px;
-		border-radius: 4px;
-		border: 1px solid var(--border);
-		background: var(--l2-background);
-		backdrop-filter: blur(20px);
-	}
-
-	.ant-dropdown-menu-item {
-		background: transparent !important;
-		padding: var(--padding-1) 0 !important;
-
-		&:hover {
-			background: transparent !important;
-		}
-	}
-}
-
-.members-filter-option {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	font-size: var(--paragraph-base-400-font-size);
-	font-weight: var(--paragraph-base-400-font-weight);
-	color: var(--foreground);
-	letter-spacing: 0.14px;
-	min-width: 170px;
-
-	&:hover {
-		color: var(--card-foreground);
-		background: transparent;
-	}
-}
-
-.members-search-input {
-	height: 32px;
-	color: var(--l1-foreground);
-	background-color: var(--l2-background);
-	border-color: var(--border);
-
-	&::placeholder {
-		color: var(--l3-foreground);
-	}
-}
-
-.lightMode {
-	.members-settings {
-		&__title {
-			color: var(--text-base-black);
-		}
-	}
-
-	.members-filter-option {
-		&:hover {
-			color: var(--bg-neutral-light-100);
-		}
-	}
-}

frontend/src/container/MembersSettings/MembersSettings.tsx

@@ -1,246 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-import { useQuery } from 'react-query';
-import { useHistory } from 'react-router-dom';
-import { Button } from '@signozhq/button';
-import { Check, ChevronDown, Plus } from '@signozhq/icons';
-import { Input } from '@signozhq/input';
-import type { MenuProps } from 'antd';
-import { Dropdown } from 'antd';
-import getPendingInvites from 'api/v1/invite/get';
-import getAll from 'api/v1/user/get';
-import EditMemberDrawer from 'components/EditMemberDrawer/EditMemberDrawer';
-import InviteMembersModal from 'components/InviteMembersModal/InviteMembersModal';
-import MembersTable, { MemberRow } from 'components/MembersTable/MembersTable';
-import useUrlQuery from 'hooks/useUrlQuery';
-import { useAppContext } from 'providers/App/App';
-
-import { FilterMode, INVITE_PREFIX, MemberStatus } from './utils';
-
-import './MembersSettings.styles.scss';
-
-const PAGE_SIZE = 20;
-
-function MembersSettings(): JSX.Element {
-	const { org } = useAppContext();
-	const history = useHistory();
-	const urlQuery = useUrlQuery();
-
-	const pageParam = parseInt(urlQuery.get('page') ?? '1', 10);
-	const currentPage = Number.isNaN(pageParam) || pageParam < 1 ? 1 : pageParam;
-
-	const [searchQuery, setSearchQuery] = useState('');
-	const [filterMode, setFilterMode] = useState<FilterMode>(FilterMode.All);
-	const [isInviteModalOpen, setIsInviteModalOpen] = useState(false);
-	const [selectedMember, setSelectedMember] = useState<MemberRow | null>(null);
-
-	const {
-		data: usersData,
-		isLoading: isUsersLoading,
-		refetch: refetchUsers,
-	} = useQuery({
-		queryFn: getAll,
-		queryKey: ['getOrgUser', org?.[0]?.id],
-	});
-
-	const {
-		data: invitesData,
-		isLoading: isInvitesLoading,
-		refetch: refetchInvites,
-	} = useQuery({
-		queryFn: getPendingInvites,
-		queryKey: ['getPendingInvites'],
-	});
-
-	const isLoading = isUsersLoading || isInvitesLoading;
-
-	const allMembers = useMemo((): MemberRow[] => {
-		const activeMembers: MemberRow[] = (usersData?.data ?? []).map((user) => ({
-			id: user.id,
-			name: user.displayName,
-			email: user.email,
-			role: user.role,
-			status: MemberStatus.Active,
-			joinedOn: user.createdAt ? String(user.createdAt) : null,
-		}));
-
-		const pendingInvites: MemberRow[] = (invitesData?.data ?? []).map(
-			(invite) => ({
-				id: `${INVITE_PREFIX}${invite.id}`,
-				name: invite.name ?? '',
-				email: invite.email,
-				role: invite.role,
-				status: MemberStatus.Invited,
-				joinedOn: invite.createdAt ? String(invite.createdAt) : null,
-				token: invite.token ?? null,
-			}),
-		);
-
-		return [...activeMembers, ...pendingInvites];
-	}, [usersData, invitesData]);
-
-	const filteredMembers = useMemo((): MemberRow[] => {
-		let result = allMembers;
-
-		if (filterMode === FilterMode.Invited) {
-			result = result.filter((m) => m.status === MemberStatus.Invited);
-		}
-
-		if (searchQuery.trim()) {
-			const q = searchQuery.toLowerCase();
-			result = result.filter(
-				(m) =>
-					m?.name?.toLowerCase().includes(q) || m.email.toLowerCase().includes(q),
-			);
-		}
-
-		return result;
-	}, [allMembers, filterMode, searchQuery]);
-
-	const paginatedMembers = useMemo((): MemberRow[] => {
-		const start = (currentPage - 1) * PAGE_SIZE;
-		return filteredMembers.slice(start, start + PAGE_SIZE);
-	}, [filteredMembers, currentPage]);
-
-	const setPage = useCallback(
-		(page: number): void => {
-			urlQuery.set('page', String(page));
-			history.replace({ search: urlQuery.toString() });
-		},
-		[history, urlQuery],
-	);
-
-	const pendingCount = invitesData?.data?.length ?? 0;
-	const totalCount = allMembers.length;
-
-	const filterMenuItems: MenuProps['items'] = [
-		{
-			key: FilterMode.All,
-			label: (
-				<div className="members-filter-option">
-					<span>All members ⎯ {totalCount}</span>
-					{filterMode === FilterMode.All && <Check size={14} />}
-				</div>
-			),
-			onClick: (): void => {
-				setFilterMode(FilterMode.All);
-				setPage(1);
-			},
-		},
-		{
-			key: FilterMode.Invited,
-			label: (
-				<div className="members-filter-option">
-					<span>Pending invites ⎯ {pendingCount}</span>
-					{filterMode === FilterMode.Invited && <Check size={14} />}
-				</div>
-			),
-			onClick: (): void => {
-				setFilterMode(FilterMode.Invited);
-				setPage(1);
-			},
-		},
-	];
-
-	const filterLabel =
-		filterMode === FilterMode.All
-			? `All members ⎯ ${totalCount}`
-			: `Pending invites ⎯ ${pendingCount}`;
-
-	const handleInviteSuccess = useCallback((): void => {
-		refetchUsers();
-		refetchInvites();
-	}, [refetchUsers, refetchInvites]);
-
-	const handleRowClick = useCallback((member: MemberRow): void => {
-		setSelectedMember(member);
-	}, []);
-
-	const handleDrawerClose = useCallback((): void => {
-		setSelectedMember(null);
-	}, []);
-
-	const handleMemberEditSuccess = useCallback((): void => {
-		refetchUsers();
-		refetchInvites();
-		setSelectedMember(null);
-	}, [refetchUsers, refetchInvites]);
-
-	return (
-		<>
-			<div className="members-settings">
-				<div className="members-settings__header">
-					<h1 className="members-settings__title">Members</h1>
-					<p className="members-settings__subtitle">
-						Overview of people added to this workspace.
-					</p>
-				</div>
-
-				<div className="members-settings__controls">
-					<Dropdown
-						menu={{ items: filterMenuItems }}
-						trigger={['click']}
-						overlayClassName="members-filter-dropdown"
-					>
-						<Button
-							variant="solid"
-							size="sm"
-							color="secondary"
-							className="members-filter-trigger"
-						>
-							<span>{filterLabel}</span>
-							<ChevronDown size={12} className="members-filter-trigger__chevron" />
-						</Button>
-					</Dropdown>
-
-					<div className="members-settings__search">
-						<Input
-							placeholder="Search by name or email..."
-							value={searchQuery}
-							onChange={(e): void => {
-								setSearchQuery(e.target.value);
-								setPage(1);
-							}}
-							className="members-search-input"
-							color="secondary"
-						/>
-					</div>
-
-					<Button
-						variant="solid"
-						size="sm"
-						color="primary"
-						onClick={(): void => setIsInviteModalOpen(true)}
-					>
-						<Plus size={12} />
-						Invite member
-					</Button>
-				</div>
-			</div>
-			<MembersTable
-				data={paginatedMembers}
-				loading={isLoading}
-				total={filteredMembers.length}
-				currentPage={currentPage}
-				pageSize={PAGE_SIZE}
-				searchQuery={searchQuery}
-				onPageChange={setPage}
-				onRowClick={handleRowClick}
-			/>
-
-			<InviteMembersModal
-				open={isInviteModalOpen}
-				onClose={(): void => setIsInviteModalOpen(false)}
-				onSuccess={handleInviteSuccess}
-			/>
-
-			<EditMemberDrawer
-				member={selectedMember}
-				open={selectedMember !== null}
-				onClose={handleDrawerClose}
-				onSuccess={handleMemberEditSuccess}
-			/>
-		</>
-	);
-}
-
-export default MembersSettings;

frontend/src/container/MembersSettings/__tests__/MembersSettings.integration.test.tsx

@@ -1,131 +0,0 @@
-import { rest, server } from 'mocks-server/server';
-import { render, screen, userEvent } from 'tests/test-utils';
-import { PendingInvite } from 'types/api/user/getPendingInvites';
-import { UserResponse } from 'types/api/user/getUser';
-
-import MembersSettings from '../MembersSettings';
-
-jest.mock('@signozhq/sonner', () => ({
-	toast: {
-		success: jest.fn(),
-		error: jest.fn(),
-	},
-}));
-
-const USERS_ENDPOINT = '*/api/v1/user';
-const INVITES_ENDPOINT = '*/api/v1/invite';
-
-const mockUsers: UserResponse[] = [
-	{
-		id: 'user-1',
-		displayName: 'Alice Smith',
-		email: 'alice@signoz.io',
-		role: 'ADMIN',
-		createdAt: 1700000000,
-		organization: 'TestOrg',
-		orgId: 'org-1',
-	},
-	{
-		id: 'user-2',
-		displayName: 'Bob Jones',
-		email: 'bob@signoz.io',
-		role: 'VIEWER',
-		createdAt: 1700000001,
-		organization: 'TestOrg',
-		orgId: 'org-1',
-	},
-];
-
-const mockInvites: PendingInvite[] = [
-	{
-		id: 'inv-1',
-		email: 'charlie@signoz.io',
-		name: 'Charlie',
-		role: 'EDITOR',
-		createdAt: 1700000002,
-		token: 'tok-abc',
-	},
-];
-
-describe('MembersSettings (integration)', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		server.use(
-			rest.get(USERS_ENDPOINT, (_, res, ctx) =>
-				res(ctx.status(200), ctx.json({ data: mockUsers })),
-			),
-			rest.get(INVITES_ENDPOINT, (_, res, ctx) =>
-				res(ctx.status(200), ctx.json({ data: mockInvites })),
-			),
-		);
-	});
-
-	afterEach(() => {
-		server.resetHandlers();
-	});
-
-	it('loads and displays active users and pending invites', async () => {
-		render(<MembersSettings />);
-
-		await screen.findByText('Alice Smith');
-		expect(screen.getByText('Bob Jones')).toBeInTheDocument();
-		expect(screen.getByText('charlie@signoz.io')).toBeInTheDocument();
-		expect(screen.getAllByText('ACTIVE')).toHaveLength(2);
-		expect(screen.getByText('INVITED')).toBeInTheDocument();
-	});
-
-	it('filters to pending invites via the filter dropdown', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		render(<MembersSettings />);
-
-		await screen.findByText('Alice Smith');
-
-		await user.click(screen.getByRole('button', { name: /all members/i }));
-
-		const pendingOption = await screen.findByText(/pending invites/i);
-		await user.click(pendingOption);
-
-		await screen.findByText('charlie@signoz.io');
-		expect(screen.queryByText('Alice Smith')).not.toBeInTheDocument();
-	});
-
-	it('filters members by name using the search input', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		render(<MembersSettings />);
-
-		await screen.findByText('Alice Smith');
-
-		await user.type(
-			screen.getByPlaceholderText(/search by name or email/i),
-			'bob',
-		);
-
-		await screen.findByText('Bob Jones');
-		expect(screen.queryByText('Alice Smith')).not.toBeInTheDocument();
-		expect(screen.queryByText('charlie@signoz.io')).not.toBeInTheDocument();
-	});
-
-	it('opens EditMemberDrawer when a member row is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		render(<MembersSettings />);
-
-		await user.click(await screen.findByText('Alice Smith'));
-
-		await screen.findByText('Member Details');
-	});
-
-	it('opens InviteMembersModal when "Invite member" button is clicked', async () => {
-		const user = userEvent.setup({ pointerEventsCheck: 0 });
-
-		render(<MembersSettings />);
-
-		await user.click(screen.getByRole('button', { name: /invite member/i }));
-
-		expect(await screen.findAllByPlaceholderText('john@signoz.io')).toHaveLength(
-			3,
-		);
-	});
-});

frontend/src/container/MembersSettings/utils.ts

@@ -1,11 +0,0 @@
-export const INVITE_PREFIX = 'invite-';
-
-export enum FilterMode {
-	All = 'all',
-	Invited = 'invited',
-}
-
-export enum MemberStatus {
-	Active = 'Active',
-	Invited = 'Invited',
-}

frontend/src/container/MySettings/index.tsx

@@ -161,7 +161,7 @@ function MySettings(): JSX.Element {
 		<div className="my-settings-container">
 			<div className="user-info-section">
 				<div className="user-info-section-header">
-					<div className="user-info-section-title">Account </div>
+					<div className="user-info-section-title">General </div>
 
 					<div className="user-info-section-subtitle">
 						Manage your account settings.

frontend/src/container/OnboardingContainer/OnboardingContainer.tsx

@@ -11,7 +11,7 @@ import { FeatureKeys } from 'constants/features';
 import ROUTES from 'constants/routes';
 import FullScreenHeader from 'container/FullScreenHeader/FullScreenHeader';
 import InviteUserModal from 'container/OrganizationSettings/InviteUserModal/InviteUserModal';
-import { InviteMemberFormValues } from 'container/OrganizationSettings/utils';
+import { InviteMemberFormValues } from 'container/OrganizationSettings/PendingInvitesContainer';
 import history from 'lib/history';
 import { UserPlus } from 'lucide-react';
 import { useAppContext } from 'providers/App/App';

frontend/src/container/OnboardingQuestionaire/index.tsx

@@ -12,7 +12,7 @@ import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { FeatureKeys } from 'constants/features';
 import { ORG_PREFERENCES } from 'constants/orgPreferences';
 import ROUTES from 'constants/routes';
-import { InviteTeamMembersProps } from 'container/OrganizationSettings/utils';
+import { InviteTeamMembersProps } from 'container/OrganizationSettings/PendingInvitesContainer';
 import { useNotifications } from 'hooks/useNotifications';
 import history from 'lib/history';
 import { useAppContext } from 'providers/App/App';

frontend/src/container/OrganizationSettings/DeleteMembersDetails/index.tsx

@@ -0,0 +1,32 @@
+import { gold } from '@ant-design/colors';
+import { ExclamationCircleTwoTone } from '@ant-design/icons';
+import { Space, Typography } from 'antd';
+
+function DeleteMembersDetails({
+	name,
+}: DeleteMembersDetailsProps): JSX.Element {
+	return (
+		<div>
+			<Space direction="horizontal" size="middle" align="start">
+				<ExclamationCircleTwoTone
+					twoToneColor={[gold[6], '#1f1f1f']}
+					style={{
+						fontSize: '1.4rem',
+					}}
+				/>
+				<Space direction="vertical">
+					<Typography>Are you sure you want to delete {name}</Typography>
+					<Typography>
+						This will remove all access from dashboards and other features in SigNoz
+					</Typography>
+				</Space>
+			</Space>
+		</div>
+	);
+}
+
+interface DeleteMembersDetailsProps {
+	name: string;
+}
+
+export default DeleteMembersDetails;

frontend/src/container/OrganizationSettings/EditMembersDetails/index.tsx

@@ -0,0 +1,167 @@
+import {
+	ChangeEventHandler,
+	Dispatch,
+	SetStateAction,
+	useCallback,
+	useEffect,
+	useState,
+} from 'react';
+import { useTranslation } from 'react-i18next';
+import { useCopyToClipboard } from 'react-use';
+import { CopyOutlined } from '@ant-design/icons';
+import { Button, Input, Select, Space, Tooltip } from 'antd';
+import getResetPasswordToken from 'api/v1/factor_password/getResetPasswordToken';
+import ROUTES from 'constants/routes';
+import { useNotifications } from 'hooks/useNotifications';
+import APIError from 'types/api/error';
+import { ROLES } from 'types/roles';
+
+import { InputGroup, SelectDrawer, Title } from './styles';
+
+const { Option } = Select;
+
+function EditMembersDetails({
+	emailAddress,
+	name,
+	role,
+	setEmailAddress,
+	setName,
+	setRole,
+	id,
+}: EditMembersDetailsProps): JSX.Element {
+	const [passwordLink, setPasswordLink] = useState<string>('');
+
+	const { t } = useTranslation(['common']);
+	const [isLoading, setIsLoading] = useState<boolean>(false);
+	const [state, copyToClipboard] = useCopyToClipboard();
+
+	const getPasswordLink = (token: string): string =>
+		`${window.location.origin}${ROUTES.PASSWORD_RESET}?token=${token}`;
+
+	const onChangeHandler = useCallback(
+		(setFunc: Dispatch<SetStateAction<string>>, value: string) => {
+			setFunc(value);
+		},
+		[],
+	);
+
+	const { notifications } = useNotifications();
+
+	useEffect(() => {
+		if (state.error) {
+			notifications.error({
+				message: t('something_went_wrong'),
+			});
+		}
+
+		if (state.value) {
+			notifications.success({
+				message: t('success'),
+			});
+		}
+	}, [state.error, state.value, t, notifications]);
+
+	const onPasswordChangeHandler: ChangeEventHandler<HTMLInputElement> = useCallback(
+		(event) => {
+			setPasswordLink(event.target.value);
+		},
+		[],
+	);
+
+	const onGeneratePasswordHandler = async (): Promise<void> => {
+		try {
+			setIsLoading(true);
+			const response = await getResetPasswordToken({
+				userId: id || '',
+			});
+			setPasswordLink(getPasswordLink(response.data.token));
+			setIsLoading(false);
+		} catch (error) {
+			setIsLoading(false);
+			notifications.error({
+				message: (error as APIError).getErrorCode(),
+				description: (error as APIError).getErrorMessage(),
+			});
+		}
+	};
+
+	return (
+		<Space direction="vertical" size="large">
+			<Space direction="horizontal">
+				<Title>Email address</Title>
+				<Input
+					placeholder="john@signoz.io"
+					readOnly
+					onChange={(event): void =>
+						onChangeHandler(setEmailAddress, event.target.value)
+					}
+					disabled={isLoading}
+					value={emailAddress}
+				/>
+			</Space>
+			<Space direction="horizontal">
+				<Title>Name (optional)</Title>
+				<Input
+					placeholder="John"
+					onChange={(event): void => onChangeHandler(setName, event.target.value)}
+					value={name}
+					disabled={isLoading}
+				/>
+			</Space>
+			<Space direction="horizontal">
+				<Title>Role</Title>
+				<SelectDrawer
+					value={role}
+					onSelect={(value: unknown): void => {
+						if (typeof value === 'string') {
+							setRole(value as ROLES);
+						}
+					}}
+					disabled={isLoading}
+				>
+					<Option value="ADMIN">ADMIN</Option>
+					<Option value="VIEWER">VIEWER</Option>
+					<Option value="EDITOR">EDITOR</Option>
+				</SelectDrawer>
+			</Space>
+
+			<Button
+				loading={isLoading}
+				disabled={isLoading}
+				onClick={onGeneratePasswordHandler}
+				type="primary"
+			>
+				Generate Reset Password link
+			</Button>
+			{passwordLink && (
+				<InputGroup>
+					<Input
+						style={{ width: '100%' }}
+						defaultValue="git@github.com:ant-design/ant-design.git"
+						onChange={onPasswordChangeHandler}
+						value={passwordLink}
+						disabled={isLoading}
+					/>
+					<Tooltip title="COPY LINK">
+						<Button
+							icon={<CopyOutlined />}
+							onClick={(): void => copyToClipboard(passwordLink)}
+						/>
+					</Tooltip>
+				</InputGroup>
+			)}
+		</Space>
+	);
+}
+
+interface EditMembersDetailsProps {
+	emailAddress: string;
+	name: string;
+	role: ROLES;
+	setEmailAddress: Dispatch<SetStateAction<string>>;
+	setName: Dispatch<SetStateAction<string>>;
+	setRole: Dispatch<SetStateAction<ROLES>>;
+	id: string;
+}
+
+export default EditMembersDetails;

frontend/src/container/OrganizationSettings/EditMembersDetails/styles.ts

@@ -0,0 +1,16 @@
+import { Select, Typography } from 'antd';
+import styled from 'styled-components';
+
+export const SelectDrawer = styled(Select)`
+	width: 120px;
+`;
+
+export const Title = styled(Typography)`
+	width: 7rem;
+`;
+
+export const InputGroup = styled.div`
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+`;

frontend/src/container/OrganizationSettings/InviteTeamMembers/index.tsx

@@ -11,7 +11,7 @@ import {
 } from 'antd';
 import { requireErrorMessage } from 'utils/form/requireErrorMessage';
 
-import { InviteMemberFormValues } from '../utils';
+import { InviteMemberFormValues } from '../PendingInvitesContainer/index';
 import { SelectDrawer, SpaceContainer, TitleWrapper } from './styles';
 
 function InviteTeamMembers({ form, onFinish }: Props): JSX.Element {

frontend/src/container/OrganizationSettings/InviteUserModal/InviteUserModal.tsx

@@ -6,7 +6,7 @@ import { useNotifications } from 'hooks/useNotifications';
 import APIError from 'types/api/error';
 
 import InviteTeamMembers from '../InviteTeamMembers';
-import { InviteMemberFormValues } from '../utils';
+import { InviteMemberFormValues } from '../PendingInvitesContainer';
 
 export interface InviteUserModalProps {
 	isInviteTeamMemberModalOpen: boolean;

frontend/src/container/OrganizationSettings/Members/index.tsx

@@ -0,0 +1,324 @@
+import { Dispatch, SetStateAction, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useQuery } from 'react-query';
+import {
+	Button,
+	Modal,
+	Space,
+	TableColumnsType as ColumnsType,
+	Typography,
+} from 'antd';
+import getAll from 'api/v1/user/get';
+import deleteUser from 'api/v1/user/id/delete';
+import update from 'api/v1/user/id/update';
+import ErrorContent from 'components/ErrorModal/components/ErrorContent';
+import { ResizeTable } from 'components/ResizeTable';
+import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
+import dayjs from 'dayjs';
+import { useNotifications } from 'hooks/useNotifications';
+import { useAppContext } from 'providers/App/App';
+import APIError from 'types/api/error';
+import { ROLES } from 'types/roles';
+
+import DeleteMembersDetails from '../DeleteMembersDetails';
+import EditMembersDetails from '../EditMembersDetails';
+
+function UserFunction({
+	setDataSource,
+	accessLevel,
+	name,
+	email,
+	id,
+}: UserFunctionProps): JSX.Element {
+	const [isModalVisible, setIsModalVisible] = useState(false);
+	const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
+
+	const onModalToggleHandler = (
+		func: Dispatch<SetStateAction<boolean>>,
+		value: boolean,
+	): void => {
+		func(value);
+	};
+
+	const [emailAddress, setEmailAddress] = useState(email);
+	const [updatedName, setUpdatedName] = useState(name);
+	const [role, setRole] = useState<ROLES>(accessLevel);
+	const { t } = useTranslation(['common']);
+	const [isDeleteLoading, setIsDeleteLoading] = useState<boolean>(false);
+	const [isUpdateLoading, setIsUpdateLoading] = useState<boolean>(false);
+	const { notifications } = useNotifications();
+
+	const onUpdateDetailsHandler = (): void => {
+		setDataSource((data) => {
+			const index = data.findIndex((e) => e.id === id);
+			if (index !== -1) {
+				const current = data[index];
+
+				const updatedData: DataType[] = [
+					...data.slice(0, index),
+					{
+						...current,
+						name: updatedName,
+						accessLevel: role,
+						email: emailAddress,
+					},
+					...data.slice(index + 1, data.length),
+				];
+
+				return updatedData;
+			}
+			return data;
+		});
+	};
+
+	const onDelete = (): void => {
+		setDataSource((source) => {
+			const index = source.findIndex((e) => e.id === id);
+
+			if (index !== -1) {
+				const updatedData: DataType[] = [
+					...source.slice(0, index),
+					...source.slice(index + 1, source.length),
+				];
+
+				return updatedData;
+			}
+			return source;
+		});
+	};
+
+	const onDeleteHandler = async (): Promise<void> => {
+		try {
+			setIsDeleteLoading(true);
+			await deleteUser({
+				userId: id,
+			});
+			onDelete();
+			notifications.success({
+				message: t('success', {
+					ns: 'common',
+				}),
+			});
+			setIsDeleteModalVisible(false);
+			setIsDeleteLoading(false);
+		} catch (error) {
+			setIsDeleteLoading(false);
+			notifications.error({
+				message: (error as APIError).getErrorCode(),
+				description: (error as APIError).getErrorMessage(),
+			});
+		}
+	};
+
+	const onEditMemberDetails = async (): Promise<void> => {
+		try {
+			setIsUpdateLoading(true);
+			await update({
+				userId: id,
+				displayName: updatedName,
+				role,
+			});
+			onUpdateDetailsHandler();
+
+			if (role !== accessLevel) {
+				notifications.success({
+					message: 'User details updated successfully',
+					description: 'The user details have been updated successfully.',
+				});
+			} else {
+				notifications.success({
+					message: t('success', {
+						ns: 'common',
+					}),
+				});
+			}
+
+			setIsUpdateLoading(false);
+			setIsModalVisible(false);
+		} catch (error) {
+			notifications.error({
+				message: (error as APIError).getErrorCode(),
+				description: (error as APIError).getErrorMessage(),
+			});
+			setIsUpdateLoading(false);
+		}
+	};
+
+	return (
+		<>
+			<Space direction="horizontal">
+				<Typography.Link
+					onClick={(): void => onModalToggleHandler(setIsModalVisible, true)}
+				>
+					Edit
+				</Typography.Link>
+				<Typography.Link
+					onClick={(): void => onModalToggleHandler(setIsDeleteModalVisible, true)}
+				>
+					Delete
+				</Typography.Link>
+			</Space>
+			<Modal
+				title="Edit member details"
+				className="edit-member-details-modal"
+				open={isModalVisible}
+				onOk={(): void => onModalToggleHandler(setIsModalVisible, false)}
+				onCancel={(): void => onModalToggleHandler(setIsModalVisible, false)}
+				centered
+				destroyOnClose
+				footer={[
+					<Button
+						key="back"
+						onClick={(): void => onModalToggleHandler(setIsModalVisible, false)}
+						type="default"
+					>
+						Cancel
+					</Button>,
+					<Button
+						key="Invite_team_members"
+						onClick={onEditMemberDetails}
+						type="primary"
+						disabled={isUpdateLoading}
+						loading={isUpdateLoading}
+					>
+						Update Details
+					</Button>,
+				]}
+			>
+				<EditMembersDetails
+					{...{
+						emailAddress,
+						name: updatedName,
+						role,
+						setEmailAddress,
+						setName: setUpdatedName,
+						setRole,
+						id,
+					}}
+				/>
+			</Modal>
+			<Modal
+				title="Edit member details"
+				open={isDeleteModalVisible}
+				onOk={onDeleteHandler}
+				onCancel={(): void => onModalToggleHandler(setIsDeleteModalVisible, false)}
+				centered
+				confirmLoading={isDeleteLoading}
+			>
+				<DeleteMembersDetails name={name} />
+			</Modal>
+		</>
+	);
+}
+
+function Members(): JSX.Element {
+	const { org } = useAppContext();
+
+	const { data, isLoading, error } = useQuery({
+		queryFn: () => getAll(),
+		queryKey: ['getOrgUser', org?.[0].id],
+	});
+
+	const [dataSource, setDataSource] = useState<DataType[]>([]);
+
+	useEffect(() => {
+		if (data?.data && Array.isArray(data.data)) {
+			const updatedData: DataType[] = data?.data?.map((e) => ({
+				accessLevel: e.role,
+				email: e.email,
+				id: String(e.id),
+				joinedOn: String(e.createdAt),
+				name: e.displayName,
+			}));
+			setDataSource(updatedData);
+		}
+	}, [data]);
+
+	const columns: ColumnsType<DataType> = [
+		{
+			title: 'Name',
+			dataIndex: 'name',
+			key: 'name',
+			width: 100,
+		},
+		{
+			title: 'Emails',
+			dataIndex: 'email',
+			key: 'email',
+			width: 100,
+		},
+		{
+			title: 'Access Level',
+			dataIndex: 'accessLevel',
+			key: 'accessLevel',
+			width: 50,
+		},
+		{
+			title: 'Joined On',
+			dataIndex: 'joinedOn',
+			key: 'joinedOn',
+			width: 60,
+			render: (_, record): JSX.Element => {
+				const { joinedOn } = record;
+				return (
+					<Typography>
+						{dayjs(joinedOn).format(DATE_TIME_FORMATS.MONTH_DATE_FULL)}
+					</Typography>
+				);
+			},
+		},
+		{
+			title: 'Action',
+			dataIndex: 'action',
+			width: 80,
+			render: (_, record): JSX.Element => (
+				<UserFunction
+					{...{
+						accessLevel: record.accessLevel,
+						email: record.email,
+						joinedOn: record.joinedOn,
+						name: record.name,
+						id: record.id,
+						setDataSource,
+					}}
+				/>
+			),
+		},
+	];
+
+	return (
+		<div className="members-container">
+			<Typography.Title level={3}>
+				Members{' '}
+				{!isLoading && dataSource && (
+					<div className="members-count"> ({dataSource.length}) </div>
+				)}
+			</Typography.Title>
+			{!(error as APIError) && (
+				<ResizeTable
+					columns={columns}
+					tableLayout="fixed"
+					dataSource={dataSource}
+					pagination={false}
+					loading={isLoading}
+					bordered
+				/>
+			)}
+			{(error as APIError) && <ErrorContent error={error as APIError} />}
+		</div>
+	);
+}
+
+interface DataType {
+	id: string;
+	name: string;
+	email: string;
+	accessLevel: ROLES;
+	joinedOn: string;
+}
+
+interface UserFunctionProps extends DataType {
+	setDataSource: Dispatch<SetStateAction<DataType[]>>;
+}
+
+export default Members;

frontend/src/container/OrganizationSettings/PendingInvitesContainer/index.tsx

@@ -0,0 +1,248 @@
+import { useCallback, useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useQuery } from 'react-query';
+import { useLocation } from 'react-router-dom';
+import { useCopyToClipboard } from 'react-use';
+import { PlusOutlined } from '@ant-design/icons';
+import {
+	Button,
+	Form,
+	Space,
+	TableColumnsType as ColumnsType,
+	Typography,
+} from 'antd';
+import get from 'api/v1/invite/get';
+import deleteInvite from 'api/v1/invite/id/delete';
+import ErrorContent from 'components/ErrorModal/components/ErrorContent';
+import { ResizeTable } from 'components/ResizeTable';
+import { INVITE_MEMBERS_HASH } from 'constants/app';
+import ROUTES from 'constants/routes';
+import { useNotifications } from 'hooks/useNotifications';
+import { useAppContext } from 'providers/App/App';
+import APIError from 'types/api/error';
+import { PendingInvite } from 'types/api/user/getPendingInvites';
+import { ROLES } from 'types/roles';
+
+import InviteUserModal from '../InviteUserModal/InviteUserModal';
+import { TitleWrapper } from './styles';
+
+function PendingInvitesContainer(): JSX.Element {
+	const [
+		isInviteTeamMemberModalOpen,
+		setIsInviteTeamMemberModalOpen,
+	] = useState<boolean>(false);
+	const [form] = Form.useForm<InviteMemberFormValues>();
+	const { t } = useTranslation(['organizationsettings', 'common']);
+	const [state, setText] = useCopyToClipboard();
+	const { notifications } = useNotifications();
+	const { user } = useAppContext();
+
+	useEffect(() => {
+		if (state.error) {
+			notifications.error({
+				message: state.error.message,
+			});
+		}
+
+		if (state.value) {
+			notifications.success({
+				message: t('success', {
+					ns: 'common',
+				}),
+			});
+		}
+	}, [state.error, state.value, t, notifications]);
+
+	const { data, isLoading, error, isError, refetch } = useQuery({
+		queryFn: get,
+		queryKey: ['getPendingInvites', user?.accessJwt],
+	});
+
+	const [dataSource, setDataSource] = useState<DataProps[]>([]);
+
+	const toggleModal = useCallback(
+		(value: boolean): void => {
+			setIsInviteTeamMemberModalOpen(value);
+			if (!value) {
+				form.resetFields();
+			}
+		},
+		[form],
+	);
+
+	const { hash } = useLocation();
+
+	const getParsedInviteData = useCallback(
+		(payload: PendingInvite[] = []) =>
+			payload?.map((data) => ({
+				key: data.createdAt,
+				name: data.name,
+				id: data.id,
+				email: data.email,
+				accessLevel: data.role,
+				inviteLink: `${window.location.origin}${ROUTES.SIGN_UP}?token=${data.token}`,
+			})),
+		[],
+	);
+
+	useEffect(() => {
+		if (hash === INVITE_MEMBERS_HASH) {
+			toggleModal(true);
+		}
+	}, [hash, toggleModal]);
+
+	useEffect(() => {
+		if (data?.data) {
+			const parsedData = getParsedInviteData(data?.data || []);
+			setDataSource(parsedData);
+		}
+	}, [data, getParsedInviteData]);
+
+	const onRevokeHandler = async (id: string): Promise<void> => {
+		try {
+			await deleteInvite({
+				id,
+			});
+			// remove from the client data
+			const index = dataSource.findIndex((e) => e.id === id);
+			if (index !== -1) {
+				setDataSource([
+					...dataSource.slice(0, index),
+					...dataSource.slice(index + 1, dataSource.length),
+				]);
+			}
+			notifications.success({
+				message: t('success', {
+					ns: 'common',
+				}),
+			});
+		} catch (error) {
+			notifications.error({
+				message: (error as APIError).getErrorCode(),
+				description: (error as APIError).getErrorMessage(),
+			});
+		}
+	};
+
+	const columns: ColumnsType<DataProps> = [
+		{
+			title: 'Name',
+			dataIndex: 'name',
+			key: 'name',
+			width: 100,
+		},
+		{
+			title: 'Emails',
+			dataIndex: 'email',
+			key: 'email',
+			width: 80,
+		},
+		{
+			title: 'Access Level',
+			dataIndex: 'accessLevel',
+			key: 'accessLevel',
+			width: 50,
+		},
+		{
+			title: 'Invite Link',
+			dataIndex: 'inviteLink',
+			key: 'Invite Link',
+			ellipsis: true,
+			width: 100,
+		},
+		{
+			title: 'Action',
+			dataIndex: 'action',
+			width: 80,
+			key: 'Action',
+			render: (_, record): JSX.Element => (
+				<Space direction="horizontal">
+					<Typography.Link onClick={(): Promise<void> => onRevokeHandler(record.id)}>
+						Revoke
+					</Typography.Link>
+					<Typography.Link
+						onClick={(): void => {
+							setText(record.inviteLink);
+						}}
+					>
+						Copy Invite Link
+					</Typography.Link>
+				</Space>
+			),
+		},
+	];
+
+	return (
+		<div className="pending-invites-container-wrapper">
+			<InviteUserModal
+				form={form}
+				isInviteTeamMemberModalOpen={isInviteTeamMemberModalOpen}
+				toggleModal={toggleModal}
+				onClose={refetch}
+			/>
+
+			<div className="pending-invites-container">
+				<TitleWrapper>
+					<Typography.Title level={3}>
+						{t('pending_invites')}
+						{dataSource && (
+							<div className="members-count"> ({dataSource.length})</div>
+						)}
+					</Typography.Title>
+
+					<Space>
+						<Button
+							icon={<PlusOutlined />}
+							type="primary"
+							onClick={(): void => {
+								toggleModal(true);
+							}}
+						>
+							{t('invite_members')}
+						</Button>
+					</Space>
+				</TitleWrapper>
+				{!isError && (
+					<ResizeTable
+						columns={columns}
+						tableLayout="fixed"
+						dataSource={dataSource}
+						pagination={false}
+						loading={isLoading}
+						bordered
+					/>
+				)}
+				{isError && <ErrorContent error={error as APIError} />}
+			</div>
+		</div>
+	);
+}
+
+export interface InviteTeamMembersProps {
+	email: string;
+	name: string;
+	role: string;
+	id: string;
+	frontendBaseUrl: string;
+}
+
+interface DataProps {
+	key: number;
+	name: string;
+	id: string;
+	email: string;
+	accessLevel: ROLES;
+	inviteLink: string;
+}
+
+type Role = 'ADMIN' | 'VIEWER' | 'EDITOR';
+
+export interface InviteMemberFormValues {
+	members: {
+		email: string;
+		name: string;
+		role: Role;
+	}[];
+}
+
+export default PendingInvitesContainer;

frontend/src/container/OrganizationSettings/PendingInvitesContainer/styles.tsx

@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+
+export const TitleWrapper = styled.div`
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+`;

frontend/src/container/OrganizationSettings/index.tsx

@@ -3,6 +3,8 @@ import { useAppContext } from 'providers/App/App';
 
 import AuthDomain from './AuthDomain';
 import DisplayName from './DisplayName';
+import Members from './Members';
+import PendingInvitesContainer from './PendingInvitesContainer';
 
 import './OrganizationSettings.styles.scss';
 
@@ -21,6 +23,9 @@ function OrganizationSettings(): JSX.Element {
 				))}
 			</Space>
 
+			<PendingInvitesContainer />
+
+			<Members />
 			<AuthDomain />
 		</div>
 	);

frontend/src/container/OrganizationSettings/tests/OrganizationSettings.test.tsx

@@ -0,0 +1,37 @@
+import { act, render, screen, waitFor } from 'tests/test-utils';
+
+import Members from '../Members';
+
+describe('Organization Settings Page', () => {
+	afterEach(() => {
+		jest.clearAllMocks();
+	});
+
+	it('render list of members', async () => {
+		act(() => {
+			render(<Members />);
+		});
+
+		const title = await screen.findByText(/Members/i);
+		expect(title).toBeInTheDocument();
+
+		await waitFor(() => {
+			expect(screen.getByText('firstUser@test.io')).toBeInTheDocument(); // first item
+			expect(screen.getByText('lastUser@test.io')).toBeInTheDocument(); // last item
+		});
+	});
+
+	// this is required as our edit/delete logic is dependent on the index and it will break with pagination enabled
+	it('render list of members without pagination', async () => {
+		render(<Members />);
+
+		await waitFor(() => {
+			expect(screen.getByText('firstUser@test.io')).toBeInTheDocument(); // first item
+			expect(screen.getByText('lastUser@test.io')).toBeInTheDocument(); // last item
+
+			expect(
+				document.querySelector('.ant-table-pagination'),
+			).not.toBeInTheDocument();
+		});
+	});
+});

frontend/src/container/OrganizationSettings/utils.ts

@@ -1,17 +0,0 @@
-export interface InviteTeamMembersProps {
-	email: string;
-	name: string;
-	role: string;
-	id: string;
-	frontendBaseUrl: string;
-}
-
-type Role = 'ADMIN' | 'VIEWER' | 'EDITOR';
-
-export interface InviteMemberFormValues {
-	members: {
-		email: string;
-		name: string;
-		role: Role;
-	}[];
-}

frontend/src/container/SideNav/SideNav.styles.scss

@@ -1057,20 +1057,21 @@
 		gap: 8px;
 
 		.user-settings-dropdown-label-text {
-			color: var(--l3-foreground);
+			color: var(--bg-slate-50, #62687c);
 			font-family: Inter;
-			font-size: var(--uppercase-small-500-font-size);
-			font-weight: var(--uppercase-small-500-font-weight);
+			font-size: 10px;
+			font-family: Inter;
+			font-weight: 600;
 			font-style: normal;
-			line-height: 18px;
+			line-height: 18px; /* 163.636% */
 			letter-spacing: 0.88px;
 			text-transform: uppercase;
 		}
 
 		.user-settings-dropdown-label-email {
-			color: var(--l1-foreground);
+			color: var(--bg-vanilla-400, #c0c1c3);
 			font-family: Inter;
-			font-size: var(--font-size-xs);
+			font-size: 12px;
 			font-style: normal;
 			line-height: normal;
 			letter-spacing: 0.14px;
@@ -1078,7 +1079,7 @@
 	}
 
 	.ant-dropdown-menu-item-divider {
-		background-color: var(--secondary) !important;
+		background-color: var(--bg-slate-500, #161922) !important;
 	}
 
 	.ant-dropdown-menu-item-disabled {
@@ -1094,14 +1095,6 @@
 .help-support-dropdown {
 	.ant-dropdown-menu-item {
 		min-height: 32px;
-
-		.ant-dropdown-menu-title-content {
-			color: var(--l1-foreground) !important;
-		}
-
-		.user-settings-dropdown-logout-section {
-			color: var(--danger-background);
-		}
 	}
 }
 
@@ -1278,7 +1271,7 @@
 }
 
 .help-support-dropdown li.ant-dropdown-menu-item-divider {
-	background-color: var(--secondary) !important;
+	background-color: var(--bg-slate-500, #161922) !important;
 }
 
 .lightMode {
@@ -1438,6 +1431,22 @@
 		}
 	}
 
+	.settings-dropdown {
+		.user-settings-dropdown-logged-in-section {
+			.user-settings-dropdown-label-text {
+				color: var(--bg-ink-400);
+			}
+
+			.user-settings-dropdown-label-email {
+				color: var(--bg-ink-300);
+			}
+		}
+
+		.ant-dropdown-menu-item-divider {
+			background-color: var(--bg-vanilla-300) !important;
+		}
+	}
+
 	.reorder-shortcut-nav-items-modal {
 		.ant-modal-content {
 			border: 1px solid var(--bg-vanilla-300);
@@ -1494,6 +1503,10 @@
 			color: var(--bg-ink-400);
 		}
 	}
+
+	.help-support-dropdown li.ant-dropdown-menu-item-divider {
+		background-color: var(--bg-vanilla-300) !important;
+	}
 }
 
 .version-tooltip-overlay {

frontend/src/container/SideNav/SideNav.tsx

@@ -69,7 +69,6 @@ import { routeConfig } from './config';
 import { getQueryString } from './helper';
 import {
 	defaultMoreMenuItems,
-	getUserSettingsDropdownMenuItems,
 	helpSupportDropdownMenuItems as DefaultHelpSupportDropdownMenuItems,
 	helpSupportMenuItem,
 	primaryMenuItems,
@@ -486,12 +485,48 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 
 	const userSettingsDropdownMenuItems: MenuProps['items'] = useMemo(
 		() =>
-			getUserSettingsDropdownMenuItems({
-				userEmail: user.email,
-				isWorkspaceBlocked,
-				isEnterpriseSelfHostedUser,
-				isCommunityEnterpriseUser,
-			}),
+			[
+				{
+					key: 'label',
+					label: (
+						<div className="user-settings-dropdown-logged-in-section">
+							<span className="user-settings-dropdown-label-text">LOGGED IN AS</span>
+							<span className="user-settings-dropdown-label-email">{user.email}</span>
+						</div>
+					),
+					disabled: true,
+					dataTestId: 'logged-in-as-nav-item',
+				},
+				{ type: 'divider' as const },
+				{
+					key: 'account',
+					label: 'Account Settings',
+					dataTestId: 'account-settings-nav-item',
+				},
+				{
+					key: 'workspace',
+					label: 'Workspace Settings',
+					disabled: isWorkspaceBlocked,
+					dataTestId: 'workspace-settings-nav-item',
+				},
+				...(isEnterpriseSelfHostedUser || isCommunityEnterpriseUser
+					? [
+							{
+								key: 'license',
+								label: 'Manage License',
+								dataTestId: 'manage-license-nav-item',
+							},
+					  ]
+					: []),
+				{ type: 'divider' as const },
+				{
+					key: 'logout',
+					label: (
+						<span className="user-settings-dropdown-logout-section">Sign out</span>
+					),
+					dataTestId: 'logout-nav-item',
+				},
+			].filter(Boolean),
 		[
 			isEnterpriseSelfHostedUser,
 			isCommunityEnterpriseUser,
@@ -821,6 +856,9 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 			});
 
 			switch (item.key) {
+				case ROUTES.SHORTCUTS:
+					history.push(ROUTES.SHORTCUTS);
+					break;
 				case 'invite-collaborators':
 					history.push(`${ROUTES.ORG_SETTINGS}#invite-team-members`);
 					break;
@@ -840,7 +878,7 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 	};
 
 	const handleSettingsMenuItemClick = (info: SidebarItem): void => {
-		const item = (userSettingsDropdownMenuItems ?? []).find(
+		const item = userSettingsDropdownMenuItems.find(
 			(item) => item?.key === info.key,
 		);
 		let menuLabel = '';
@@ -866,9 +904,6 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 			case 'license':
 				history.push(ROUTES.LIST_LICENSES);
 				break;
-			case 'keyboard-shortcuts':
-				history.push(ROUTES.SHORTCUTS);
-				break;
 			case 'logout':
 				Logout();
 				break;

frontend/src/container/SideNav/__tests__/menuItems.test.tsx

@@ -1,74 +0,0 @@
-import { getUserSettingsDropdownMenuItems } from 'container/SideNav/menuItems';
-
-const BASE_PARAMS = {
-	userEmail: 'test@signoz.io',
-	isWorkspaceBlocked: false,
-	isEnterpriseSelfHostedUser: false,
-	isCommunityEnterpriseUser: false,
-};
-
-describe('getUserSettingsDropdownMenuItems', () => {
-	it('always includes logged-in-as label, workspace, account, keyboard shortcuts, and sign out', () => {
-		const items = getUserSettingsDropdownMenuItems(BASE_PARAMS);
-		const keys = items?.map((item) => item?.key);
-
-		expect(keys).toContain('label');
-		expect(keys).toContain('workspace');
-		expect(keys).toContain('account');
-		expect(keys).toContain('keyboard-shortcuts');
-		expect(keys).toContain('logout');
-
-		// workspace item is enabled when workspace is not blocked
-		const workspaceItem = items?.find(
-			(item: any) => item.key === 'workspace',
-		) as any;
-
-		expect(workspaceItem?.disabled).toBe(false);
-
-		// does not include license item for regular cloud user
-		expect(keys).not.toContain('license');
-	});
-
-	it('includes manage license item for enterprise self-hosted users', () => {
-		const items = getUserSettingsDropdownMenuItems({
-			...BASE_PARAMS,
-			isEnterpriseSelfHostedUser: true,
-		});
-		const keys = items?.map((item) => item?.key);
-
-		expect(keys).toContain('license');
-	});
-
-	it('includes manage license item for community enterprise users', () => {
-		const items = getUserSettingsDropdownMenuItems({
-			...BASE_PARAMS,
-			isCommunityEnterpriseUser: true,
-		});
-		const keys = items?.map((item) => item?.key);
-
-		expect(keys).toContain('license');
-	});
-
-	it('workspace item is disabled when workspace is blocked', () => {
-		const items = getUserSettingsDropdownMenuItems({
-			...BASE_PARAMS,
-			isWorkspaceBlocked: true,
-		});
-		const workspaceItem = items?.find(
-			(item: any) => item.key === 'workspace',
-		) as any;
-
-		expect(workspaceItem?.disabled).toBe(true);
-	});
-
-	it('returns items in correct order: label, divider, workspace, account, ..., shortcuts, divider, logout', () => {
-		const items = getUserSettingsDropdownMenuItems(BASE_PARAMS) ?? [];
-		const keys = items.map((item: any) => item.key ?? item.type);
-
-		expect(keys[0]).toBe('label');
-		expect(keys[1]).toBe('divider');
-		expect(keys[2]).toBe('workspace');
-		expect(keys[3]).toBe('account');
-		expect(keys[keys.length - 1]).toBe('logout');
-	});
-});

frontend/src/container/SideNav/menuItems.tsx

@@ -1,6 +1,4 @@
 import { RocketOutlined } from '@ant-design/icons';
-import { Style } from '@signozhq/design-tokens';
-import { MenuProps } from 'antd';
 import ROUTES from 'constants/routes';
 import {
 	ArrowUpRight,
@@ -10,7 +8,6 @@ import {
 	Book,
 	Boxes,
 	BugIcon,
-	Building2,
 	ChartArea,
 	Cloudy,
 	DraftingCompass,
@@ -23,7 +20,6 @@ import {
 	Layers2,
 	LayoutGrid,
 	ListMinus,
-	LogOut,
 	MessageSquareText,
 	Plus,
 	Receipt,
@@ -36,14 +32,9 @@ import {
 	Unplug,
 	User,
 	UserPlus,
-	Users,
 } from 'lucide-react';
 
-import {
-	SecondaryMenuItemKey,
-	SettingsNavSection,
-	SidebarItem,
-} from './sideNav.types';
+import { SecondaryMenuItemKey, SidebarItem } from './sideNav.types';
 
 export const getStartedMenuItem = {
 	key: ROUTES.GET_STARTED,
@@ -305,107 +296,77 @@ export const defaultMoreMenuItems: SidebarItem[] = [
 	},
 ];
 
-export const settingsNavSections: SettingsNavSection[] = [
+export const settingsMenuItems: SidebarItem[] = [
 	{
-		key: 'general',
-		items: [
-			{
-				key: ROUTES.SETTINGS,
-				label: 'Workspace',
-				icon: <Settings size={16} />,
-				isEnabled: true,
-				itemKey: 'workspace',
-			},
-			{
-				key: ROUTES.MY_SETTINGS,
-				label: 'Account',
-				icon: <User size={16} />,
-				isEnabled: true,
-				itemKey: 'account',
-			},
-			{
-				key: ROUTES.ALL_CHANNELS,
-				label: 'Notification Channels',
-				icon: <FileKey2 size={16} />,
-				isEnabled: true,
-				itemKey: 'notification-channels',
-			},
-			{
-				key: ROUTES.BILLING,
-				label: 'Billing',
-				icon: <Receipt size={16} />,
-				isEnabled: false,
-				itemKey: 'billing',
-			},
-			{
-				key: ROUTES.INTEGRATIONS,
-				label: 'Integrations',
-				icon: <Unplug size={16} />,
-				isEnabled: false,
-				itemKey: 'integrations',
-			},
-		],
+		key: ROUTES.SETTINGS,
+		label: 'General',
+		icon: <Settings size={16} />,
+		isEnabled: true,
+		itemKey: 'general',
+	},
+	{
+		key: ROUTES.BILLING,
+		label: 'Billing',
+		icon: <Receipt size={16} />,
+		isEnabled: false,
+		itemKey: 'billing',
+	},
+	{
+		key: ROUTES.ROLES_SETTINGS,
+		label: 'Roles',
+		icon: <Shield size={16} />,
+		isEnabled: false,
+		itemKey: 'roles',
+	},
+	{
+		key: ROUTES.ORG_SETTINGS,
+		label: 'Members & SSO',
+		icon: <User size={16} />,
+		isEnabled: false,
+		itemKey: 'members-sso',
 	},
 
 	{
-		key: 'identity-access',
-		title: 'Identity & Access',
-		items: [
-			{
-				key: ROUTES.ROLES_SETTINGS,
-				label: 'Roles',
-				icon: <Shield size={16} />,
-				isEnabled: false,
-				itemKey: 'roles',
-			},
-			{
-				key: ROUTES.MEMBERS_SETTINGS,
-				label: 'Members',
-				icon: <Users size={16} />,
-				isEnabled: false,
-				itemKey: 'members',
-			},
-			{
-				key: ROUTES.API_KEYS,
-				label: 'API Keys',
-				icon: <Key size={16} />,
-				isEnabled: false,
-				itemKey: 'api-keys',
-			},
-			{
-				key: ROUTES.INGESTION_SETTINGS,
-				label: 'Ingestion',
-				icon: <RocketOutlined rotate={45} />,
-				isEnabled: false,
-				itemKey: 'ingestion',
-			},
-		],
+		key: ROUTES.INTEGRATIONS,
+		label: 'Integrations',
+		icon: <Unplug size={16} />,
+		isEnabled: false,
+		itemKey: 'integrations',
 	},
 	{
-		key: 'authentication',
-		title: 'Authentication',
-		items: [
-			{
-				key: ROUTES.ORG_SETTINGS,
-				label: 'Single Sign-on',
-				icon: <User size={16} />,
-				isEnabled: false,
-				itemKey: 'sso',
-			},
-		],
+		key: ROUTES.ALL_CHANNELS,
+		label: 'Notification Channels',
+		icon: <FileKey2 size={16} />,
+		isEnabled: true,
+		itemKey: 'notification-channels',
 	},
 	{
-		key: 'shortcuts',
-		hasDivider: true,
-		items: [
-			{
-				key: ROUTES.SHORTCUTS,
-				label: 'Keyboard Shortcuts',
-				icon: <Keyboard size={16} />,
-				isEnabled: true,
-				itemKey: 'keyboard-shortcuts',
-			},
-		],
+		key: ROUTES.API_KEYS,
+		label: 'API Keys',
+		icon: <Key size={16} />,
+		isEnabled: false,
+		itemKey: 'api-keys',
+	},
+	{
+		key: ROUTES.INGESTION_SETTINGS,
+		label: 'Ingestion',
+		icon: <RocketOutlined rotate={45} />,
+		isEnabled: false,
+		itemKey: 'ingestion',
+	},
+	{
+		key: ROUTES.MY_SETTINGS,
+		label: 'Account Settings',
+		icon: <User size={16} />,
+		isEnabled: true,
+		itemKey: 'account-settings',
+	},
+	{
+		key: ROUTES.SHORTCUTS,
+		label: 'Keyboard Shortcuts',
+		icon: <Layers2 size={16} />,
+		isEnabled: true,
+		itemKey: 'keyboard-shortcuts',
 	},
 ];
 
@@ -456,6 +417,12 @@ export const helpSupportDropdownMenuItems: SidebarItem[] = [
 		icon: <MessageSquareText size={14} />,
 		itemKey: 'chat-support',
 	},
+	{
+		key: ROUTES.SHORTCUTS,
+		label: 'Keyboard Shortcuts',
+		icon: <Keyboard size={14} />,
+		itemKey: 'keyboard-shortcuts',
+	},
 	{
 		key: 'invite-collaborators',
 		label: 'Invite a Team Member',
@@ -464,78 +431,6 @@ export const helpSupportDropdownMenuItems: SidebarItem[] = [
 	},
 ];
 
-export interface UserSettingsMenuItemsParams {
-	userEmail: string;
-	isWorkspaceBlocked: boolean;
-	isEnterpriseSelfHostedUser: boolean;
-	isCommunityEnterpriseUser: boolean;
-}
-
-export const getUserSettingsDropdownMenuItems = ({
-	userEmail,
-	isWorkspaceBlocked,
-	isEnterpriseSelfHostedUser,
-	isCommunityEnterpriseUser,
-}: UserSettingsMenuItemsParams): MenuProps['items'] =>
-	[
-		{
-			key: 'label',
-			label: (
-				<div className="user-settings-dropdown-logged-in-section">
-					<span className="user-settings-dropdown-label-text">LOGGED IN AS</span>
-					<span className="user-settings-dropdown-label-email">{userEmail}</span>
-				</div>
-			),
-			disabled: true,
-			dataTestId: 'logged-in-as-nav-item',
-		},
-		{ type: 'divider' as const },
-		{
-			key: 'workspace',
-			label: 'Workspace Settings',
-			icon: <Building2 size={14} color={Style.L1_FOREGROUND} />,
-			disabled: isWorkspaceBlocked,
-			dataTestId: 'workspace-settings-nav-item',
-		},
-		{
-			key: 'account',
-			label: 'Account Settings',
-			icon: <User size={14} color={Style.L1_FOREGROUND} />,
-			dataTestId: 'account-settings-nav-item',
-		},
-		...(isEnterpriseSelfHostedUser || isCommunityEnterpriseUser
-			? [
-					{
-						key: 'license',
-						label: 'Manage License',
-						icon: <Shield size={14} color={Style.L1_FOREGROUND} />,
-						dataTestId: 'manage-license-nav-item',
-					},
-			  ]
-			: []),
-		{
-			key: 'keyboard-shortcuts',
-			label: 'Keyboard Shortcuts',
-			icon: <Keyboard size={14} color={Style.L1_FOREGROUND} />,
-			dataTestId: 'keyboard-shortcuts-nav-item',
-		},
-		{ type: 'divider' as const },
-		{
-			key: 'logout',
-			label: (
-				<span className="user-settings-dropdown-logout-section">Sign out</span>
-			),
-			icon: (
-				<LogOut
-					size={14}
-					className="user-settings-dropdown-logout-section"
-					color={Style.DANGER_BACKGROUND}
-				/>
-			),
-			dataTestId: 'logout-nav-item',
-		},
-	].filter(Boolean);
-
 /** Mapping of some newly added routes and their corresponding active sidebar menu key */
 export const NEW_ROUTES_MENU_ITEM_KEY_MAP: Record<string, string> = {
 	[ROUTES.TRACE]: ROUTES.TRACES_EXPLORER,

frontend/src/container/SideNav/sideNav.types.ts

@@ -24,13 +24,6 @@ export interface SidebarItem {
 
 export const CHANGELOG_LABEL = 'Full Changelog';
 
-export interface SettingsNavSection {
-	title?: string;
-	items: SidebarItem[];
-	key: string;
-	hasDivider?: boolean;
-}
-
 export interface DropdownSeparator {
 	type: 'divider' | 'group';
 	label?: ReactNode;

frontend/src/container/TopNav/DateTimeSelectionV2/constants.ts

@@ -153,7 +153,6 @@ export const routesToSkip = [
 	ROUTES.VERSION,
 	ROUTES.ALL_DASHBOARD,
 	ROUTES.ORG_SETTINGS,
-	ROUTES.MEMBERS_SETTINGS,
 	ROUTES.INGESTION_SETTINGS,
 	ROUTES.API_KEYS,
 	ROUTES.ERROR_DETAIL,

frontend/src/lib/uPlotV2/components/Tooltip/__tests__/Tooltip.test.tsx

@@ -92,7 +92,6 @@ function renderTooltip(props: Partial<TooltipTestProps> = {}): RenderResult {
 		isPinned: false,
 		dismiss: jest.fn(),
 		viaSync: false,
-		clickData: null,
 	} as TooltipTestProps;
 
 	return render(

frontend/src/lib/uPlotV2/plugins/TooltipPlugin/TooltipPlugin.tsx

@@ -1,7 +1,6 @@
-import { useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useLayoutEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import cx from 'classnames';
-import { getFocusedSeriesAtPosition } from 'lib/uPlotLib/plugins/onClickPlugin';
 import uPlot from 'uplot';
 
 import {
@@ -16,7 +15,6 @@ import {
 } from './tooltipController';
 import {
 	DashboardCursorSync,
-	TooltipClickData,
 	TooltipControllerContext,
 	TooltipControllerState,
 	TooltipLayoutInfo,
@@ -40,7 +38,6 @@ export default function TooltipPlugin({
 	maxHeight = 400,
 	syncMode = DashboardCursorSync.None,
 	syncKey = '_tooltip_sync_global_',
-	pinnedTooltipElement,
 	canPinTooltip = false,
 }: TooltipPluginProps): JSX.Element | null {
 	const containerRef = useRef<HTMLDivElement>(null);
@@ -76,6 +73,11 @@ export default function TooltipPlugin({
 		layoutRef.current?.observer.disconnect();
 		layoutRef.current = createLayoutObserver(layoutRef);
 
+		/**
+		 * Plot lifecycle and GC: viewState uses hasPlot (boolean), not the plot
+		 * reference; clearPlotReferences runs in cleanup so
+		 * detached canvases can be garbage collected.
+		 */
 		// Controller holds the mutable interaction state for this tooltip
 		// instance. It is intentionally *not* React state so uPlot hooks
 		// and DOM listeners can update it freely without triggering a
@@ -83,9 +85,7 @@ export default function TooltipPlugin({
 		const controller: TooltipControllerState = createInitialControllerState();
 
 		/**
-		 * Plot lifecycle and GC: viewState uses hasPlot (boolean), not the plot
-		 * reference; clearPlotReferences runs in cleanup so
-		 * detached canvases can be garbage collected.
+		 * Clear plot references so detached canvases can be garbage collected.
 		 */
 		const clearPlotReferences = (): void => {
 			controller.plot = null;
@@ -157,7 +157,6 @@ export default function TooltipPlugin({
 			const isPinnedBeforeDismiss = controller.pinned;
 			controller.pinned = false;
 			controller.hoverActive = false;
-			controller.clickData = null;
 			const plot = getPlot(controller);
 			if (plot) {
 				plot.setCursor({ left: -10, top: -10 });
@@ -197,7 +196,6 @@ export default function TooltipPlugin({
 				style: controller.style,
 				isPinned: controller.pinned,
 				isHovering: controller.hoverActive,
-				clickData: controller.clickData,
 				contents: createTooltipContents(),
 				dismiss: dismissTooltip,
 			});
@@ -270,37 +268,6 @@ export default function TooltipPlugin({
 				!controller.pinned &&
 				controller.focusedSeriesIndex != null
 			) {
-				const xValue = plot.posToVal(event.offsetX, 'x');
-				const yValue = plot.posToVal(event.offsetY, 'y');
-				const focusedSeries = getFocusedSeriesAtPosition(event, plot);
-
-				let clickedDataTimestamp = xValue;
-				if (focusedSeries) {
-					const dataIndex = plot.posToIdx(event.offsetX);
-					const xSeriesData = plot.data[0];
-					if (
-						xSeriesData &&
-						dataIndex >= 0 &&
-						dataIndex < xSeriesData.length &&
-						xSeriesData[dataIndex] !== undefined
-					) {
-						clickedDataTimestamp = xSeriesData[dataIndex];
-					}
-				}
-
-				const clickData: TooltipClickData = {
-					xValue,
-					yValue,
-					focusedSeries,
-					clickedDataTimestamp,
-					mouseX: event.offsetX,
-					mouseY: event.offsetY,
-					absoluteMouseX: event.clientX,
-					absoluteMouseY: event.clientY,
-				};
-
-				controller.clickData = clickData;
-
 				setTimeout(() => {
 					controller.pinned = true;
 					scheduleRender(true);
@@ -407,25 +374,6 @@ export default function TooltipPlugin({
 		}
 	}, [isHovering, hasPlot]);
 
-	const tooltipBody = useMemo(() => {
-		if (isPinned && pinnedTooltipElement != null && viewState.clickData != null) {
-			return pinnedTooltipElement(viewState.clickData);
-		}
-
-		if (isHovering) {
-			return contents;
-		}
-
-		return null;
-	}, [
-		isPinned,
-		pinnedTooltipElement,
-		viewState.clickData,
-		isHovering,
-		contents,
-	]);
-	const isTooltipVisible = isHovering || tooltipBody != null;
-
 	if (!hasPlot) {
 		return null;
 	}
@@ -434,7 +382,7 @@ export default function TooltipPlugin({
 		<div
 			className={cx('tooltip-plugin-container', {
 				pinned: isPinned,
-				visible: isTooltipVisible,
+				visible: isHovering,
 			})}
 			style={{
 				...style,
@@ -443,11 +391,11 @@ export default function TooltipPlugin({
 			}}
 			aria-live="polite"
 			aria-atomic="true"
-			aria-hidden={!isTooltipVisible}
+			aria-hidden={!isHovering}
 			ref={containerRef}
 			data-testid="tooltip-plugin-container"
 		>
-			{tooltipBody}
+			{isHovering ? contents : null}
 		</div>,
 		portalRoot.current,
 	);

frontend/src/lib/uPlotV2/plugins/TooltipPlugin/tooltipController.ts

@@ -21,7 +21,6 @@ export function createInitialControllerState(): TooltipControllerState {
 		hoverActive: false,
 		isAnySeriesActive: false,
 		pinned: false,
-		clickData: null,
 		style: { transform: '', pointerEvents: 'none' },
 		horizontalOffset: 0,
 		verticalOffset: 0,

frontend/src/lib/uPlotV2/plugins/TooltipPlugin/types.ts

@@ -24,7 +24,6 @@ export interface TooltipViewState {
 	isHovering: boolean;
 	isPinned: boolean;
 	dismiss: () => void;
-	clickData: TooltipClickData | null;
 	contents?: ReactNode;
 }
 
@@ -40,27 +39,10 @@ export interface TooltipPluginProps {
 	syncMode?: DashboardCursorSync;
 	syncKey?: string;
 	render: (args: TooltipRenderArgs) => ReactNode;
-	pinnedTooltipElement?: (clickData: TooltipClickData) => ReactNode;
 	maxWidth?: number;
 	maxHeight?: number;
 }
 
-export interface TooltipClickData {
-	xValue: number;
-	yValue: number;
-	focusedSeries: {
-		seriesIndex: number;
-		seriesName: string;
-		value: number;
-		color: string;
-	} | null;
-	clickedDataTimestamp: number;
-	mouseX: number;
-	mouseY: number;
-	absoluteMouseX: number;
-	absoluteMouseY: number;
-}
-
 /**
  * Mutable, non-React state that drives tooltip behaviour:
  * - whether the tooltip is active / pinned
@@ -77,7 +59,6 @@ export interface TooltipControllerState {
 	hoverActive: boolean;
 	isAnySeriesActive: boolean;
 	pinned: boolean;
-	clickData: TooltipClickData | null;
 	style: TooltipViewState['style'];
 	horizontalOffset: number;
 	verticalOffset: number;

frontend/src/lib/uPlotV2/plugins/TooltipPlugin/utils.ts

@@ -125,7 +125,6 @@ export function createInitialViewState(): TooltipViewState {
 		contents: null,
 		hasPlot: false,
 		dismiss: (): void => {},
-		clickData: null,
 	};
 }
 

frontend/src/lib/uPlotV2/plugins/__tests__/TooltipPlugin.test.ts

@@ -9,12 +9,6 @@ import { UPlotConfigBuilder } from '../../config/UPlotConfigBuilder';
 import TooltipPlugin from '../TooltipPlugin/TooltipPlugin';
 import { DashboardCursorSync } from '../TooltipPlugin/types';
 
-// Avoid depending on the full uPlot + onClickPlugin behaviour in these tests.
-// We only care that pinning logic runs without throwing, not which series is focused.
-jest.mock('lib/uPlotLib/plugins/onClickPlugin', () => ({
-	getFocusedSeriesAtPosition: jest.fn(() => null),
-}));
-
 // ---------------------------------------------------------------------------
 // Mock helpers
 // ---------------------------------------------------------------------------
@@ -61,21 +55,11 @@ function createFakePlot(): {
 	over: HTMLDivElement;
 	setCursor: jest.Mock<void, [uPlot.Cursor]>;
 	cursor: { event: Record<string, unknown> };
-	posToVal: jest.Mock<number, [value: number]>;
-	posToIdx: jest.Mock<number, []>;
-	data: [number[], number[]];
 } {
-	const over = document.createElement('div');
-
-	// Provide the minimal uPlot surface used by TooltipPlugin's pin logic.
 	return {
-		over,
+		over: document.createElement('div'),
 		setCursor: jest.fn(),
 		cursor: { event: {} },
-		// In real uPlot these map overlay coordinates to data-space values.
-		posToVal: jest.fn((value: number) => value),
-		posToIdx: jest.fn(() => 0),
-		data: [[0], [0]],
 	};
 }
 
@@ -214,34 +198,6 @@ describe('TooltipPlugin', () => {
 			});
 		});
 
-		it('renders pinnedTooltipElement after pinning and hides hover content', async () => {
-			const config = createConfigMock();
-			const pinnedTooltipElement = jest.fn(() =>
-				React.createElement('div', null, 'pinned-tooltip'),
-			);
-
-			const fakePlot = renderAndActivateHover(
-				config,
-				() => React.createElement('div', null, 'hover-tooltip'),
-				{
-					canPinTooltip: true,
-					pinnedTooltipElement,
-				},
-			);
-
-			expect(screen.getByText('hover-tooltip')).toBeInTheDocument();
-
-			act(() => {
-				fakePlot.over.dispatchEvent(new MouseEvent('click', { bubbles: true }));
-			});
-
-			await waitFor(() => {
-				expect(pinnedTooltipElement).toHaveBeenCalled();
-				expect(screen.getByText('pinned-tooltip')).toBeInTheDocument();
-				expect(screen.queryByText('hover-tooltip')).not.toBeInTheDocument();
-			});
-		});
-
 		it('dismisses a pinned tooltip via the dismiss callback', async () => {
 			const config = createConfigMock();
 

frontend/src/pages/MembersSettings/index.tsx

@@ -1,7 +0,0 @@
-import MembersSettingsContainer from 'container/MembersSettings/MembersSettings';
-
-function MembersSettings(): JSX.Element {
-	return <MembersSettingsContainer />;
-}
-
-export default MembersSettings;

frontend/src/pages/Settings/Settings.styles.scss

@@ -31,33 +31,9 @@
 		.settings-page-sidenav {
 			width: 240px;
 			height: calc(100vh - 48px);
-			border-right: 1px solid var(--secondary);
-			background: var(--sidebar-primary-foreground);
-			padding-top: var(--padding-1);
-			display: flex;
-			flex-direction: column;
-			gap: var(--spacing-12);
-			overflow-y: auto;
-
-			.settings-nav-section {
-				display: flex;
-				flex-direction: column;
-			}
-
-			.settings-nav-section--with-divider {
-				border-top: 1px solid var(--secondary);
-				padding-top: var(--padding-4);
-			}
-
-			.settings-nav-section-title {
-				font-size: var(--uppercase-small-600-font-size);
-				font-weight: var(--uppercase-small-600-font-weight);
-				letter-spacing: 0.88px;
-				text-transform: uppercase;
-				color: var(--l3-foreground);
-				margin-bottom: var(--margin-2);
-				padding: var(--padding-1) var(--padding-3);
-			}
+			border-right: 1px solid var(--Slate-500, #161922);
+			background: var(--Ink-500, #0b0c0e);
+			margin-top: 4px;
 
 			.nav-item {
 				.nav-item-data {

frontend/src/pages/Settings/Settings.tsx

@@ -7,7 +7,7 @@ import { FeatureKeys } from 'constants/features';
 import ROUTES from 'constants/routes';
 import { routeConfig } from 'container/SideNav/config';
 import { getQueryString } from 'container/SideNav/helper';
-import { settingsNavSections } from 'container/SideNav/menuItems';
+import { settingsMenuItems as defaultSettingsMenuItems } from 'container/SideNav/menuItems';
 import NavItem from 'container/SideNav/NavItem/NavItem';
 import { SidebarItem } from 'container/SideNav/sideNav.types';
 import useComponentPermission from 'hooks/useComponentPermission';
@@ -33,7 +33,7 @@ function SettingsPage(): JSX.Element {
 	const { isCloudUser, isEnterpriseSelfHostedUser } = useGetTenantLicense();
 
 	const [settingsMenuItems, setSettingsMenuItems] = useState<SidebarItem[]>(
-		settingsNavSections.flatMap((section) => section.items),
+		defaultSettingsMenuItems,
 	);
 
 	const isAdmin = user.role === USER_ROLES.ADMIN;
@@ -83,7 +83,6 @@ function SettingsPage(): JSX.Element {
 							item.key === ROUTES.API_KEYS ||
 							item.key === ROUTES.INGESTION_SETTINGS ||
 							item.key === ROUTES.ORG_SETTINGS ||
-							item.key === ROUTES.MEMBERS_SETTINGS ||
 							item.key === ROUTES.SHORTCUTS
 								? true
 								: item.isEnabled,
@@ -114,7 +113,6 @@ function SettingsPage(): JSX.Element {
 							item.key === ROUTES.INTEGRATIONS ||
 							item.key === ROUTES.API_KEYS ||
 							item.key === ROUTES.ORG_SETTINGS ||
-							item.key === ROUTES.MEMBERS_SETTINGS ||
 							item.key === ROUTES.INGESTION_SETTINGS
 								? true
 								: item.isEnabled,
@@ -138,9 +136,7 @@ function SettingsPage(): JSX.Element {
 					updatedItems = updatedItems.map((item) => ({
 						...item,
 						isEnabled:
-							item.key === ROUTES.API_KEYS ||
-							item.key === ROUTES.ORG_SETTINGS ||
-							item.key === ROUTES.MEMBERS_SETTINGS
+							item.key === ROUTES.API_KEYS || item.key === ROUTES.ORG_SETTINGS
 								? true
 								: item.isEnabled,
 					}));
@@ -256,45 +252,25 @@ function SettingsPage(): JSX.Element {
 
 			<div className="settings-page-content-container">
 				<div className="settings-page-sidenav" data-testid="settings-page-sidenav">
-					{settingsNavSections.map((section) => {
-						const enabledItems = section.items.filter((sectionItem) =>
-							settingsMenuItems.some(
-								(item) => item.key === sectionItem.key && item.isEnabled,
-							),
-						);
-						if (enabledItems.length === 0) {
-							return null;
-						}
-						return (
-							<div
-								key={section.key}
-								className={`settings-nav-section${
-									section.hasDivider ? ' settings-nav-section--with-divider' : ''
-								}`}
-							>
-								{section.title && (
-									<div className="settings-nav-section-title">{section.title}</div>
-								)}
-								{enabledItems.map((item) => (
-									<NavItem
-										key={item.key}
-										item={item}
-										isActive={isActiveNavItem(item.key as string)}
-										isDisabled={false}
-										showIcon={false}
-										onClick={(event): void => {
-											logEvent('Settings V2: Menu clicked', {
-												menuLabel: item.label,
-												menuRoute: item.key,
-											});
-											handleMenuItemClick((event as unknown) as MouseEvent, item);
-										}}
-										dataTestId={item.itemKey}
-									/>
-								))}
-							</div>
-						);
-					})}
+					{settingsMenuItems
+						.filter((item) => item.isEnabled)
+						.map((item) => (
+							<NavItem
+								key={item.key}
+								item={item}
+								isActive={isActiveNavItem(item.key as string)}
+								isDisabled={false}
+								showIcon={false}
+								onClick={(event): void => {
+									logEvent('Settings V2: Menu clicked', {
+										menuLabel: item.label,
+										menuRoute: item.key,
+									});
+									handleMenuItemClick((event as unknown) as MouseEvent, item);
+								}}
+								dataTestId={item.itemKey}
+							/>
+						))}
 				</div>
 
 				<div className="settings-page-content">

frontend/src/pages/Settings/__tests__/Settings.test.tsx

@@ -1,138 +0,0 @@
-import React from 'react';
-import SettingsPage from 'pages/Settings/Settings';
-import { render, screen, within } from 'tests/test-utils';
-import { LicensePlatform } from 'types/api/licensesV3/getActive';
-import { USER_ROLES } from 'types/roles';
-
-jest.mock('components/MarkdownRenderer/MarkdownRenderer', () => ({
-	__esModule: true,
-	default: ({ children }: { children: React.ReactNode }): React.ReactNode =>
-		children,
-}));
-
-jest.mock('api/common/logEvent', () => ({
-	__esModule: true,
-	default: jest.fn(),
-}));
-
-jest.mock('lib/history', () => ({
-	push: jest.fn(),
-	listen: jest.fn(() => jest.fn()),
-	location: { pathname: '/settings', search: '' },
-}));
-
-const getCloudAdminOverrides = (): any => ({
-	activeLicense: {
-		key: 'test-key',
-		platform: LicensePlatform.CLOUD,
-	},
-});
-
-const getSelfHostedAdminOverrides = (): any => ({
-	activeLicense: {
-		key: 'test-key',
-		platform: LicensePlatform.SELF_HOSTED,
-	},
-});
-
-describe('SettingsPage nav sections', () => {
-	describe('Cloud Admin', () => {
-		beforeEach(() => {
-			render(<SettingsPage />, undefined, {
-				role: USER_ROLES.ADMIN,
-				appContextOverrides: getCloudAdminOverrides(),
-				initialRoute: '/settings',
-			});
-		});
-
-		it.each([
-			'settings-page-sidenav',
-			'workspace',
-			'account',
-			'notification-channels',
-			'billing',
-			'roles',
-			'members',
-			'api-keys',
-			'sso',
-			'integrations',
-			'ingestion',
-		])('renders "%s" element', (id) => {
-			expect(screen.getByTestId(id)).toBeInTheDocument();
-		});
-
-		it.each(['Identity & Access', 'Authentication'])(
-			'renders "%s" section title',
-			(text) => {
-				expect(screen.getByText(text)).toBeInTheDocument();
-			},
-		);
-	});
-
-	describe('Cloud Viewer', () => {
-		beforeEach(() => {
-			render(<SettingsPage />, undefined, {
-				role: USER_ROLES.VIEWER,
-				appContextOverrides: getCloudAdminOverrides(),
-				initialRoute: '/settings',
-			});
-		});
-
-		it.each(['workspace', 'account'])('renders "%s" element', (id) => {
-			expect(screen.getByTestId(id)).toBeInTheDocument();
-		});
-
-		it.each(['billing', 'roles', 'api-keys'])(
-			'does not render "%s" element',
-			(id) => {
-				expect(screen.queryByTestId(id)).not.toBeInTheDocument();
-			},
-		);
-	});
-
-	describe('Self-hosted Admin', () => {
-		beforeEach(() => {
-			render(<SettingsPage />, undefined, {
-				role: USER_ROLES.ADMIN,
-				appContextOverrides: getSelfHostedAdminOverrides(),
-				initialRoute: '/settings',
-			});
-		});
-
-		it.each(['roles', 'members', 'api-keys', 'integrations', 'sso', 'ingestion'])(
-			'renders "%s" element',
-			(id) => {
-				expect(screen.getByTestId(id)).toBeInTheDocument();
-			},
-		);
-	});
-
-	describe('section structure', () => {
-		it('renders items in correct sections for cloud admin', () => {
-			const { container } = render(<SettingsPage />, undefined, {
-				role: USER_ROLES.ADMIN,
-				appContextOverrides: getCloudAdminOverrides(),
-				initialRoute: '/settings',
-			});
-
-			const sidenav = within(container).getByTestId('settings-page-sidenav');
-			const sections = sidenav.querySelectorAll('.settings-nav-section');
-
-			// Should have at least 2 sections (general + identity-access) for cloud admin
-			expect(sections.length).toBeGreaterThanOrEqual(2);
-		});
-
-		it('hides section entirely when all items in it are disabled', () => {
-			// Community user has very limited access — identity section should be hidden
-			render(<SettingsPage />, undefined, {
-				role: USER_ROLES.VIEWER,
-				appContextOverrides: {
-					activeLicense: null,
-				},
-				initialRoute: '/settings',
-			});
-
-			expect(screen.queryByText('IDENTITY & ACCESS')).not.toBeInTheDocument();
-		});
-	});
-});

frontend/src/pages/Settings/config.tsx

@@ -26,10 +26,8 @@ import {
 	Plus,
 	Shield,
 	User,
-	Users,
 } from 'lucide-react';
 import ChannelsEdit from 'pages/ChannelsEdit';
-import MembersSettings from 'pages/MembersSettings';
 import Shortcuts from 'pages/Shortcuts';
 
 export const organizationSettings = (t: TFunction): RouteTabProps['routes'] => [
@@ -138,19 +136,6 @@ export const billingSettings = (t: TFunction): RouteTabProps['routes'] => [
 	},
 ];
 
-export const membersSettings = (t: TFunction): RouteTabProps['routes'] => [
-	{
-		Component: MembersSettings,
-		name: (
-			<div className="periscope-tab">
-				<Users size={16} /> {t('routes:members').toString()}
-			</div>
-		),
-		route: ROUTES.MEMBERS_SETTINGS,
-		key: ROUTES.MEMBERS_SETTINGS,
-	},
-];
-
 export const rolesSettings = (t: TFunction): RouteTabProps['routes'] => [
 	{
 		Component: RolesSettings,

frontend/src/pages/Settings/utils.ts

@@ -11,7 +11,6 @@ import {
 	generalSettings,
 	ingestionSettings,
 	keyboardShortcuts,
-	membersSettings,
 	multiIngestionSettings,
 	mySettings,
 	organizationSettings,
@@ -61,7 +60,7 @@ export const getRoutes = (
 	settings.push(...alertChannels(t));
 
 	if (isAdmin) {
-		settings.push(...apiKeys(t), ...membersSettings(t));
+		settings.push(...apiKeys(t));
 	}
 
 	// todo: Sagar - check the condition for role list and details page, to whom we want to serve

frontend/src/utils/app.ts

@@ -71,5 +71,3 @@ export function buildAbsolutePath({
 
 	return urlQueryString ? `${absolutePath}?${urlQueryString}` : absolutePath;
 }
-
-export const EMAIL_REGEX = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;

frontend/src/utils/permission/index.ts

@@ -99,7 +99,6 @@ export const routePermission: Record<keyof typeof ROUTES, ROLES[]> = {
 	WORKSPACE_SUSPENDED: ['ADMIN', 'EDITOR', 'VIEWER'],
 	ROLES_SETTINGS: ['ADMIN'],
 	ROLE_DETAILS: ['ADMIN'],
-	MEMBERS_SETTINGS: ['ADMIN'],
 	BILLING: ['ADMIN'],
 	SUPPORT: ['ADMIN', 'EDITOR', 'VIEWER'],
 	SOMETHING_WENT_WRONG: ['ADMIN', 'EDITOR', 'VIEWER'],

frontend/yarn.lock

@@ -4439,7 +4439,7 @@
     aria-hidden "^1.1.1"
     react-remove-scroll "2.5.4"
 
-"@radix-ui/react-dialog@^1.1.1", "@radix-ui/react-dialog@^1.1.11", "@radix-ui/react-dialog@^1.1.6":
+"@radix-ui/react-dialog@^1.1.11", "@radix-ui/react-dialog@^1.1.6":
   version "1.1.15"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz#1de3d7a7e9a17a9874d29c07f5940a18a119b632"
   integrity sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==
@@ -5519,21 +5519,6 @@
     tailwind-merge "^2.5.2"
     tailwindcss-animate "^1.0.7"
 
-"@signozhq/drawer@0.0.4":
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/@signozhq/drawer/-/drawer-0.0.4.tgz#7c6e6779602113f55df8a55076e68b9cc13c7d79"
-  integrity sha512-m/shStl5yVPjHjrhDAh3EeKqqTtMmZUBVlgJPUGgoNV3sFsuN6JNaaAtEJI8cQBWkbEEiHLWKVkL/vhbQ7YrUg==
-  dependencies:
-    "@radix-ui/react-dialog" "^1.1.11"
-    "@radix-ui/react-icons" "^1.3.0"
-    "@radix-ui/react-slot" "^1.1.0"
-    class-variance-authority "^0.7.0"
-    clsx "^2.1.1"
-    lucide-react "^0.445.0"
-    tailwind-merge "^2.5.2"
-    tailwindcss-animate "^1.0.7"
-    vaul "^1.1.2"
-
 "@signozhq/icons@0.1.0", "@signozhq/icons@^0.1.0":
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/@signozhq/icons/-/icons-0.1.0.tgz#00dfb430dbac423bfff715876f91a7b8a72509e4"
@@ -19675,13 +19660,6 @@ value-equal@^1.0.1:
   resolved "https://registry.npmjs.org/value-equal/-/value-equal-1.0.1.tgz"
   integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw==
 
-vaul@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vaul/-/vaul-1.1.2.tgz#c959f8b9dc2ed4f7d99366caee433fbef91f5ba9"
-  integrity sha512-ZFkClGpWyI2WUQjdLJ/BaGuV6AVQiJ3uELGk3OYtP+B6yCO7Cmn9vPFXVJkRaGkOJu3m8bQMgtyzNHixULceQA==
-  dependencies:
-    "@radix-ui/react-dialog" "^1.1.1"
-
 vfile-location@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-4.1.0.tgz#69df82fb9ef0a38d0d02b90dd84620e120050dd0"

pkg/querier/promql_query.go

@@ -237,21 +237,11 @@ func (q *promqlQuery) Execute(ctx context.Context) (*qbv5.Result, error) {
 		return nil, errors.WrapInternalf(promErr, errors.CodeInternal, "error getting matrix from promql query %q", query)
 	}
 
-	excludeLabel := func(labelName string) bool {
-		if labelName == "__name__" {
-			return false
-		}
-		return strings.HasPrefix(labelName, "__") || labelName == "fingerprint"
-	}
-
 	var series []*qbv5.TimeSeries
 	for _, v := range matrix {
 		var s qbv5.TimeSeries
 		lbls := make([]*qbv5.Label, 0, len(v.Metric))
 		for name, value := range v.Metric.Copy().Map() {
-			if excludeLabel(name) {
-				continue
-			}
 			lbls = append(lbls, &qbv5.Label{
 				Key:   telemetrytypes.TelemetryFieldKey{Name: name},
 				Value: value,

pkg/query-service/agentConf/db.go

@@ -114,7 +114,6 @@ func (r *Repo) GetLatestVersion(
 func (r *Repo) insertConfig(
 	ctx context.Context, orgId valuer.UUID, userId valuer.UUID, c *opamptypes.AgentConfigVersion, elements []string,
 ) error {
-
 	if c.ElementType.StringValue() == "" {
 		return errors.NewInvalidInputf(CodeElementTypeRequired, "element type is required for creating agent config version")
 	}
@@ -228,6 +227,55 @@ func (r *Repo) updateDeployStatus(ctx context.Context,
 	return nil
 }
 
+// GetDeployStatusByHash returns the DeployStatus for the given config hash
+// (stored with orgId prefix). Returns DeployStatusUnknown when no matching row exists.
+func (r *Repo) GetDeployStatusByHash(ctx context.Context, orgId valuer.UUID, configHash string) (opamptypes.DeployStatus, error) {
+	var version opamptypes.AgentConfigVersion
+	err := r.store.BunDB().NewSelect().
+		Model(&version).
+		ColumnExpr("deploy_status").
+		Where("hash = ?", configHash).
+		Where("org_id = ?", orgId).
+		Scan(ctx)
+	if err != nil {
+		if errors.Is(err, sql.ErrNoRows) {
+			return opamptypes.DeployStatusUnknown, nil
+		}
+		return opamptypes.DeployStatusUnknown, errors.WrapInternalf(err, errors.CodeInternal, "failed to query deploy status by hash")
+	}
+	return version.DeployStatus, nil
+}
+
+// GetPendingDeployments returns all config versions with in_progress deploy status.
+// Used on server startup to rehydrate coordinator subscribers that were lost on crash/restart.
+func (r *Repo) GetPendingDeployments(ctx context.Context) ([]opamptypes.AgentConfigVersion, error) {
+	var versions []opamptypes.AgentConfigVersion
+	err := r.store.BunDB().NewSelect().
+		Model(&versions).
+		ColumnExpr("org_id, hash").
+		// Only consider non-terminal deployment states (i.e. anything except failed or deployed).
+		Where("deploy_status NOT IN (?, ?)",
+			opamptypes.DeployFailed.StringValue(),
+			opamptypes.Deployed.StringValue(),
+		).
+		// For each org, keep only the latest pending version.
+		Where("version = (SELECT MAX(version) FROM agent_config_version WHERE org_id = acv.org_id AND deploy_status NOT IN (?, ?))",
+			opamptypes.DeployFailed.StringValue(),
+			opamptypes.Deployed.StringValue(),
+		).
+		// Exclude any pending version that is before a terminal (deployed/failed) version for the same org.
+		Where("NOT EXISTS (SELECT 1 FROM agent_config_version acv2 WHERE acv2.org_id = acv.org_id AND acv2.version > acv.version AND acv2.deploy_status IN (?, ?))",
+			opamptypes.Deployed.StringValue(),
+			opamptypes.DeployFailed.StringValue(),
+		).
+		Where("hash IS NOT NULL AND hash != ''").
+		Scan(ctx)
+	if err != nil {
+		return nil, errors.WrapInternalf(err, errors.CodeInternal, "failed to query pending deployments")
+	}
+	return versions, nil
+}
+
 func (r *Repo) updateDeployStatusByHash(
 	ctx context.Context, orgId valuer.UUID, confighash string, status string, result string,
 ) error {

pkg/query-service/agentConf/manager.go

@@ -178,6 +178,31 @@ func (m *Manager) ReportConfigDeploymentStatus(
 	}
 }
 
+// Implements model.AgentConfigProvider
+func (m *Manager) GetDeployStatusByHash(ctx context.Context, orgId valuer.UUID, configHash string) (opamptypes.DeployStatus, error) {
+	return m.Repo.GetDeployStatusByHash(ctx, orgId, configHash)
+}
+
+// Implements opamp.AgentConfigProvider
+func (m *Manager) GetPendingDeployments(ctx context.Context) ([]opamp.PendingDeployment, error) {
+	versions, err := m.Repo.GetPendingDeployments(ctx)
+	if err != nil {
+		return nil, err
+	}
+	result := make([]opamp.PendingDeployment, 0, len(versions))
+	for _, v := range versions {
+		rawHash := strings.TrimPrefix(v.Hash, v.OrgID.String())
+		if rawHash == "" {
+			continue
+		}
+		result = append(result, opamp.PendingDeployment{
+			OrgID:         v.OrgID,
+			RawConfigHash: rawHash,
+		})
+	}
+	return result, nil
+}
+
 func GetLatestVersion(
 	ctx context.Context, orgId valuer.UUID, elementType opamptypes.ElementType,
 ) (*opamptypes.AgentConfigVersion, error) {

pkg/query-service/app/opamp/config_provider.go

@@ -1,6 +1,21 @@
 package opamp
 
-import "github.com/SigNoz/signoz/pkg/query-service/app/opamp/model"
+import (
+	"context"
+
+	"github.com/SigNoz/signoz/pkg/query-service/app/opamp/model"
+	"github.com/SigNoz/signoz/pkg/valuer"
+)
+
+// PendingDeployment is an agent config deployment still in the in_progress state.
+// These are re-registered in the coordinator on server startup so that
+// notifySubscribers can find them when the agent reconnects after a crash.
+type PendingDeployment struct {
+	OrgID valuer.UUID
+	// RawConfigHash is the hash without the orgId prefix, matching the
+	// ConfigHash sent in AgentRemoteConfig and reported back by the agent.
+	RawConfigHash string
+}
 
 // Interface for a source of otel collector config recommendations.
 type AgentConfigProvider interface {
@@ -9,4 +24,9 @@ type AgentConfigProvider interface {
 	// Subscribe to be notified on changes in config provided by this source.
 	// Used for rolling out latest config recommendation to all connected agents when settings change
 	SubscribeToConfigUpdates(callback func()) (unsubscribe func())
+
+	// GetPendingDeployments returns all config deployments currently in_progress.
+	// Called on server startup to re-register coordinator subscribers that were
+	// lost when the server previously crashed or restarted.
+	GetPendingDeployments(ctx context.Context) ([]PendingDeployment, error)
 }

pkg/query-service/app/opamp/mocks.go

@@ -5,6 +5,7 @@ import (
 	"log"
 	"net"
 
+	"github.com/SigNoz/signoz/pkg/types/opamptypes"
 	"github.com/SigNoz/signoz/pkg/valuer"
 	"github.com/google/uuid"
 	"github.com/knadh/koanf"
@@ -127,6 +128,16 @@ func (ta *MockAgentConfigProvider) HasReportedDeploymentStatus(orgID valuer.UUID
 	return exists
 }
 
+// AgentConfigProvider interface
+func (ta *MockAgentConfigProvider) GetDeployStatusByHash(_ context.Context, _ valuer.UUID, _ string) (opamptypes.DeployStatus, error) {
+	return opamptypes.DeployStatusUnknown, nil
+}
+
+// AgentConfigProvider interface
+func (ta *MockAgentConfigProvider) GetPendingDeployments(_ context.Context) ([]PendingDeployment, error) {
+	return nil, nil
+}
+
 // AgentConfigProvider interface
 func (ta *MockAgentConfigProvider) SubscribeToConfigUpdates(callback func()) func() {
 	subscriberId := uuid.NewString()

pkg/query-service/app/opamp/model/agent.go

@@ -112,53 +112,71 @@ func ExtractLbFlag(agentDescr *protobufs.AgentDescription) bool {
 	return false
 }
 
-func (agent *Agent) updateAgentDescription(newStatus *protobufs.AgentToServer) (agentDescrChanged bool) {
-	prevStatus := agent.Status
-
+func (agent *Agent) updateAgentDescription(newStatus *protobufs.AgentToServer, configProvider AgentConfigProvider) (agentDescrChanged bool) {
 	if agent.Status == nil {
-		// First time this Agent reports a status, remember it.
-		agent.Status = newStatus
-		agentDescrChanged = true
-	} else {
-		// Not a new Agent. Update the Status.
-		agent.Status.SequenceNum = newStatus.SequenceNum
-
-		// Check what's changed in the AgentDescription.
-		if newStatus.AgentDescription != nil {
-			// If the AgentDescription field is set it means the Agent tells us
-			// something is changed in the field since the last status report
-			// (or this is the first report).
-			// Make full comparison of previous and new descriptions to see if it
-			// really is different.
-			if prevStatus != nil && proto.Equal(prevStatus.AgentDescription, newStatus.AgentDescription) {
-				// Agent description didn't change.
-				agentDescrChanged = false
-			} else {
-				// Yes, the description is different, update it.
-				agent.Status.AgentDescription = newStatus.AgentDescription
-				agentDescrChanged = true
-			}
-		} else {
-			// AgentDescription field is not set, which means description didn't change.
-			agentDescrChanged = false
+		// initialize the remote config status to unset
+		agent.Status = &protobufs.AgentToServer{
+			RemoteConfigStatus: &protobufs.RemoteConfigStatus{
+				Status: protobufs.RemoteConfigStatuses_RemoteConfigStatuses_UNSET,
+			},
 		}
 
-		// Update remote config status if it is included and is different from what we have.
-		if newStatus.RemoteConfigStatus != nil &&
-			!proto.Equal(agent.Status.RemoteConfigStatus, newStatus.RemoteConfigStatus) {
-			agent.Status.RemoteConfigStatus = newStatus.RemoteConfigStatus
+		rawHash := string(newStatus.RemoteConfigStatus.LastRemoteConfigHash)
+		dbHash := agent.OrgID.String() + rawHash
+		deployStatus, err := configProvider.GetDeployStatusByHash(context.Background(), agent.OrgID, dbHash)
+		if err == nil {
+			// Set the agent config status to the status from the database
+			agent.Status.RemoteConfigStatus.Status = opamptypes.DeployStatusToProtoStatus[deployStatus]
+		}
 
-			// todo: need to address multiple agent scenario here
-			// for now, the first response will be sent back to the UI
-			if agent.Status.RemoteConfigStatus.Status == protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLIED {
-				onConfigSuccess(agent.OrgID, agent.AgentID, string(agent.Status.RemoteConfigStatus.LastRemoteConfigHash))
-			}
+		// First message from this agent instance (new connect or server restart).
+		// If the agent brings a RemoteConfigStatus, consult the DB to decide
+		// whether this resolves a pending deployment. This is the authoritative
+		// answer: if DB says in_progress and agent says APPLIED/FAILED, we notify.
+		// No mock status, no guessing — the DB IS the source of truth.
+		if newStatus.RemoteConfigStatus != nil {
+			// Agent just started, i.e. it doesn't have a remote config status yet.
+			if newStatus.RemoteConfigStatus.Status == protobufs.RemoteConfigStatuses_RemoteConfigStatuses_UNSET {
+				agentDescrChanged = true
+				agent.Status.RemoteConfigStatus.Status = protobufs.RemoteConfigStatuses_RemoteConfigStatuses_UNSET
+			} else {
+				// else Agent was already running, Server just reconnected.
+				agent.Status.AgentDescription = newStatus.AgentDescription
 
-			if agent.Status.RemoteConfigStatus.Status == protobufs.RemoteConfigStatuses_RemoteConfigStatuses_FAILED {
-				onConfigFailure(agent.OrgID, agent.AgentID, string(agent.Status.RemoteConfigStatus.LastRemoteConfigHash), agent.Status.RemoteConfigStatus.ErrorMessage)
+				// database has already recorded the final status of the deployment, So here we don't need to prepare status for the agent
+				// Instead we directly Copy it from newStatus
+				switch agent.Status.RemoteConfigStatus.Status {
+				case protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLIED,
+					protobufs.RemoteConfigStatuses_RemoteConfigStatuses_FAILED:
+					agent.Status.RemoteConfigStatus.Status = newStatus.RemoteConfigStatus.Status
+				}
 			}
 		}
 	}
+	// Subsequent message — update sequence number and diff fields.
+	agent.Status.SequenceNum = newStatus.SequenceNum
+
+	if newStatus.AgentDescription != nil {
+		if proto.Equal(agent.Status.AgentDescription, newStatus.AgentDescription) {
+			agentDescrChanged = false
+		} else {
+			agent.Status.AgentDescription = newStatus.AgentDescription
+			agentDescrChanged = true
+		}
+	}
+
+	// Notify subscribers when RemoteConfigStatus changes.
+	if newStatus.RemoteConfigStatus != nil &&
+		!proto.Equal(agent.Status.RemoteConfigStatus, newStatus.RemoteConfigStatus) {
+		agent.Status.RemoteConfigStatus = newStatus.RemoteConfigStatus
+		hash := string(agent.Status.RemoteConfigStatus.LastRemoteConfigHash)
+		switch agent.Status.RemoteConfigStatus.Status {
+		case protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLIED:
+			onConfigSuccess(agent.OrgID, agent.AgentID, hash)
+		case protobufs.RemoteConfigStatuses_RemoteConfigStatuses_FAILED:
+			onConfigFailure(agent.OrgID, agent.AgentID, hash, agent.Status.RemoteConfigStatus.ErrorMessage)
+		}
+	}
 
 	if agentDescrChanged {
 		agent.CanLB = ExtractLbFlag(newStatus.AgentDescription)
@@ -186,14 +204,8 @@ func (agent *Agent) updateRemoteConfigStatus(newStatus *protobufs.AgentToServer)
 	}
 }
 
-func (agent *Agent) updateStatusField(newStatus *protobufs.AgentToServer) (agentDescrChanged bool) {
-	if agent.Status == nil {
-		// First time this Agent reports a status, remember it.
-		agent.Status = newStatus
-		agentDescrChanged = true
-	}
-
-	agentDescrChanged = agent.updateAgentDescription(newStatus) || agentDescrChanged
+func (agent *Agent) updateStatusField(newStatus *protobufs.AgentToServer, configProvider AgentConfigProvider) (agentDescrChanged bool) {
+	agentDescrChanged = agent.updateAgentDescription(newStatus, configProvider)
 	agent.updateRemoteConfigStatus(newStatus)
 	agent.updateHealth(newStatus)
 	return agentDescrChanged
@@ -238,7 +250,7 @@ func (agent *Agent) processStatusUpdate(
 	// current status is not up-to-date.
 	lostPreviousUpdate := (agent.Status == nil) || (agent.Status != nil && agent.Status.SequenceNum+1 != newStatus.SequenceNum)
 
-	agentDescrChanged := agent.updateStatusField(newStatus)
+	agentDescrChanged := agent.updateStatusField(newStatus, configProvider)
 
 	// Check if any fields were omitted in the status report.
 	effectiveConfigOmitted := newStatus.EffectiveConfig == nil &&

pkg/query-service/app/opamp/model/config.go

@@ -1,6 +1,11 @@
 package model
 
-import "github.com/SigNoz/signoz/pkg/valuer"
+import (
+	"context"
+
+	"github.com/SigNoz/signoz/pkg/types/opamptypes"
+	"github.com/SigNoz/signoz/pkg/valuer"
+)
 
 // Interface for source of otel collector config recommendations.
 type AgentConfigProvider interface {
@@ -20,4 +25,10 @@ type AgentConfigProvider interface {
 		configId string,
 		err error,
 	)
+
+	// GetDeployStatusByHash returns the DeployStatus for the given config hash
+	// (with orgId prefix as stored in the DB). Returns DeployStatusUnknown when
+	// no matching row exists. Used by the agent's first-connect handler to
+	// determine whether the reported RemoteConfigStatus resolves a pending deployment.
+	GetDeployStatusByHash(ctx context.Context, orgId valuer.UUID, configHash string) (opamptypes.DeployStatus, error)
 }

pkg/query-service/app/opamp/model/coordinator.go

@@ -41,7 +41,6 @@ func onConfigFailure(orgId valuer.UUID, agentId string, hash string, errorMessag
 	notifySubscribers(orgId, agentId, key, errors.New(errorMessage))
 }
 
-// OnSuccess listens to config changes and notifies subscribers
 func notifySubscribers(orgId valuer.UUID, agentId string, key string, err error) {
 	// this method currently does not handle multi-agent scenario.
 	// as soon as a message is delivered, we release all the subscribers
@@ -66,6 +65,7 @@ func ListenToConfigUpdate(orgId valuer.UUID, agentId string, hash string, ss OnC
 	defer coordinator.mutex.Unlock()
 
 	key := getSubscriberKey(orgId, hash)
+
 	if subs, ok := coordinator.subscribers[key]; ok {
 		subs = append(subs, ss)
 		coordinator.subscribers[key] = subs

pkg/query-service/app/opamp/opamp_server.go

@@ -66,6 +66,17 @@ func (srv *Server) Start(listener string) error {
 		ListenEndpoint: listener,
 	}
 
+	// Re-register coordinator subscribers for any deployments that were in_progress
+	// when the server last shut down or crashed. Without this, notifySubscribers
+	// would find an empty map and the deployment status would stay stuck in_progress.
+	if pending, err := srv.agentConfigProvider.GetPendingDeployments(context.Background()); err != nil {
+		return err
+	} else {
+		for _, dep := range pending {
+			model.ListenToConfigUpdate(dep.OrgID, "", dep.RawConfigHash, srv.agentConfigProvider.ReportConfigDeploymentStatus)
+		}
+	}
+
 	// This will have to send request to all the agents of all tenants
 	unsubscribe := srv.agentConfigProvider.SubscribeToConfigUpdates(func() {
 		err := srv.agents.RecommendLatestConfigToAll(srv.agentConfigProvider)

pkg/types/opamptypes/agent.go

@@ -6,6 +6,7 @@ import (
 	"github.com/SigNoz/signoz/pkg/sqlstore"
 	"github.com/SigNoz/signoz/pkg/types"
 	"github.com/SigNoz/signoz/pkg/valuer"
+	"github.com/open-telemetry/opamp-go/protobufs"
 	"github.com/uptrace/bun"
 )
 
@@ -78,6 +79,15 @@ var (
 	DeployStatusUnknown = DeployStatus{valuer.NewString("unknown")}
 )
 
+var DeployStatusToProtoStatus = map[DeployStatus]protobufs.RemoteConfigStatuses{
+	PendingDeploy:       protobufs.RemoteConfigStatuses_RemoteConfigStatuses_UNSET,
+	Deploying:           protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLYING,
+	Deployed:            protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLIED,
+	DeployInitiated:     protobufs.RemoteConfigStatuses_RemoteConfigStatuses_APPLYING,
+	DeployFailed:        protobufs.RemoteConfigStatuses_RemoteConfigStatuses_FAILED,
+	DeployStatusUnknown: protobufs.RemoteConfigStatuses_RemoteConfigStatuses_UNSET,
+}
+
 type AgentConfigVersion struct {
 	bun.BaseModel `bun:"table:agent_config_version,alias:acv"`