chore: add further filtering for required attribute columns

ee/query-service/app/api/featureFlags.go

@@ -80,15 +80,6 @@ func (ah *APIHandler) getFeatureFlags(w http.ResponseWriter, r *http.Request) {
 		Route:      "",
 	})
 
-	fineGrainedAuthz := ah.Signoz.Flagger.BooleanOrEmpty(ctx, flagger.FeatureUseFineGrainedAuthz, evalCtx)
-	featureSet = append(featureSet, &licensetypes.Feature{
-		Name:       valuer.NewString(flagger.FeatureUseFineGrainedAuthz.String()),
-		Active:     fineGrainedAuthz,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	})
-
 	if constants.IsDotMetricsEnabled {
 		for idx, feature := range featureSet {
 			if feature.Name == licensetypes.DotMetricsEnabled {

frontend/orval.config.ts

@@ -10,13 +10,6 @@ export default defineConfig({
 	signoz: {
 		input: {
 			target: '../docs/api/openapi.yml',
-			// Perses' `common.JSONRef` (used by `DashboardGridItem.content`) has a
-			// field tagged `json:"$ref"`, so our spec contains a property literally
-			// named `$ref`.
-			// Orval v8's validator (`@scalar/openapi-parser`) treats every `$ref` key
-			// as a JSON Reference and aborts with `INVALID_REFERENCE` when the value isn't a URI string.
-			// Safe to disable: yes, the spec is generated by `cmd/openapi.go` and gated by backend CI, not hand-edited.
-			unsafeDisableValidation: true,
 		},
 		output: {
 			target: './src/api/generated/services',
@@ -34,7 +27,7 @@ export default defineConfig({
 					signal: true,
 					useOperationIdAsQueryKey: false,
 				},
-				useDates: false,
+				useDates: true,
 				useNamedParameters: true,
 				enumGenerationType: 'enum',
 				mutator: {

frontend/src/AppRoutes/routes.ts

@@ -144,18 +144,18 @@ const routes: AppRoutes[] = [
 	// /trace-old serves V3 (URL-only access). Flip the two `component`
 	// values back to release V3.
 	{
-		path: ROUTES.TRACE_DETAIL_OLD,
+		path: ROUTES.TRACE_DETAIL,
 		exact: true,
 		component: TraceDetail,
 		isPrivate: true,
-		key: 'TRACE_DETAIL_OLD',
+		key: 'TRACE_DETAIL',
 	},
 	{
-		path: ROUTES.TRACE_DETAIL,
+		path: ROUTES.TRACE_DETAIL_OLD,
 		exact: true,
 		component: TraceDetailV3,
 		isPrivate: true,
-		key: 'TRACE_DETAIL',
+		key: 'TRACE_DETAIL_OLD',
 	},
 	{
 		path: ROUTES.SETTINGS,

frontend/src/api/generated/services/alerts/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/authdomains/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/authz/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation } from 'react-query';
 import type {

frontend/src/api/generated/services/channels/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/cloudintegration/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/dashboard/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/downtimeschedules/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/features/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/fields/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/gateway/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/global/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/health/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/inframonitoring/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation } from 'react-query';
 import type {

frontend/src/api/generated/services/llmpricingrules/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/logs/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/metrics/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/orgs/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/preferences/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/querier/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation } from 'react-query';
 import type {

frontend/src/api/generated/services/role/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/routepolicies/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/rules/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/serviceaccount/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/sessions/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/sigNoz.schemas.ts

@@ -3,13 +3,14 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 export interface AlertmanagertypesChannelDTO {
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -34,7 +35,7 @@ export interface AlertmanagertypesChannelDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface ModelLabelSetDTO {
@@ -62,7 +63,7 @@ export interface AlertmanagertypesDeprecatedGettableAlertDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	endsAt?: string;
+	endsAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -80,7 +81,7 @@ export interface AlertmanagertypesDeprecatedGettableAlertDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	startsAt?: string;
+	startsAt?: Date;
 	status?: TypesAlertStatusDTO;
 }
 
@@ -97,7 +98,7 @@ export interface AlertmanagertypesGettableRoutePolicyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt: string;
+	createdAt: Date;
 	/**
 	 * @type string,null
 	 */
@@ -127,7 +128,7 @@ export interface AlertmanagertypesGettableRoutePolicyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt: string;
+	updatedAt: Date;
 	/**
 	 * @type string,null
 	 */
@@ -1834,7 +1835,7 @@ export interface AuthtypesGettableAuthDomainDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -1851,7 +1852,7 @@ export interface AuthtypesGettableAuthDomainDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface AuthtypesGettableTokenDTO {
@@ -2009,7 +2010,7 @@ export interface AuthtypesRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -2034,7 +2035,7 @@ export interface AuthtypesRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface AuthtypesSessionContextDTO {
@@ -2062,7 +2063,7 @@ export interface AuthtypesUserRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt: string;
+	createdAt: Date;
 	/**
 	 * @type string
 	 */
@@ -2076,7 +2077,7 @@ export interface AuthtypesUserRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt: string;
+	updatedAt: Date;
 	/**
 	 * @type string
 	 */
@@ -2088,7 +2089,7 @@ export interface AuthtypesUserWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -2117,7 +2118,7 @@ export interface AuthtypesUserWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 	/**
 	 * @type array,null
 	 */
@@ -2284,7 +2285,7 @@ export interface CloudintegrationtypesAccountDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -2305,12 +2306,12 @@ export interface CloudintegrationtypesAccountDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	removedAt: string | null;
+	removedAt: Date | null;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface DashboardtypesStorableDashboardDataDTO {
@@ -2441,7 +2442,7 @@ export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -2451,7 +2452,7 @@ export type CloudintegrationtypesCloudIntegrationServiceDTOAnyOf = {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 };
 
 /**
@@ -2645,12 +2646,12 @@ export interface CloudintegrationtypesGettableAgentCheckInDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	removed_at: string | null;
+	removed_at: Date | null;
 	/**
 	 * @type string,null
 	 * @format date-time
 	 */
-	removedAt: string | null;
+	removedAt: Date | null;
 }
 
 export interface CloudintegrationtypesServiceMetadataDTO {
@@ -2885,7 +2886,7 @@ export interface DashboardtypesDashboardDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -2907,7 +2908,7 @@ export interface DashboardtypesDashboardDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -3089,7 +3090,7 @@ export interface GatewaytypesLimitDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	created_at?: string;
+	created_at?: Date;
 	/**
 	 * @type string
 	 */
@@ -3111,7 +3112,7 @@ export interface GatewaytypesLimitDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updated_at?: string;
+	updated_at?: Date;
 }
 
 export interface GatewaytypesIngestionKeyDTO {
@@ -3119,12 +3120,12 @@ export interface GatewaytypesIngestionKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	created_at?: string;
+	created_at?: Date;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	expires_at?: string;
+	expires_at?: Date;
 	/**
 	 * @type string
 	 */
@@ -3145,7 +3146,7 @@ export interface GatewaytypesIngestionKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updated_at?: string;
+	updated_at?: Date;
 	/**
 	 * @type string
 	 */
@@ -3169,7 +3170,7 @@ export interface GatewaytypesPostableIngestionKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	expires_at?: string;
+	expires_at?: Date;
 	/**
 	 * @type string
 	 */
@@ -4439,7 +4440,7 @@ export interface LlmpricingruletypesLLMPricingRuleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -4478,13 +4479,13 @@ export interface LlmpricingruletypesLLMPricingRuleDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	syncedAt?: string | null;
+	syncedAt?: Date | null;
 	unit: LlmpricingruletypesLLMPricingRuleUnitDTO;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -5710,7 +5711,7 @@ export interface Querybuildertypesv5RawRowDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	timestamp?: string;
+	timestamp?: Date;
 }
 
 export interface Querybuildertypesv5RawDataDTO {
@@ -6179,7 +6180,7 @@ export interface RuletypesRecurrenceDTO {
 	 * @type string,null
 	 * @format date-time
 	 */
-	endTime?: string | null;
+	endTime?: Date | null;
 	/**
 	 * @type array,null
 	 */
@@ -6189,7 +6190,7 @@ export interface RuletypesRecurrenceDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	startTime: string;
+	startTime: Date;
 }
 
 export interface RuletypesScheduleDTO {
@@ -6197,13 +6198,13 @@ export interface RuletypesScheduleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	endTime?: string;
+	endTime?: Date;
 	recurrence?: RuletypesRecurrenceDTO;
 	/**
 	 * @type string
 	 * @format date-time
 	 */
-	startTime?: string;
+	startTime?: Date;
 	/**
 	 * @type string
 	 */
@@ -6219,7 +6220,7 @@ export interface RuletypesPlannedMaintenanceDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6243,7 +6244,7 @@ export interface RuletypesPlannedMaintenanceDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6406,7 +6407,7 @@ export interface RuletypesRuleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6455,7 +6456,7 @@ export interface RuletypesRuleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6474,7 +6475,7 @@ export interface ServiceaccounttypesGettableFactorAPIKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type integer
 	 * @minimum 0
@@ -6488,7 +6489,7 @@ export interface ServiceaccounttypesGettableFactorAPIKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	lastObservedAt: string;
+	lastObservedAt: Date;
 	/**
 	 * @type string
 	 */
@@ -6501,7 +6502,7 @@ export interface ServiceaccounttypesGettableFactorAPIKeyDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface ServiceaccounttypesGettableFactorAPIKeyWithKeyDTO {
@@ -6546,7 +6547,7 @@ export interface ServiceaccounttypesServiceAccountDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6571,7 +6572,7 @@ export interface ServiceaccounttypesServiceAccountDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface ServiceaccounttypesServiceAccountRoleDTO {
@@ -6579,7 +6580,7 @@ export interface ServiceaccounttypesServiceAccountRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6597,7 +6598,7 @@ export interface ServiceaccounttypesServiceAccountRoleDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface ServiceaccounttypesServiceAccountWithRolesDTO {
@@ -6605,7 +6606,7 @@ export interface ServiceaccounttypesServiceAccountWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6634,7 +6635,7 @@ export interface ServiceaccounttypesServiceAccountWithRolesDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface ServiceaccounttypesUpdatableFactorAPIKeyDTO {
@@ -6676,7 +6677,7 @@ export interface SpantypesSpanMapperGroupDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6701,7 +6702,7 @@ export interface SpantypesSpanMapperGroupDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6770,7 +6771,7 @@ export interface SpantypesSpanMapperDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -6796,7 +6797,7 @@ export interface SpantypesSpanMapperDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -7163,7 +7164,7 @@ export interface TypesDeprecatedUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -7196,7 +7197,7 @@ export interface TypesDeprecatedUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface TypesIdentifiableDTO {
@@ -7211,7 +7212,7 @@ export interface TypesInviteDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -7244,7 +7245,7 @@ export interface TypesInviteDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface TypesOrganizationDTO {
@@ -7256,7 +7257,7 @@ export interface TypesOrganizationDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -7278,7 +7279,7 @@ export interface TypesOrganizationDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface TypesPostableInviteDTO {
@@ -7345,7 +7346,7 @@ export interface TypesResetPasswordTokenDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	expiresAt?: string;
+	expiresAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -7372,7 +7373,7 @@ export interface TypesUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	createdAt?: string;
+	createdAt?: Date;
 	/**
 	 * @type string
 	 */
@@ -7401,7 +7402,7 @@ export interface TypesUserDTO {
 	 * @type string
 	 * @format date-time
 	 */
-	updatedAt?: string;
+	updatedAt?: Date;
 }
 
 export interface ZeustypesHostDTO {

frontend/src/api/generated/services/spanmapper/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/tracedetail/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation } from 'react-query';
 import type {

frontend/src/api/generated/services/users/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/api/generated/services/zeus/index.ts

@@ -3,6 +3,7 @@
  * * The file has been auto-generated using Orval for SigNoz
  * * regenerate with 'pnpm generate:api'
  * SigNoz
+ * OpenAPI spec version: 0.0.1
  */
 import { useMutation, useQuery } from 'react-query';
 import type {

frontend/src/components/EditMemberDrawer/EditMemberDrawer.tsx

@@ -59,7 +59,7 @@ function getDeleteTooltip(
 
 function getInviteButtonLabel(
 	isLoading: boolean,
-	existingToken: { expiresAt?: string } | undefined,
+	existingToken: { expiresAt?: Date } | undefined,
 	isExpired: boolean,
 	notFound: boolean,
 ): string {

frontend/src/components/FieldsSelector/FieldsSelector.tsx

@@ -1,176 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-import { toast } from '@signozhq/ui/sonner';
-import { Button } from '@signozhq/ui/button';
-import { Input } from '@signozhq/ui/input';
-import useDebouncedFn from 'hooks/useDebouncedFunction';
-import { Check, TableColumnsSplit, X } from '@signozhq/icons';
-import { FloatingPanel } from 'periscope/components/FloatingPanel';
-import { TelemetryFieldKey } from 'types/api/v5/queryRange';
-import { DataSource } from 'types/common/queryBuilder';
-
-import AddedFields from './AddedFields';
-import OtherFields from './OtherFields';
-
-import styles from './FieldsSelector.module.scss';
-
-const DEFAULT_PANEL_WIDTH = 350;
-const DEFAULT_PANEL_HEIGHT_OFFSET = 100;
-const DEFAULT_PANEL_RIGHT_INSET = 100;
-const DEFAULT_PANEL_TOP_INSET = 50;
-
-interface FieldsSelectorProps {
-	isOpen: boolean;
-	title: string;
-	fields: TelemetryFieldKey[];
-	onFieldsChange: (fields: TelemetryFieldKey[]) => void;
-	onClose: () => void;
-	signal: DataSource;
-	maxFields?: number;
-	width?: number;
-	height?: number;
-	defaultPosition?: { x: number; y: number };
-}
-
-function FieldsSelector({
-	isOpen,
-	title,
-	fields,
-	onFieldsChange,
-	onClose,
-	signal,
-	maxFields,
-	width = DEFAULT_PANEL_WIDTH,
-	height,
-	defaultPosition,
-}: FieldsSelectorProps): JSX.Element | null {
-	if (!isOpen) {
-		return null;
-	}
-
-	const resolvedHeight =
-		height ?? window.innerHeight - DEFAULT_PANEL_HEIGHT_OFFSET;
-	const resolvedPosition = defaultPosition ?? {
-		x: window.innerWidth - width - DEFAULT_PANEL_RIGHT_INSET,
-		y: DEFAULT_PANEL_TOP_INSET,
-	};
-	const [draftFields, setDraftFields] = useState<TelemetryFieldKey[]>(fields);
-	const [inputValue, setInputValue] = useState('');
-	const [debouncedInputValue, setDebouncedInputValue] = useState('');
-
-	const debouncedUpdate = useDebouncedFn((value) => {
-		setDebouncedInputValue(value as string);
-	}, 400);
-
-	const handleInputChange = useCallback(
-		(e: React.ChangeEvent<HTMLInputElement>): void => {
-			const value = e.target.value.trim().toLowerCase();
-			setInputValue(value);
-			debouncedUpdate(value);
-		},
-		[debouncedUpdate],
-	);
-
-	const handleAdd = useCallback(
-		(field: TelemetryFieldKey): void => {
-			if (maxFields !== undefined && draftFields.length >= maxFields) {
-				return;
-			}
-			if (draftFields.some((f) => f.name === field.name)) {
-				return;
-			}
-			setDraftFields((prev) => [...prev, field]);
-		},
-		[draftFields, maxFields],
-	);
-
-	const handleSave = useCallback((): void => {
-		onFieldsChange(draftFields);
-		toast.success('Saved successfully', {
-			position: 'top-right',
-		});
-		onClose();
-	}, [draftFields, onFieldsChange, onClose]);
-
-	const handleDiscard = useCallback((): void => {
-		setDraftFields(fields);
-	}, [fields]);
-
-	const hasUnsavedChanges = useMemo(
-		() =>
-			!(
-				draftFields.length === fields.length &&
-				draftFields.every((f, i) => f.name === fields[i]?.name)
-			),
-		[draftFields, fields],
-	);
-
-	const isAtLimit = maxFields !== undefined && draftFields.length >= maxFields;
-
-	return (
-		<FloatingPanel
-			isOpen
-			width={width}
-			height={resolvedHeight}
-			defaultPosition={resolvedPosition}
-			enableResizing={false}
-		>
-			<div className={styles.root}>
-				<div className={styles.header}>
-					<div className={styles.title}>
-						<TableColumnsSplit size={16} />
-						{title}
-					</div>
-					<X className={styles.closeIcon} size={16} onClick={onClose} />
-				</div>
-
-				<section>
-					<Input
-						className={styles.searchInput}
-						type="text"
-						value={inputValue}
-						placeholder="Search for a field..."
-						onChange={handleInputChange}
-					/>
-				</section>
-
-				<AddedFields
-					inputValue={inputValue}
-					fields={draftFields}
-					onFieldsChange={setDraftFields}
-					maxFields={maxFields}
-				/>
-
-				<OtherFields
-					signal={signal}
-					debouncedInputValue={debouncedInputValue}
-					addedFields={draftFields}
-					onAdd={handleAdd}
-					isAtLimit={isAtLimit}
-				/>
-
-				{hasUnsavedChanges && (
-					<div className={styles.footer}>
-						<Button
-							variant="outlined"
-							color="secondary"
-							onClick={handleDiscard}
-							prefix={<X width={14} height={14} />}
-						>
-							Discard
-						</Button>
-						<Button
-							variant="solid"
-							color="primary"
-							onClick={handleSave}
-							prefix={<Check width={14} height={14} />}
-						>
-							Save changes
-						</Button>
-					</div>
-				)}
-			</div>
-		</FloatingPanel>
-	);
-}
-
-export default FieldsSelector;

frontend/src/components/FieldsSelector/index.ts

@@ -1 +0,0 @@
-export { default } from './FieldsSelector';

frontend/src/components/HeaderRightSection/HeaderRightSection.tsx

@@ -5,8 +5,6 @@ import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import { Popover } from 'antd';
 import logEvent from 'api/common/logEvent';
-import { AIAssistantEvents } from 'container/AIAssistant/events';
-import { normalizePage } from 'container/AIAssistant/hooks/useAIAssistantAnalyticsContext';
 import {
 	openAIAssistant,
 	useAIAssistantStore,
@@ -52,14 +50,6 @@ function HeaderRightSection({
 		setOpenAnnouncementsModal(false);
 	}, [location.pathname]);
 
-	const handleOpenAIAssistant = useCallback((): void => {
-		void logEvent(AIAssistantEvents.Opened, {
-			source: 'header',
-			currentPage: normalizePage(location.pathname),
-		});
-		openAIAssistant();
-	}, [location.pathname]);
-
 	const handleOpenShareURLModal = useCallback((): void => {
 		logEvent('Share: Clicked', {
 			page: location.pathname,
@@ -111,7 +101,7 @@ function HeaderRightSection({
 						<Button
 							variant="solid"
 							color="secondary"
-							onClick={handleOpenAIAssistant}
+							onClick={openAIAssistant}
 							aria-label={
 								showHeaderPendingBadge
 									? pendingUserInputCount === 1

frontend/src/components/QueryBuilderV2/QueryV2/MerticsAggregateSection/MetricsAggregateSection.tsx

@@ -66,7 +66,7 @@ const MetricsAggregateSection = memo(function MetricsAggregateSection({
 
 	const handleChangeGroupByKeys = useCallback(
 		(value: IBuilderQuery['groupBy']) => {
-			handleChangeQueryData('groupBy', value, { runAfterUpdate: true });
+			handleChangeQueryData('groupBy', value);
 		},
 		[handleChangeQueryData],
 	);

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.tsx

@@ -283,14 +283,14 @@ function QueryAddOns({
 
 	const handleChangeGroupByKeys = useCallback(
 		(value: IBuilderQuery['groupBy']) => {
-			handleChangeQueryData('groupBy', value, { runAfterUpdate: true });
+			handleChangeQueryData('groupBy', value);
 		},
 		[handleChangeQueryData],
 	);
 
 	const handleChangeOrderByKeys = useCallback(
 		(value: IBuilderQuery['orderBy']) => {
-			handleChangeQueryData('orderBy', value, { runAfterUpdate: true });
+			handleChangeQueryData('orderBy', value);
 		},
 		[handleChangeQueryData],
 	);

frontend/src/components/QueryBuilderV2/QueryV2/QueryV2.tsx

@@ -73,8 +73,8 @@ export const QueryV2 = forwardRef(function QueryV2(
 	});
 
 	const handleToggleDisableQuery = useCallback(() => {
-		handleChangeQueryData('disabled', !query.disabled, { runAfterUpdate: true });
-	}, [handleChangeQueryData, query.disabled]);
+		handleChangeQueryData('disabled', !query.disabled);
+	}, [handleChangeQueryData, query]);
 
 	const handleToggleCollapsQuery = (): void => {
 		setIsCollapsed(!isCollapsed);

frontend/src/components/RolesSelect/RolesSelect.tsx

@@ -144,7 +144,6 @@ function RolesSelect(props: RolesSelectProps): JSX.Element {
 				loading={loading}
 				notFoundContent={notFoundContent}
 				options={options}
-				optionFilterProp="label"
 				optionRender={(option): JSX.Element => (
 					<Checkbox
 						checked={value.includes(option.value as string)}
@@ -163,7 +162,6 @@ function RolesSelect(props: RolesSelectProps): JSX.Element {
 	return (
 		<Select
 			id={id}
-			showSearch
 			value={value || undefined}
 			onChange={onChange}
 			placeholder={placeholder}
@@ -172,7 +170,6 @@ function RolesSelect(props: RolesSelectProps): JSX.Element {
 			loading={loading}
 			notFoundContent={notFoundContent}
 			options={options}
-			optionFilterProp="label"
 			getPopupContainer={getPopupContainer}
 			disabled={disabled}
 		/>

frontend/src/components/ServiceAccountDrawer/__tests__/EditKeyModal.test.tsx

@@ -28,7 +28,7 @@ const mockKey: ServiceaccounttypesGettableFactorAPIKeyDTO = {
 	id: 'key-1',
 	name: 'Original Key Name',
 	expiresAt: 0,
-	lastObservedAt: null as unknown as string,
+	lastObservedAt: null as unknown as Date,
 	serviceAccountId: 'sa-1',
 };
 

frontend/src/components/ServiceAccountDrawer/__tests__/KeysTab.test.tsx

@@ -29,14 +29,14 @@ const keys: ServiceaccounttypesGettableFactorAPIKeyDTO[] = [
 		id: 'key-1',
 		name: 'Production Key',
 		expiresAt: 0,
-		lastObservedAt: null as unknown as string,
+		lastObservedAt: null as unknown as Date,
 		serviceAccountId: 'sa-1',
 	},
 	{
 		id: 'key-2',
 		name: 'Staging Key',
 		expiresAt: 1924905600, // 2030-12-31
-		lastObservedAt: '2026-03-10T10:00:00Z',
+		lastObservedAt: new Date('2026-03-10T10:00:00Z'),
 		serviceAccountId: 'sa-1',
 	},
 ];

frontend/src/constants/features.ts

@@ -10,5 +10,4 @@ export enum FeatureKeys {
 	ONBOARDING_V3 = 'onboarding_v3',
 	DOT_METRICS_ENABLED = 'dot_metrics_enabled',
 	USE_JSON_BODY = 'use_json_body',
-	USE_FINE_GRAINED_AUTHZ = 'use_fine_grained_authz',
 }

frontend/src/constants/reactQueryKeys.ts

@@ -108,7 +108,4 @@ export const REACT_QUERY_KEY = {
 
 	// Dashboard Grid Card Query Keys
 	DASHBOARD_GRID_CARD_QUERY_RANGE: 'DASHBOARD_GRID_CARD_QUERY_RANGE',
-
-	// Fields Selector Query Keys
-	GET_FIELDS_SELECTOR_SUGGESTIONS: 'GET_FIELDS_SELECTOR_SUGGESTIONS',
 } as const;

frontend/src/container/AIAssistant/AIAssistantModal/AIAssistantModal.tsx

@@ -1,20 +1,13 @@
 import { useCallback, useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
-import { useHistory, useLocation } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import ROUTES from 'constants/routes';
 import { History, Maximize2, Minus, Plus, Sparkles, X } from '@signozhq/icons';
 
-import logEvent from 'api/common/logEvent';
-
 import HistorySidebar from '../components/ConversationsList';
 import ConversationView from '../ConversationView';
-import { AIAssistantEvents } from '../events';
-import {
-	normalizePage,
-	useAIAssistantAnalyticsContext,
-} from '../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../store/useAIAssistantStore';
 import { VariantContext } from '../VariantContext';
 
@@ -31,7 +24,6 @@ import styles from './AIAssistantModal.module.scss';
 // eslint-disable-next-line sonarjs/cognitive-complexity
 export default function AIAssistantModal(): JSX.Element | null {
 	const history = useHistory();
-	const { pathname } = useLocation();
 	const [showHistory, setShowHistory] = useState(false);
 
 	const isOpen = useAIAssistantStore((s) => s.isModalOpen);
@@ -44,7 +36,6 @@ export default function AIAssistantModal(): JSX.Element | null {
 	const startNewConversation = useAIAssistantStore(
 		(s) => s.startNewConversation,
 	);
-	const analyticsCtx = useAIAssistantAnalyticsContext();
 
 	useEffect(() => {
 		const handleKeyDown = (e: KeyboardEvent): void => {
@@ -64,10 +55,6 @@ export default function AIAssistantModal(): JSX.Element | null {
 				} else {
 					startNewConversation();
 					setShowHistory(false);
-					void logEvent(AIAssistantEvents.Opened, {
-						source: 'shortcut',
-						currentPage: normalizePage(pathname),
-					});
 					openModal();
 				}
 				return;
@@ -81,7 +68,7 @@ export default function AIAssistantModal(): JSX.Element | null {
 
 		window.addEventListener('keydown', handleKeyDown);
 		return (): void => window.removeEventListener('keydown', handleKeyDown);
-	}, [isOpen, openModal, closeModal, startNewConversation, pathname]);
+	}, [isOpen, openModal, closeModal, startNewConversation]);
 
 	// ── Handlers ────────────────────────────────────────────────────────────────
 
@@ -90,28 +77,15 @@ export default function AIAssistantModal(): JSX.Element | null {
 			return;
 		}
 		closeModal();
-		// Router state tells AIAssistantPage to skip its mount-time Opened fire:
-		// the assistant was already open in the modal, so this is a surface
-		// switch, not a new open.
 		history.push(
 			ROUTES.AI_ASSISTANT.replace(':conversationId', activeConversationId),
-			{ fromInApp: true },
 		);
 	}, [activeConversationId, closeModal, history]);
 
 	const handleNew = useCallback(() => {
-		void logEvent(AIAssistantEvents.NewChatClicked, {
-			...analyticsCtx,
-			// useAIAssistantAnalyticsContext() runs above this component's
-			// VariantContext.Provider, so the hook reports the default 'page'
-			// mode. Override here: the modal collapses to 'sidepane' in our
-			// taxonomy alongside the drawer.
-			mode: 'sidepane',
-			source: 'header',
-		});
 		startNewConversation();
 		setShowHistory(false);
-	}, [startNewConversation, analyticsCtx]);
+	}, [startNewConversation]);
 
 	const handleHistorySelect = useCallback(() => {
 		setShowHistory(false);

frontend/src/container/AIAssistant/AIAssistantPanel/AIAssistantPanel.tsx

@@ -5,12 +5,8 @@ import { TooltipSimple } from '@signozhq/ui/tooltip';
 import ROUTES from 'constants/routes';
 import { History, Maximize2, Plus, Sparkles, X } from '@signozhq/icons';
 
-import logEvent from 'api/common/logEvent';
-
 import ConversationsList from '../components/ConversationsList';
 import ConversationView from '../ConversationView';
-import { AIAssistantEvents } from '../events';
-import { useAIAssistantAnalyticsContext } from '../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../store/useAIAssistantStore';
 import { VariantContext } from '../VariantContext';
 
@@ -36,35 +32,21 @@ export default function AIAssistantPanel(): JSX.Element | null {
 	const startNewConversation = useAIAssistantStore(
 		(s) => s.startNewConversation,
 	);
-	const analyticsCtx = useAIAssistantAnalyticsContext();
 
 	const handleExpand = useCallback(() => {
 		if (!activeConversationId) {
 			return;
 		}
 		closeDrawer();
-		// Router state tells AIAssistantPage to skip its mount-time Opened fire:
-		// the assistant was already open in the drawer, so this is a surface
-		// switch, not a new open.
 		history.push(
 			ROUTES.AI_ASSISTANT.replace(':conversationId', activeConversationId),
-			{ fromInApp: true },
 		);
 	}, [activeConversationId, closeDrawer, history]);
 
 	const handleNew = useCallback(() => {
-		void logEvent(AIAssistantEvents.NewChatClicked, {
-			...analyticsCtx,
-			// useAIAssistantAnalyticsContext() runs above this component's
-			// VariantContext.Provider, so the hook reports the default 'page'
-			// mode. Override here: this handler only runs when the drawer
-			// itself is mounted, which is unambiguously the sidepane surface.
-			mode: 'sidepane',
-			source: 'header',
-		});
 		startNewConversation();
 		setShowHistory(false);
-	}, [startNewConversation, analyticsCtx]);
+	}, [startNewConversation]);
 
 	// When user picks a conversation from the list, close the sidebar
 	const handleHistorySelect = useCallback(() => {

frontend/src/container/AIAssistant/AIAssistantTrigger/AIAssistantTrigger.tsx

@@ -1,13 +1,9 @@
-import { useCallback } from 'react';
 import { matchPath, useLocation } from 'react-router-dom';
 import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
-import logEvent from 'api/common/logEvent';
 import ROUTES from 'constants/routes';
 import { Bot } from '@signozhq/icons';
 
-import { AIAssistantEvents } from '../events';
-import { normalizePage } from '../hooks/useAIAssistantAnalyticsContext';
 import {
 	openAIAssistant,
 	useAIAssistantStore,
@@ -29,14 +25,6 @@ export default function AIAssistantTrigger(): JSX.Element | null {
 		exact: true,
 	});
 
-	const handleOpen = useCallback((): void => {
-		void logEvent(AIAssistantEvents.Opened, {
-			source: 'icon',
-			currentPage: normalizePage(pathname),
-		});
-		openAIAssistant();
-	}, [pathname]);
-
 	if (isDrawerOpen || isModalOpen || isFullScreenPage) {
 		return null;
 	}
@@ -47,7 +35,7 @@ export default function AIAssistantTrigger(): JSX.Element | null {
 				variant="solid"
 				color="primary"
 				className={styles.trigger}
-				onClick={handleOpen}
+				onClick={openAIAssistant}
 				aria-label="Open AI Assistant"
 			>
 				<Bot size={20} />

frontend/src/container/AIAssistant/ConversationView/ConversationView.tsx

@@ -1,15 +1,11 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useLocation } from 'react-router-dom';
 import cx from 'classnames';
 
-import logEvent from 'api/common/logEvent';
-
 import ChatInput, { autoContextKey } from '../components/ChatInput';
 import ConversationSkeleton from '../components/ConversationSkeleton';
 import VirtualizedMessages from '../components/VirtualizedMessages';
-import { AIAssistantEvents } from '../events';
 import { getAutoContexts } from '../getAutoContexts';
-import { useAIAssistantAnalyticsContext } from '../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../store/useAIAssistantStore';
 import { MessageAttachment } from '../types';
 import { MessageContext } from '../../../api/ai-assistant/chat';
@@ -43,7 +39,6 @@ export default function ConversationView({
 	);
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
 	const cancelStream = useAIAssistantStore((s) => s.cancelStream);
-	const analyticsCtx = useAIAssistantAnalyticsContext(conversationId);
 
 	// Auto-derived contexts come from the route the user is currently looking
 	// at (dashboard detail, service metrics, an explorer, …). Skip when the
@@ -87,50 +82,14 @@ export default function ConversationView({
 			attachments?: MessageAttachment[],
 			contexts?: MessageContext[],
 		) => {
-			const hasAuto = contexts?.some((c) => c.source === 'auto') ?? false;
-			const hasManual = contexts?.some((c) => c.source === 'mention') ?? false;
-			let contextType: 'manual' | 'auto' | 'both' | undefined;
-			if (hasAuto && hasManual) {
-				contextType = 'both';
-			} else if (hasAuto) {
-				contextType = 'auto';
-			} else if (hasManual) {
-				contextType = 'manual';
-			}
-			void logEvent(AIAssistantEvents.MessageSent, {
-				...analyticsCtx,
-				queryLength: text.length,
-				hasContext: hasAuto || hasManual,
-				contextType,
-				respondingToClarification: Boolean(pendingClarificationHere),
-			});
 			void sendMessage(text, attachments, contexts);
 		},
-		[sendMessage, analyticsCtx, pendingClarificationHere],
+		[sendMessage],
 	);
 
-	// Wall-clock timestamp of the current streaming start, used to compute
-	// `secondsSinceStart` on Cancel clicked. Cleared whenever streaming ends.
-	const streamStartedAtRef = useRef<number | null>(null);
-	useEffect(() => {
-		if (!isStreamingHere) {
-			streamStartedAtRef.current = null;
-			return;
-		}
-		if (streamStartedAtRef.current === null) {
-			streamStartedAtRef.current = Date.now();
-		}
-	}, [isStreamingHere]);
-
 	const handleCancel = useCallback(() => {
-		const startedAt = streamStartedAtRef.current;
-		void logEvent(AIAssistantEvents.CancelClicked, {
-			threadId: analyticsCtx.threadId,
-			secondsSinceStart:
-				startedAt !== null ? Math.round((Date.now() - startedAt) / 1000) : null,
-		});
 		cancelStream(conversationId);
-	}, [cancelStream, conversationId, analyticsCtx.threadId]);
+	}, [cancelStream, conversationId]);
 
 	const messages = conversation?.messages ?? [];
 	const showDisclaimer = messages.length > 0;
@@ -175,7 +134,6 @@ export default function ConversationView({
 				conversationId={conversationId}
 				messages={messages}
 				isStreaming={isStreamingHere}
-				onSendSuggestedPrompt={(text): void => handleSend(text)}
 			/>
 			{showDisclaimer && (
 				<div className={disclaimerClass} role="note" aria-live="polite">

frontend/src/container/AIAssistant/components/ActionsSection/ActionsSection.tsx

@@ -41,68 +41,12 @@ import {
 	Undo,
 } from '@signozhq/icons';
 
-import logEvent from 'api/common/logEvent';
-
-import { AIAssistantEvents, SuggestedPromptCategory } from '../../events';
-import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 
 import styles from './ActionsSection.module.scss';
 
 interface ActionsSectionProps {
 	actions: MessageActionDTO[];
-	/** ID of the assistant message these actions belong to — used in analytics. */
-	messageId: string;
-}
-
-/**
- * Resource-type strings the backend uses for `open_resource` and rollback
- * actions. Centralized here so the route/module lookups below stay in sync.
- */
-const ResourceType = {
-	dashboard: 'dashboard',
-	alert: 'alert',
-	service: 'service',
-	saved_view: 'saved_view',
-	logs_explorer: 'logs_explorer',
-	traces_explorer: 'traces_explorer',
-	metrics_explorer: 'metrics_explorer',
-} as const;
-
-/** Maps an open_resource action's resourceType to its product module name. */
-function targetModuleForResource(resourceType: string): string | null {
-	switch (resourceType) {
-		case ResourceType.dashboard:
-			return 'dashboards';
-		case ResourceType.alert:
-			return 'alerts';
-		case ResourceType.service:
-			return 'apm';
-		case ResourceType.saved_view:
-			return 'savedViews';
-		case ResourceType.logs_explorer:
-			return 'logs';
-		case ResourceType.traces_explorer:
-			return 'traces';
-		case ResourceType.metrics_explorer:
-			return 'metrics';
-		default:
-			return null;
-	}
-}
-
-/** Maps an apply_filter signal to its product module name. */
-function targetModuleForSignal(signal: ApplyFilterSignalDTO): string | null {
-	switch (signal) {
-		case ApplyFilterSignalDTO.logs:
-			return 'logs';
-		case ApplyFilterSignalDTO.traces:
-			return 'traces';
-		case ApplyFilterSignalDTO.metrics:
-			return 'metrics';
-		default:
-			return null;
-	}
 }
 
 type ChipState = 'idle' | 'loading' | 'success' | 'error';
@@ -150,23 +94,23 @@ function resourceRoute(
 	resourceId: string,
 ): string | null {
 	switch (resourceType) {
-		case ResourceType.dashboard:
+		case 'dashboard':
 			return ROUTES.DASHBOARD.replace(':dashboardId', resourceId);
-		case ResourceType.alert: {
+		case 'alert': {
 			const params = new URLSearchParams({ [QueryParams.ruleId]: resourceId });
 			return `${ROUTES.EDIT_ALERTS}?${params.toString()}`;
 		}
-		case ResourceType.service:
+		case 'service':
 			return ROUTES.SERVICE_METRICS.replace(':servicename', resourceId);
-		case ResourceType.saved_view:
+		case 'saved_view':
 			// No detail route — saved views land on the list page.
 			// Caller may provide signal-aware metadata in future; default to logs.
 			return ROUTES.LOGS_SAVE_VIEWS;
-		case ResourceType.logs_explorer:
+		case 'logs_explorer':
 			return ROUTES.LOGS_EXPLORER;
-		case ResourceType.traces_explorer:
+		case 'traces_explorer':
 			return ROUTES.TRACES_EXPLORER;
-		case ResourceType.metrics_explorer:
+		case 'metrics_explorer':
 			return ROUTES.METRICS_EXPLORER_EXPLORER;
 		default:
 			return null;
@@ -280,24 +224,6 @@ function actionKey(action: MessageActionDTO, index: number): string {
 		: `${action.kind}:${action.label}:${index}`;
 }
 
-/**
- * Resolves the prompt to send for a follow_up action. The chip's `label` is
- * the short display text (e.g. "Python setup"); the real prompt lives in
- * `input.intent` per the schema doc. Falls back to label defensively so a
- * malformed server payload doesn't drop the click silently. Both branches
- * are trimmed so whitespace-only payloads don't become whitespace messages.
- */
-function followUpIntent(action: MessageActionDTO): string {
-	const intent = action.input?.intent;
-	if (typeof intent === 'string') {
-		const trimmed = intent.trim();
-		if (trimmed.length > 0) {
-			return trimmed;
-		}
-	}
-	return action.label.trim();
-}
-
 /** Maps a signal to its target explorer route. */
 function explorerRouteForSignal(signal: ApplyFilterSignalDTO): string | null {
 	switch (signal) {
@@ -427,12 +353,10 @@ function rollbackCall(
  */
 export default function ActionsSection({
 	actions,
-	messageId,
 }: ActionsSectionProps): JSX.Element | null {
 	const history = useHistory();
 	const { pathname } = useLocation();
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
-	const { threadId, page, mode } = useAIAssistantAnalyticsContext();
 	const { redirectWithQueryBuilderData, handleSetQueryData } = useQueryBuilder();
 
 	// Per-chip click state, keyed by chip key (see `key` below). Persists
@@ -506,39 +430,13 @@ export default function ActionsSection({
 		switch (action.kind) {
 			case MessageActionKindDTO.open_docs: {
 				if (action.url) {
-					void logEvent(AIAssistantEvents.DocOpened, {
-						threadId,
-						messageId,
-						docPath: action.url,
-					});
 					openInNewTab(action.url);
 				}
 				break;
 			}
 			case MessageActionKindDTO.follow_up: {
-				const intent = followUpIntent(action);
-				if (intent) {
-					// Fire SuggestedPromptClicked + MessageSent so analytics can compute
-					// both the click-through rate against follow-ups offered *and* keep
-					// the unified send funnel intact. `category` distinguishes server-
-					// emitted follow-ups from the empty-state grid. `promptId` stays the
-					// label so dashboards group identical chip texts together regardless
-					// of the dynamic intent payload.
-					void logEvent(AIAssistantEvents.SuggestedPromptClicked, {
-						threadId,
-						messageId,
-						promptId: action.label,
-						category: SuggestedPromptCategory.FollowUp,
-					});
-					void logEvent(AIAssistantEvents.MessageSent, {
-						threadId,
-						page,
-						mode,
-						queryLength: intent.length,
-						hasContext: false,
-						respondingToClarification: false,
-					});
-					void sendMessage(intent);
+				if (action.label) {
+					void sendMessage(action.label);
 				}
 				break;
 			}
@@ -546,12 +444,6 @@ export default function ActionsSection({
 				if (action.resourceType && action.resourceId) {
 					const path = resourceRoute(action.resourceType, action.resourceId);
 					if (path) {
-						void logEvent(AIAssistantEvents.ResourceOpened, {
-							threadId,
-							messageId,
-							targetModule: targetModuleForResource(action.resourceType),
-							resourceId: action.resourceId,
-						});
 						history.push(path);
 					}
 				}
@@ -564,13 +456,6 @@ export default function ActionsSection({
 				break;
 			}
 			case MessageActionKindDTO.apply_filter: {
-				if (action.signal) {
-					void logEvent(AIAssistantEvents.ApplyFilterClicked, {
-						threadId,
-						messageId,
-						targetModule: targetModuleForSignal(action.signal),
-					});
-				}
 				applyFilter(action, {
 					history,
 					pathname,

frontend/src/container/AIAssistant/components/ChatInput/ChatInput.tsx

@@ -5,17 +5,13 @@ import { Badge } from '@signozhq/ui/badge';
 import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import { Popover, PopoverContent, PopoverTrigger } from '@signozhq/ui/popover';
-import { toast } from '@signozhq/ui/sonner';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import type { UploadFile } from 'antd';
-import getSessionStorage from 'api/browser/sessionstorage/get';
-import setSessionStorage from 'api/browser/sessionstorage/set';
 import {
 	getListRulesQueryKey,
 	useListRules,
 } from 'api/generated/services/rules';
 import type { ListRules200 } from 'api/generated/services/sigNoz.schemas';
-import logEvent from 'api/common/logEvent';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import { useGetAllDashboard } from 'hooks/dashboard/useGetAllDashboard';
 import { useQueryService } from 'hooks/useQueryService';
@@ -26,8 +22,6 @@ import { useSelector } from 'react-redux';
 import { AppState } from 'store/reducers';
 import { GlobalReducer } from 'types/reducer/globalTime';
 
-import { AIAssistantEvents, getBrowserInfo } from '../../events';
-import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useSpeechRecognition } from '../../hooks/useSpeechRecognition';
 import { MessageAttachment } from '../../types';
 import { MessageContext } from '../../../../api/ai-assistant/chat';
@@ -143,8 +137,6 @@ function autoContextCategory(ctx: MessageContext): string {
 const MAX_INPUT_LENGTH = 20000;
 const WARNING_THRESHOLD = 15000;
 const HOME_SERVICES_INTERVAL = 30 * 60 * 1000;
-/** sessionStorage key for the "voice input failed this tab" flag. */
-const VOICE_UNAVAILABLE_KEY = 'ai-assistant-voice-unavailable';
 
 const CONTEXT_CATEGORIES = ['Dashboards', 'Alerts', 'Services'] as const;
 
@@ -376,28 +368,6 @@ export default function ChatInput({
 
 	// ── Voice input ────────────────────────────────────────────────────────────
 
-	const analyticsCtx = useAIAssistantAnalyticsContext();
-	// Captured at the start of a voice session, consumed when it ends.
-	// Tracks both the trigger (button vs. PTT shortcut) and the wall-clock
-	// start time so we can attribute `durationMs` on the Voice input used
-	// event regardless of which control ended the session.
-	const voiceStartedAtRef = useRef<number | null>(null);
-	const voiceSourceRef = useRef<'button' | 'shortcut' | null>(null);
-	// Set to true after a `network`, `not-allowed`, or `not-supported` failure
-	// so we hide the mic button for the rest of the tab session — silent
-	// retries don't help, and Chromium derivatives without the Google Speech
-	// API key always fail with `network` no matter how many times the user
-	// clicks. Persisted to sessionStorage so a page reload doesn't surface the
-	// button again (closing the tab still resets, in case the user fixed
-	// permissions or switched browsers).
-	const [voiceUnavailable, setVoiceUnavailable] = useState(
-		() => getSessionStorage(VOICE_UNAVAILABLE_KEY) === 'true',
-	);
-	const markVoiceUnavailable = useCallback((): void => {
-		setVoiceUnavailable(true);
-		setSessionStorage(VOICE_UNAVAILABLE_KEY, 'true');
-	}, []);
-
 	const {
 		isListening,
 		isSupported,
@@ -418,81 +388,9 @@ export default function ChatInput({
 				setText(capText(committedTextRef.current + separator + transcriptText));
 			}
 		},
-		onError: (error) => {
-			// Guard against double-fire: Chrome can fire `onerror` more than
-			// once per session when `continuous = true` (it retries internally
-			// before giving up). Only fire the analytics event for the first
-			// error in a given session — voiceSourceRef being null means we've
-			// already handled it.
-			const source = voiceSourceRef.current;
-			if (source === null) {
-				return;
-			}
-			voiceStartedAtRef.current = null;
-			voiceSourceRef.current = null;
-			void logEvent(AIAssistantEvents.VoiceInputFailed, {
-				...analyticsCtx,
-				...getBrowserInfo(),
-				source,
-				errorType: error,
-			});
-			if (error === 'network') {
-				markVoiceUnavailable();
-				toast.error('Voice input unavailable in this browser', {
-					description:
-						'This browser cannot reach the speech recognition service. Try Google Chrome or Microsoft Edge.',
-				});
-			} else if (error === 'not-allowed') {
-				markVoiceUnavailable();
-				toast.error('Microphone access denied', {
-					description:
-						'Grant microphone permission in your browser settings to use voice input.',
-				});
-			} else if (error === 'not-supported') {
-				markVoiceUnavailable();
-				toast.error('Voice input is not supported in this browser.');
-			}
-			// `no-speech` is benign (just silence) — don't toast or hide.
-		},
 	});
 
-	const showMic = isSupported && micPermission !== 'denied' && !voiceUnavailable;
-
-	const startVoiceInput = useCallback(
-		(source: 'button' | 'shortcut') => {
-			// Defense in depth: the button is hidden when `voiceUnavailable` is
-			// true, but the PTT shortcut listener can still call us. Bailing here
-			// keeps a single source of truth and prevents repeat `Voice input
-			// failed` events in the same session.
-			if (voiceUnavailable) {
-				return;
-			}
-			voiceStartedAtRef.current = Date.now();
-			voiceSourceRef.current = source;
-			start();
-		},
-		[start, voiceUnavailable],
-	);
-
-	const fireVoiceInputEvent = useCallback(
-		(outcome: 'sent' | 'discarded') => {
-			const startedAt = voiceStartedAtRef.current;
-			const source = voiceSourceRef.current;
-			voiceStartedAtRef.current = null;
-			voiceSourceRef.current = null;
-			if (startedAt === null || source === null) {
-				return;
-			}
-			void logEvent(AIAssistantEvents.VoiceInputUsed, {
-				...analyticsCtx,
-				...getBrowserInfo(),
-				source,
-				outcome,
-				durationMs: Date.now() - startedAt,
-			});
-		},
-		[analyticsCtx],
-	);
+	const showMic = isSupported && micPermission !== 'denied';
 
 	// Stop recording and immediately send whatever is in the textarea.
 	const handleStopAndSend = useCallback(async () => {
@@ -500,17 +398,15 @@ export default function ChatInput({
 		committedTextRef.current = capText(text);
 		// Stop recognition without triggering onTranscript again (would double-append).
 		discard();
-		fireVoiceInputEvent('sent');
 		await handleSend();
-	}, [text, discard, handleSend, capText, fireVoiceInputEvent]);
+	}, [text, discard, handleSend, capText]);
 
 	// Stop recording and revert the textarea to what it was before voice started.
 	const handleDiscard = useCallback(() => {
 		discard();
-		fireVoiceInputEvent('discarded');
 		setText(committedTextRef.current);
 		textareaRef.current?.focus();
-	}, [discard, fireVoiceInputEvent]);
+	}, [discard]);
 
 	// ── Push-to-talk (Cmd/Ctrl + Shift + Space) ────────────────────────────────
 	// Hold the combo to record; release Space to submit. We track which key
@@ -519,7 +415,7 @@ export default function ChatInput({
 	// "session active" ref so a held key only calls `start()` once.
 	const pttActiveRef = useRef(false);
 	useEffect(() => {
-		if (!isSupported || micPermission === 'denied' || voiceUnavailable) {
+		if (!isSupported || micPermission === 'denied') {
 			return undefined;
 		}
 
@@ -536,7 +432,7 @@ export default function ChatInput({
 				return; // ignore auto-repeat
 			}
 			pttActiveRef.current = true;
-			startVoiceInput('shortcut');
+			start();
 		};
 
 		const handleKeyUp = (e: KeyboardEvent): void => {
@@ -570,10 +466,9 @@ export default function ChatInput({
 	}, [
 		isSupported,
 		micPermission,
-		voiceUnavailable,
 		disabled,
 		isStreaming,
-		startVoiceInput,
+		start,
 		handleStopAndSend,
 	]);
 
@@ -1008,7 +903,7 @@ export default function ChatInput({
 								<Button
 									variant="ghost"
 									size="icon"
-									onClick={(): void => startVoiceInput('button')}
+									onClick={start}
 									disabled={disabled}
 									aria-label="Start voice input"
 									className={styles.micBtn}

frontend/src/container/AIAssistant/components/ClarificationForm/ClarificationForm.tsx

@@ -9,7 +9,6 @@ import {
 	SelectItem,
 	SelectTrigger,
 } from '@signozhq/ui/select';
-import logEvent from 'api/common/logEvent';
 import { ClarificationFieldTypeDTO } from 'api/ai-assistant/sigNozAIAssistantAPI.schemas';
 import type {
 	ClarificationEventDTO,
@@ -17,8 +16,6 @@ import type {
 } from 'api/ai-assistant/sigNozAIAssistantAPI.schemas';
 import { CircleHelp, Send, X } from '@signozhq/icons';
 
-import { AIAssistantEvents } from '../../events';
-import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 
 import styles from './ClarificationForm.module.scss';
@@ -47,8 +44,6 @@ export default function ClarificationForm({
 	const isStreaming = useAIAssistantStore(
 		(s) => s.streams[conversationId]?.isStreaming ?? false,
 	);
-	const { threadId, page, mode } =
-		useAIAssistantAnalyticsContext(conversationId);
 
 	const fields = clarification.fields ?? [];
 	const initialAnswers = Object.fromEntries(
@@ -65,18 +60,6 @@ export default function ClarificationForm({
 
 	const handleSubmit = async (): Promise<void> => {
 		setSubmitted(true);
-		// Approximate queryLength as the JSON encoding of the form answers — the
-		// clarification API doesn't render a single user-visible string, but the
-		// JSON size is a reasonable stand-in for "how much did the user provide".
-		const queryLength = JSON.stringify(answers).length;
-		void logEvent(AIAssistantEvents.MessageSent, {
-			threadId,
-			page,
-			mode,
-			queryLength,
-			hasContext: false,
-			respondingToClarification: true,
-		});
 		await submitClarification(
 			conversationId,
 			clarification.clarificationId,
@@ -86,10 +69,6 @@ export default function ClarificationForm({
 
 	const handleCancel = (): void => {
 		setCancelled(true);
-		void logEvent(AIAssistantEvents.CancelClicked, {
-			threadId,
-			secondsSinceStart: null,
-		});
 		cancelStream(conversationId);
 	};
 

frontend/src/container/AIAssistant/components/ConversationsList/ConversationsList.tsx

@@ -5,9 +5,6 @@ import { Input } from '@signozhq/ui/input';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import { Plus, Search } from '@signozhq/icons';
 
-import logEvent from 'api/common/logEvent';
-
-import { AIAssistantEvents } from '../../events';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 import { Conversation } from '../../types';
 import { useVariant } from '../../VariantContext';
@@ -139,17 +136,6 @@ export default function ConversationsList({
 
 	const handleSelect = (id: string): void => {
 		const conv = conversations[id];
-		// Skip re-selecting the currently active thread — Notion-style click on
-		// the highlighted row in the history list shouldn't inflate the funnel.
-		const isReselectingActive = id === activeConversationId;
-		if (conv?.threadId && !isReselectingActive) {
-			void logEvent(AIAssistantEvents.ThreadOpenedFromHistory, {
-				threadId: conv.threadId,
-				threadAgeDays: Math.floor(
-					(Date.now() - conv.createdAt) / (24 * 60 * 60 * 1000),
-				),
-			});
-		}
 		if (conv?.threadId) {
 			// Always load from backend — refreshes messages and reconnects
 			// to active execution if the thread is still busy.

frontend/src/container/AIAssistant/components/MessageBubble/MessageBubble.tsx

@@ -144,7 +144,7 @@ export default function MessageBubble({
 						)}
 
 						{!isUser && message.actions && message.actions.length > 0 && (
-							<ActionsSection actions={message.actions} messageId={message.id} />
+							<ActionsSection actions={message.actions} />
 						)}
 					</div>
 				</div>

frontend/src/container/AIAssistant/components/MessageFeedback/MessageFeedback.tsx

@@ -8,10 +8,6 @@ import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { Check, Copy, RefreshCw, ThumbsDown, ThumbsUp } from '@signozhq/icons';
 import { useTimezone } from 'providers/Timezone';
 
-import logEvent from 'api/common/logEvent';
-
-import { AIAssistantEvents } from '../../events';
-import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 import { FeedbackRating, Message } from '../../types';
 
@@ -58,7 +54,6 @@ export default function MessageFeedback({
 	const submitMessageFeedback = useAIAssistantStore(
 		(s) => s.submitMessageFeedback,
 	);
-	const { threadId } = useAIAssistantAnalyticsContext();
 
 	const { formatTimezoneAdjustedTimestamp } = useTimezone();
 
@@ -96,21 +91,10 @@ export default function MessageFeedback({
 	}, [message.createdAt]);
 
 	const handleCopy = useCallback((): void => {
-		void logEvent(AIAssistantEvents.MessageCopied, {
-			role: message.role,
-			messageId: message.id,
-			hadToolCalls: Boolean(message.blocks?.some((b) => b.type === 'tool_call')),
-		});
 		copyToClipboard(message.content);
 		setCopied(true);
 		setTimeout(() => setCopied(false), 1500);
-	}, [
-		copyToClipboard,
-		message.content,
-		message.id,
-		message.role,
-		message.blocks,
-	]);
+	}, [copyToClipboard, message.content]);
 
 	const handleVote = useCallback(
 		(rating: FeedbackRating): void => {
@@ -123,31 +107,20 @@ export default function MessageFeedback({
 				return;
 			}
 			setVote(rating);
-			void logEvent(AIAssistantEvents.FeedbackSubmitted, {
-				messageId: message.id,
-				threadId,
-				rating: 'up',
-				hasComment: false,
-				commentLength: 0,
-			});
 			submitMessageFeedback(message.id, rating);
 		},
-		[vote, message.id, submitMessageFeedback, threadId],
+		[vote, message.id, submitMessageFeedback],
 	);
 
 	const handleSubmitNegative = useCallback((): void => {
 		setVote('negative');
 		setIsNegativeDialogOpen(false);
-		const trimmed = negativeComment.trim();
-		void logEvent(AIAssistantEvents.FeedbackSubmitted, {
-			messageId: message.id,
-			threadId,
-			rating: 'down',
-			hasComment: trimmed.length > 0,
-			commentLength: trimmed.length,
-		});
-		submitMessageFeedback(message.id, 'negative', trimmed || undefined);
-	}, [message.id, negativeComment, submitMessageFeedback, threadId]);
+		submitMessageFeedback(
+			message.id,
+			'negative',
+			negativeComment.trim() || undefined,
+		);
+	}, [message.id, negativeComment, submitMessageFeedback]);
 
 	return (
 		<>

frontend/src/container/AIAssistant/components/UserMessageActions/UserMessageActions.tsx

@@ -4,9 +4,6 @@ import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import { Check, Copy } from '@signozhq/icons';
 
-import logEvent from 'api/common/logEvent';
-
-import { AIAssistantEvents } from '../../events';
 import { Message } from '../../types';
 
 import styles from './UserMessageActions.module.scss';
@@ -28,15 +25,10 @@ export default function UserMessageActions({
 	const [, copyToClipboard] = useCopyToClipboard();
 
 	const handleCopy = useCallback((): void => {
-		void logEvent(AIAssistantEvents.MessageCopied, {
-			role: message.role,
-			messageId: message.id,
-			hadToolCalls: false,
-		});
 		copyToClipboard(message.content);
 		setCopied(true);
 		setTimeout(() => setCopied(false), 1500);
-	}, [copyToClipboard, message.content, message.id, message.role]);
+	}, [copyToClipboard, message.content]);
 
 	return (
 		<div className={styles.actions}>

frontend/src/container/AIAssistant/components/VirtualizedMessages/VirtualizedMessages.tsx

@@ -10,10 +10,6 @@ import {
 	Sparkles,
 } from '@signozhq/icons';
 
-import logEvent from 'api/common/logEvent';
-
-import { AIAssistantEvents, SuggestedPromptCategory } from '../../events';
-import { useAIAssistantAnalyticsContext } from '../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../store/useAIAssistantStore';
 import { Message, StreamingEventItem } from '../../types';
 import MessageBubble from '../MessageBubble';
@@ -50,24 +46,17 @@ interface VirtualizedMessagesProps {
 	conversationId: string;
 	messages: Message[];
 	isStreaming: boolean;
-	/**
-	 * Called when a user clicks an empty-state suggested prompt. Routed
-	 * through the parent so analytics (Message sent) fire with the same
-	 * page/mode/context attribution as a normal send.
-	 */
-	onSendSuggestedPrompt: (text: string) => void;
 }
 
 export default function VirtualizedMessages({
 	conversationId,
 	messages,
 	isStreaming,
-	onSendSuggestedPrompt,
 }: VirtualizedMessagesProps): JSX.Element {
+	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
 	const regenerateAssistantMessage = useAIAssistantStore(
 		(s) => s.regenerateAssistantMessage,
 	);
-	const { threadId } = useAIAssistantAnalyticsContext(conversationId);
 	const streamingStatus = useAIAssistantStore(
 		(s) => s.streams[conversationId]?.streamingStatus ?? '',
 	);
@@ -96,13 +85,9 @@ export default function VirtualizedMessages({
 			if (isStreaming) {
 				return;
 			}
-			void logEvent(AIAssistantEvents.RegenerateClicked, {
-				messageId,
-				threadId,
-			});
 			void regenerateAssistantMessage(conversationId, messageId);
 		},
-		[conversationId, isStreaming, regenerateAssistantMessage, threadId],
+		[conversationId, isStreaming, regenerateAssistantMessage],
 	);
 
 	// Scroll all the way to the actual bottom — including the 64px of bottom
@@ -161,11 +146,7 @@ export default function VirtualizedMessages({
 							color="secondary"
 							className={styles.emptyChip}
 							onClick={(): void => {
-								void logEvent(AIAssistantEvents.SuggestedPromptClicked, {
-									promptId: s.text,
-									category: SuggestedPromptCategory.EmptyState,
-								});
-								onSendSuggestedPrompt(s.text);
+								sendMessage(s.text);
 							}}
 							prefix={<s.icon size={14} />}
 						>

frontend/src/container/AIAssistant/components/blocks/ConfirmBlock/ConfirmBlock.tsx

@@ -1,10 +1,7 @@
 import cx from 'classnames';
 import { Button } from '@signozhq/ui/button';
-import logEvent from 'api/common/logEvent';
 import { Check, X } from '@signozhq/icons';
 
-import { AIAssistantEvents } from '../../../events';
-import { useAIAssistantAnalyticsContext } from '../../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../../store/useAIAssistantStore';
 import { useMessageContext } from '../../MessageContext';
 
@@ -40,7 +37,6 @@ export default function ConfirmBlock({
 	const answeredBlocks = useAIAssistantStore((s) => s.answeredBlocks);
 	const markBlockAnswered = useAIAssistantStore((s) => s.markBlockAnswered);
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
-	const { threadId, page, mode } = useAIAssistantAnalyticsContext();
 
 	// Durable answered state — survives re-renders/remounts
 	const answeredChoice = messageId ? answeredBlocks[messageId] : undefined;
@@ -51,14 +47,6 @@ export default function ConfirmBlock({
 		if (messageId) {
 			markBlockAnswered(messageId, choice);
 		}
-		void logEvent(AIAssistantEvents.MessageSent, {
-			threadId,
-			page,
-			mode,
-			queryLength: responseText.length,
-			hasContext: false,
-			respondingToClarification: false,
-		});
 		sendMessage(responseText);
 	};
 

frontend/src/container/AIAssistant/components/blocks/InteractiveQuestion/InteractiveQuestion.tsx

@@ -1,11 +1,8 @@
 import { useState } from 'react';
 import cx from 'classnames';
 import { Button } from '@signozhq/ui/button';
-import logEvent from 'api/common/logEvent';
 import { Checkbox, Radio } from 'antd';
 
-import { AIAssistantEvents } from '../../../events';
-import { useAIAssistantAnalyticsContext } from '../../../hooks/useAIAssistantAnalyticsContext';
 import { useAIAssistantStore } from '../../../store/useAIAssistantStore';
 import { useMessageContext } from '../../MessageContext';
 
@@ -39,7 +36,6 @@ export default function InteractiveQuestion({
 	const answeredBlocks = useAIAssistantStore((s) => s.answeredBlocks);
 	const markBlockAnswered = useAIAssistantStore((s) => s.markBlockAnswered);
 	const sendMessage = useAIAssistantStore((s) => s.sendMessage);
-	const { threadId, page, mode } = useAIAssistantAnalyticsContext();
 
 	// Persist selected state locally only for the pending (not-yet-submitted) case
 	const [selected, setSelected] = useState<string[]>([]);
@@ -56,14 +52,6 @@ export default function InteractiveQuestion({
 		if (messageId) {
 			markBlockAnswered(messageId, answer);
 		}
-		void logEvent(AIAssistantEvents.MessageSent, {
-			threadId,
-			page,
-			mode,
-			queryLength: answer.length,
-			hasContext: false,
-			respondingToClarification: false,
-		});
 		sendMessage(answer);
 	};
 

frontend/src/container/AIAssistant/events.ts

@@ -1,81 +0,0 @@
-/**
- * Analytics event names for the AI Assistant feature. Backend-emitted events
- * (Execution finished, Approval resolved, Resource mutated, Clarification
- * requested, Limit hit) are not declared here — they fire from the AI service.
- */
-
-export interface BrowserInfo {
-	browserName: string;
-	browserVersion: string;
-}
-
-type NavigatorWithBrandHints = Navigator & {
-	userAgentData?: { brands: { brand: string; version: string }[] };
-	brave?: { isBrave: () => Promise<boolean> };
-};
-
-/**
- * We mainly need to distinguish Chrome / Edge (Speech API works) from Chromium
- * derivatives (no Google API key → voice fails with `network`). UA sniffing is
- * the source of truth for derivative identification; `userAgentData` is used
- * only as a fast happy path for Chrome / Edge. Brave needs its own probe — it
- * advertises Chrome in both UA and brand hints.
- */
-export function getBrowserInfo(): BrowserInfo {
-	if (typeof navigator === 'undefined') {
-		return { browserName: 'unknown', browserVersion: 'unknown' };
-	}
-	const nav = navigator as NavigatorWithBrandHints;
-	const ua = nav.userAgent;
-
-	// Order matters: derivatives put "Chrome" in their UA; Chrome puts "Safari".
-	const matchers: { name: string; re: RegExp }[] = [
-		{ name: 'Edge', re: /Edg(?:e|A|iOS)?\/([\d.]+)/ },
-		{ name: 'Opera', re: /OPR\/([\d.]+)/ },
-		{ name: 'Vivaldi', re: /Vivaldi\/([\d.]+)/ },
-		{ name: 'Chrome', re: /Chrome\/([\d.]+)/ },
-		{ name: 'Firefox', re: /Firefox\/([\d.]+)/ },
-		{ name: 'Safari', re: /Version\/([\d.]+).*Safari/ },
-	];
-	let browserName = 'unknown';
-	let browserVersion = 'unknown';
-	for (const { name, re } of matchers) {
-		const m = ua.match(re);
-		if (m) {
-			browserName = name;
-			browserVersion = m[1];
-			break;
-		}
-	}
-
-	// Brave hides as Chrome in UA + brand hints; its probe is the only tell.
-	if (nav.brave?.isBrave) {
-		browserName = 'Brave';
-	}
-
-	return { browserName, browserVersion };
-}
-
-export const SuggestedPromptCategory = {
-	FollowUp: 'follow_up',
-	EmptyState: 'empty_state',
-} as const;
-export type SuggestedPromptCategory =
-	(typeof SuggestedPromptCategory)[keyof typeof SuggestedPromptCategory];
-
-export enum AIAssistantEvents {
-	Opened = 'AI Assistant: Opened',
-	MessageSent = 'AI Assistant: Message sent',
-	SuggestedPromptClicked = 'AI Assistant: Suggested prompt clicked',
-	CancelClicked = 'AI Assistant: Cancel clicked',
-	RegenerateClicked = 'AI Assistant: Regenerate clicked',
-	MessageCopied = 'AI Assistant: Message copied',
-	FeedbackSubmitted = 'AI Assistant: Feedback submitted',
-	ResourceOpened = 'AI Assistant: Resource opened',
-	DocOpened = 'AI Assistant: Doc opened',
-	ApplyFilterClicked = 'AI Assistant: Apply filter clicked',
-	ThreadOpenedFromHistory = 'AI Assistant: Thread opened from history',
-	VoiceInputUsed = 'AI Assistant: Voice input used',
-	VoiceInputFailed = 'AI Assistant: Voice input failed',
-	NewChatClicked = 'AI Assistant: New chat clicked',
-}

frontend/src/container/AIAssistant/hooks/useAIAssistantAnalyticsContext.ts

@@ -1,60 +0,0 @@
-import { matchPath, useLocation } from 'react-router-dom';
-
-import ROUTES from 'constants/routes';
-
-import { useAIAssistantStore } from '../store/useAIAssistantStore';
-import { useVariant } from '../VariantContext';
-
-export interface AIAssistantAnalyticsContext {
-	/** Backend thread ID for the resolved conversation; undefined before the first send. */
-	threadId: string | undefined;
-	/**
-	 * Normalised route template for the current page (e.g. `/dashboard/:dashboardId`).
-	 * Falls back to the raw pathname for routes not in ROUTES. We normalise to keep
-	 * analytics cardinality bounded and avoid leaking customer identifiers
-	 * (dashboard IDs, service names, trace IDs, conversation IDs) into the event.
-	 */
-	page: string;
-	/** Surface the assistant is rendered on. `panel` / `modal` collapse to `sidepane`. */
-	mode: 'sidepane' | 'full_screen';
-}
-
-// Pre-sorted longest-first so more specific templates match before their
-// less specific siblings (e.g. `/services/:s/top-level-operations` wins
-// over `/services/:s`). Module-level — ROUTES is static.
-const ROUTE_TEMPLATES = Object.values(ROUTES).sort(
-	(a, b) => b.length - a.length,
-);
-
-export function normalizePage(pathname: string): string {
-	for (const template of ROUTE_TEMPLATES) {
-		if (matchPath(pathname, { path: template, exact: true })) {
-			return template;
-		}
-	}
-	return pathname;
-}
-
-/**
- * Shared base attributes for AI Assistant analytics events (Message sent,
- * Cancel clicked, Feedback submitted, Resource/Doc/Apply filter, …).
- *
- * Pass `conversationId` when the caller is scoped to a specific
- * conversation (e.g. `ClarificationForm`, `VirtualizedMessages`); omit
- * to fall back to the store's active conversation.
- */
-export function useAIAssistantAnalyticsContext(
-	conversationId?: string,
-): AIAssistantAnalyticsContext {
-	const { pathname } = useLocation();
-	const variant = useVariant();
-	const threadId = useAIAssistantStore((s) => {
-		const id = conversationId ?? s.activeConversationId;
-		return id ? s.conversations[id]?.threadId : undefined;
-	});
-	return {
-		threadId,
-		page: normalizePage(pathname),
-		mode: variant === 'page' ? 'full_screen' : 'sidepane',
-	};
-}

frontend/src/container/DashboardContainer/DashboardDescription/Description.styles.scss

@@ -186,40 +186,77 @@
 		display: flex;
 		flex-direction: column;
 
-		section {
+		.section-1 {
 			display: flex;
 			flex-direction: column;
 			align-items: start;
+			border-bottom: 1px solid var(--l1-border);
 
 			.ant-btn {
 				display: flex;
 				width: 100%;
-				height: unset;
-				padding: 8px;
+				height: 20px;
+				padding: 16px 18px 18px 14px;
 				align-items: center;
-				gap: 12px;
+				gap: 6px;
 				color: var(--l2-foreground);
 				font-family: Inter;
-				font-size: 13px;
+				font-size: 14px;
+				font-style: normal;
+				font-weight: 400;
+				line-height: normal;
+				letter-spacing: 0.14px;
+				.ant-btn-icon {
+					margin-inline-end: 0px;
+				}
+			}
+		}
+		.section-2 {
+			display: flex;
+			flex-direction: column;
+			align-items: start;
+			border-bottom: 1px solid var(--l1-border);
+
+			.ant-btn {
+				display: flex;
+				width: 100%;
+				height: 20px;
+				padding: 16px 18px 18px 14px;
+				align-items: center;
+				gap: 6px;
+				color: var(--l2-foreground);
+				font-family: Inter;
+				font-size: 14px;
 				font-style: normal;
 				font-weight: 400;
 				line-height: normal;
 				letter-spacing: 0.14px;
-				border-top: none;
 
 				.ant-btn-icon {
 					margin-inline-end: 0px;
 				}
 			}
 		}
+		.delete-dashboard {
+			display: flex;
+			flex-direction: column;
+			align-items: start;
 
-		.section-1,
-		.section-2 {
-			border-bottom: 1px solid var(--l1-border);
-		}
-
-		.delete-dashboard .ant-btn {
-			color: var(--bg-cherry-400) !important;
+			.ant-typography {
+				display: flex;
+				width: 100%;
+				height: 20px;
+				padding: 16px 18px 18px 14px;
+				align-items: center;
+				gap: 6px;
+				color: var(--bg-cherry-400) !important;
+				font-family: Inter;
+				font-size: 14px;
+				font-style: normal;
+				font-weight: 400;
+				line-height: normal;
+				letter-spacing: 0.14px;
+			}
 		}
 	}
 }

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/VariableItem/VariableItem.styles.scss

@@ -211,12 +211,7 @@
 			display: grid;
 			grid-template-columns: max-content 1fr;
 
-			.typography-variables {
-				display: block;
-			}
-
 			.default-value-description {
-				display: block;
 				color: var(--l2-foreground);
 				font-family: Inter;
 				font-size: 11px;

frontend/src/container/DashboardContainer/DashboardSettings/General/index.tsx

@@ -11,7 +11,7 @@ import {
 	SyncTooltipFilterMode,
 } from 'lib/uPlotV2/plugins/TooltipPlugin/types';
 import { isEqual } from 'lodash-es';
-import { Check, ExternalLink, SolidInfoCircle, X } from '@signozhq/icons';
+import { Check, ExternalLink, Info, X } from '@signozhq/icons';
 import { useDashboardStore } from 'providers/Dashboard/store/useDashboardStore';
 
 import styles from './GeneralSettings.module.scss';
@@ -201,7 +201,7 @@ function GeneralDashboardSettings(): JSX.Element {
 						placement="top"
 						mouseEnterDelay={0.5}
 					>
-						<SolidInfoCircle size="md" className={styles.crossPanelSyncInfoIcon} />
+						<Info size={14} className={styles.crossPanelSyncInfoIcon} />
 					</Tooltip>
 				</div>
 				<div className={styles.crossPanelSyncRow}>

frontend/src/container/FormAlertRules/index.tsx

@@ -5,8 +5,7 @@ import { useQueryClient } from 'react-query';
 import { useSelector } from 'react-redux';
 import { useLocation } from 'react-router-dom';
 import { BellDot, CircleAlert, ExternalLink, Save } from '@signozhq/icons';
-import { Button, FormInstance, SelectProps } from 'antd';
-import { ConfirmDialog } from '@signozhq/ui/dialog';
+import { Button, FormInstance, Modal, SelectProps } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { convertToApiError } from 'api/ErrorResponseHandlerForGeneratedAPIs';
@@ -163,7 +162,6 @@ function FormAlertRules({
 	const alertTypeFromURL = urlQuery.get(QueryParams.ruleType);
 
 	const [detectionMethod, setDetectionMethod] = useState<string | null>(null);
-	const [isConfirmSaveOpen, setIsConfirmSaveOpen] = useState(false);
 
 	useEffect(() => {
 		if (!isEqual(currentQuery.unit, yAxisUnit)) {
@@ -579,16 +577,19 @@ function FormAlertRules({
 			});
 
 			// invalidate rule in cache
-			await ruleCache.invalidateQueries([
+			ruleCache.invalidateQueries([
 				REACT_QUERY_KEY.ALERT_RULE_DETAILS,
 				`${ruleId}`,
 			]);
 
-			urlQuery.delete(QueryParams.compositeQuery);
-			urlQuery.delete(QueryParams.panelTypes);
-			urlQuery.delete(QueryParams.ruleId);
-			urlQuery.delete(QueryParams.relativeTime);
-			safeNavigate(`${ROUTES.LIST_ALL_ALERT}?${urlQuery.toString()}`);
+			// eslint-disable-next-line sonarjs/no-identical-functions
+			setTimeout(() => {
+				urlQuery.delete(QueryParams.compositeQuery);
+				urlQuery.delete(QueryParams.panelTypes);
+				urlQuery.delete(QueryParams.ruleId);
+				urlQuery.delete(QueryParams.relativeTime);
+				safeNavigate(`${ROUTES.LIST_ALL_ALERT}?${urlQuery.toString()}`);
+			}, 2000);
 		} catch (e) {
 			const apiError = convertToApiError(e as AxiosError<RenderErrorResponseDTO>);
 			logData = {
@@ -624,9 +625,24 @@ function FormAlertRules({
 		urlQuery,
 	]);
 
-	const onSaveHandler = useCallback(() => {
-		setIsConfirmSaveOpen(true);
-	}, []);
+	const onSaveHandler = useCallback(async () => {
+		const content = (
+			<Typography.Text>
+				{' '}
+				{t('confirm_save_content_part1')}{' '}
+				<QueryTypeTag queryType={currentQuery.queryType} />{' '}
+				{t('confirm_save_content_part2')}
+			</Typography.Text>
+		);
+		Modal.confirm({
+			icon: <CircleAlert size="md" />,
+			title: t('confirm_save_title'),
+			centered: true,
+			content,
+			onOk: saveRule,
+			className: 'create-alert-modal',
+		});
+	}, [t, saveRule, currentQuery]);
 
 	const onTestRuleHandler = useCallback(async () => {
 		if (!isFormValid()) {
@@ -972,27 +988,6 @@ function FormAlertRules({
 					</ButtonContainer>
 				</MainFormContainer>
 			</div>
-
-			<ConfirmDialog
-				open={isConfirmSaveOpen}
-				onOpenChange={setIsConfirmSaveOpen}
-				title={t('confirm_save_title')}
-				titleIcon={<CircleAlert size={14} />}
-				confirmText="OK"
-				confirmColor="primary"
-				onConfirm={async (): Promise<boolean> => {
-					await saveRule();
-					return true;
-				}}
-				onCancel={() => setIsConfirmSaveOpen(false)}
-				width="narrow"
-			>
-				<Typography.Text>
-					{t('confirm_save_content_part1')}{' '}
-					<QueryTypeTag queryType={currentQuery.queryType} />{' '}
-					{t('confirm_save_content_part2')}
-				</Typography.Text>
-			</ConfirmDialog>
 		</>
 	);
 }

frontend/src/container/GridCardLayout/WidgetHeader/WidgetHeader.styles.scss

@@ -26,13 +26,10 @@
 	gap: 8px;
 	overflow: hidden;
 	text-overflow: ellipsis;
-	flex: 1;
-	min-width: 0;
 }
 
 .widget-header-title {
 	max-width: 80%;
-	min-width: 0;
 }
 
 .widget-header-actions {

frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx

@@ -438,7 +438,9 @@ function MultiIngestionSettings(): JSX.Element {
 							data: {
 								name: values.name,
 								tags: updatedTags,
-								expires_at: dayjs(values.expires_at).endOf('day').toISOString(),
+								expires_at: new Date(
+									dayjs(values.expires_at).endOf('day').toISOString(),
+								),
 							},
 						},
 						{
@@ -469,11 +471,13 @@ function MultiIngestionSettings(): JSX.Element {
 					const requestPayload = {
 						name: values.name,
 						tags: updatedTags,
-						expires_at: dayjs(values.expires_at).endOf('day').toISOString(),
+						expires_at: new Date(dayjs(values.expires_at).endOf('day').toISOString()),
 					};
 
 					createIngestionKey(
-						{ data: requestPayload },
+						{
+							data: requestPayload,
+						},
 						{
 							onSuccess: (_data) => {
 								notifications.success({

frontend/src/container/IngestionSettings/__tests__/MultiIngestionSettings.test.tsx

@@ -79,12 +79,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key One',
-						expires_at: TEST_EXPIRES_AT,
+						expires_at: new Date(TEST_EXPIRES_AT),
 						value: 'secret',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k1',
-						created_at: TEST_CREATED_UPDATED,
-						updated_at: TEST_CREATED_UPDATED,
+						created_at: new Date(TEST_CREATED_UPDATED),
+						updated_at: new Date(TEST_CREATED_UPDATED),
 						tags: [],
 						limits: [
 							{
@@ -160,12 +160,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key Logs',
-						expires_at: TEST_EXPIRES_AT,
+						expires_at: new Date(TEST_EXPIRES_AT),
 						value: 'secret',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k2',
-						created_at: TEST_CREATED_UPDATED,
-						updated_at: TEST_CREATED_UPDATED,
+						created_at: new Date(TEST_CREATED_UPDATED),
+						updated_at: new Date(TEST_CREATED_UPDATED),
 						tags: [],
 						limits: [
 							{
@@ -238,12 +238,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: KEY_NAME,
-						expires_at: TEST_EXPIRES_AT,
+						expires_at: new Date(TEST_EXPIRES_AT),
 						value: 'secret',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k1',
-						created_at: TEST_CREATED_UPDATED,
-						updated_at: TEST_CREATED_UPDATED,
+						created_at: new Date(TEST_CREATED_UPDATED),
+						updated_at: new Date(TEST_CREATED_UPDATED),
 						tags: [],
 						limits: [
 							{
@@ -299,12 +299,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key Regular',
-						expires_at: TEST_EXPIRES_AT,
+						expires_at: new Date(TEST_EXPIRES_AT),
 						value: 'secret1',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k1',
-						created_at: TEST_CREATED_UPDATED,
-						updated_at: TEST_CREATED_UPDATED,
+						created_at: new Date(TEST_CREATED_UPDATED),
+						updated_at: new Date(TEST_CREATED_UPDATED),
 						tags: [],
 						limits: [],
 					},
@@ -319,12 +319,12 @@ describe('MultiIngestionSettings Page', () => {
 				keys: [
 					{
 						name: 'Key Search Result',
-						expires_at: TEST_EXPIRES_AT,
+						expires_at: new Date(TEST_EXPIRES_AT),
 						value: 'secret2',
 						workspace_id: TEST_WORKSPACE_ID,
 						id: 'k2',
-						created_at: TEST_CREATED_UPDATED,
-						updated_at: TEST_CREATED_UPDATED,
+						created_at: new Date(TEST_CREATED_UPDATED),
+						updated_at: new Date(TEST_CREATED_UPDATED),
 						tags: [],
 						limits: [],
 					},

frontend/src/container/ListAlertRules/__test__/utils.test.ts

@@ -13,9 +13,9 @@ describe('filterAlerts', () => {
 	const mockAlertBase: Partial<RuletypesRuleDTO> = {
 		state: 'active' as RuletypesAlertStateDTO,
 		disabled: false,
-		createdAt: '2024-01-01T00:00:00Z',
+		createdAt: new Date('2024-01-01T00:00:00Z'),
 		createdBy: 'test-user',
-		updatedAt: '2024-01-01T00:00:00Z',
+		updatedAt: new Date('2024-01-01T00:00:00Z'),
 		updatedBy: 'test-user',
 		version: '1',
 		condition: {

frontend/src/container/ListOfDashboard/DashboardActions.module.scss

@@ -1,36 +0,0 @@
-.actionContent {
-	display: flex;
-	flex-direction: column;
-}
-
-.actionBtn {
-	display: flex;
-	padding: 8px;
-	height: unset;
-	align-items: center;
-	gap: 6px;
-	color: var(--l2-foreground);
-	font-family: Inter;
-	font-size: 12px;
-	font-weight: 400;
-	line-height: normal;
-	letter-spacing: 0.14px;
-
-	:global(.ant-icon-btn) {
-		margin-inline-end: 0px;
-	}
-}
-
-.deleteBtn {
-	composes: actionBtn;
-	color: var(--danger-background) !important;
-	border-top: 1px solid var(--l1-border);
-}
-
-.deleteBtn:hover {
-	background-color: color-mix(in srgb, var(--l1-foreground) 12%, transparent);
-}
-
-.deleteModal :global(.ant-modal-confirm-body) {
-	align-items: center;
-}

frontend/src/container/ListOfDashboard/DashboardList.styles.scss

@@ -745,6 +745,52 @@
 		box-shadow: 4px 10px 16px 2px rgba(0, 0, 0, 0.2);
 		backdrop-filter: blur(20px);
 		padding: 0px;
+
+		.dashboard-action-content {
+			.section-1 {
+				display: flex;
+				flex-direction: column;
+
+				.action-btn {
+					display: flex;
+					padding: 8px;
+					height: unset;
+					align-items: center;
+					gap: 6px;
+					color: var(--l2-foreground);
+					font-family: Inter;
+					font-size: 12px;
+					font-style: normal;
+					font-weight: 400;
+					line-height: normal;
+					letter-spacing: 0.14px;
+
+					.ant-icon-btn {
+						margin-inline-end: 0px;
+					}
+				}
+			}
+
+			.section-2 {
+				display: flex;
+				flex-direction: column;
+				border-top: 1px solid var(--l1-border);
+
+				.ant-typography {
+					display: flex;
+					padding: 12px 8px;
+					align-items: center;
+					gap: 6px;
+					color: var(--bg-cherry-400) !important;
+					font-family: Inter;
+					font-size: 12px;
+					font-style: normal;
+					font-weight: 400;
+					line-height: normal;
+					letter-spacing: 0.14px;
+				}
+			}
+		}
 	}
 }
 

frontend/src/container/ListOfDashboard/DashboardsList.tsx

@@ -102,7 +102,6 @@ import {
 	filterDashboards,
 } from './utils';
 
-import styles from './DashboardActions.module.scss';
 import './DashboardList.styles.scss';
 
 // eslint-disable-next-line sonarjs/cognitive-complexity
@@ -437,53 +436,57 @@ function DashboardsList(): JSX.Element {
 							{action && (
 								<Popover
 									content={
-										<div className={styles.actionContent}>
-											<Button
-												type="text"
-												className={styles.actionBtn}
-												icon={<Expand size={12} />}
-												onClick={onClickHandler}
-											>
-												View
-											</Button>
-											<Button
-												type="text"
-												className={styles.actionBtn}
-												icon={<SquareArrowOutUpRight size={12} />}
-												onClick={(e): void => {
-													e.stopPropagation();
-													e.preventDefault();
-													openInNewTab(getLink());
-												}}
-											>
-												Open in New Tab
-											</Button>
-											<Button
-												type="text"
-												className={styles.actionBtn}
-												icon={<Link2 size={12} />}
-												onClick={(e): void => {
-													e.stopPropagation();
-													e.preventDefault();
-													setCopy(getAbsoluteUrl(getLink()));
-												}}
-											>
-												Copy Link
-											</Button>
-											<Button
-												type="text"
-												className={styles.actionBtn}
-												icon={<FileJson size={12} />}
-												onClick={handleJsonExport}
-											>
-												Export JSON
-											</Button>
-											<DeleteButton
-												name={dashboard.name}
-												id={dashboard.id}
-												isLocked={dashboard.isLocked}
-												createdBy={dashboard.createdBy}
-											/>
+										<div className="dashboard-action-content">
+											<section className="section-1">
+												<Button
+													type="text"
+													className="action-btn"
+													icon={<Expand size={12} />}
+													onClick={onClickHandler}
+												>
+													View
+												</Button>
+												<Button
+													type="text"
+													className="action-btn"
+													icon={<SquareArrowOutUpRight size={12} />}
+													onClick={(e): void => {
+														e.stopPropagation();
+														e.preventDefault();
+														openInNewTab(getLink());
+													}}
+												>
+													Open in New Tab
+												</Button>
+												<Button
+													type="text"
+													className="action-btn"
+													icon={<Link2 size={12} />}
+													onClick={(e): void => {
+														e.stopPropagation();
+														e.preventDefault();
+														setCopy(getAbsoluteUrl(getLink()));
+													}}
+												>
+													Copy Link
+												</Button>
+												<Button
+													type="text"
+													className="action-btn"
+													icon={<FileJson size={12} />}
+													onClick={handleJsonExport}
+												>
+													Export JSON
+												</Button>
+											</section>
+											<section className="section-2">
+												<DeleteButton
+													name={dashboard.name}
+													id={dashboard.id}
+													isLocked={dashboard.isLocked}
+													createdBy={dashboard.createdBy}
+												/>
+											</section>
 										</div>
 									}
 									placement="bottomRight"

frontend/src/container/ListOfDashboard/TableComponents/DeleteButton.styles.scss

@@ -0,0 +1,9 @@
+.delete-modal {
+	.ant-modal-confirm-body {
+		align-items: center;
+	}
+}
+
+.delete-btn:hover {
+	background-color: color-mix(in srgb, var(--l1-foreground) 12%, transparent);
+}

frontend/src/container/ListOfDashboard/TableComponents/DeleteButton.tsx

@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQueryClient } from 'react-query';
 import { CircleAlert, Trash2 } from '@signozhq/icons';
-import { Button, Modal, Tooltip } from 'antd';
+import { Flex, Modal, Tooltip } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';
 import ROUTES from 'constants/routes';
@@ -12,8 +12,10 @@ import history from 'lib/history';
 import { useAppContext } from 'providers/App/App';
 import { USER_ROLES } from 'types/roles';
 
-import styles from '../DashboardActions.module.scss';
 import { Data } from '../DashboardsList';
+import { TableLinkText } from './styles';
+
+import './DeleteButton.styles.scss';
 
 interface DeleteButtonProps {
 	createdBy: string;
@@ -83,7 +85,7 @@ export function DeleteButton({
 				},
 			},
 			centered: true,
-			className: styles.deleteModal,
+			className: 'delete-modal',
 		});
 	}, [
 		modal,
@@ -107,16 +109,10 @@ export function DeleteButton({
 		return '';
 	};
 
-	const isDisabled = isLocked || (user.role === USER_ROLES.VIEWER && !isAuthor);
-
 	return (
 		<>
 			<Tooltip placement="left" title={getDeleteTooltipContent()}>
-				<Button
-					type="text"
-					className={styles.deleteBtn}
-					icon={<Trash2 size={12} />}
-					disabled={isDisabled}
+				<TableLinkText
 					onClick={(e): void => {
 						e.preventDefault();
 						e.stopPropagation();
@@ -124,9 +120,13 @@ export function DeleteButton({
 							openConfirmationDialog();
 						}
 					}}
+					className="delete-btn"
+					disabled={isLocked || (user.role === USER_ROLES.VIEWER && !isAuthor)}
 				>
-					Delete Dashboard
-				</Button>
+					<Flex align="center" justify="center" gap={4}>
+						<Trash2 size={14} /> Delete dashboard
+					</Flex>
+				</TableLinkText>
 			</Tooltip>
 
 			{contextHolder}

frontend/src/container/ListOfDashboard/TableComponents/styles.ts

@@ -0,0 +1,8 @@
+import styled from 'styled-components';
+
+export const TableLinkText = styled.span<{ disabled: boolean }>`
+	color: var(--destructive);
+	cursor: ${({ disabled }): string => (disabled ? 'not-allowed' : 'pointer')};
+	${({ disabled }): string => (disabled ? 'opacity: 0.5;' : '')}
+	padding: var(--spacing-3) var(--spacing-4);
+`;

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

@@ -20,7 +20,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: 'Alice Smith',
 		email: 'alice@signoz.io',
 		status: 'active',
-		createdAt: '2024-01-01T00:00:00.000Z',
+		createdAt: new Date('2024-01-01T00:00:00.000Z'),
 		orgId: 'org-1',
 	},
 	{
@@ -28,7 +28,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: 'Bob Jones',
 		email: 'bob@signoz.io',
 		status: 'active',
-		createdAt: '2024-01-02T00:00:00.000Z',
+		createdAt: new Date('2024-01-02T00:00:00.000Z'),
 		orgId: 'org-1',
 	},
 	{
@@ -36,7 +36,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: '',
 		email: 'charlie@signoz.io',
 		status: 'pending_invite',
-		createdAt: '2024-01-03T00:00:00.000Z',
+		createdAt: new Date('2024-01-03T00:00:00.000Z'),
 		orgId: 'org-1',
 	},
 	{
@@ -44,7 +44,7 @@ const mockUsers: TypesUserDTO[] = [
 		displayName: 'Dave Deleted',
 		email: 'dave@signoz.io',
 		status: 'deleted',
-		createdAt: '2024-01-04T00:00:00.000Z',
+		createdAt: new Date('2024-01-04T00:00:00.000Z'),
 		orgId: 'org-1',
 	},
 ];

frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/ClickHouse/__tests__/query.test.tsx

@@ -1,81 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-import { IClickHouseQuery } from 'types/api/queryBuilder/queryBuilderData';
-import { EQueryType } from 'types/common/dashboard';
-import { QueryBuilderContextType } from 'types/common/queryBuilder';
-
-import ClickHouseQueryBuilder from '../query';
-
-jest.mock('@monaco-editor/react', () => ({
-	__esModule: true,
-	default: (): JSX.Element => <div data-testid="monaco-editor-mock" />,
-}));
-
-const queryData: IClickHouseQuery = {
-	name: 'A',
-	legend: '',
-	query: 'SELECT 1',
-	disabled: false,
-};
-
-const buildOverrides = (
-	overrides: Partial<QueryBuilderContextType> = {},
-): Partial<QueryBuilderContextType> => ({
-	handleSetQueryItemData: jest.fn(),
-	removeQueryTypeItemByIndex: jest.fn(),
-	...overrides,
-});
-
-describe('ClickHouseQueryBuilder', () => {
-	it('passes runAfterUpdate when toggling disable so the query stages-and-runs', async () => {
-		const user = userEvent.setup();
-		const handleSetQueryItemData = jest.fn();
-
-		render(
-			<ClickHouseQueryBuilder
-				queryData={queryData}
-				queryIndex={0}
-				deletable={false}
-			/>,
-			undefined,
-			{ queryBuilderOverrides: buildOverrides({ handleSetQueryItemData }) },
-		);
-
-		await user.click(screen.getByRole('button', { name: /A/i }));
-
-		expect(handleSetQueryItemData).toHaveBeenCalledTimes(1);
-		expect(handleSetQueryItemData).toHaveBeenCalledWith(
-			0,
-			EQueryType.CLICKHOUSE,
-			expect.objectContaining({ ...queryData, disabled: true }),
-			{ runAfterUpdate: true },
-		);
-	});
-
-	it('does not pass runAfterUpdate for non-disable updates (delete)', async () => {
-		const user = userEvent.setup();
-		const handleSetQueryItemData = jest.fn();
-		const removeQueryTypeItemByIndex = jest.fn();
-
-		render(
-			<ClickHouseQueryBuilder queryData={queryData} queryIndex={2} deletable />,
-			undefined,
-			{
-				queryBuilderOverrides: buildOverrides({
-					handleSetQueryItemData,
-					removeQueryTypeItemByIndex,
-				}),
-			},
-		);
-
-		// QueryHeader renders the trash button only when `deletable` is true.
-		// It's the last button in the header (no accessible name).
-		const buttons = screen.getAllByRole('button');
-		await user.click(buttons[buttons.length - 1]);
-
-		expect(removeQueryTypeItemByIndex).toHaveBeenCalledWith(
-			EQueryType.CLICKHOUSE,
-			2,
-		);
-		expect(handleSetQueryItemData).not.toHaveBeenCalled();
-	});
-});

frontend/src/container/NewWidget/LeftContainer/QuerySection/QueryBuilder/ClickHouse/query.tsx

@@ -47,9 +47,7 @@ function ClickHouseQueryBuilder({
 			disabled: !queryData.disabled,
 		};
 
-		handleSetQueryItemData(queryIndex, EQueryType.CLICKHOUSE, newQuery, {
-			runAfterUpdate: true,
-		});
+		handleSetQueryItemData(queryIndex, EQueryType.CLICKHOUSE, newQuery);
 	}, [handleSetQueryItemData, queryData, queryIndex]);
 
 	const handleUpdateEditor = useCallback(

frontend/src/container/NewWidget/WidgetModals/DiscardChangesModal.tsx

@@ -1,53 +0,0 @@
-import { SolidAlertTriangle } from '@signozhq/icons';
-import { ConfirmDialog } from '@signozhq/ui/dialog';
-import { Typography } from '@signozhq/ui/typography';
-
-export interface DiscardChangesModalProps {
-	open: boolean;
-	isNewPanel: boolean;
-	panelTitle?: string;
-	dashboardTitle?: string;
-	onDiscard: () => void;
-	onClose: () => void;
-}
-
-export default function DiscardChangesModal({
-	open,
-	isNewPanel,
-	panelTitle,
-	dashboardTitle,
-	onDiscard,
-	onClose,
-}: DiscardChangesModalProps): JSX.Element {
-	const dashboardName = dashboardTitle ? (
-		<>
-			{' '}
-			to <strong>{dashboardTitle}</strong>
-		</>
-	) : null;
-	const panelLabel = panelTitle ? <strong>{panelTitle}</strong> : 'this panel';
-
-	return (
-		<ConfirmDialog
-			open={open}
-			onOpenChange={(next): void => {
-				if (!next) {
-					onClose();
-				}
-			}}
-			title="Discard changes?"
-			titleIcon={<SolidAlertTriangle size={14} color="#fdd600" />}
-			confirmText="Discard"
-			confirmColor="destructive"
-			cancelText="Keep editing"
-			onConfirm={onDiscard}
-			onCancel={onClose}
-		>
-			{isNewPanel ? (
-				<Typography>This new panel won&apos;t be added{dashboardName}.</Typography>
-			) : (
-				<Typography>Your unsaved edits to {panelLabel} will be lost.</Typography>
-			)}
-		</ConfirmDialog>
-	);
-}

frontend/src/container/NewWidget/__test__/utils.test.ts

@@ -1,17 +1,13 @@
 import {
-	initialAutocompleteData,
 	initialQueryBuilderFormValuesMap,
 	PANEL_TYPES,
 } from 'constants/queryBuilder';
-import { cloneDeep } from 'lodash-es';
-import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { Query } from 'types/api/queryBuilder/queryBuilderData';
-import { MetricAggregation } from 'types/api/v5/queryRange';
 import { EQueryType } from 'types/common/dashboard';
 import { DataSource } from 'types/common/queryBuilder';
 
 import type { PartialPanelTypes } from '../utils';
-import { getIsQueryModified, handleQueryChange } from '../utils';
+import { handleQueryChange } from '../utils';
 
 const buildSupersetQuery = (extras?: Record<string, unknown>): Query => ({
 	queryType: EQueryType.QUERY_BUILDER,
@@ -41,128 +37,6 @@ const buildSupersetQuery = (extras?: Record<string, unknown>): Query => ({
 	},
 });
 
-const buildMetricsQuery = (
-	overrides?: Partial<{
-		metricName: string;
-		aggregateAttributeKey: string;
-		legend: string;
-		groupByKey: string;
-	}>,
-): Query => ({
-	queryType: EQueryType.QUERY_BUILDER,
-	promql: [],
-	clickhouse_sql: [],
-	id: 'query-id',
-	unit: '',
-	builder: {
-		queryFormulas: [],
-		queryData: [
-			{
-				...initialQueryBuilderFormValuesMap[DataSource.METRICS],
-				queryName: 'A',
-				aggregateAttribute: overrides?.aggregateAttributeKey
-					? {
-							...initialAutocompleteData,
-							key: overrides.aggregateAttributeKey,
-							type: 'tag',
-							dataType: DataTypes.Float64,
-						}
-					: cloneDeep(initialAutocompleteData),
-				aggregations: [
-					{
-						metricName: overrides?.metricName ?? 'system.cpu.load',
-						temporality: '',
-						timeAggregation: 'rate',
-						spaceAggregation: 'sum',
-						reduceTo: 'avg',
-					} as MetricAggregation,
-				],
-				legend: overrides?.legend ?? '',
-				groupBy: overrides?.groupByKey
-					? [
-							{
-								...initialAutocompleteData,
-								key: overrides.groupByKey,
-								type: 'tag',
-								dataType: DataTypes.String,
-							},
-						]
-					: [],
-			},
-		],
-		queryTraceOperator: [],
-	},
-});
-
-describe('getIsQueryModified', () => {
-	it('returns false when baseline is null (new unsaved panel with no edits anchor)', () => {
-		const current = buildMetricsQuery();
-		expect(getIsQueryModified(current, null)).toBe(false);
-	});
-
-	it('returns false when baseline is undefined', () => {
-		const current = buildMetricsQuery();
-		expect(getIsQueryModified(current, undefined)).toBe(false);
-	});
-
-	it('returns false when current only differs by auto-backfilled aggregateAttribute', () => {
-		// saved widget query: aggregateAttribute is the v5-style empty initial value
-		// (stripped from persisted spec; spread back in as initialAutocompleteData on load)
-		const savedQuery = buildMetricsQuery({ metricName: 'system.cpu.load' });
-		// after MetricNameSelector edit-mode backfill, currentQuery has the populated
-		// aggregateAttribute while the rest of the query is identical
-		const currentQuery = buildMetricsQuery({
-			metricName: 'system.cpu.load',
-			aggregateAttributeKey: 'system.cpu.load',
-		});
-		expect(getIsQueryModified(currentQuery, savedQuery)).toBe(false);
-	});
-
-	it('returns true when the user edits the legend', () => {
-		const baseline = buildMetricsQuery({ metricName: 'system.cpu.load' });
-		const edited = buildMetricsQuery({
-			metricName: 'system.cpu.load',
-			legend: 'cpu-load',
-		});
-		expect(getIsQueryModified(edited, baseline)).toBe(true);
-	});
-
-	it('returns true when the user picks a different metric (aggregations diverges)', () => {
-		const baseline = buildMetricsQuery({ metricName: 'system.cpu.load' });
-		const edited = buildMetricsQuery({ metricName: 'system.memory.usage' });
-		expect(getIsQueryModified(edited, baseline)).toBe(true);
-	});
-
-	it('returns true when the user adds a groupBy', () => {
-		const baseline = buildMetricsQuery({ metricName: 'system.cpu.load' });
-		const edited = buildMetricsQuery({
-			metricName: 'system.cpu.load',
-			groupByKey: 'host.name',
-		});
-		expect(getIsQueryModified(edited, baseline)).toBe(true);
-	});
-
-	it('returns true on existing widget when current diverges from saved (Stage-and-Run silent-loss flow)', () => {
-		// After Edit → Stage and Run, stagedQuery is reset to match currentQuery.
-		// The dirty check must compare against the SAVED widget query, not stagedQuery.
-		const savedQuery = buildMetricsQuery({ metricName: 'system.cpu.load' });
-		const currentQuery = buildMetricsQuery({ metricName: 'system.memory.usage' });
-		expect(getIsQueryModified(currentQuery, savedQuery)).toBe(true);
-	});
-
-	it('returns false for a new panel where currentQuery still matches stagedQuery baseline', () => {
-		const stagedQuery = buildMetricsQuery();
-		const currentQuery = buildMetricsQuery();
-		expect(getIsQueryModified(currentQuery, stagedQuery)).toBe(false);
-	});
-
-	it('returns true for a new panel where currentQuery has been edited away from stagedQuery', () => {
-		const stagedQuery = buildMetricsQuery();
-		const currentQuery = buildMetricsQuery({ legend: 'custom' });
-		expect(getIsQueryModified(currentQuery, stagedQuery)).toBe(true);
-	});
-});
-
 describe('handleQueryChange', () => {
 	it('sets list-specific fields when switching to LIST', () => {
 		const superset = buildSupersetQuery();

frontend/src/container/NewWidget/index.tsx

@@ -1,17 +1,18 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
 import { UseQueryResult } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
 import { generatePath } from 'react-router-dom';
-import { Check, X } from '@signozhq/icons';
+import { Check, SolidAlertTriangle, X } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import {
 	ResizableHandle,
 	ResizablePanel,
 	ResizablePanelGroup,
 } from '@signozhq/ui/resizable';
-import { Flex } from 'antd';
+import { Flex, Modal, Space } from 'antd';
 import { Typography } from '@signozhq/ui/typography';
 import logEvent from 'api/common/logEvent';
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
@@ -68,6 +69,7 @@ import { GlobalReducer } from 'types/reducer/globalTime';
 import { getGraphType, getGraphTypeForFormat } from 'utils/getGraphType';
 
 import LeftContainer from './LeftContainer';
+import QueryTypeTag from './LeftContainer/QueryTypeTag';
 import RightContainer from './RightContainer';
 import { ThresholdProps } from './RightContainer/Threshold/types';
 import TimeItems, { timePreferance } from './RightContainer/timeItems';
@@ -80,7 +82,6 @@ import {
 	placeWidgetAtBottom,
 	placeWidgetBetweenRows,
 } from './utils';
-import DiscardChangesModal from './WidgetModals/DiscardChangesModal';
 
 import './NewWidget.styles.scss';
 
@@ -97,6 +98,8 @@ function NewWidget({
 
 	const { dashboardVariables } = useDashboardVariables();
 
+	const { t } = useTranslation(['dashboard']);
+
 	const { registerShortcut, deregisterShortcut } = useKeyboardHotkeys();
 
 	const {
@@ -107,6 +110,11 @@ function NewWidget({
 		setSupersetQuery,
 	} = useQueryBuilder();
 
+	const isQueryModified = useMemo(
+		() => getIsQueryModified(currentQuery, stagedQuery),
+		[currentQuery, stagedQuery],
+	);
+
 	const { selectedTime: globalSelectedInterval } = useSelector<
 		AppState,
 		GlobalReducer
@@ -131,23 +139,6 @@ function NewWidget({
 
 	const query = useUrlQuery();
 
-	// For existing widgets, compare currentQuery against the saved widget query
-	// (stable across Stage-and-Run cycles). For new panels with no saved baseline,
-	// fall back to stagedQuery so initial edits still trigger the warning.
-	const savedWidgetQuery = useMemo(() => {
-		const widgetId = query.get('widgetId');
-		const match = widgets?.find((w) => w.id === widgetId);
-		if (!match || match.panelTypes === PANEL_GROUP_TYPES.ROW) {
-			return null;
-		}
-		return (match as Widgets).query ?? null;
-	}, [widgets, query]);
-
-	const isQueryModified = useMemo(
-		() => getIsQueryModified(currentQuery, savedWidgetQuery ?? stagedQuery),
-		[currentQuery, savedWidgetQuery, stagedQuery],
-	);
-
 	const [isNewDashboard, setIsNewDashboard] = useState<boolean>(false);
 
 	const logEventCalledRef = useRef(false);
@@ -237,6 +228,7 @@ function NewWidget({
 		Record<string, string>
 	>(selectedWidget?.customLegendColors || {});
 
+	const [saveModal, setSaveModal] = useState(false);
 	const [discardModal, setDiscardModal] = useState(false);
 
 	const [bucketWidth, setBucketWidth] = useState<number>(
@@ -348,6 +340,7 @@ function NewWidget({
 	]);
 
 	const closeModal = (): void => {
+		setSaveModal(false);
 		setDiscardModal(false);
 	};
 
@@ -600,7 +593,7 @@ function NewWidget({
 			},
 		};
 
-		return updateDashboardMutation.mutateAsync(dashboard, {
+		updateDashboardMutation.mutateAsync(dashboard, {
 			onSuccess: () => {
 				setToScrollWidgetId(selectedWidget?.id || '');
 				navigateToDashboardPage();
@@ -695,9 +688,9 @@ function NewWidget({
 				})),
 			}),
 		});
-		onClickSaveHandler();
+		setSaveModal(true);
 		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, [onClickSaveHandler]);
+	}, [isNewPanel]);
 
 	const isNewTraceLogsAvailable =
 		currentQuery.queryType === EQueryType.QUERY_BUILDER &&
@@ -958,14 +951,57 @@ function NewWidget({
 					</ResizablePanel>
 				</ResizablePanelGroup>
 			</PanelContainer>
-			<DiscardChangesModal
+			<Modal
+				title={
+					isQueryModified ? (
+						<Space>
+							<SolidAlertTriangle size={16} color="#fdd600" />
+							Unsaved Changes
+						</Space>
+					) : (
+						'Save Widget'
+					)
+				}
+				focusTriggerAfterClose
+				forceRender
+				destroyOnClose
+				closable
+				onCancel={closeModal}
+				onOk={onClickSaveHandler}
+				confirmLoading={updateDashboardMutation.isLoading}
+				centered
+				open={saveModal}
+				width={600}
+			>
+				{!isQueryModified ? (
+					<Typography>
+						{t('your_graph_build_with')}{' '}
+						<QueryTypeTag queryType={currentQuery.queryType} />{' '}
+						{t('dashboard_ok_confirm')}
+					</Typography>
+				) : (
+					<Typography>{t('dashboard_unsave_changes')} </Typography>
+				)}
+			</Modal>
+			<Modal
+				title={
+					<Space>
+						<SolidAlertTriangle size={16} color="#fdd600" />
+						Unsaved Changes
+					</Space>
+				}
+				focusTriggerAfterClose
+				forceRender
+				destroyOnClose
+				closable
+				onCancel={closeModal}
+				onOk={discardChanges}
+				centered
 				open={discardModal}
-				isNewPanel={isNewPanel}
-				panelTitle={title}
-				dashboardTitle={dashboardData?.data?.title}
-				onDiscard={discardChanges}
-				onClose={closeModal}
-			/>
+				width={600}
+			>
+				<Typography>{t('dashboard_unsave_changes')}</Typography>
+			</Modal>
 		</Container>
 	);
 }

frontend/src/container/NewWidget/utils.ts

@@ -1,4 +1,5 @@
 import { Layout } from 'react-grid-layout';
+import { omitIdFromQuery } from 'components/ExplorerCard/utils';
 import { PrecisionOptionsEnum } from 'components/Graph/types';
 import { YAxisCategoryNames } from 'components/YAxisUnitSelector/constants';
 import {
@@ -25,84 +26,16 @@ import { DataSource } from 'types/common/queryBuilder';
 
 import { getCategoryName } from './RightContainer/dataFormatCategories';
 
-// Asks "would saving the current panel change the persisted widget spec?".
-//
-// `adjustQueryForV5` is deliberately not reused here: in addition to stripping
-// the legacy v4 fields, it also resurrects them onto each metric
-// `aggregations[i]`. That migration step is correct on save but bleeds
-// asymmetrically across a comparator — the live query still carries the
-// legacy defaults from `initialQueryBuilderFormValuesMap` while a previously
-// saved widget had them stripped.
-const stripQueryDataForCompare = (
-	queryData: IBuilderQuery,
-): Record<string, unknown> => {
-	const {
-		aggregateAttribute: _aggregateAttribute,
-		aggregateOperator: _aggregateOperator,
-		timeAggregation: _timeAggregation,
-		spaceAggregation: _spaceAggregation,
-		reduceTo: _reduceTo,
-		filters: _filters,
-		...retained
-	} = queryData ?? ({} as IBuilderQuery);
-
-	const groupBy = (retained.groupBy ?? []).map((entry) => {
-		const { id: _id, ...rest } = entry;
-		return rest;
-	});
-
-	return {
-		...retained,
-		groupBy,
-		source: retained.source || '',
-	};
-};
-
-const normalizeForDirtyCheck = (query: Query): Record<string, unknown> => {
-	const { id: _id, unit, builder, ...rest } = query;
-	return {
-		...rest,
-		// `id` is regenerated on every Stage and Run; `unit` flips between ''
-		// and undefined depending on whether the user has touched the selector.
-		unit: unit || '',
-		builder: {
-			...builder,
-			queryData: (builder?.queryData ?? []).map(stripQueryDataForCompare),
-		},
-	};
-};
-
-// `lodash.isEqual` distinguishes `{a: undefined}` from `{}`; for the dirty
-// check those are the same. Initial-values spreads on the live query
-// frequently leave such explicit-undefined keys.
-const stripUndefined = (value: unknown): unknown => {
-	if (Array.isArray(value)) {
-		return value.map(stripUndefined);
-	}
-	if (value && typeof value === 'object') {
-		const out: Record<string, unknown> = {};
-		Object.entries(value as Record<string, unknown>).forEach(([k, v]) => {
-			if (v === undefined) {
-				return;
-			}
-			out[k] = stripUndefined(v);
-		});
-		return out;
-	}
-	return value;
-};
-
 export const getIsQueryModified = (
 	currentQuery: Query,
-	baselineQuery: Query | null | undefined,
+	stagedQuery: Query | null,
 ): boolean => {
-	if (!baselineQuery) {
+	if (!stagedQuery) {
 		return false;
 	}
-	return !isEqual(
-		stripUndefined(normalizeForDirtyCheck(baselineQuery)),
-		stripUndefined(normalizeForDirtyCheck(currentQuery)),
-	);
+	const omitIdFromStageQuery = omitIdFromQuery(stagedQuery);
+	const omitIdFromCurrentQuery = omitIdFromQuery(currentQuery);
+	return !isEqual(omitIdFromStageQuery, omitIdFromCurrentQuery);
 };
 
 export type PartialPanelTypes = {

frontend/src/container/OnboardingQuestionaire/AboutSigNozQuestions/AboutSigNozQuestions.tsx

@@ -1,11 +1,10 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useState } from 'react';
 import { Button } from '@signozhq/ui/button';
 import { Checkbox } from '@signozhq/ui/checkbox';
 import { Input } from '@signozhq/ui/input';
 import { Input as AntdInput } from 'antd';
 import logEvent from 'api/common/logEvent';
 import { ArrowRight } from '@signozhq/icons';
-import { useAppContext } from 'providers/App/App';
 
 import { OnboardingQuestionHeader } from '../OnboardingQuestionHeader';
 
@@ -33,31 +32,11 @@ const interestedInOptions: Record<string, string> = {
 	openSourceTooling: 'Prefer open-source tooling',
 };
 
-function seededShuffle<T>(array: T[], seed: string): T[] {
-	const result = [...array];
-
-	let num = 0;
-	for (let i = 0; i < seed.length; i++) {
-		num = Math.imul(num + seed.charCodeAt(i), 2654435761);
-		num = Math.abs(num);
-	}
-
-	for (let i = result.length - 1; i > 0; i--) {
-		num = Math.abs(Math.imul(num, 1664525) + 1013904223);
-		const j = num % (i + 1);
-		[result[i], result[j]] = [result[j], result[i]];
-	}
-
-	return result;
-}
-
 export function AboutSigNozQuestions({
 	signozDetails,
 	setSignozDetails,
 	onNext,
 }: AboutSigNozQuestionsProps): JSX.Element {
-	const { versionData } = useAppContext();
-
 	const [interestInSignoz, setInterestInSignoz] = useState<string[]>(
 		signozDetails?.interestInSignoz || [],
 	);
@@ -69,12 +48,6 @@ export function AboutSigNozQuestions({
 	);
 	const [isNextDisabled, setIsNextDisabled] = useState<boolean>(true);
 
-	const shuffledOptionKeys = useMemo(
-		() =>
-			seededShuffle(Object.keys(interestedInOptions), versionData?.version ?? ''),
-		[versionData?.version],
-	);
-
 	useEffect((): void => {
 		if (
 			discoverSignoz !== '' &&
@@ -142,7 +115,7 @@ export function AboutSigNozQuestions({
 					<div className="form-group">
 						<div className="question">What got you interested in SigNoz?</div>
 						<div className="checkbox-grid">
-							{shuffledOptionKeys.map((option: string) => (
+							{Object.keys(interestedInOptions).map((option: string) => (
 								<div key={option} className="checkbox-item">
 									<Checkbox
 										id={`checkbox-${option}`}

frontend/src/container/PlannedDowntime/PlannedDowntime.tsx

@@ -24,7 +24,7 @@ import { PlannedDowntimeDeleteModal } from './PlannedDowntimeDeleteModal';
 import { PlannedDowntimeForm } from './PlannedDowntimeForm';
 import { PlannedDowntimeList } from './PlannedDowntimeList';
 import {
-	defaultInitialValues,
+	defautlInitialValues,
 	deleteDowntimeHandler,
 } from './PlannedDowntimeutils';
 
@@ -48,7 +48,9 @@ export function PlannedDowntime(): JSX.Element {
 	const urlQuery = useUrlQuery();
 
 	const [initialValues, setInitialValues] =
-		useState<Partial<RuletypesPlannedMaintenanceDTO>>(defaultInitialValues);
+		useState<Partial<RuletypesPlannedMaintenanceDTO & { editMode: boolean }>>(
+			defautlInitialValues,
+		);
 
 	const downtimeSchedules = useListDowntimeSchedules();
 	const alertOptions = React.useMemo(
@@ -146,7 +148,7 @@ export function PlannedDowntime(): JSX.Element {
 						<Button
 							type="primary"
 							onClick={(): void => {
-								setInitialValues(defaultInitialValues);
+								setInitialValues({ ...defautlInitialValues, editMode: false });
 								setIsOpen(true);
 								setEditMode(false);
 								form.resetFields();

frontend/src/container/PlannedDowntime/PlannedDowntimeForm.tsx

@@ -46,6 +46,8 @@ import { AlertRuleTags } from './PlannedDowntimeList';
 import {
 	getAlertOptionsFromIds,
 	getDurationInfo,
+	getEndTime,
+	handleTimeConversion,
 	isScheduleRecurring,
 	recurrenceOptions,
 	recurrenceOptionWithSubmenu,
@@ -62,19 +64,11 @@ const TIME_FORMAT = DATE_TIME_FORMATS.TIME;
 const DATE_FORMAT = DATE_TIME_FORMATS.ORDINAL_DATE;
 const ORDINAL_FORMAT = DATE_TIME_FORMATS.ORDINAL_ONLY;
 
-const TZ_OPTIONS: DefaultOptionType[] = ALL_TIME_ZONES.map(
-	(timezone: string) => ({
-		label: timezone,
-		value: timezone,
-		key: timezone,
-	}),
-);
-
 interface PlannedDowntimeFormData {
 	name: string;
-	startTime: dayjs.Dayjs | null;
-	endTime: dayjs.Dayjs | null;
-	recurrence?: RuletypesRecurrenceDTO;
+	startTime: dayjs.Dayjs | string;
+	endTime: dayjs.Dayjs | string;
+	recurrence?: RuletypesRecurrenceDTO | null;
 	alertRules: DefaultOptionType[];
 	recurrenceSelect?: RuletypesRecurrenceDTO;
 	timezone?: string;
@@ -83,7 +77,11 @@ interface PlannedDowntimeFormData {
 const customFormat = DATE_TIME_FORMATS.ORDINAL_DATETIME;
 
 interface PlannedDowntimeFormProps {
-	initialValues: Partial<RuletypesPlannedMaintenanceDTO>;
+	initialValues: Partial<
+		RuletypesPlannedMaintenanceDTO & {
+			editMode: boolean;
+		}
+	>;
 	alertOptions: DefaultOptionType[];
 	isError: boolean;
 	isLoading: boolean;
@@ -91,7 +89,7 @@ interface PlannedDowntimeFormProps {
 	setIsOpen: React.Dispatch<React.SetStateAction<boolean>>;
 	refetchAllSchedules: () => void;
 	isEditMode: boolean;
-	form: FormInstance;
+	form: FormInstance<any>;
 }
 
 export function PlannedDowntimeForm(
@@ -109,46 +107,66 @@ export function PlannedDowntimeForm(
 		form,
 	} = props;
 
-	const [selectedTags, setSelectedTags] = React.useState<DefaultOptionType[]>(
-		[],
-	);
+	const [selectedTags, setSelectedTags] = React.useState<
+		DefaultOptionType | DefaultOptionType[]
+	>([]);
 	const alertRuleFormName = 'alertRules';
 	const [saveLoading, setSaveLoading] = useState(false);
 	const [durationUnit, setDurationUnit] = useState<string>(
-		getDurationInfo(initialValues.schedule?.recurrence?.duration)?.unit || 'm',
+		getDurationInfo(initialValues.schedule?.recurrence?.duration as string)
+			?.unit || 'm',
 	);
 
 	const [formData, setFormData] = useState<Partial<PlannedDowntimeFormData>>({
 		timezone: initialValues.schedule?.timezone,
 	});
 
-	const [recurrenceType, setRecurrenceType] = useState<string>(
-		initialValues.schedule?.recurrence?.repeatType ||
+	const [recurrenceType, setRecurrenceType] = useState<string | null>(
+		(initialValues.schedule?.recurrence?.repeatType as string) ||
 			recurrenceOptions.doesNotRepeat.value,
 	);
 
+	const timezoneInitialValue = !isEmpty(initialValues.schedule?.timezone)
+		? (initialValues.schedule?.timezone as string)
+		: undefined;
+
 	const { notifications } = useNotifications();
 	const { showErrorModal } = useErrorModal();
 
-	const requiredFieldRule = [{ required: true }];
-
 	const datePickerFooter = (mode: any): any =>
 		mode === 'time' ? (
 			<span style={{ color: 'gray' }}>Please select the time</span>
 		) : null;
 
-	const saveHandler = useCallback(
+	const saveHanlder = useCallback(
 		async (values: PlannedDowntimeFormData) => {
+			const shouldKeepLocalTime = !isEditMode;
 			const data: RuletypesPostablePlannedMaintenanceDTO = {
 				alertIds: values.alertRules
 					.map((alert) => alert.value)
 					.filter((alert) => alert !== undefined) as string[],
 				name: values.name,
 				schedule: {
-					startTime: values.startTime?.format(),
-					endTime: values.endTime?.format(),
-					timezone: values.timezone!,
-					recurrence: values.recurrence,
+					startTime: new Date(
+						handleTimeConversion(
+							values.startTime,
+							timezoneInitialValue,
+							values.timezone,
+							shouldKeepLocalTime,
+						),
+					),
+					timezone: values.timezone as string,
+					endTime: values.endTime
+						? new Date(
+								handleTimeConversion(
+									values.endTime,
+									timezoneInitialValue,
+									values.timezone,
+									shouldKeepLocalTime,
+								),
+							)
+						: undefined,
+					recurrence: values.recurrence as RuletypesRecurrenceDTO,
 				},
 			};
 
@@ -180,58 +198,50 @@ export function PlannedDowntimeForm(
 			notifications,
 			refetchAllSchedules,
 			setIsOpen,
+			timezoneInitialValue,
 			showErrorModal,
 		],
 	);
 	const onFinish = async (values: PlannedDowntimeFormData): Promise<void> => {
-		const { recurrence } = values;
 		const recurrenceData =
-			!recurrence ||
-			recurrence.repeatType === recurrenceOptions.doesNotRepeat.value
+			values?.recurrence?.repeatType === recurrenceOptions.doesNotRepeat.value
 				? undefined
 				: {
-						duration: recurrence.duration
-							? `${recurrence.duration}${durationUnit}`
-							: '',
-						startTime: values.startTime!.format(),
-						endTime: values.endTime?.format(),
-						repeatOn: recurrence.repeatOn,
-						repeatType: recurrence.repeatType,
+						duration: values.recurrence?.duration
+							? `${values.recurrence?.duration}${durationUnit}`
+							: undefined,
+						endTime: !isEmpty(values.endTime)
+							? handleTimeConversion(
+									values.endTime,
+									timezoneInitialValue,
+									values.timezone,
+									!isEditMode,
+								)
+							: undefined,
+						startTime: handleTimeConversion(
+							values.startTime,
+							timezoneInitialValue,
+							values.timezone,
+							!isEditMode,
+						),
+						repeatOn: !values.recurrence?.repeatOn?.length
+							? undefined
+							: values.recurrence?.repeatOn,
+						repeatType: values.recurrence?.repeatType,
 					};
 
-		await saveHandler({
+		const payloadValues = {
 			...values,
-			recurrence: recurrenceData,
-		});
+			recurrence: recurrenceData as RuletypesRecurrenceDTO | undefined,
+		};
+		await saveHanlder(payloadValues);
 	};
 
-	const handleFormData = (data: Partial<PlannedDowntimeFormData>): void => {
-		const { startTime, endTime, timezone } = data;
-		const update: Partial<PlannedDowntimeFormData> = {};
-
-		// If the set timezone doesn't match, update it.
-		if (
-			startTime &&
-			timezone &&
-			startTime.format() !== startTime.tz(timezone, true).format()
-		) {
-			update.startTime = startTime.tz(timezone, true);
-		}
-		if (
-			endTime &&
-			timezone &&
-			endTime.format() !== endTime.tz(timezone, true).format()
-		) {
-			update.endTime = endTime.tz(timezone, true);
-		}
-
-		if (!isEmpty(update)) {
-			data = { ...data, ...update };
-			form.setFieldsValue({ ...update });
-		}
-
-		setFormData(data);
-	};
+	const formValidationRules = [
+		{
+			required: true,
+		},
+	];
 
 	const handleOk = async (): Promise<void> => {
 		await form.validateFields().catch(() => {
@@ -239,11 +249,16 @@ export function PlannedDowntimeForm(
 		});
 	};
 
-	const handleCancel = (): void => setIsOpen(false);
+	const handleCancel = (): void => {
+		setIsOpen(false);
+	};
 
-	const handleAlertRulesChange: SelectProps['onChange'] = (_value, options) => {
+	const handleChange = (
+		_value: string,
+		options: DefaultOptionType | DefaultOptionType[],
+	): void => {
 		form.setFieldValue(alertRuleFormName, options);
-		setSelectedTags(Array.isArray(options) ? options : [options]);
+		setSelectedTags(options);
 	};
 
 	const noTagRenderer: SelectProps['tagRender'] = () => <></>;
@@ -252,51 +267,113 @@ export function PlannedDowntimeForm(
 		if (!removedTag) {
 			return;
 		}
-		const newTags = selectedTags.filter((tag) => tag.value !== removedTag);
+		const newTags = selectedTags.filter(
+			(tag: DefaultOptionType) => tag.value !== removedTag,
+		);
 		form.setFieldValue(alertRuleFormName, newTags);
 		setSelectedTags(newTags);
 	};
 
-	const formattedInitialValues = useMemo((): PlannedDowntimeFormData => {
-		const { schedule } = initialValues;
-		const startTime = schedule?.recurrence?.startTime || schedule?.startTime;
-		const endTime = schedule?.recurrence?.endTime || schedule?.endTime;
-
-		return {
+	const formatedInitialValues = useMemo(() => {
+		const formData: PlannedDowntimeFormData = {
 			name: defaultTo(initialValues.name, ''),
 			alertRules: getAlertOptionsFromIds(
 				initialValues.alertIds || [],
 				alertOptions,
 			),
-			startTime: startTime ? dayjs(startTime).tz(schedule.timezone) : null,
-			endTime: endTime ? dayjs(endTime).tz(schedule.timezone) : null,
+			endTime: getEndTime(initialValues) ? dayjs(getEndTime(initialValues)) : '',
+			startTime: initialValues.schedule?.startTime
+				? dayjs(initialValues.schedule?.startTime)
+				: '',
 			recurrence: {
-				...schedule?.recurrence,
-				repeatType: !isScheduleRecurring(schedule)
+				...initialValues.schedule?.recurrence,
+				repeatType: (!isScheduleRecurring(initialValues?.schedule)
 					? recurrenceOptions.doesNotRepeat.value
-					: schedule?.recurrence?.repeatType,
-				duration: getDurationInfo(schedule?.recurrence?.duration)?.value ?? '',
+					: initialValues.schedule?.recurrence
+							?.repeatType) as RuletypesRecurrenceDTO['repeatType'],
+				duration: String(
+					getDurationInfo(initialValues.schedule?.recurrence?.duration as string)
+						?.value ?? '',
+				),
 			} as RuletypesRecurrenceDTO,
-			timezone: schedule?.timezone as string,
+			timezone: initialValues.schedule?.timezone as string,
 		};
+		return formData;
 	}, [initialValues, alertOptions]);
 
 	useEffect(() => {
-		setSelectedTags(formattedInitialValues.alertRules);
-		form.setFieldsValue({ ...formattedInitialValues });
-	}, [form, formattedInitialValues, initialValues]);
+		setSelectedTags(formatedInitialValues.alertRules);
+		form.setFieldsValue({ ...formatedInitialValues });
+	}, [form, formatedInitialValues, initialValues]);
+
+	const timeZoneItems: DefaultOptionType[] = ALL_TIME_ZONES.map(
+		(timezone: string) => ({
+			label: timezone,
+			value: timezone,
+			key: timezone,
+		}),
+	);
+
+	const getTimezoneFormattedTime = (
+		time: string | dayjs.Dayjs,
+		timeZone?: string,
+		isEditMode?: boolean,
+		format?: string,
+	): string => {
+		if (!time) {
+			return '';
+		}
+		if (!timeZone) {
+			return dayjs(time).format(format);
+		}
+		return dayjs(time).tz(timeZone, isEditMode).format(format);
+	};
 
 	const startTimeText = useMemo((): string => {
-		const startTime = formData.startTime;
+		let startTime = formData?.startTime;
+		if (recurrenceType !== recurrenceOptions.doesNotRepeat.value) {
+			startTime =
+				(formData?.recurrence?.startTime
+					? dayjs(formData.recurrence.startTime).toISOString()
+					: '') ||
+				formData?.startTime ||
+				'';
+		}
+
 		if (!startTime) {
 			return '';
 		}
 
-		const daysOfWeek = formData.recurrence?.repeatOn;
+		if (formData.timezone) {
+			startTime = handleTimeConversion(
+				startTime,
+				timezoneInitialValue,
+				formData?.timezone,
+				!isEditMode,
+			);
+		}
+		const daysOfWeek = formData?.recurrence?.repeatOn;
 
-		const formattedStartTime = startTime.format(TIME_FORMAT);
-		const formattedStartDate = startTime.format(DATE_FORMAT);
-		const ordinalFormat = startTime.format(ORDINAL_FORMAT);
+		const formattedStartTime = getTimezoneFormattedTime(
+			startTime,
+			formData.timezone,
+			!isEditMode,
+			TIME_FORMAT,
+		);
+
+		const formattedStartDate = getTimezoneFormattedTime(
+			startTime,
+			formData.timezone,
+			!isEditMode,
+			DATE_FORMAT,
+		);
+
+		const ordinalFormat = getTimezoneFormattedTime(
+			startTime,
+			formData.timezone,
+			!isEditMode,
+			ORDINAL_FORMAT,
+		);
 
 		const formattedDaysOfWeek = daysOfWeek?.join(', ');
 		switch (recurrenceType) {
@@ -311,18 +388,49 @@ export function PlannedDowntimeForm(
 			default:
 				return `Scheduled for ${formattedStartDate} starting at ${formattedStartTime}.`;
 		}
-	}, [formData, recurrenceType, timezone]);
+	}, [formData, recurrenceType, isEditMode, timezoneInitialValue]);
 
 	const endTimeText = useMemo((): string => {
-		const endTime = formData.endTime;
+		let endTime = formData?.endTime;
+		if (recurrenceType !== recurrenceOptions.doesNotRepeat.value) {
+			endTime =
+				(formData?.recurrence?.endTime
+					? dayjs(formData.recurrence.endTime).toISOString()
+					: '') || '';
+
+			if (!isEditMode && !endTime) {
+				endTime = formData?.endTime || '';
+			}
+		}
+
 		if (!endTime) {
 			return '';
 		}
 
-		const formattedEndTime = endTime.format(TIME_FORMAT);
-		const formattedEndDate = endTime.format(DATE_FORMAT);
+		if (formData.timezone) {
+			endTime = handleTimeConversion(
+				endTime,
+				timezoneInitialValue,
+				formData?.timezone,
+				!isEditMode,
+			);
+		}
+
+		const formattedEndTime = getTimezoneFormattedTime(
+			endTime,
+			formData.timezone,
+			!isEditMode,
+			TIME_FORMAT,
+		);
+
+		const formattedEndDate = getTimezoneFormattedTime(
+			endTime,
+			formData.timezone,
+			!isEditMode,
+			DATE_FORMAT,
+		);
 		return `Scheduled to end maintenance on ${formattedEndDate} at ${formattedEndTime}.`;
-	}, [formData, recurrenceType, timezone]);
+	}, [formData, recurrenceType, isEditMode, timezoneInitialValue]);
 
 	return (
 		<Modal
@@ -338,28 +446,33 @@ export function PlannedDowntimeForm(
 			footer={null}
 		>
 			<Form<PlannedDowntimeFormData>
-				name={isEditMode ? 'edit-form' : 'create-form'}
+				name={initialValues.editMode ? 'edit-form' : 'create-form'}
 				form={form}
 				layout="vertical"
 				className="createForm"
 				onFinish={onFinish}
 				onValuesChange={(): void => {
 					setRecurrenceType(form.getFieldValue('recurrence')?.repeatType as string);
-					handleFormData(form.getFieldsValue());
+					setFormData(form.getFieldsValue());
 				}}
 				autoComplete="off"
 			>
-				<Form.Item label="Name" name="name" rules={requiredFieldRule}>
+				<Form.Item label="Name" name="name" rules={formValidationRules}>
 					<Input placeholder="e.g. Upgrade downtime" />
 				</Form.Item>
 				<Form.Item
 					label="Starts from"
 					name="startTime"
-					rules={requiredFieldRule}
+					rules={formValidationRules}
 					className={!isEmpty(startTimeText) ? 'formItemWithBullet' : ''}
+					getValueProps={(value): any => ({
+						value: value ? dayjs(value).tz(timezoneInitialValue) : undefined,
+					})}
 				>
 					<DatePicker
-						format={(date) => date.format(customFormat)}
+						format={(date): string =>
+							dayjs(date).tz(timezoneInitialValue).format(customFormat)
+						}
 						showTime
 						renderExtraFooter={datePickerFooter}
 						showNow={false}
@@ -372,7 +485,7 @@ export function PlannedDowntimeForm(
 				<Form.Item
 					label="Repeats every"
 					name={['recurrence', 'repeatType']}
-					rules={requiredFieldRule}
+					rules={formValidationRules}
 				>
 					<Select
 						placeholder="Select option..."
@@ -383,7 +496,7 @@ export function PlannedDowntimeForm(
 					<Form.Item
 						label="Weekly occurernce"
 						name={['recurrence', 'repeatOn']}
-						rules={requiredFieldRule}
+						rules={formValidationRules}
 					>
 						<Select
 							placeholder="Select option..."
@@ -397,14 +510,16 @@ export function PlannedDowntimeForm(
 						<Form.Item
 							label="Duration"
 							name={['recurrence', 'duration']}
-							rules={requiredFieldRule}
+							rules={formValidationRules}
 						>
 							<Input
 								addonAfter={
 									<Select
 										defaultValue="m"
 										value={durationUnit}
-										onChange={(value): void => setDurationUnit(value)}
+										onChange={(value): void => {
+											setDurationUnit(value);
+										}}
 									>
 										<Select.Option value="m">Mins</Select.Option>
 										<Select.Option value="h">Hours</Select.Option>
@@ -418,8 +533,8 @@ export function PlannedDowntimeForm(
 							/>
 						</Form.Item>
 					)}
-				<Form.Item label="Timezone" name="timezone" rules={requiredFieldRule}>
-					<Select options={TZ_OPTIONS} placeholder="Select timezone" showSearch />
+				<Form.Item label="Timezone" name="timezone" rules={formValidationRules}>
+					<Select options={timeZoneItems} placeholder="Select timezone" showSearch />
 				</Form.Item>
 				<Form.Item
 					label="Ends on"
@@ -431,9 +546,14 @@ export function PlannedDowntimeForm(
 						},
 					]}
 					className={!isEmpty(endTimeText) ? 'formItemWithBullet' : ''}
+					getValueProps={(value): any => ({
+						value: value ? dayjs(value).tz(timezoneInitialValue) : undefined,
+					})}
 				>
 					<DatePicker
-						format={(date) => date.format(customFormat)}
+						format={(date): string =>
+							dayjs(date).tz(timezoneInitialValue).format(customFormat)
+						}
 						showTime
 						showNow={false}
 						renderExtraFooter={datePickerFooter}
@@ -464,7 +584,7 @@ export function PlannedDowntimeForm(
 							status={isError ? 'error' : undefined}
 							loading={isLoading}
 							tagRender={noTagRenderer}
-							onChange={handleAlertRulesChange}
+							onChange={handleChange}
 							showSearch
 							options={alertOptions}
 							filterOption={(input, option): boolean =>

frontend/src/container/PlannedDowntime/PlannedDowntimeList.tsx

@@ -1,4 +1,4 @@
-import React, { ReactNode, useEffect } from 'react';
+import { ReactNode, useEffect } from 'react';
 import { UseQueryResult } from 'react-query';
 import { Color } from '@signozhq/design-tokens';
 import { Collapse, Flex, Space, Table, TableProps, Tag, Tooltip } from 'antd';
@@ -8,7 +8,7 @@ import type {
 	ListDowntimeSchedules200,
 	RenderErrorResponseDTO,
 	RuletypesPlannedMaintenanceDTO,
-	RuletypesScheduleDTO,
+	RuletypesRecurrenceDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import type { ErrorType } from 'api/generatedAPIInstance';
 import cx from 'classnames';
@@ -19,11 +19,12 @@ import { CalendarClock, PenLine, Trash2 } from '@signozhq/icons';
 import { useAppContext } from 'providers/App/App';
 import { USER_ROLES } from 'types/roles';
 
-import { showErrorNotification } from 'utils/error';
+import { showErrorNotification } from '../../utils/error';
 import {
 	formatDateTime,
 	getAlertOptionsFromIds,
 	getDuration,
+	getEndTime,
 	recurrenceInfo,
 } from './PlannedDowntimeutils';
 
@@ -125,28 +126,29 @@ export function CollapseListContent({
 	created_at,
 	created_by_name,
 	created_by_email,
-	schedule,
+	timeframe,
+	repeats,
 	updated_at,
 	updated_by_name,
 	alertOptions,
+	timezone,
 }: {
 	created_at?: string;
 	created_by_name?: string;
 	created_by_email?: string;
-	schedule?: RuletypesScheduleDTO;
+	timeframe: [string | undefined | null, string | undefined | null];
+	repeats?: RuletypesRecurrenceDTO | null;
 	updated_at?: string;
 	updated_by_name?: string;
 	alertOptions?: DefaultOptionType[];
+	timezone?: string;
 }): JSX.Element {
-	const repeats = schedule?.recurrence;
 	const renderItems = (title: string, value: ReactNode): JSX.Element => (
 		<div className="render-item-collapse-list">
 			<Typography>{title}</Typography>
 			<div className="render-item-value">{value}</div>
 		</div>
 	);
-	const startTime = formatDateTime(schedule?.startTime, schedule?.timezone);
-	const endTime = formatDateTime(schedule?.endTime, schedule?.timezone);
 
 	return (
 		<Flex vertical>
@@ -181,20 +183,16 @@ export function CollapseListContent({
 
 			{renderItems(
 				'Timeframe',
-				schedule?.startTime ? (
-					<Typography>{`${startTime} ⎯ ${endTime}`}</Typography>
+				timeframe[0] || timeframe[1] ? (
+					<Typography>{`${formatDateTime(timeframe[0])} ⎯ ${formatDateTime(
+						timeframe[1],
+					)}`}</Typography>
 				) : (
 					'-'
 				),
 			)}
-			{renderItems(
-				'Timezone',
-				<Typography>{schedule?.timezone || '-'}</Typography>,
-			)}
-			{renderItems(
-				'Repeats',
-				<Typography>{recurrenceInfo(repeats, schedule?.timezone)}</Typography>,
-			)}
+			{renderItems('Timezone', <Typography>{timezone || '-'}</Typography>)}
+			{renderItems('Repeats', <Typography>{recurrenceInfo(repeats)}</Typography>)}
 			{renderItems(
 				'Alerts silenced',
 				alertOptions?.length ? (
@@ -234,12 +232,22 @@ export function CustomCollapseList(
 		setModalOpen,
 		handleDeleteDowntime,
 		setEditMode,
+		kind,
 	} = props;
 
 	const scheduleTime = schedule?.startTime
-		? dayjs(schedule.startTime).tz(schedule.timezone)
-		: createdAt || '';
-	const formattedDateAndTime = `Start time ⎯ ${formatDateTime(scheduleTime)} ${schedule?.timezone}`;
+		? dayjs(schedule.startTime).toISOString()
+		: createdAt
+			? dayjs(createdAt).toISOString()
+			: '';
+	// Combine time and date
+	const formattedDateAndTime = `Start time ⎯ ${formatDateTime(
+		defaultTo(scheduleTime, ''),
+	)} ${schedule?.timezone}`;
+	const endTime = getEndTime({
+		kind,
+		schedule,
+	} as Partial<RuletypesPlannedMaintenanceDTO>);
 
 	return (
 		<>
@@ -249,16 +257,21 @@ export function CustomCollapseList(
 						<HeaderComponent
 							duration={
 								schedule?.recurrence?.duration
-									? schedule.recurrence.duration
-									: getDuration(schedule?.startTime || '', schedule?.endTime || '')
+									? (schedule?.recurrence?.duration as string)
+									: getDuration(
+											schedule?.startTime ? dayjs(schedule.startTime).toISOString() : '',
+											schedule?.endTime ? dayjs(schedule.endTime).toISOString() : '',
+										)
 							}
 							name={defaultTo(name, '')}
-							handleEdit={() => {
+							handleEdit={(): void => {
 								setInitialValues({ ...props });
 								setModalOpen(true);
 								setEditMode(true);
 							}}
-							handleDelete={() => handleDeleteDowntime(id ?? '', name || '')}
+							handleDelete={(): void => {
+								handleDeleteDowntime(id ?? '', name || '');
+							}}
 						/>
 					}
 					key={id ?? ''}
@@ -266,10 +279,17 @@ export function CustomCollapseList(
 					<CollapseListContent
 						created_at={createdAt ? dayjs(createdAt).toISOString() : ''}
 						created_by_name={defaultTo(createdBy, '')}
-						schedule={schedule}
+						timeframe={[
+							schedule?.startTime?.toString(),
+							typeof endTime === 'string' ? endTime : endTime?.toString(),
+						]}
+						repeats={
+							schedule?.recurrence as RuletypesRecurrenceDTO | null | undefined
+						}
 						updated_at={updatedAt ? dayjs(updatedAt).toISOString() : ''}
 						updated_by_name={defaultTo(updatedBy, '')}
 						alertOptions={alertOptions}
+						timezone={defaultTo(schedule?.timezone, '')}
 					/>
 				</Panel>
 			</Collapse>

frontend/src/container/PlannedDowntime/PlannedDowntimeutils.ts

@@ -11,8 +11,8 @@ import type {
 import type { ErrorType } from 'api/generatedAPIInstance';
 import { AxiosError } from 'axios';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
-import dayjs, { Dayjs } from 'dayjs';
-import { isEmpty } from 'lodash-es';
+import dayjs from 'dayjs';
+import { isEmpty, isEqual } from 'lodash-es';
 import APIError from 'types/api/error';
 
 type DateTimeString = string | null | undefined;
@@ -38,20 +38,14 @@ export const getDuration = (
 	return `${hours} hours`;
 };
 
-export const formatDateTime = (
-	dateTimeString?: string | Dayjs | null,
-	timezone?: string,
-): string => {
+export const formatDateTime = (dateTimeString?: string | null): string => {
 	if (!dateTimeString) {
 		return 'N/A';
 	}
 
-	let dt = dayjs(dateTimeString);
-	if (timezone) {
-		dt = dt.tz(timezone);
-	}
-
-	return dt.format(DATE_TIME_FORMATS.MONTH_DATETIME);
+	return dayjs(dateTimeString.slice(0, 19)).format(
+		DATE_TIME_FORMATS.MONTH_DATETIME,
+	);
 };
 
 export const getAlertOptionsFromIds = (
@@ -67,7 +61,6 @@ export const getAlertOptionsFromIds = (
 
 export const recurrenceInfo = (
 	recurrence?: RuletypesRecurrenceDTO | null,
-	timezone?: string,
 ): string => {
 	if (!recurrence) {
 		return 'No';
@@ -76,10 +69,10 @@ export const recurrenceInfo = (
 	const { startTime, duration, repeatOn, repeatType, endTime } = recurrence;
 
 	const formattedStartTime = startTime
-		? formatDateTime(startTime, timezone)
+		? formatDateTime(dayjs(startTime).toISOString())
 		: '';
 	const formattedEndTime = endTime
-		? `to ${formatDateTime(endTime, timezone)}`
+		? `to ${formatDateTime(dayjs(endTime).toISOString())}`
 		: '';
 	const weeklyRepeatString = repeatOn ? `on ${repeatOn.join(', ')}` : '';
 	const durationString = duration ? `- Duration: ${duration}` : '';
@@ -87,7 +80,9 @@ export const recurrenceInfo = (
 	return `Repeats - ${repeatType} ${weeklyRepeatString} from ${formattedStartTime} ${formattedEndTime} ${durationString}`;
 };
 
-export const defaultInitialValues: Partial<RuletypesPlannedMaintenanceDTO> = {
+export const defautlInitialValues: Partial<
+	RuletypesPlannedMaintenanceDTO & { editMode: boolean }
+> = {
 	name: '',
 	description: '',
 	schedule: {
@@ -99,6 +94,7 @@ export const defaultInitialValues: Partial<RuletypesPlannedMaintenanceDTO> = {
 	alertIds: [],
 	createdAt: undefined,
 	createdBy: undefined,
+	editMode: false,
 };
 
 type DeleteDowntimeScheduleProps = {
@@ -214,6 +210,75 @@ export const recurrenceOptionWithSubmenu: Option[] = [
 	recurrenceOptions.monthly,
 ];
 
+export const getRecurrenceOptionFromValue = (
+	value?: string | Option | null,
+): Option | null | undefined => {
+	if (!value) {
+		return null;
+	}
+	if (typeof value === 'string') {
+		return Object.values(recurrenceOptions).find(
+			(option) => option.value === value,
+		);
+	}
+	return value;
+};
+
+export const getEndTime = ({
+	kind,
+	schedule,
+}: Partial<
+	RuletypesPlannedMaintenanceDTO & {
+		editMode: boolean;
+	}
+>): string | dayjs.Dayjs => {
+	if (kind === 'fixed') {
+		return schedule?.endTime ? dayjs(schedule.endTime).toISOString() : '';
+	}
+
+	return schedule?.recurrence?.endTime
+		? dayjs(schedule.recurrence.endTime).toISOString()
+		: '';
+};
+
 export const isScheduleRecurring = (
 	schedule?: RuletypesPlannedMaintenanceDTO['schedule'] | null,
 ): boolean => (schedule ? !isEmpty(schedule?.recurrence) : false);
+
+function convertUtcOffsetToTimezoneOffset(offsetMinutes: number): string {
+	const sign = offsetMinutes >= 0 ? '+' : '-';
+	const absOffset = Math.abs(offsetMinutes);
+	const hours = String(Math.floor(absOffset / 60)).padStart(2, '0');
+	const minutes = String(absOffset % 60).padStart(2, '0');
+	return `${sign}${hours}:${minutes}`;
+}
+
+export function formatWithTimezone(
+	dateValue?: string | dayjs.Dayjs,
+	timezone?: string,
+): string {
+	const parsedDate =
+		typeof dateValue === 'string' ? dateValue : dateValue?.format();
+
+	// Get the target timezone offset
+	const targetOffset = convertUtcOffsetToTimezoneOffset(
+		dayjs(dateValue).tz(timezone).utcOffset(),
+	);
+
+	return `${parsedDate?.substring(0, 19)}${targetOffset}`;
+}
+
+export function handleTimeConversion(
+	dateValue: string | dayjs.Dayjs,
+	timezoneInit?: string,
+	timezone?: string,
+	shouldKeepLocalTime?: boolean,
+): string {
+	const timezoneChanged = !isEqual(timezoneInit, timezone);
+	const initialTime = dayjs(dateValue).tz(timezoneInit);
+
+	const formattedTime = formatWithTimezone(initialTime, timezone);
+	return timezoneChanged
+		? formattedTime
+		: dayjs(dateValue).tz(timezone, shouldKeepLocalTime).format();
+}

frontend/src/container/PlannedDowntime/__test__/PlannedDowntime.test.tsx

@@ -27,10 +27,10 @@ const MOCK_DATE_3 = '2024-01-03';
 const MOCK_DOWNTIME_1 = createMockDowntime({
 	id: '1',
 	name: MOCK_DOWNTIME_1_NAME,
-	createdAt: MOCK_DATE_1,
-	updatedAt: MOCK_DATE_1,
+	createdAt: new Date(MOCK_DATE_1),
+	updatedAt: new Date(MOCK_DATE_1),
 	schedule: buildSchedule({
-		startTime: MOCK_DATE_1,
+		startTime: new Date(MOCK_DATE_1),
 		timezone: 'UTC',
 	}),
 	alertIds: [],
@@ -39,10 +39,10 @@ const MOCK_DOWNTIME_1 = createMockDowntime({
 const MOCK_DOWNTIME_2 = createMockDowntime({
 	id: '2',
 	name: MOCK_DOWNTIME_2_NAME,
-	createdAt: MOCK_DATE_2,
-	updatedAt: MOCK_DATE_2,
+	createdAt: new Date(MOCK_DATE_2),
+	updatedAt: new Date(MOCK_DATE_2),
 	schedule: buildSchedule({
-		startTime: MOCK_DATE_2,
+		startTime: new Date(MOCK_DATE_2),
 		timezone: 'UTC',
 	}),
 	alertIds: [],
@@ -51,10 +51,10 @@ const MOCK_DOWNTIME_2 = createMockDowntime({
 const MOCK_DOWNTIME_3 = createMockDowntime({
 	id: '3',
 	name: MOCK_DOWNTIME_3_NAME,
-	createdAt: MOCK_DATE_3,
-	updatedAt: MOCK_DATE_3,
+	createdAt: new Date(MOCK_DATE_3),
+	updatedAt: new Date(MOCK_DATE_3),
 	schedule: buildSchedule({
-		startTime: MOCK_DATE_3,
+		startTime: new Date(MOCK_DATE_3),
 		timezone: 'UTC',
 	}),
 	alertIds: [],

frontend/src/container/PlannedDowntime/__test__/testUtils.ts

@@ -24,7 +24,7 @@ export const createMockDowntime = (
 	description: overrides.description ?? '',
 	schedule: buildSchedule({
 		timezone: 'UTC',
-		startTime: '2024-01-01',
+		startTime: new Date('2024-01-01'),
 		...overrides.schedule,
 	}),
 	alertIds: overrides.alertIds ?? [],

frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/SpanScopeSelector.tsx

@@ -16,31 +16,35 @@ enum SpanScope {
 	ENTRYPOINT_SPANS = 'entrypoint_spans',
 }
 
+interface SpanFilterConfig {
+	key: string;
+	type: string;
+}
+
 interface SpanScopeSelectorProps {
 	onChange?: (value: TagFilter) => void;
 	query?: IBuilderQuery;
 	skipQueryBuilderRedirect?: boolean;
 }
 
-const SPAN_FILTER_KEY: Record<SpanScope, string | null> = {
+const SPAN_FILTER_CONFIG: Record<SpanScope, SpanFilterConfig | null> = {
 	[SpanScope.ALL_SPANS]: null,
-	[SpanScope.ROOT_SPANS]: 'isRoot',
-	[SpanScope.ENTRYPOINT_SPANS]: 'isEntryPoint',
+	[SpanScope.ROOT_SPANS]: {
+		key: 'isRoot',
+		type: 'spanSearchScope',
+	},
+	[SpanScope.ENTRYPOINT_SPANS]: {
+		key: 'isEntryPoint',
+		type: 'spanSearchScope',
+	},
 };
 
-const SCOPE_FILTER_KEYS = Object.values(SPAN_FILTER_KEY).filter(
-	(key): key is string => key !== null,
-);
-
-const isScopeFilter = (filter: TagFilterItem, key: string): boolean =>
-	filter.key?.key === key && String(filter.value) === 'true';
-
-const createFilterItem = (key: string): TagFilterItem => ({
+const createFilterItem = (config: SpanFilterConfig): TagFilterItem => ({
 	id: uuid().slice(0, 8),
 	key: {
-		key,
+		key: config.key,
 		dataType: undefined,
-		type: '',
+		type: config?.type,
 	},
 	op: '=',
 	value: 'true',
@@ -66,7 +70,12 @@ function SpanScopeSelector({
 		filters: TagFilterItem[] = [],
 	): SpanScope => {
 		const hasFilter = (key: string): boolean =>
-			filters?.some((filter) => isScopeFilter(filter, key));
+			filters?.some(
+				(filter) =>
+					filter.key?.type === 'spanSearchScope' &&
+					filter.key.key === key &&
+					filter.value === 'true',
+			);
 
 		if (hasFilter('isRoot')) {
 			return SpanScope.ROOT_SPANS;
@@ -104,21 +113,28 @@ function SpanScopeSelector({
 
 			const nonScopeFilters = currentFilters.filter(
 				(filter) =>
-					!SCOPE_FILTER_KEYS.some((scopeKey) => isScopeFilter(filter, scopeKey)),
+					!(
+						filter.key?.type === 'spanSearchScope' &&
+						(filter.key.key === 'isRoot' || filter.key.key === 'isEntryPoint')
+					),
 			);
 
-			const scopeKey = SPAN_FILTER_KEY[newScope];
-			const newScopeFilter = scopeKey !== null ? [createFilterItem(scopeKey)] : [];
+			const config = SPAN_FILTER_CONFIG[newScope];
+			const newScopeFilter = config !== null ? [createFilterItem(config)] : [];
 
 			return [...nonScopeFilters, ...newScopeFilter];
 		};
 
+		const keysToRemove = Object.values(SPAN_FILTER_CONFIG)
+			.map((config) => config?.key)
+			.filter((key): key is string => typeof key === 'string');
+
 		newQuery.builder.queryData = newQuery.builder.queryData.map((item) => ({
 			...item,
 			filter: {
 				expression: removeKeysFromExpression(
 					item.filter?.expression ?? '',
-					SCOPE_FILTER_KEYS,
+					keysToRemove,
 				),
 			},
 			filters: {

frontend/src/container/QueryBuilder/filters/QueryBuilderSearchV2/__test__/SpanScopeSelector.test.tsx

@@ -20,16 +20,12 @@ import SpanScopeSelector from '../SpanScopeSelector';
 
 const mockRedirectWithQueryBuilderData = jest.fn();
 
-const SCOPE_KEYS = ['isRoot', 'isEntryPoint'];
-const isScopeFilter = (filter: TagFilterItem): boolean =>
-	SCOPE_KEYS.includes(filter.key?.key ?? '') && String(filter.value) === 'true';
-
 // Helper to create filter items
 const createSpanScopeFilter = (key: string): TagFilterItem => ({
 	id: 'span-filter',
 	key: {
 		key,
-		type: '',
+		type: 'spanSearchScope',
 	},
 	op: '=',
 	value: 'true',
@@ -147,6 +143,7 @@ describe('SpanScopeSelector', () => {
 				expect.objectContaining({
 					key: expect.objectContaining({
 						key: expectedKey,
+						type: 'spanSearchScope',
 					}),
 					op: '=',
 					value: 'true',
@@ -165,7 +162,11 @@ describe('SpanScopeSelector', () => {
 			expect(mockRedirectWithQueryBuilderData).toHaveBeenCalled();
 			const updatedQuery = mockRedirectWithQueryBuilderData.mock.calls[0][0];
 			const filters = updatedQuery.builder.queryData[0].filters.items;
-			expect(filters.some(isScopeFilter)).toBe(false);
+			expect(filters).not.toContainEqual(
+				expect.objectContaining({
+					key: expect.objectContaining({ type: 'spanSearchScope' }),
+				}),
+			);
 		});
 
 		it('should add isRoot filter when selecting ROOT_SPANS', async () => {
@@ -205,27 +206,6 @@ describe('SpanScopeSelector', () => {
 				await expect(screen.findByText(expectedText)).resolves.toBeInTheDocument();
 			},
 		);
-
-		// Round-trip from filter.expression can deserialize the value as a boolean
-		// `true` (unquoted in the expression) instead of the string `'true'` produced
-		// by the dropdown. The dropdown must still recognize that as the scope filter.
-		it.each([
-			['Root Spans', 'isRoot'],
-			['Entrypoint Spans', 'isEntryPoint'],
-		])(
-			'should initialize with %s selected when %s = true (boolean value)',
-			async (expectedText, filterKey) => {
-				const booleanScopeFilter: TagFilterItem = {
-					id: 'span-filter',
-					key: { key: filterKey, type: '' },
-					op: '=',
-					value: true as unknown as string,
-				};
-				const queryWithFilter = createQueryWithFilters([booleanScopeFilter]);
-				renderWithContext(queryWithFilter, undefined, defaultQueryBuilderQuery);
-				await expect(screen.findByText(expectedText)).resolves.toBeInTheDocument();
-			},
-		);
 	});
 
 	describe('when onChange and query props are provided', () => {
@@ -253,7 +233,9 @@ describe('SpanScopeSelector', () => {
 				expect(items).toContainEqual(nonScopeItem);
 			});
 
-			const scopeFiltersInPayload = items.filter(isScopeFilter);
+			const scopeFiltersInPayload = items.filter(
+				(filter) => filter.key?.type === 'spanSearchScope',
+			);
 
 			if (expectedScopeKey) {
 				expect(scopeFiltersInPayload).toHaveLength(1);
@@ -452,7 +434,9 @@ describe('SpanScopeSelector', () => {
 				items: [],
 			};
 			// Count non-scope filters
-			const nonScopeFilters = items.filter((filter) => !isScopeFilter(filter));
+			const nonScopeFilters = items.filter(
+				(filter) => filter.key?.type !== 'spanSearchScope',
+			);
 			expect(nonScopeFilters).toHaveLength(1);
 
 			expect(nonScopeFilters).toContainEqual(

frontend/src/container/RolesSettings/RoleDetails/RoleDetailsPage.tsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from 'react';
 import { useQueryClient } from 'react-query';
-import { Redirect, useHistory, useLocation } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { Trash2 } from '@signozhq/icons';
 import { Button } from '@signozhq/ui/button';
 import { toast } from '@signozhq/ui/sonner';
@@ -21,7 +21,6 @@ import {
 	buildRoleUpdatePermission,
 } from 'hooks/useAuthZ/permissions/role.permissions';
 import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
-import { useRolesFeatureGate } from 'hooks/useRolesFeatureGate';
 
 import type { AuthzResources } from '../utils';
 import ErrorInPlace from 'components/ErrorInPlace/ErrorInPlace';
@@ -53,10 +52,8 @@ function RoleDetailsPage(): JSX.Element {
 
 	const queryClient = useQueryClient();
 	const { showErrorModal } = useErrorModal();
-	const { isRolesEnabled, isLoading: isRolesGateLoading } =
-		useRolesFeatureGate();
 
-	const authzResources: AuthzResources = permissionsType.data;
+	const authzResources = permissionsType.data as unknown as AuthzResources;
 
 	// Extract roleId from URL pathname since useParams doesn't work in nested routing
 	const roleIdMatch = pathname.match(ROLE_ID_REGEX);
@@ -161,22 +158,6 @@ function RoleDetailsPage(): JSX.Element {
 		},
 	});
 
-	if (isRolesGateLoading) {
-		return (
-			<div className="role-details-page">
-				<Skeleton
-					active
-					paragraph={{ rows: 8 }}
-					className="role-details-skeleton"
-				/>
-			</div>
-		);
-	}
-
-	if (!isRolesEnabled) {
-		return <Redirect to={ROUTES.ROLES_SETTINGS} />;
-	}
-
 	if (!hasReadPermission && readPerms !== null) {
 		return <PermissionDeniedFullPage permissionName="role:read" />;
 	}

frontend/src/container/RolesSettings/RoleDetails/__tests__/RoleDetailsPage.test.tsx

@@ -5,9 +5,7 @@ import {
 } from 'mocks-server/__mockdata__/roles';
 import { server } from 'mocks-server/server';
 import { rest } from 'msw';
-import { Route, Switch } from 'react-router-dom';
 import {
-	defaultFeatureFlags,
 	fireEvent,
 	render,
 	screen,
@@ -15,10 +13,8 @@ import {
 	waitFor,
 	within,
 } from 'tests/test-utils';
-import { FeatureKeys } from 'constants/features';
 import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
 import {
-	invalidLicense,
 	mockUseAuthZDenyAll,
 	mockUseAuthZGrantAll,
 } from 'tests/authz-test-utils';
@@ -234,56 +230,6 @@ describe('RoleDetailsPage', () => {
 		).resolves.toBeInTheDocument();
 	});
 
-	it('redirects to the roles list when license is not valid', async () => {
-		render(
-			<Switch>
-				<Route path="/settings/roles/:roleId">
-					<RoleDetailsPage />
-				</Route>
-				<Route path="/settings/roles" exact>
-					<div data-testid="roles-list-redirect-target" />
-				</Route>
-			</Switch>,
-			undefined,
-			{
-				initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}`,
-				appContextOverrides: { activeLicense: invalidLicense },
-			},
-		);
-
-		await expect(
-			screen.findByTestId('roles-list-redirect-target'),
-		).resolves.toBeInTheDocument();
-	});
-
-	it('redirects to the roles list when fine-grained authz flag is inactive', async () => {
-		render(
-			<Switch>
-				<Route path="/settings/roles/:roleId">
-					<RoleDetailsPage />
-				</Route>
-				<Route path="/settings/roles" exact>
-					<div data-testid="roles-list-redirect-target" />
-				</Route>
-			</Switch>,
-			undefined,
-			{
-				initialRoute: `/settings/roles/${CUSTOM_ROLE_ID}`,
-				appContextOverrides: {
-					featureFlags: defaultFeatureFlags.map((f) =>
-						f.name === FeatureKeys.USE_FINE_GRAINED_AUTHZ
-							? { ...f, active: false }
-							: f,
-					),
-				},
-			},
-		);
-
-		await expect(
-			screen.findByTestId('roles-list-redirect-target'),
-		).resolves.toBeInTheDocument();
-	});
-
 	describe('permission side panel', () => {
 		beforeEach(() => {
 			// Both hooks mocked so data renders synchronously — no React Query scheduler or MSW round-trip.

frontend/src/container/RolesSettings/RolesComponents/RolesListingTable.tsx

@@ -9,7 +9,6 @@ import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import ROUTES from 'constants/routes';
 import { RoleListPermission } from 'hooks/useAuthZ/permissions/role.permissions';
 import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
-import { useRolesFeatureGate } from 'hooks/useRolesFeatureGate';
 import useUrlQuery from 'hooks/useUrlQuery';
 import LineClampedText from 'periscope/components/LineClampedText/LineClampedText';
 import { useTimezone } from 'providers/Timezone';
@@ -31,8 +30,6 @@ interface RolesListingTableProps {
 function RolesListingTable({
 	searchQuery,
 }: RolesListingTableProps): JSX.Element {
-	const { isRolesEnabled } = useRolesFeatureGate();
-
 	const { permissions: listPerms, isLoading: isAuthZLoading } = useAuthZ([
 		RoleListPermission,
 	]);
@@ -206,27 +203,19 @@ function RolesListingTable({
 	const renderRow = (role: AuthtypesRoleDTO): JSX.Element => (
 		<div
 			key={role.id}
-			className={`roles-table-row${isRolesEnabled ? ' roles-table-row--clickable' : ''}`}
-			role={isRolesEnabled ? 'button' : undefined}
-			tabIndex={isRolesEnabled ? 0 : undefined}
-			onClick={
-				isRolesEnabled
-					? (): void => {
-							if (role.id) {
-								navigateToRole(role.id, role.name);
-							}
-						}
-					: undefined
-			}
-			onKeyDown={
-				isRolesEnabled
-					? (e): void => {
-							if ((e.key === 'Enter' || e.key === ' ') && role.id) {
-								navigateToRole(role.id, role.name);
-							}
-						}
-					: undefined
-			}
+			className="roles-table-row roles-table-row--clickable"
+			role="button"
+			tabIndex={0}
+			onClick={(): void => {
+				if (role.id) {
+					navigateToRole(role.id, role.name);
+				}
+			}}
+			onKeyDown={(e): void => {
+				if ((e.key === 'Enter' || e.key === ' ') && role.id) {
+					navigateToRole(role.id, role.name);
+				}
+			}}
 		>
 			<div className="roles-table-cell roles-table-cell--name">
 				{role.name ?? '—'}

frontend/src/container/RolesSettings/RolesSettings.tsx

@@ -4,7 +4,6 @@ import { Button } from '@signozhq/ui/button';
 import { Input } from '@signozhq/ui/input';
 import AuthZTooltip from 'components/AuthZTooltip/AuthZTooltip';
 import { RoleCreatePermission } from 'hooks/useAuthZ/permissions/role.permissions';
-import { useRolesFeatureGate } from 'hooks/useRolesFeatureGate';
 
 import CreateRoleModal from './RolesComponents/CreateRoleModal';
 import RolesListingTable from './RolesComponents/RolesListingTable';
@@ -14,7 +13,6 @@ import './RolesSettings.styles.scss';
 function RolesSettings(): JSX.Element {
 	const [searchQuery, setSearchQuery] = useState('');
 	const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
-	const { isRolesEnabled } = useRolesFeatureGate();
 
 	return (
 		<div className="roles-settings" data-testid="roles-settings">
@@ -40,19 +38,17 @@ function RolesSettings(): JSX.Element {
 						value={searchQuery}
 						onChange={(e): void => setSearchQuery(e.target.value)}
 					/>
-					{isRolesEnabled && (
-						<AuthZTooltip checks={[RoleCreatePermission]}>
-							<Button
-								variant="solid"
-								color="primary"
-								className="role-settings-toolbar-button"
-								onClick={(): void => setIsCreateModalOpen(true)}
-							>
-								<Plus size={14} />
-								Custom role
-							</Button>
-						</AuthZTooltip>
-					)}
+					<AuthZTooltip checks={[RoleCreatePermission]}>
+						<Button
+							variant="solid"
+							color="primary"
+							className="role-settings-toolbar-button"
+							onClick={(): void => setIsCreateModalOpen(true)}
+						>
+							<Plus size={14} />
+							Custom role
+						</Button>
+					</AuthZTooltip>
 				</div>
 				<RolesListingTable searchQuery={searchQuery} />
 			</div>

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

@@ -4,15 +4,9 @@ import {
 } from 'mocks-server/__mockdata__/roles';
 import { server } from 'mocks-server/server';
 import { rest } from 'msw';
-import {
-	defaultFeatureFlags,
-	fireEvent,
-	render,
-	screen,
-} from 'tests/test-utils';
-import { FeatureKeys } from 'constants/features';
+import { fireEvent, render, screen } from 'tests/test-utils';
 import { useAuthZ } from 'hooks/useAuthZ/useAuthZ';
-import { invalidLicense, mockUseAuthZGrantAll } from 'tests/authz-test-utils';
+import { mockUseAuthZGrantAll } from 'tests/authz-test-utils';
 
 import RolesSettings from '../RolesSettings';
 
@@ -182,50 +176,6 @@ describe('RolesSettings', () => {
 		}
 	});
 
-	it('hides the create button and disables row clicks when fine-grained authz flag is inactive', async () => {
-		render(<RolesSettings />, undefined, {
-			appContextOverrides: {
-				featureFlags: defaultFeatureFlags.map((f) =>
-					f.name === FeatureKeys.USE_FINE_GRAINED_AUTHZ
-						? { ...f, active: false }
-						: f,
-				),
-			},
-		});
-
-		await expect(screen.findByText('signoz-admin')).resolves.toBeInTheDocument();
-
-		expect(
-			screen.queryByRole('button', { name: /custom role/i }),
-		).not.toBeInTheDocument();
-
-		const rows = document.querySelectorAll('.roles-table-row');
-		rows.forEach((row) => {
-			expect(row).not.toHaveClass('roles-table-row--clickable');
-			expect(row.getAttribute('role')).not.toBe('button');
-		});
-	});
-
-	it('hides the create button and disables row clicks when license is not valid', async () => {
-		render(<RolesSettings />, undefined, {
-			appContextOverrides: { activeLicense: invalidLicense },
-		});
-
-		await expect(screen.findByText('signoz-admin')).resolves.toBeInTheDocument();
-
-		// Create button must be absent
-		expect(
-			screen.queryByRole('button', { name: /custom role/i }),
-		).not.toBeInTheDocument();
-
-		// Rows must not carry the clickable class or button role
-		const rows = document.querySelectorAll('.roles-table-row');
-		rows.forEach((row) => {
-			expect(row).not.toHaveClass('roles-table-row--clickable');
-			expect(row.getAttribute('role')).not.toBe('button');
-		});
-	});
-
 	it('handles invalid dates gracefully by showing fallback', async () => {
 		const invalidRole = {
 			id: 'edge-0009',

frontend/src/container/RolesSettings/__tests__/utils.test.ts

@@ -1,4 +1,5 @@
 import type {
+	CoretypesResourceRefDTO,
 	CoretypesObjectGroupDTO,
 	CoretypesTypeDTO,
 } from 'api/generated/services/sigNoz.schemas';
@@ -7,7 +8,11 @@ import type {
 	PermissionConfig,
 	ResourceDefinition,
 } from '../PermissionSidePanel/PermissionSidePanel.types';
-import type { AuthzResources } from '../utils';
+
+type AuthzResources = {
+	resources: CoretypesResourceRefDTO[];
+	relations: Record<string, string[]>;
+};
 import { PermissionScope } from '../PermissionSidePanel/PermissionSidePanel.types';
 import {
 	buildConfig,
@@ -36,14 +41,12 @@ jest.mock('../RoleDetails/constants', () => {
 
 const dashboardResource: AuthzResources['resources'][number] = {
 	kind: 'dashboard',
-	type: 'metaresource',
-	allowedVerbs: ['create', 'read', 'update', 'delete', 'list'],
+	type: 'metaresource' as CoretypesTypeDTO,
 };
 
 const alertResource: AuthzResources['resources'][number] = {
 	kind: 'alert',
-	type: 'metaresource',
-	allowedVerbs: ['create', 'read', 'update', 'delete', 'list'],
+	type: 'metaresource' as CoretypesTypeDTO,
 };
 
 const baseAuthzResources: AuthzResources = {
@@ -54,16 +57,6 @@ const baseAuthzResources: AuthzResources = {
 	},
 };
 
-// API payload resource refs — only kind+type, no allowedVerbs (matches CoretypesResourceRefDTO shape)
-const dashboardResourceRef = {
-	kind: 'dashboard',
-	type: 'metaresource' as CoretypesTypeDTO,
-};
-const alertResourceRef = {
-	kind: 'alert',
-	type: 'metaresource' as CoretypesTypeDTO,
-};
-
 const resourceDefs: ResourceDefinition[] = [
 	{
 		id: 'metaresource:dashboard',
@@ -114,7 +107,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.additions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: [ID_B] },
+			{ resource: dashboardResource, selectors: [ID_B] },
 		]);
 		expect(result.deletions).toBeNull();
 	});
@@ -149,7 +142,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.deletions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: [ID_B] },
+			{ resource: dashboardResource, selectors: [ID_B] },
 		]);
 		expect(result.additions).toBeNull();
 	});
@@ -214,10 +207,10 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.deletions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: ['*'] },
+			{ resource: dashboardResource, selectors: ['*'] },
 		]);
 		expect(result.additions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: [ID_A, ID_B] },
+			{ resource: dashboardResource, selectors: [ID_A, ID_B] },
 		]);
 	});
 
@@ -248,7 +241,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.deletions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: ['*'] },
+			{ resource: dashboardResource, selectors: ['*'] },
 		]);
 		expect(result.additions).toBeNull();
 	});
@@ -271,7 +264,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.deletions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: ['*'] },
+			{ resource: dashboardResource, selectors: ['*'] },
 		]);
 		expect(result.additions).toBeNull();
 	});
@@ -294,7 +287,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.additions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: ['*'] },
+			{ resource: dashboardResource, selectors: ['*'] },
 		]);
 		expect(result.deletions).toBeNull();
 	});
@@ -320,7 +313,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.deletions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: [ID_A, ID_B] },
+			{ resource: dashboardResource, selectors: [ID_A, ID_B] },
 		]);
 		expect(result.additions).toBeNull();
 	});
@@ -346,7 +339,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.additions).toStrictEqual([
-			{ resource: dashboardResourceRef, selectors: [ID_A] },
+			{ resource: dashboardResource, selectors: [ID_A] },
 		]);
 		expect(result.deletions).toBeNull();
 	});
@@ -392,7 +385,7 @@ describe('buildPatchPayload', () => {
 		});
 
 		expect(result.additions).toStrictEqual([
-			{ resource: alertResourceRef, selectors: [ID_B] },
+			{ resource: alertResource, selectors: [ID_B] },
 		]);
 		expect(result.deletions).toBeNull();
 	});
@@ -401,7 +394,7 @@ describe('buildPatchPayload', () => {
 describe('objectsToPermissionConfig', () => {
 	it('maps a wildcard selector to ALL scope', () => {
 		const objects: CoretypesObjectGroupDTO[] = [
-			{ resource: dashboardResourceRef, selectors: ['*'] },
+			{ resource: dashboardResource, selectors: ['*'] },
 		];
 
 		const result = objectsToPermissionConfig(objects, resourceDefs);
@@ -414,7 +407,7 @@ describe('objectsToPermissionConfig', () => {
 
 	it('maps specific selectors to ONLY_SELECTED scope with the IDs', () => {
 		const objects: CoretypesObjectGroupDTO[] = [
-			{ resource: dashboardResourceRef, selectors: [ID_A, ID_B] },
+			{ resource: dashboardResource, selectors: [ID_A, ID_B] },
 		];
 
 		const result = objectsToPermissionConfig(objects, resourceDefs);
@@ -573,41 +566,4 @@ describe('deriveResourcesForRelation', () => {
 			deriveResourcesForRelation(baseAuthzResources, 'nonexistent'),
 		).toHaveLength(0);
 	});
-
-	describe('allowedVerbs filtering', () => {
-		it('excludes resources whose allowedVerbs does not include the relation', () => {
-			const authz: AuthzResources = {
-				resources: [
-					{
-						kind: 'dashboard',
-						type: 'metaresource',
-						allowedVerbs: ['create', 'read', 'update', 'delete', 'list'],
-					},
-					{
-						kind: 'alert',
-						type: 'metaresource',
-						allowedVerbs: ['create', 'read', 'update', 'delete', 'list', 'attach'],
-					},
-				],
-				relations: { attach: ['metaresource'] },
-			};
-
-			const result = deriveResourcesForRelation(authz, 'attach');
-
-			expect(result).toHaveLength(1);
-			expect(result[0].id).toBe('metaresource:alert');
-		});
-
-		it('requires both type-relation match and allowedVerbs — neither condition alone is sufficient', () => {
-			const authz: AuthzResources = {
-				resources: [
-					{ kind: 'dashboard', type: 'metaresource', allowedVerbs: ['read'] },
-					{ kind: 'role', type: 'role', allowedVerbs: ['create'] },
-				],
-				relations: { create: ['metaresource'] },
-			};
-
-			expect(deriveResourcesForRelation(authz, 'create')).toHaveLength(0);
-		});
-	});
 });

frontend/src/container/RolesSettings/utils.tsx

@@ -1,9 +1,8 @@
 import React from 'react';
 import { Badge } from '@signozhq/ui/badge';
 import type {
-	CoretypesObjectGroupDTO,
 	CoretypesResourceRefDTO,
-	CoretypesTypeDTO,
+	CoretypesObjectGroupDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { capitalize } from 'lodash-es';
@@ -22,11 +21,7 @@ import {
 } from './RoleDetails/constants';
 
 export type AuthzResources = {
-	resources: ReadonlyArray<{
-		kind: string;
-		type: string;
-		allowedVerbs: readonly string[];
-	}>;
+	resources: ReadonlyArray<CoretypesResourceRefDTO>;
 	relations: Readonly<Record<string, ReadonlyArray<string>>>;
 };
 
@@ -74,9 +69,7 @@ export function deriveResourcesForRelation(
 	}
 	const supportedTypes = authzResources.relations[relation] ?? [];
 	return authzResources.resources
-		.filter(
-			(r) => supportedTypes.includes(r.type) && r.allowedVerbs.includes(relation),
-		)
+		.filter((r) => supportedTypes.includes(r.type))
 		.map((r) => ({
 			id: `${r.type}:${r.kind}`,
 			kind: r.kind,
@@ -148,7 +141,7 @@ export function buildPatchPayload({
 		}
 		const resourceDef: CoretypesResourceRefDTO = {
 			kind: found.kind,
-			type: found.type as CoretypesTypeDTO,
+			type: found.type,
 		};
 
 		const initialScope = initial?.scope ?? PermissionScope.NONE;

frontend/src/hooks/queryBuilder/__tests__/useQueryBuilderOperations.test.ts

@@ -5,8 +5,7 @@ import {
 	BaseAutocompleteData,
 	DataTypes,
 } from 'types/api/queryBuilder/queryAutocompleteResponse';
-import { IBuilderQuery, Query } from 'types/api/queryBuilder/queryBuilderData';
-import { EQueryType } from 'types/common/dashboard';
+import { IBuilderQuery } from 'types/api/queryBuilder/queryBuilderData';
 import {
 	DataSource,
 	MetricAggregateOperator,
@@ -334,196 +333,3 @@ describe('useQueryBuilderOperations - Empty Aggregate Attribute Type', () => {
 		});
 	});
 });
-
-describe('useQueryBuilderOperations - handleChangeQueryData runAfterUpdate', () => {
-	const mockHandleSetQueryData = jest.fn();
-	const mockHandleSetTraceOperatorData = jest.fn();
-	const mockHandleRunQuery = jest.fn();
-
-	const baseQuery: IBuilderQuery = {
-		dataSource: DataSource.METRICS,
-		aggregateOperator: MetricAggregateOperator.AVG,
-		aggregateAttribute: {
-			key: 'system.cpu.load',
-			dataType: DataTypes.Float64,
-			type: ATTRIBUTE_TYPES.GAUGE,
-		} as BaseAutocompleteData,
-		timeAggregation: MetricAggregateOperator.AVG,
-		spaceAggregation: '',
-		aggregations: [],
-		having: [],
-		limit: null,
-		queryName: 'A',
-		functions: [],
-		filters: { items: [], op: 'AND' },
-		groupBy: [],
-		orderBy: [],
-		stepInterval: 60,
-		expression: '',
-		disabled: false,
-		reduceTo: ReduceOperators.AVG,
-		legend: '',
-	};
-
-	const otherQuery: IBuilderQuery = { ...baseQuery, queryName: 'B' };
-
-	const buildCurrentQuery = (): Query => ({
-		queryType: EQueryType.QUERY_BUILDER,
-		promql: [],
-		clickhouse_sql: [],
-		id: 'q-1',
-		unit: '',
-		builder: {
-			queryData: [baseQuery, otherQuery],
-			queryFormulas: [],
-			queryTraceOperator: [],
-		},
-	});
-
-	const setupMock = (overrides: Record<string, unknown> = {}): void => {
-		(useQueryBuilder as jest.Mock).mockReturnValue({
-			handleSetQueryData: mockHandleSetQueryData,
-			handleSetTraceOperatorData: mockHandleSetTraceOperatorData,
-			handleSetFormulaData: jest.fn(),
-			removeQueryBuilderEntityByIndex: jest.fn(),
-			setLastUsedQuery: jest.fn(),
-			redirectWithQueryBuilderData: jest.fn(),
-			handleRunQuery: mockHandleRunQuery,
-			panelType: 'time_series',
-			currentQuery: buildCurrentQuery(),
-			...overrides,
-		});
-	};
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		setupMock();
-	});
-
-	it('does not call handleRunQuery when options is omitted', () => {
-		const { result } = renderHook(() =>
-			useQueryOperations({
-				query: baseQuery,
-				index: 0,
-				entityVersion: ENTITY_VERSION_V4,
-			}),
-		);
-
-		act(() => {
-			result.current.handleChangeQueryData('legend', 'cpu-load');
-		});
-
-		expect(mockHandleSetQueryData).toHaveBeenCalledWith(
-			0,
-			expect.objectContaining({ legend: 'cpu-load' }),
-		);
-		expect(mockHandleRunQuery).not.toHaveBeenCalled();
-	});
-
-	it('calls handleRunQuery with the freshly-changed query when runAfterUpdate is true', () => {
-		const { result } = renderHook(() =>
-			useQueryOperations({
-				query: baseQuery,
-				index: 0,
-				entityVersion: ENTITY_VERSION_V4,
-			}),
-		);
-
-		act(() => {
-			result.current.handleChangeQueryData('disabled', true, {
-				runAfterUpdate: true,
-			});
-		});
-
-		expect(mockHandleSetQueryData).toHaveBeenCalledWith(
-			0,
-			expect.objectContaining({ disabled: true }),
-		);
-		expect(mockHandleRunQuery).toHaveBeenCalledTimes(1);
-		const [override] = mockHandleRunQuery.mock.calls[0];
-		// Index 0 reflects the new value...
-		expect(override.builder.queryData[0]).toStrictEqual(
-			expect.objectContaining({ queryName: 'A', disabled: true }),
-		);
-		// ...siblings stay untouched.
-		expect(override.builder.queryData[1]).toStrictEqual(
-			expect.objectContaining({ queryName: 'B', disabled: false }),
-		);
-	});
-
-	it('applies the change at the correct index without disturbing other queries', () => {
-		const { result } = renderHook(() =>
-			useQueryOperations({
-				query: otherQuery,
-				index: 1,
-				entityVersion: ENTITY_VERSION_V4,
-			}),
-		);
-
-		act(() => {
-			result.current.handleChangeQueryData(
-				'groupBy',
-				[
-					{
-						key: 'host.name',
-						type: 'tag',
-						dataType: DataTypes.String,
-					} as BaseAutocompleteData,
-				],
-				{ runAfterUpdate: true },
-			);
-		});
-
-		const [override] = mockHandleRunQuery.mock.calls[0];
-		expect(override.builder.queryData[0]).toStrictEqual(
-			expect.objectContaining({ queryName: 'A', groupBy: [] }),
-		);
-		expect(override.builder.queryData[1]).toStrictEqual(
-			expect.objectContaining({
-				queryName: 'B',
-				groupBy: [expect.objectContaining({ key: 'host.name' })],
-			}),
-		);
-	});
-
-	it('keeps handleSetQueryData and handleRunQuery in sync for legend formatting', () => {
-		const { result } = renderHook(() =>
-			useQueryOperations({
-				query: baseQuery,
-				index: 0,
-				entityVersion: ENTITY_VERSION_V4,
-			}),
-		);
-
-		act(() => {
-			result.current.handleChangeQueryData('legend', '{{service.name}}', {
-				runAfterUpdate: true,
-			});
-		});
-
-		const [override] = mockHandleRunQuery.mock.calls[0];
-		const setCallLegend = mockHandleSetQueryData.mock.calls[0][1].legend;
-		expect(override.builder.queryData[0].legend).toBe(setCallLegend);
-	});
-
-	it('does not call handleRunQuery for trace-operator queries (early return)', () => {
-		const { result } = renderHook(() =>
-			useQueryOperations({
-				query: baseQuery,
-				index: 0,
-				entityVersion: ENTITY_VERSION_V4,
-				isForTraceOperator: true,
-			}),
-		);
-
-		act(() => {
-			result.current.handleChangeQueryData('disabled', true, {
-				runAfterUpdate: true,
-			});
-		});
-
-		expect(mockHandleSetTraceOperatorData).toHaveBeenCalledTimes(1);
-		expect(mockHandleSetQueryData).not.toHaveBeenCalled();
-		expect(mockHandleRunQuery).not.toHaveBeenCalled();
-	});
-});

frontend/src/hooks/queryBuilder/useQueryBuilderOperations.ts

@@ -45,7 +45,6 @@ import {
 import {
 	HandleChangeFormulaData,
 	HandleChangeQueryData,
-	HandleChangeQueryDataOptions,
 	HandleChangeQueryDataV5,
 	UseQueryOperations,
 } from 'types/common/operations.types';
@@ -77,7 +76,6 @@ export const useQueryOperations: UseQueryOperations = ({
 		currentQuery,
 		setLastUsedQuery,
 		redirectWithQueryBuilderData,
-		handleRunQuery,
 	} = useQueryBuilder();
 
 	const [operators, setOperators] = useState<SelectOption<string, string>[]>([]);
@@ -532,7 +530,7 @@ export const useQueryOperations: UseQueryOperations = ({
 
 	const handleChangeQueryData: HandleChangeQueryData | HandleChangeQueryDataV5 =
 		useCallback(
-			(key: string, value: any, options?: HandleChangeQueryDataOptions) => {
+			(key: string, value: any) => {
 				const newQuery = {
 					...query,
 					[key]:
@@ -543,24 +541,8 @@ export const useQueryOperations: UseQueryOperations = ({
 
 				if (isForTraceOperator) {
 					handleSetTraceOperatorData(index, newQuery);
-					return;
-				}
-
-				handleSetQueryData(index, newQuery);
-
-				// `runAfterUpdate` lets callers stage-and-run inline. We pass the
-				// freshly-computed query straight to `handleRunQuery` because the
-				// setState above hasn't flushed yet.
-				if (options?.runAfterUpdate) {
-					handleRunQuery({
-						...currentQuery,
-						builder: {
-							...currentQuery.builder,
-							queryData: currentQuery.builder.queryData.map((item, i) =>
-								i === index ? newQuery : item,
-							),
-						},
-					});
+				} else {
+					handleSetQueryData(index, newQuery);
 				}
 			},
 			[
@@ -569,8 +551,6 @@ export const useQueryOperations: UseQueryOperations = ({
 				handleSetQueryData,
 				handleSetTraceOperatorData,
 				isForTraceOperator,
-				handleRunQuery,
-				currentQuery,
 			],
 		);
 

frontend/src/hooks/useRolesFeatureGate.ts

@@ -1,27 +0,0 @@
-import { FeatureKeys } from 'constants/features';
-import { useAppContext } from 'providers/App/App';
-import { LicenseStatus } from 'types/api/licensesV3/getActive';
-
-export const useRolesFeatureGate = (): {
-	isRolesEnabled: boolean;
-	isLoading: boolean;
-} => {
-	const {
-		activeLicense,
-		featureFlags,
-		isFetchingActiveLicense,
-		isFetchingFeatureFlags,
-	} = useAppContext();
-
-	const isValidLicense = activeLicense?.status === LicenseStatus.VALID;
-	const isFineGrainedAuthzEnabled =
-		featureFlags?.find((f) => f.name === FeatureKeys.USE_FINE_GRAINED_AUTHZ)
-			?.active ?? false;
-
-	return {
-		isRolesEnabled: isValidLicense && isFineGrainedAuthzEnabled,
-		isLoading:
-			(isFetchingActiveLicense && !activeLicense) ||
-			(isFetchingFeatureFlags && !featureFlags),
-	};
-};