Merge branch 'main' into nv/schema-changes

fix: reject single-element list default when allowMultiple is false in list variables
2026-06-23 16:40:35 +01:00 · 2026-06-18 21:09:40 +05:30 · 2026-06-18 21:08:36 +05:30 · 2026-06-18 20:54:49 +05:30 · 2026-06-18 20:54:16 +05:30 · 2026-06-18 19:50:30 +05:30
267 changed files with 3283 additions and 12023 deletions
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -189,82 +189,6 @@ go.mod @therealpandey
 /frontend/src/container/TriggeredAlerts/ @SigNoz/pulse-frontend
 /frontend/src/container/AnomalyAlertEvaluationView/ @SigNoz/pulse-frontend

-## Notification Channels
-/frontend/src/pages/ChannelsEdit/ @SigNoz/pulse-frontend
-/frontend/src/pages/ChannelsNew/ @SigNoz/pulse-frontend
-/frontend/src/container/AllAlertChannels/ @SigNoz/pulse-frontend
-/frontend/src/container/CreateAlertChannels/ @SigNoz/pulse-frontend
-/frontend/src/container/EditAlertChannels/ @SigNoz/pulse-frontend
-
 ## OpenAPI Schema - Generated
 /frontend/src/api/generated/services/ @therealpandey @vikrantgupta25 @srikanthccv
 /docs/api/openapi.yml @therealpandey @vikrantgupta25 @srikanthccv
-
-## Logs
-/frontend/src/pages/Logs/ @SigNoz/events-frontend
-/frontend/src/pages/LogsExplorer/ @SigNoz/events-frontend
-/frontend/src/pages/LogsModulePage/ @SigNoz/events-frontend
-/frontend/src/pages/LogsSettings/ @SigNoz/events-frontend
-/frontend/src/pages/LiveLogs/ @SigNoz/events-frontend
-/frontend/src/container/LogsExplorerChart/ @SigNoz/events-frontend
-/frontend/src/container/LogsExplorerContext/ @SigNoz/events-frontend
-/frontend/src/container/LogsExplorerList/ @SigNoz/events-frontend
-/frontend/src/container/LogsExplorerTable/ @SigNoz/events-frontend
-/frontend/src/container/LogsExplorerViews/ @SigNoz/events-frontend
-/frontend/src/container/LogsFilters/ @SigNoz/events-frontend
-/frontend/src/container/LogsSearchFilter/ @SigNoz/events-frontend
-/frontend/src/container/LogsTable/ @SigNoz/events-frontend
-/frontend/src/container/LogsAggregate/ @SigNoz/events-frontend
-/frontend/src/container/LogsContextList/ @SigNoz/events-frontend
-/frontend/src/container/LogsIndexToFields/ @SigNoz/events-frontend
-/frontend/src/container/LogsLoading/ @SigNoz/events-frontend
-/frontend/src/container/LogsPanelTable/ @SigNoz/events-frontend
-/frontend/src/container/LogControls/ @SigNoz/events-frontend
-/frontend/src/container/LogDetailedView/ @SigNoz/events-frontend
-/frontend/src/container/LogExplorerQuerySection/ @SigNoz/events-frontend
-/frontend/src/container/LogLiveTail/ @SigNoz/events-frontend
-/frontend/src/container/LiveLogs/ @SigNoz/events-frontend
-/frontend/src/container/EmptyLogsSearch/ @SigNoz/events-frontend
-/frontend/src/container/NoLogs/ @SigNoz/events-frontend
-/frontend/src/components/Logs/ @SigNoz/events-frontend
-/frontend/src/components/LogDetail/ @SigNoz/events-frontend
-/frontend/src/components/LogsFormatOptionsMenu/ @SigNoz/events-frontend
-/frontend/src/hooks/logs/ @SigNoz/events-frontend
-
-## Logs Pipelines
-/frontend/src/pages/Pipelines/ @SigNoz/events-frontend
-/frontend/src/container/PipelinePage/ @SigNoz/events-frontend
-
-## Traces / Trace Explorer
-/frontend/src/pages/Trace/ @SigNoz/events-frontend
-/frontend/src/pages/TracesExplorer/ @SigNoz/events-frontend
-/frontend/src/pages/TracesModulePage/ @SigNoz/events-frontend
-/frontend/src/container/Trace/ @SigNoz/events-frontend
-/frontend/src/container/TracesExplorer/ @SigNoz/events-frontend
-/frontend/src/container/TracesTableComponent/ @SigNoz/events-frontend
-
-## Trace Funnels
-/frontend/src/pages/TracesFunnels/ @SigNoz/events-frontend
-/frontend/src/pages/TracesFunnelDetails/ @SigNoz/events-frontend
-/frontend/src/hooks/TracesFunnels/ @SigNoz/events-frontend
-
-## Trace Details
-/frontend/src/pages/TraceDetailsV3/ @SigNoz/events-frontend
-/frontend/src/pages/TraceDetailOldRedirect/ @SigNoz/events-frontend
-/frontend/src/hooks/trace/ @SigNoz/events-frontend
-
-## Exceptions
-/frontend/src/pages/AllErrors/ @SigNoz/events-frontend
-/frontend/src/pages/ErrorDetails/ @SigNoz/events-frontend
-/frontend/src/container/AllError/ @SigNoz/events-frontend
-/frontend/src/container/ErrorDetails/ @SigNoz/events-frontend
-
-## External APIs
-/frontend/src/pages/ApiMonitoring/ @SigNoz/events-frontend
-/frontend/src/container/ApiMonitoring/ @SigNoz/events-frontend
-
-## Messaging Queues
-/frontend/src/pages/MessagingQueues/ @SigNoz/events-frontend
-/frontend/src/components/MessagingQueues/ @SigNoz/events-frontend
-/frontend/src/components/MessagingQueueHealthCheck/ @SigNoz/events-frontend
-/frontend/src/hooks/messagingQueue/ @SigNoz/events-frontend
--- a/.github/workflows/goci.yaml
+++ b/.github/workflows/goci.yaml
@@ -140,20 +140,3 @@ jobs:
        run: |
          go run cmd/enterprise/*.go generate config web-settings
          git diff --compact-summary --exit-code || (echo; echo "Unexpected difference in web settings schema. Run go run cmd/enterprise/*.go generate config web-settings locally and commit."; exit 1)
-  transaction-groups:
-    if: |
-      github.event_name == 'merge_group' ||
-      (github.event_name == 'pull_request' && ! github.event.pull_request.head.repo.fork && github.event.pull_request.user.login != 'dependabot[bot]' && ! contains(github.event.pull_request.labels.*.name, 'safe-to-test')) ||
-      (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'safe-to-test'))
-    runs-on: ubuntu-latest
-    steps:
-      - name: self-checkout
-        uses: actions/checkout@v4
-      - name: go-install
-        uses: actions/setup-go@v5
-        with:
-          go-version: "1.24"
-      - name: generate-transaction-groups
-        run: |
-          go run cmd/enterprise/*.go generate config transaction-groups
-          git diff --compact-summary --exit-code || (echo; echo "Unexpected difference in transaction groups schema. Run go run cmd/enterprise/*.go generate config transaction-groups locally and commit."; exit 1)
--- a/cmd/genconfig.go
+++ b/cmd/genconfig.go
@@ -6,7 +6,6 @@ import (
 	"reflect"
 	"strings"

-	"github.com/SigNoz/signoz/pkg/types/authtypes"
 	"github.com/SigNoz/signoz/pkg/web"
 	"github.com/spf13/cobra"
 	"github.com/swaggest/jsonschema-go"
@@ -14,8 +13,6 @@ import (

 const webSettingsSchemaPath = "docs/config/web-settings.json"

-const transactionGroupsSchemaPath = "frontend/src/api/generated/transactionGroups.schema.json"
-
 func registerGenerateConfig(parentCmd *cobra.Command) {
 	configCmd := &cobra.Command{
 		Use:   "config",
@@ -30,14 +27,6 @@ func registerGenerateConfig(parentCmd *cobra.Command) {
 		},
 	})

-	configCmd.AddCommand(&cobra.Command{
-		Use:   "transaction-groups",
-		Short: "Generate JSON Schema for transaction groups",
-		RunE: func(currCmd *cobra.Command, args []string) error {
-			return generateTransactionGroups()
-		},
-	})
-
 	parentCmd.AddCommand(configCmd)
 }

@@ -70,30 +59,3 @@ func generateWebSettings() error {

 	return os.WriteFile(webSettingsSchemaPath, append(data, '\n'), 0o600)
 }
-
-func generateTransactionGroups() error {
-	falseVal := false
-	noAdditional := jsonschema.SchemaOrBool{TypeBoolean: &falseVal}
-
-	reflector := jsonschema.Reflector{}
-	reflector.DefaultOptions = append(reflector.DefaultOptions,
-		jsonschema.InterceptSchema(func(params jsonschema.InterceptSchemaParams) (bool, error) {
-			if params.Value.Kind() == reflect.Struct {
-				params.Schema.AdditionalProperties = &noAdditional
-			}
-			return false, nil
-		}),
-	)
-
-	schema, err := reflector.Reflect(authtypes.TransactionGroups{})
-	if err != nil {
-		return err
-	}
-
-	data, err := json.MarshalIndent(schema, "", "  ")
-	if err != nil {
-		return err
-	}
-
-	return os.WriteFile(transactionGroupsSchemaPath, append(data, '\n'), 0o600)
-}
--- a/docs/api/openapi.yml
+++ b/docs/api/openapi.yml
@@ -647,41 +647,14 @@ components:
          type: string
        name:
          type: string
-        transactionGroups:
-          $ref: '#/components/schemas/AuthtypesTransactionGroups'
      required:
      - name
-      - description
-      - transactionGroups
      type: object
    AuthtypesPostableRotateToken:
      properties:
        refreshToken:
          type: string
      type: object
-    AuthtypesPostableUser:
-      properties:
-        displayName:
-          type: string
-        email:
-          type: string
-        frontendBaseUrl:
-          type: string
-        userRoles:
-          items:
-            $ref: '#/components/schemas/AuthtypesPostableUserRole'
-          type: array
-      required:
-      - email
-      - userRoles
-      type: object
-    AuthtypesPostableUserRole:
-      properties:
-        id:
-          type: string
-      required:
-      - id
-      type: object
    AuthtypesRelation:
      enum:
      - create
@@ -730,34 +703,6 @@ components:
        useRoleAttribute:
          type: boolean
      type: object
-    AuthtypesRoleWithTransactionGroups:
-      properties:
-        createdAt:
-          format: date-time
-          type: string
-        description:
-          type: string
-        id:
-          type: string
-        name:
-          type: string
-        orgId:
-          type: string
-        transactionGroups:
-          $ref: '#/components/schemas/AuthtypesTransactionGroups'
-        type:
-          type: string
-        updatedAt:
-          format: date-time
-          type: string
-      required:
-      - id
-      - name
-      - description
-      - type
-      - orgId
-      - transactionGroups
-      type: object
    AuthtypesSamlConfig:
      properties:
        attributeMapping:
@@ -791,35 +736,11 @@ components:
      - relation
      - object
      type: object
-    AuthtypesTransactionGroup:
-      properties:
-        objectGroup:
-          $ref: '#/components/schemas/CoretypesObjectGroup'
-        relation:
-          $ref: '#/components/schemas/AuthtypesRelation'
-      required:
-      - relation
-      - objectGroup
-      type: object
-    AuthtypesTransactionGroups:
-      items:
-        $ref: '#/components/schemas/AuthtypesTransactionGroup'
-      type: array
    AuthtypesUpdatableAuthDomain:
      properties:
        config:
          $ref: '#/components/schemas/AuthtypesAuthDomainConfig'
      type: object
-    AuthtypesUpdatableRole:
-      properties:
-        description:
-          type: string
-        transactionGroups:
-          $ref: '#/components/schemas/AuthtypesTransactionGroups'
-      required:
-      - description
-      - transactionGroups
-      type: object
    AuthtypesUserRole:
      properties:
        createdAt:
@@ -2516,17 +2437,6 @@ components:
        url:
          type: string
      type: object
-    DashboardTextVariableSpec:
-      properties:
-        constant:
-          type: boolean
-        display:
-          $ref: '#/components/schemas/VariableDisplay'
-        name:
-          type: string
-        value:
-          type: string
-      type: object
    DashboardtypesAxes:
      properties:
        isLogScale:
@@ -2891,9 +2801,15 @@ components:
            type: string
          nullable: true
          type: object
+        mode:
+          $ref: '#/components/schemas/DashboardtypesLegendMode'
        position:
          $ref: '#/components/schemas/DashboardtypesLegendPosition'
      type: object
+    DashboardtypesLegendMode:
+      enum:
+      - list
+      type: string
    DashboardtypesLegendPosition:
      enum:
      - bottom
@@ -2944,15 +2860,25 @@ components:
        display:
          $ref: '#/components/schemas/DashboardtypesDisplay'
        name:
+          minLength: 1
          type: string
        plugin:
          $ref: '#/components/schemas/DashboardtypesVariablePlugin'
        sort:
-          nullable: true
-          type: string
+          $ref: '#/components/schemas/DashboardtypesListVariableSpecSort'
      required:
-      - display
+      - name
      type: object
+    DashboardtypesListVariableSpecSort:
+      enum:
+      - none
+      - alphabetical-asc
+      - alphabetical-desc
+      - numerical-asc
+      - numerical-desc
+      - alphabetical-ci-asc
+      - alphabetical-ci-desc
+      type: string
    DashboardtypesListableDashboardForUserV2:
      properties:
        dashboards:
@@ -3462,8 +3388,13 @@ components:
    DashboardtypesSpanGaps:
      properties:
        fillLessThan:
+          description: The maximum gap size to connect when fillOnlyBelow is true.
+            Gaps larger than this duration are left disconnected.
          type: string
        fillOnlyBelow:
+          description: Controls whether lines connect across null values. When false
+            (default), all gaps are connected. When true, only gaps smaller than fillLessThan
+            are connected.
          type: boolean
      type: object
    DashboardtypesStorableDashboardData:
@@ -3511,6 +3442,20 @@ components:
      - color
      - columnName
      type: object
+    DashboardtypesTextVariableSpec:
+      properties:
+        constant:
+          type: boolean
+        display:
+          $ref: '#/components/schemas/DashboardtypesDisplay'
+        name:
+          minLength: 1
+          type: string
+        value:
+          type: string
+      required:
+      - name
+      type: object
    DashboardtypesThresholdFormat:
      enum:
      - text
@@ -3530,7 +3475,6 @@ components:
      required:
      - value
      - color
-      - label
      type: object
    DashboardtypesTimePreference:
      enum:
@@ -3615,23 +3559,11 @@ components:
      discriminator:
        mapping:
          ListVariable: '#/components/schemas/DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesListVariableSpec'
-          TextVariable: '#/components/schemas/DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpec'
+          TextVariable: '#/components/schemas/DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpec'
        propertyName: kind
      oneOf:
      - $ref: '#/components/schemas/DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesListVariableSpec'
-      - $ref: '#/components/schemas/DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpec'
-      type: object
-    DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpec:
-      properties:
-        kind:
-          enum:
-          - TextVariable
-          type: string
-        spec:
-          $ref: '#/components/schemas/DashboardTextVariableSpec'
-      required:
-      - kind
-      - spec
+      - $ref: '#/components/schemas/DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpec'
      type: object
    DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesListVariableSpec:
      properties:
@@ -3645,6 +3577,18 @@ components:
      - kind
      - spec
      type: object
+    DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpec:
+      properties:
+        kind:
+          enum:
+          - TextVariable
+          type: string
+        spec:
+          $ref: '#/components/schemas/DashboardtypesTextVariableSpec'
+      required:
+      - kind
+      - spec
+      type: object
    DashboardtypesVariablePlugin:
      discriminator:
        mapping:
@@ -7730,15 +7674,6 @@ components:
      type: object
    VariableDefaultValue:
      type: object
-    VariableDisplay:
-      properties:
-        description:
-          type: string
-        hidden:
-          type: boolean
-        name:
-          type: string
-      type: object
    ZeustypesGettableHost:
      properties:
        hosts:
@@ -10206,7 +10141,7 @@ paths:
      - global
  /api/v1/invite:
    post:
-      deprecated: true
+      deprecated: false
      description: This endpoint creates an invite for a user
      operationId: CreateInvite
      requestBody:
@@ -10269,7 +10204,7 @@ paths:
      - users
  /api/v1/invite/bulk:
    post:
-      deprecated: true
+      deprecated: false
      description: This endpoint creates a bulk invite for a user
      operationId: CreateBulkInvite
      requestBody:
@@ -10332,15 +10267,6 @@ paths:
        name: limit
        schema:
          type: integer
-      - in: query
-        name: q
-        schema:
-          type: string
-      - in: query
-        name: isOverride
-        schema:
-          nullable: true
-          type: boolean
      responses:
        "200":
          content:
@@ -11146,7 +11072,7 @@ paths:
              schema:
                properties:
                  data:
-                    $ref: '#/components/schemas/AuthtypesRoleWithTransactionGroups'
+                    $ref: '#/components/schemas/AuthtypesRole'
                  status:
                    type: string
                required:
@@ -11181,7 +11107,7 @@ paths:
      tags:
      - role
    patch:
-      deprecated: true
+      deprecated: false
      description: This endpoint patches a role
      operationId: PatchRole
      parameters:
@@ -11242,68 +11168,6 @@ paths:
      summary: Patch role
      tags:
      - role
-    put:
-      deprecated: false
-      description: This endpoint updates a role
-      operationId: UpdateRole
-      parameters:
-      - in: path
-        name: id
-        required: true
-        schema:
-          type: string
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/AuthtypesUpdatableRole'
-      responses:
-        "204":
-          description: No Content
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "404":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Not Found
-        "451":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unavailable For Legal Reasons
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-        "501":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Not Implemented
-      security:
-      - api_key:
-        - role:update
-      - tokenizer:
-        - role:update
-      summary: Update role
-      tags:
-      - role
  /api/v1/roles/{id}/relations/{relation}/objects:
    get:
      deprecated: false
@@ -11383,7 +11247,7 @@ paths:
      tags:
      - role
    patch:
-      deprecated: true
+      deprecated: false
      description: Patches the objects connected to the specified role via a given
        relation type
      operationId: PatchObjects
@@ -13110,7 +12974,7 @@ paths:
      - tracedetail
  /api/v1/user:
    get:
-      deprecated: true
+      deprecated: false
      description: This endpoint lists all users
      operationId: ListUsersDeprecated
      responses:
@@ -13203,7 +13067,7 @@ paths:
      tags:
      - users
    get:
-      deprecated: true
+      deprecated: false
      description: This endpoint returns the user by id
      operationId: GetUserDeprecated
      parameters:
@@ -13260,7 +13124,7 @@ paths:
      tags:
      - users
    put:
-      deprecated: true
+      deprecated: false
      description: This endpoint updates the user by id
      operationId: UpdateUserDeprecated
      parameters:
@@ -13329,7 +13193,7 @@ paths:
      - users
  /api/v1/user/me:
    get:
-      deprecated: true
+      deprecated: false
      description: This endpoint returns the user I belong to
      operationId: GetMyUserDeprecated
      responses:
@@ -20745,68 +20609,6 @@ paths:
      summary: List users v2
      tags:
      - users
-    post:
-      deprecated: false
-      description: This endpoint creates a user for the organization
-      operationId: CreateUser
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/AuthtypesPostableUser'
-      responses:
-        "201":
-          content:
-            application/json:
-              schema:
-                properties:
-                  data:
-                    $ref: '#/components/schemas/TypesIdentifiable'
-                  status:
-                    type: string
-                required:
-                - status
-                - data
-                type: object
-          description: Created
-        "400":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Bad Request
-        "401":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Unauthorized
-        "403":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Forbidden
-        "409":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Conflict
-        "500":
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/RenderErrorResponse'
-          description: Internal Server Error
-      security:
-      - api_key:
-        - ADMIN
-      - tokenizer:
-        - ADMIN
-      summary: Create user
-      tags:
-      - users
  /api/v2/users/{id}:
    get:
      deprecated: false
--- a/ee/authz/openfgaauthz/provider.go
+++ b/ee/authz/openfgaauthz/provider.go
@@ -179,36 +179,13 @@ func (provider *provider) CreateManagedUserRoleTransactions(ctx context.Context,
 	return provider.Write(ctx, tuples, nil)
 }

-func (provider *provider) Create(ctx context.Context, orgID valuer.UUID, role *authtypes.RoleWithTransactionGroups) error {
+func (provider *provider) Create(ctx context.Context, orgID valuer.UUID, role *authtypes.Role) error {
 	_, err := provider.licensing.GetActive(ctx, orgID)
 	if err != nil {
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}

-	existingRole, err := provider.GetByOrgIDAndName(ctx, orgID, role.Name)
-	if err != nil && !errors.Asc(err, authtypes.ErrCodeRoleNotFound) {
-		return err
-	}
-
-	if existingRole != nil {
-		return errors.Newf(errors.TypeAlreadyExists, authtypes.ErrCodeRoleAlreadyExists, "role with name: %s already exists", existingRole.Name)
-	}
-
-	tuples, err := authtypes.NewTuplesFromTransactionGroups(role.Name, orgID, role.TransactionGroups)
-	if err != nil {
-		return err
-	}
-
-	err = provider.Write(ctx, tuples, nil)
-	if err != nil {
-		return err
-	}
-
-	if err := provider.store.Create(ctx, role.Role); err != nil {
-		return err
-	}
-
-	return nil
+	return provider.store.Create(ctx, role)
 }

 func (provider *provider) GetOrCreate(ctx context.Context, orgID valuer.UUID, role *authtypes.Role) (*authtypes.Role, error) {
@@ -236,26 +213,6 @@ func (provider *provider) GetOrCreate(ctx context.Context, orgID valuer.UUID, ro
 	return role, nil
 }

-func (provider *provider) GetWithTransactionGroups(ctx context.Context, orgID valuer.UUID, id valuer.UUID) (*authtypes.RoleWithTransactionGroups, error) {
-	_, err := provider.licensing.GetActive(ctx, orgID)
-	if err != nil {
-		return nil, errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
-	}
-
-	role, err := provider.store.Get(ctx, orgID, id)
-	if err != nil {
-		return nil, err
-	}
-
-	tuples, err := provider.readAllTuplesForRole(ctx, role.Name, orgID)
-	if err != nil {
-		return nil, err
-	}
-
-	transactionGroups := authtypes.MustNewTransactionGroupsFromTuples(tuples)
-	return authtypes.MakeRoleWithTransactionGroups(role, transactionGroups), nil
-}
-
 func (provider *provider) GetObjects(ctx context.Context, orgID valuer.UUID, id valuer.UUID, relation authtypes.Relation) ([]*coretypes.Object, error) {
 	_, err := provider.licensing.GetActive(ctx, orgID)
 	if err != nil {
@@ -290,36 +247,6 @@ func (provider *provider) GetObjects(ctx context.Context, orgID valuer.UUID, id
 	return objects, nil
 }

-func (provider *provider) Update(ctx context.Context, orgID valuer.UUID, updatedRole *authtypes.RoleWithTransactionGroups) error {
-	_, err := provider.licensing.GetActive(ctx, orgID)
-	if err != nil {
-		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
-	}
-
-	existingRole, err := provider.GetWithTransactionGroups(ctx, orgID, updatedRole.ID)
-	if err != nil {
-		return err
-	}
-
-	additions, deletions := existingRole.TransactionGroups.Diff(updatedRole.TransactionGroups)
-	additionTuples, err := authtypes.NewTuplesFromTransactionGroups(existingRole.Name, orgID, additions)
-	if err != nil {
-		return err
-	}
-
-	deletionTuples, err := authtypes.NewTuplesFromTransactionGroups(existingRole.Name, orgID, deletions)
-	if err != nil {
-		return err
-	}
-
-	err = provider.Write(ctx, additionTuples, deletionTuples)
-	if err != nil {
-		return err
-	}
-
-	return provider.store.Update(ctx, orgID, updatedRole.Role)
-}
-
 func (provider *provider) Patch(ctx context.Context, orgID valuer.UUID, role *authtypes.Role) error {
 	_, err := provider.licensing.GetActive(ctx, orgID)
 	if err != nil {
@@ -359,7 +286,7 @@ func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valu
 		return errors.New(errors.TypeLicenseUnavailable, errors.CodeLicenseUnavailable, "a valid license is not available").WithAdditional("this feature requires a valid license").WithAdditional(err.Error())
 	}

-	role, err := provider.GetWithTransactionGroups(ctx, orgID, id)
+	role, err := provider.store.Get(ctx, orgID, id)
 	if err != nil {
 		return err
 	}
@@ -375,12 +302,7 @@ func (provider *provider) Delete(ctx context.Context, orgID valuer.UUID, id valu
 		}
 	}

-	tuples, err := authtypes.NewTuplesFromTransactionGroups(role.Name, orgID, role.TransactionGroups)
-	if err != nil {
-		return err
-	}
-
-	if err := provider.Write(ctx, nil, tuples); err != nil {
+	if err := provider.deleteTuples(ctx, role.Name, orgID); err != nil {
 		return errors.WithAdditionalf(err, "failed to delete tuples for the role: %s", role.Name)
 	}

@@ -439,7 +361,7 @@ func (provider *provider) getManagedRoleTransactionTuples(orgID valuer.UUID) []*
 	return tuples
 }

-func (provider *provider) readAllTuplesForRole(ctx context.Context, roleName string, orgID valuer.UUID) ([]*openfgav1.TupleKey, error) {
+func (provider *provider) deleteTuples(ctx context.Context, roleName string, orgID valuer.UUID) error {
 	subject := authtypes.MustNewSubject(coretypes.NewResourceRole(), roleName, orgID, &coretypes.VerbAssignee)

 	tuples := make([]*openfgav1.TupleKey, 0)
@@ -449,10 +371,26 @@ func (provider *provider) readAllTuplesForRole(ctx context.Context, roleName str
 			Object: objectType.StringValue() + ":",
 		})
 		if err != nil {
-			return nil, err
+			return err
 		}
 		tuples = append(tuples, typeTuples...)
 	}

-	return tuples, nil
+	if len(tuples) == 0 {
+		return nil
+	}
+
+	for idx := 0; idx < len(tuples); idx += provider.config.OpenFGA.MaxTuplesPerWrite {
+		end := idx + provider.config.OpenFGA.MaxTuplesPerWrite
+		if end > len(tuples) {
+			end = len(tuples)
+		}
+
+		err := provider.Write(ctx, nil, tuples[idx:end])
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
 }
--- a/ee/query-service/app/api/featureFlags.go
+++ b/ee/query-service/app/api/featureFlags.go
@@ -98,15 +98,6 @@ func (ah *APIHandler) getFeatureFlags(w http.ResponseWriter, r *http.Request) {
 		Route:      "",
 	})

-	aiObservability := ah.Signoz.Flagger.BooleanOrEmpty(ctx, flagger.FeatureEnableAIObservability, evalCtx)
-	featureSet = append(featureSet, &licensetypes.Feature{
-		Name:       valuer.NewString(flagger.FeatureEnableAIObservability.String()),
-		Active:     aiObservability,
-		Usage:      0,
-		UsageLimit: -1,
-		Route:      "",
-	})
-
 	if constants.IsDotMetricsEnabled {
 		for idx, feature := range featureSet {
 			if feature.Name == licensetypes.DotMetricsEnabled {
--- a/frontend/jest.config.ts
+++ b/frontend/jest.config.ts
@@ -48,14 +48,13 @@ const config: Config.InitialOptions = {
 		],
 		'^.+\\.(js|jsx)$': 'babel-jest',
 	},
-	// TODO: https://github.com/SigNoz/engineering-pod/issues/5334
 	transformIgnorePatterns: [
 		// @chenglou/pretext is ESM-only; @signozhq/ui pulls it in via text-ellipsis.
 		// Pattern 1: allow .pnpm virtual store through (handled by pattern 2), plus root-level ESM packages.
-		'node_modules/(?!(\\.pnpm|lodash-es|react-dnd|core-dnd|@react-dnd|dnd-core|react-dnd-html5-backend|axios|@chenglou/pretext|@signozhq/design-tokens|@signozhq|date-fns|d3-interpolate|d3-color|api|@codemirror|@lezer|@marijn|@grafana|nuqs|uuid|copy-text-to-clipboard|react-markdown|vfile|vfile-message|unist-util-stringify-position|unified|bail|is-plain-obj|trough|remark-parse|mdast-util-from-markdown|mdast-util-to-string|micromark|micromark-core-commonmark|micromark-extension-gfm|micromark-extension-gfm-autolink-literal|micromark-extension-gfm-footnote|micromark-extension-gfm-strikethrough|micromark-extension-gfm-table|micromark-extension-gfm-tagfilter|micromark-extension-gfm-task-list-item|micromark-factory-destination|micromark-factory-label|micromark-factory-space|micromark-factory-title|micromark-factory-whitespace|micromark-util-character|micromark-util-chunked|micromark-util-classify-character|micromark-util-combine-extensions|micromark-util-decode-numeric-character-reference|micromark-util-decode-string|micromark-util-encode|micromark-util-html-tag-name|micromark-util-normalize-identifier|micromark-util-resolve-all|micromark-util-sanitize-uri|micromark-util-subtokenize|micromark-util-symbol|micromark-util-types|decode-named-character-reference|remark-rehype|mdast-util-to-hast|unist-util-position|trim-lines|unist-util-visit|unist-util-visit-parents|unist-util-is|unist-util-generated|mdast-util-definitions|property-information|hast-util-whitespace|space-separated-tokens|comma-separated-tokens|rehype-raw|hast-util-raw|hast-util-from-parse5|devlop|hastscript|hast-util-parse-selector|vfile-location|web-namespaces|hast-util-to-parse5|zwitch|html-void-elements)/)',
+		'node_modules/(?!(\\.pnpm|lodash-es|react-dnd|core-dnd|@react-dnd|dnd-core|react-dnd-html5-backend|axios|@chenglou/pretext|@signozhq/design-tokens|@signozhq|date-fns|d3-interpolate|d3-color|api|@codemirror|@lezer|@marijn|@grafana|nuqs|uuid|copy-text-to-clipboard)/)',
 		// Pattern 2: pnpm virtual store — ignore everything except ESM-only packages.
 		// pnpm encodes scoped packages as @scope+name@version, so match on scope prefix.
-		'node_modules/\\.pnpm/(?!(lodash-es|react-dnd|core-dnd|@react-dnd|dnd-core|react-dnd-html5-backend|axios|@chenglou|@signozhq|date-fns|d3-interpolate|d3-color|api|@codemirror|@lezer|@marijn|@grafana|nuqs|uuid|copy-text-to-clipboard|react-markdown|vfile|vfile-message|unist-util-stringify-position|unified|bail|is-plain-obj|trough|remark-parse|mdast-util-from-markdown|mdast-util-to-string|micromark|decode-named-character-reference|remark-rehype|mdast-util-to-hast|unist-util-position|trim-lines|unist-util-visit|unist-util-visit-parents|unist-util-is|unist-util-generated|mdast-util-definitions|property-information|hast-util-whitespace|space-separated-tokens|comma-separated-tokens|rehype-raw|hast-util-raw|hast-util-from-parse5|devlop|hastscript|hast-util-parse-selector|vfile-location|web-namespaces|hast-util-to-parse5|zwitch|html-void-elements)[^/]*/node_modules)',
+		'node_modules/\\.pnpm/(?!(lodash-es|react-dnd|core-dnd|@react-dnd|dnd-core|react-dnd-html5-backend|axios|@chenglou|@signozhq|date-fns|d3-interpolate|d3-color|api|@codemirror|@lezer|@marijn|@grafana|nuqs|uuid|copy-text-to-clipboard)[^/]*/node_modules)',
 	],
 	setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
 	testPathIgnorePatterns: ['/node_modules/', '/public/'],
--- a/frontend/jest.setup.ts
+++ b/frontend/jest.setup.ts
@@ -29,18 +29,6 @@ if (!HTMLElement.prototype.scrollIntoView) {
 	HTMLElement.prototype.scrollIntoView = function (): void {};
 }

-// jsdom doesn't implement the Pointer Capture API, which Radix UI primitives
-// (e.g. @signozhq/ui Select) call when opening. Stub them so those components
-// can be exercised in tests.
-if (!HTMLElement.prototype.hasPointerCapture) {
-	HTMLElement.prototype.hasPointerCapture = function (): boolean {
-		return false;
-	};
-}
-if (!HTMLElement.prototype.releasePointerCapture) {
-	HTMLElement.prototype.releasePointerCapture = function (): void {};
-}
-
 if (typeof window.IntersectionObserver === 'undefined') {
 	class IntersectionObserverMock {
 		observe(): void {}
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -43,7 +43,7 @@
    "@dnd-kit/modifiers": "7.0.0",
    "@dnd-kit/sortable": "8.0.0",
    "@dnd-kit/utilities": "3.2.2",
-    "@grafana/data": "^11.6.15",
+    "@grafana/data": "^11.6.14",
    "@monaco-editor/react": "^4.7.0",
    "@sentry/react": "10.57.0",
    "@sentry/vite-plugin": "5.3.0",
@@ -79,7 +79,7 @@
    "event-source-polyfill": "1.0.31",
    "eventemitter3": "5.0.1",
    "history": "4.10.1",
-    "http-proxy-middleware": "4.1.1",
+    "http-proxy-middleware": "4.0.0",
    "http-status-codes": "2.3.0",
    "i18next": "^21.6.12",
    "i18next-browser-languagedetector": "^6.1.3",
@@ -231,17 +231,16 @@
    "xml2js": "0.5.0",
    "phin": "^3.7.1",
    "body-parser": "1.20.3",
-    "http-proxy-middleware": "4.1.1",
+    "http-proxy-middleware": "4.0.0",
    "cross-spawn": "7.0.5",
    "cookie": "^0.7.1",
    "serialize-javascript": "6.0.2",
    "prismjs": "1.30.0",
    "got": "11.8.5",
-    "form-data": "4.0.6",
+    "form-data": "4.0.4",
    "brace-expansion": "^2.0.2",
    "on-headers": "^1.1.0",
-    "js-cookie": "^3.0.7",
-    "tmp": "0.2.7",
+    "tmp": "0.2.4",
    "vite": "npm:rolldown-vite@7.3.1"
  }
 }
--- a/frontend/pnpm-lock.yaml
+++ b/frontend/pnpm-lock.yaml
@@ -12,17 +12,16 @@ overrides:
  xml2js: 0.5.0
  phin: ^3.7.1
  body-parser: 1.20.3
-  http-proxy-middleware: 4.1.1
+  http-proxy-middleware: 4.0.0
  cross-spawn: 7.0.5
  cookie: ^0.7.1
  serialize-javascript: 6.0.2
  prismjs: 1.30.0
  got: 11.8.5
-  form-data: 4.0.6
+  form-data: 4.0.4
  brace-expansion: ^2.0.2
  on-headers: ^1.1.0
-  js-cookie: ^3.0.7
-  tmp: 0.2.7
+  tmp: 0.2.4
  vite: npm:rolldown-vite@7.3.1

 importers:
@@ -57,8 +56,8 @@ importers:
        specifier: 3.2.2
        version: 3.2.2(react@18.2.0)
      '@grafana/data':
-        specifier: ^11.6.15
-        version: 11.6.15(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
+        specifier: ^11.6.14
+        version: 11.6.14(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
      '@monaco-editor/react':
        specifier: ^4.7.0
        version: 4.7.0(monaco-editor@0.55.1)(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
@@ -165,8 +164,8 @@ importers:
        specifier: 4.10.1
        version: 4.10.1
      http-proxy-middleware:
-        specifier: 4.1.1
-        version: 4.1.1
+        specifier: 4.0.0
+        version: 4.0.0
      http-status-codes:
        specifier: 2.3.0
        version: 2.3.0
@@ -1637,14 +1636,14 @@ packages:
  '@gerrit0/mini-shiki@3.23.0':
    resolution: {integrity: sha512-bEMORlG0cqdjVyCEuU0cDQbORWX+kYCeo0kV1lbxF5bt4r7SID2l9bqsxJEM0zndaxpOUT7riCyIVEuqq/Ynxg==}

-  '@grafana/data@11.6.15':
-    resolution: {integrity: sha512-q2Zbjr0N9iEGY/zKHm4Z4X5x64806E17W58y7mnvwc0MlbyGPPVulcp/rWA2Nd190mZeafZQPer9u+MaO+0HUQ==}
+  '@grafana/data@11.6.14':
+    resolution: {integrity: sha512-Nsjq1A9m6LbsKsKvOgvAk9Wq7RGjy0V4N9d5YsSnzMwCiw/ov2wblR2bcDpy95uF8KaDTIR2Gf40nJaOYksPMA==}
    peerDependencies:
      react: ^18.0.0
      react-dom: ^18.0.0

-  '@grafana/schema@11.6.15':
-    resolution: {integrity: sha512-MPIvGAp9uzkswnH6e+Fmzu+WBTqWMgbv93/8iu56gb+sjCB2LciZLz4KvrPFdw32bWCGSMAGqsML9mgmeJZtGQ==}
+  '@grafana/schema@11.6.14':
+    resolution: {integrity: sha512-YTqgYekb7kiu5NEoQxKF8czJ6QIARmMkCi9cNcynHqYpcDLOv5pg5Q0QtKgiiqHjlYoEeCV6iejdB4hXxzB+VA==}

  '@humanfs/core@0.19.2':
    resolution: {integrity: sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==}
@@ -5168,8 +5167,8 @@ packages:
    resolution: {integrity: sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==}
    engines: {node: '>=14'}

-  form-data@4.0.6:
-    resolution: {integrity: sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==}
+  form-data@4.0.4:
+    resolution: {integrity: sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==}
    engines: {node: '>= 6'}

  format@0.2.2:
@@ -5382,10 +5381,6 @@ packages:
    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
    engines: {node: '>= 0.4'}

-  hasown@2.0.4:
-    resolution: {integrity: sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==}
-    engines: {node: '>= 0.4'}
-
  hast-util-from-parse5@8.0.1:
    resolution: {integrity: sha512-Er/Iixbc7IEa7r/XLtuG52zoqn/b3Xng/w6aZQ0xGVxzhw5xUFxcRqdPzP6yFi/4HBYRaifaI5fQ1RH8n0ZeOQ==}

@@ -5461,8 +5456,8 @@ packages:
    resolution: {integrity: sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==}
    engines: {node: '>= 6'}

-  http-proxy-middleware@4.1.1:
-    resolution: {integrity: sha512-KX5ZofGXLFXqFAkQoOWZ+rTtaLTut7m0gyL+QzJrdejtIZ+F4bPPDoe7reISg2+v0CAz5OfVwEJEhty7X+e57g==}
+  http-proxy-middleware@4.0.0:
+    resolution: {integrity: sha512-wuHwaUtmC0XzJNHqRp41zXtt5ojpHbusXGhq6781VvnjWUYPu7opmOF3eomGNujT07kEOnHWZyV9UZzKimVCKA==}
    engines: {node: ^22.15.0 || ^24.0.0 || >=26.0.0}

  http-status-codes@2.3.0:
@@ -5472,8 +5467,8 @@ packages:
    resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
    engines: {node: '>= 6'}

-  httpxy@0.5.3:
-    resolution: {integrity: sha512-SMS9V6Sn7VWaS11lYhoAr0ceoaiolTWf4jYdJn0NJhCdKMu9R2H9Fh0LBDWBHQF6HRLI1PmaePYsjanSpE5PEw==}
+  httpxy@0.5.1:
+    resolution: {integrity: sha512-JPhqYiixe1A1I+MXDewWDZqeudBGU8Q9jCHYN8ML+779RQzLjTi78HBvWz4jMxUD6h2/vUL12g4q/mFM0OUw1A==}

  human-signals@2.1.0:
    resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
@@ -6046,8 +6041,8 @@ packages:
  js-base64@3.7.5:
    resolution: {integrity: sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==}

-  js-cookie@3.0.8:
-    resolution: {integrity: sha512-yeJd4aNAdYZQjaon2bpD/Gb0B/omw7HQOsynXXcOiWVCacbBcPlgn8S/d1X6blFSaHao7ozqtW7NZW19xpCtIw==}
+  js-cookie@2.2.1:
+    resolution: {integrity: sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==}

  js-levenshtein@1.1.6:
    resolution: {integrity: sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==}
@@ -8399,8 +8394,8 @@ packages:
    resolution: {integrity: sha512-Pugqs6M0m7Lv1I7FtxN4aoyToKg1C4tu+/381vH35y8oENM/Ai7f7C4StcoK4/+BSw9ebcS8jRiVrORFKCALLw==}
    engines: {node: ^20.0.0 || >=22.0.0}

-  tmp@0.2.7:
-    resolution: {integrity: sha512-e0votIpp4Uo2AJYSzVHV6xCcawuiez3DzqDAbrTc3YxBkplN6e+dM13ZeIcZnDg/QpSuU2zfZ3rzwY8ukEnaXw==}
+  tmp@0.2.4:
+    resolution: {integrity: sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==}
    engines: {node: '>=14.14'}

  tmpl@1.0.5:
@@ -10323,10 +10318,10 @@ snapshots:
      '@shikijs/types': 3.23.0
      '@shikijs/vscode-textmate': 10.0.2

-  '@grafana/data@11.6.15(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
+  '@grafana/data@11.6.14(react-dom@18.2.0(react@18.2.0))(react@18.2.0)':
    dependencies:
      '@braintree/sanitize-url': 7.0.1
-      '@grafana/schema': 11.6.15
+      '@grafana/schema': 11.6.14
      '@types/d3-interpolate': 3.0.1
      '@types/string-hash': 1.1.3
      d3-interpolate: 3.0.1
@@ -10352,7 +10347,7 @@ snapshots:
      uplot: 1.6.31
      xss: 1.0.14

-  '@grafana/schema@11.6.15':
+  '@grafana/schema@11.6.14':
    dependencies:
      tslib: 2.8.1

@@ -12891,7 +12886,7 @@ snapshots:
  axios@1.16.0:
    dependencies:
      follow-redirects: 1.16.0
-      form-data: 4.0.6
+      form-data: 4.0.4
      proxy-from-env: 2.1.0
    transitivePeerDependencies:
      - debug
@@ -13838,7 +13833,7 @@ snapshots:
      es-errors: 1.3.0
      get-intrinsic: 1.3.0
      has-tostringtag: 1.0.2
-      hasown: 2.0.4
+      hasown: 2.0.2

  es-toolkit@1.46.1: {}

@@ -14036,7 +14031,7 @@ snapshots:
    dependencies:
      chardet: 0.7.0
      iconv-lite: 0.4.24
-      tmp: 0.2.7
+      tmp: 0.2.4

  fast-deep-equal@3.1.3: {}

@@ -14169,12 +14164,12 @@ snapshots:
      cross-spawn: 7.0.5
      signal-exit: 4.1.0

-  form-data@4.0.6:
+  form-data@4.0.4:
    dependencies:
      asynckit: 0.4.0
      combined-stream: 1.0.8
      es-set-tostringtag: 2.1.0
-      hasown: 2.0.4
+      hasown: 2.0.2
      mime-types: 2.1.35

  format@0.2.2: {}
@@ -14253,7 +14248,7 @@ snapshots:
      get-proto: 1.0.1
      gopd: 1.2.0
      has-symbols: 1.1.0
-      hasown: 2.0.4
+      hasown: 2.0.2
      math-intrinsics: 1.1.0

  get-nonce@1.0.1: {}
@@ -14391,10 +14386,6 @@ snapshots:
    dependencies:
      function-bind: 1.1.2

-  hasown@2.0.4:
-    dependencies:
-      function-bind: 1.1.2
-
  hast-util-from-parse5@8.0.1:
    dependencies:
      '@types/hast': 3.0.4
@@ -14515,10 +14506,10 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  http-proxy-middleware@4.1.1:
+  http-proxy-middleware@4.0.0:
    dependencies:
      debug: 4.3.4(supports-color@5.5.0)
-      httpxy: 0.5.3
+      httpxy: 0.5.1
      is-glob: 4.0.3
      is-plain-obj: 4.1.0
      micromatch: 4.0.8
@@ -14534,7 +14525,7 @@ snapshots:
    transitivePeerDependencies:
      - supports-color

-  httpxy@0.5.3: {}
+  httpxy@0.5.1: {}

  human-signals@2.1.0: {}

@@ -15348,7 +15339,7 @@ snapshots:

  js-base64@3.7.5: {}

-  js-cookie@3.0.8: {}
+  js-cookie@2.2.1: {}

  js-levenshtein@1.1.6: {}

@@ -15376,7 +15367,7 @@ snapshots:
      decimal.js: 10.6.0
      domexception: 4.0.0
      escodegen: 2.1.0
-      form-data: 4.0.6
+      form-data: 4.0.4
      html-encoding-sniffer: 3.0.0
      http-proxy-agent: 5.0.0
      https-proxy-agent: 5.0.1
@@ -17345,7 +17336,7 @@ snapshots:
      copy-to-clipboard: 3.3.3
      fast-deep-equal: 3.1.3
      fast-shallow-equal: 1.0.0
-      js-cookie: 3.0.8
+      js-cookie: 2.2.1
      nano-css: 5.6.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
      react: 18.2.0
      react-dom: 18.2.0(react@18.2.0)
@@ -17364,7 +17355,7 @@ snapshots:
      copy-to-clipboard: 3.3.3
      fast-deep-equal: 3.1.3
      fast-shallow-equal: 1.0.0
-      js-cookie: 3.0.8
+      js-cookie: 2.2.1
      nano-css: 5.6.2(react-dom@18.2.0(react@18.2.0))(react@18.2.0)
      react: 18.2.0
      react-dom: 18.2.0(react@18.2.0)
@@ -18112,7 +18103,7 @@ snapshots:

  tinypool@2.1.0: {}

-  tmp@0.2.7: {}
+  tmp@0.2.4: {}

  tmpl@1.0.5: {}

--- a/frontend/src/AppRoutes/Private.tsx
+++ b/frontend/src/AppRoutes/Private.tsx
@@ -55,6 +55,7 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 			),
 		[pathname],
 	);
+	const isOldRoute = oldRoutes.indexOf(pathname) > -1;
 	const currentRoute = mapRoutes.get('current');
 	const { isCloudUser: isCloudUserVal } = useGetTenantLicense();

@@ -82,36 +83,12 @@ function PrivateRoute({ children }: PrivateRouteProps): JSX.Element {
 	}, [usersData?.data]);

 	// Handle old routes - redirect to new routes
-	const isOldRoute = oldRoutes.indexOf(pathname) > -1;
 	if (isOldRoute) {
 		const redirectUrl = oldNewRoutesMapping[pathname];
-		// TODO(H4ad): Remove this after https://github.com/SigNoz/engineering-pod/issues/5322
-		// A mapped target may itself carry a query string (e.g. `/alerts?tab=Channels`).
-		// react-router does not re-parse a `?` embedded in the `pathname` field, so split
-		// it out and merge with the incoming search params.
-		const [redirectPath, redirectSearch = ''] = redirectUrl.split('?');
-		const mergedParams = new URLSearchParams(location.search);
-		new URLSearchParams(redirectSearch).forEach((value, name) => {
-			mergedParams.set(name, value);
-		});
-		const search = mergedParams.toString();
 		return (
 			<Redirect
 				to={{
-					pathname: redirectPath,
-					search: search ? `?${search}` : '',
-					hash: location.hash,
-				}}
-			/>
-		);
-	}
-
-	if (pathname.startsWith('/settings/channels/edit/')) {
-		const channelId = pathname.replace('/settings/channels/edit/', '');
-		return (
-			<Redirect
-				to={{
-					pathname: `/alerts/channels/edit/${channelId}`,
+					pathname: redirectUrl,
 					search: location.search,
 					hash: location.hash,
 				}}
--- a/frontend/src/AppRoutes/tests/Private.test.tsx
+++ b/frontend/src/AppRoutes/tests/Private.test.tsx
@@ -73,13 +73,7 @@ const queryClient = new QueryClient({
 // Component to capture current location for assertions
 function LocationDisplay(): ReactElement {
 	const location = useLocation();
-	return (
-		<>
-			<div data-testid="location-display">{location.pathname}</div>
-			<div data-testid="location-search">{location.search}</div>
-			<div data-testid="location-hash">{location.hash}</div>
-		</>
-	);
+	return <div data-testid="location-display">{location.pathname}</div>;
 }

 // Helper to create mock user
@@ -1481,10 +1475,12 @@ describe('PrivateRoute', () => {
 			await assertRedirectsTo(ROUTES.UN_AUTHORIZED);
 		});

-		it('should redirect VIEWER from /alerts/channels/new (ADMIN only)', async () => {
-			// After moving channels under /alerts, CHANNELS_NEW ('/alerts/channels/new')
-			// is an exact, ADMIN-only route with no overlapping non-exact ALL_CHANNELS
-			// route to match last, so a VIEWER is now correctly redirected.
+		it('should not redirect VIEWER from /settings/channels/new due to route matching order (ALL_CHANNELS matches last)', () => {
+			// Note: This tests the ACTUAL behavior of Private.tsx route matching
+			// CHANNELS_NEW has path '/settings/channels/new' with permission ['ADMIN']
+			// ALL_CHANNELS has path '/settings/channels' with permission ['ADMIN', 'EDITOR', 'VIEWER']
+			// Due to non-exact matching and array order, ALL_CHANNELS matches LAST for '/settings/channels/new'
+			// This is a known limitation - actual permission enforcement happens in the page component
 			renderPrivateRoute({
 				initialRoute: ROUTES.CHANNELS_NEW,
 				appContext: {
@@ -1493,7 +1489,8 @@ describe('PrivateRoute', () => {
 				},
 			});

-			await assertRedirectsTo(ROUTES.UN_AUTHORIZED);
+			assertRendersChildren();
+			assertStaysOnRoute(ROUTES.CHANNELS_NEW);
 		});

 		it('should allow EDITOR to access /get-started route', () => {
@@ -1551,60 +1548,4 @@ describe('PrivateRoute', () => {
 			await assertRedirectsTo(ROUTES.UN_AUTHORIZED);
 		});
 	});
-
-	describe('Old channel route redirects', () => {
-		it.each([
-			['/settings/channels', '/alerts', 'tab=Channels'],
-			['/settings/channels/new', '/alerts/channels/new', ''],
-		])(
-			'should redirect %s to %s',
-			async (oldRoute, expectedPath, expectedSearch) => {
-				renderPrivateRoute({
-					initialRoute: oldRoute,
-					appContext: { isLoggedIn: true },
-				});
-
-				await waitFor(() => {
-					expect(screen.getByTestId('location-display')).toHaveTextContent(
-						expectedPath,
-					);
-				});
-
-				if (expectedSearch) {
-					const search = screen.getByTestId('location-search').textContent ?? '';
-					const params = new URLSearchParams(search);
-					new URLSearchParams(expectedSearch).forEach((value, name) => {
-						expect(params.get(name)).toBe(value);
-					});
-				} else {
-					expect(screen.getByTestId('location-search')).toHaveTextContent('');
-				}
-			},
-		);
-
-		it('should redirect dynamic channel edit route preserving the channel id', async () => {
-			renderPrivateRoute({
-				initialRoute: '/settings/channels/edit/abc123',
-				appContext: { isLoggedIn: true },
-			});
-
-			await assertRedirectsTo('/alerts/channels/edit/abc123');
-		});
-
-		it('should merge incoming query params with the embedded query of the target', async () => {
-			renderPrivateRoute({
-				initialRoute: '/settings/channels?foo=bar',
-				appContext: { isLoggedIn: true },
-			});
-
-			await waitFor(() => {
-				expect(screen.getByTestId('location-display')).toHaveTextContent('/alerts');
-			});
-
-			const search = screen.getByTestId('location-search').textContent ?? '';
-			const params = new URLSearchParams(search);
-			expect(params.get('tab')).toBe('Channels');
-			expect(params.get('foo')).toBe('bar');
-		});
-	});
 });
--- a/frontend/src/AppRoutes/pageComponents.ts
+++ b/frontend/src/AppRoutes/pageComponents.ts
@@ -122,13 +122,6 @@ export const DashboardWidget = Loadable(
 		import(/* webpackChunkName: "DashboardWidgetPage" */ 'pages/DashboardWidget'),
 );

-export const DashboardPanelEditorPage = Loadable(
-	() =>
-		import(
-			/* webpackChunkName: "DashboardPanelEditorPage" */ 'pages/DashboardPageV2/PanelEditorPage/PanelEditorPage'
-		),
-);
-
 export const EditRulesPage = Loadable(
 	() => import(/* webpackChunkName: "Alerts Edit Page" */ 'pages/EditRules'),
 );
@@ -149,12 +142,12 @@ export const AlertOverview = Loadable(
 	() => import(/* webpackChunkName: "Alert Overview" */ 'pages/AlertList'),
 );

-export const ChannelsNew = Loadable(
-	() => import(/* webpackChunkName: "Create Channels" */ 'pages/AlertList'),
+export const CreateAlertChannelAlerts = Loadable(
+	() => import(/* webpackChunkName: "Create Channels" */ 'pages/Settings'),
 );

-export const ChannelsEdit = Loadable(
-	() => import(/* webpackChunkName: "Edit Channels" */ 'pages/AlertList'),
+export const AllAlertChannels = Loadable(
+	() => import(/* webpackChunkName: "All Channels" */ 'pages/Settings'),
 );

 export const AllErrors = Loadable(
--- a/frontend/src/AppRoutes/routes.ts
+++ b/frontend/src/AppRoutes/routes.ts
@@ -5,13 +5,12 @@ import {
 	AIAssistantPage,
 	AlertHistory,
 	AlertOverview,
+	AllAlertChannels,
 	AllErrors,
 	ApiMonitoring,
-	ChannelsEdit,
-	ChannelsNew,
+	CreateAlertChannelAlerts,
 	CreateNewAlerts,
 	DashboardPage,
-	DashboardPanelEditorPage,
 	DashboardsListPage,
 	DashboardWidget,
 	EditRulesPage,
@@ -197,13 +196,6 @@ const routes: AppRoutes[] = [
 		isPrivate: true,
 		key: 'DASHBOARD_WIDGET',
 	},
-	{
-		path: ROUTES.DASHBOARD_PANEL_EDITOR,
-		exact: true,
-		component: DashboardPanelEditorPage,
-		isPrivate: true,
-		key: 'DASHBOARD_PANEL_EDITOR',
-	},
 	{
 		path: ROUTES.EDIT_ALERTS,
 		exact: true,
@@ -277,16 +269,16 @@ const routes: AppRoutes[] = [
 	{
 		path: ROUTES.CHANNELS_NEW,
 		exact: true,
-		component: ChannelsNew,
+		component: CreateAlertChannelAlerts,
 		isPrivate: true,
 		key: 'CHANNELS_NEW',
 	},
 	{
-		path: ROUTES.CHANNELS_EDIT,
+		path: ROUTES.ALL_CHANNELS,
 		exact: true,
-		component: ChannelsEdit,
+		component: AllAlertChannels,
 		isPrivate: true,
-		key: 'CHANNELS_EDIT',
+		key: 'ALL_CHANNELS',
 	},
 	{
 		path: ROUTES.ALL_ERROR,
@@ -542,9 +534,6 @@ export const oldNewRoutesMapping: Record<string, string> = {
 	'/messaging-queues': '/messaging-queues/overview',
 	'/alerts/edit': '/alerts/overview',
 	'/alerts/type-selection': '/alerts/new',
-	// TODO(H4ad): Update this after https://github.com/SigNoz/engineering-pod/issues/5322
-	'/settings/channels': '/alerts?tab=Channels',
-	'/settings/channels/new': '/alerts/channels/new',
 };
 export const oldRoutes = Object.keys(oldNewRoutesMapping);

--- a/frontend/src/api/generated/services/role/index.ts
+++ b/frontend/src/api/generated/services/role/index.ts
@@ -20,7 +20,6 @@ import type {
 import type {
 	AuthtypesPatchableRoleDTO,
 	AuthtypesPostableRoleDTO,
-	AuthtypesUpdatableRoleDTO,
 	CoretypesPatchableObjectsDTO,
 	CreateRole201,
 	DeleteRolePathParameters,
@@ -32,7 +31,6 @@ import type {
 	PatchObjectsPathParameters,
 	PatchRolePathParameters,
 	RenderErrorResponseDTO,
-	UpdateRolePathParameters,
 } from '../sigNoz.schemas';

 import { GeneratedAPIInstance } from '../../../generatedAPIInstance';
@@ -367,7 +365,6 @@ export const invalidateGetRole = async (

 /**
 * This endpoint patches a role
- * @deprecated
 * @summary Patch role
 */
 export const patchRole = (
@@ -439,7 +436,6 @@ export type PatchRoleMutationBody =
 export type PatchRoleMutationError = ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary Patch role
 */
 export const usePatchRole = <
@@ -466,105 +462,6 @@ export const usePatchRole = <
 > => {
 	return useMutation(getPatchRoleMutationOptions(options));
 };
-/**
- * This endpoint updates a role
- * @summary Update role
- */
-export const updateRole = (
-	{ id }: UpdateRolePathParameters,
-	authtypesUpdatableRoleDTO?: BodyType<AuthtypesUpdatableRoleDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<void>({
-		url: `/api/v1/roles/${id}`,
-		method: 'PUT',
-		headers: { 'Content-Type': 'application/json' },
-		data: authtypesUpdatableRoleDTO,
-		signal,
-	});
-};
-
-export const getUpdateRoleMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updateRole>>,
-		TError,
-		{
-			pathParams: UpdateRolePathParameters;
-			data?: BodyType<AuthtypesUpdatableRoleDTO>;
-		},
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof updateRole>>,
-	TError,
-	{
-		pathParams: UpdateRolePathParameters;
-		data?: BodyType<AuthtypesUpdatableRoleDTO>;
-	},
-	TContext
-> => {
-	const mutationKey = ['updateRole'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof updateRole>>,
-		{
-			pathParams: UpdateRolePathParameters;
-			data?: BodyType<AuthtypesUpdatableRoleDTO>;
-		}
-	> = (props) => {
-		const { pathParams, data } = props ?? {};
-
-		return updateRole(pathParams, data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type UpdateRoleMutationResult = NonNullable<
-	Awaited<ReturnType<typeof updateRole>>
->;
-export type UpdateRoleMutationBody =
-	| BodyType<AuthtypesUpdatableRoleDTO>
-	| undefined;
-export type UpdateRoleMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Update role
- */
-export const useUpdateRole = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof updateRole>>,
-		TError,
-		{
-			pathParams: UpdateRolePathParameters;
-			data?: BodyType<AuthtypesUpdatableRoleDTO>;
-		},
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof updateRole>>,
-	TError,
-	{
-		pathParams: UpdateRolePathParameters;
-		data?: BodyType<AuthtypesUpdatableRoleDTO>;
-	},
-	TContext
-> => {
-	return useMutation(getUpdateRoleMutationOptions(options));
-};
 /**
 * Gets all objects connected to the specified role via a given relation type
 * @summary Get objects for a role by relation
@@ -668,7 +565,6 @@ export const invalidateGetObjects = async (

 /**
 * Patches the objects connected to the specified role via a given relation type
- * @deprecated
 * @summary Patch objects for a role by relation
 */
 export const patchObjects = (
@@ -740,7 +636,6 @@ export type PatchObjectsMutationBody =
 export type PatchObjectsMutationError = ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary Patch objects for a role by relation
 */
 export const usePatchObjects = <
--- a/frontend/src/api/generated/services/sigNoz.schemas.ts
+++ b/frontend/src/api/generated/services/sigNoz.schemas.ts
@@ -2224,31 +2224,15 @@ export interface AuthtypesPostableEmailPasswordSessionDTO {
 	password?: string;
 }

-export interface CoretypesObjectGroupDTO {
-	resource: CoretypesResourceRefDTO;
-	/**
-	 * @type array
-	 */
-	selectors: string[];
-}
-
-export interface AuthtypesTransactionGroupDTO {
-	objectGroup: CoretypesObjectGroupDTO;
-	relation: AuthtypesRelationDTO;
-}
-
-export type AuthtypesTransactionGroupsDTO = AuthtypesTransactionGroupDTO[];
-
 export interface AuthtypesPostableRoleDTO {
 	/**
 	 * @type string
 	 */
-	description: string;
+	description?: string;
 	/**
 	 * @type string
 	 */
 	name: string;
-	transactionGroups: AuthtypesTransactionGroupsDTO;
 }

 export interface AuthtypesPostableRotateTokenDTO {
@@ -2258,32 +2242,6 @@ export interface AuthtypesPostableRotateTokenDTO {
 	refreshToken?: string;
 }

-export interface AuthtypesPostableUserRoleDTO {
-	/**
-	 * @type string
-	 */
-	id: string;
-}
-
-export interface AuthtypesPostableUserDTO {
-	/**
-	 * @type string
-	 */
-	displayName?: string;
-	/**
-	 * @type string
-	 */
-	email: string;
-	/**
-	 * @type string
-	 */
-	frontendBaseUrl?: string;
-	/**
-	 * @type array
-	 */
-	userRoles: AuthtypesPostableUserRoleDTO[];
-}
-
 export interface AuthtypesRoleDTO {
 	/**
 	 * @type string
@@ -2317,40 +2275,6 @@ export interface AuthtypesRoleDTO {
 	updatedAt?: string;
 }

-export interface AuthtypesRoleWithTransactionGroupsDTO {
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	createdAt?: string;
-	/**
-	 * @type string
-	 */
-	description: string;
-	/**
-	 * @type string
-	 */
-	id: string;
-	/**
-	 * @type string
-	 */
-	name: string;
-	/**
-	 * @type string
-	 */
-	orgId: string;
-	transactionGroups: AuthtypesTransactionGroupsDTO;
-	/**
-	 * @type string
-	 */
-	type: string;
-	/**
-	 * @type string
-	 * @format date-time
-	 */
-	updatedAt?: string;
-}
-
 export interface AuthtypesSessionContextDTO {
 	/**
 	 * @type boolean
@@ -2371,14 +2295,6 @@ export interface AuthtypesUpdatableAuthDomainDTO {
 	config?: AuthtypesAuthDomainConfigDTO;
 }

-export interface AuthtypesUpdatableRoleDTO {
-	/**
-	 * @type string
-	 */
-	description: string;
-	transactionGroups: AuthtypesTransactionGroupsDTO;
-}
-
 export interface AuthtypesUserRoleDTO {
 	/**
 	 * @type string
@@ -3149,6 +3065,14 @@ export interface CommonJSONRefDTO {
 	$ref?: string;
 }

+export interface CoretypesObjectGroupDTO {
+	resource: CoretypesResourceRefDTO;
+	/**
+	 * @type array
+	 */
+	selectors: string[];
+}
+
 export interface CoretypesPatchableObjectsDTO {
 	/**
 	 * @type array,null
@@ -3230,37 +3154,6 @@ export interface DashboardLinkDTO {
 	url?: string;
 }

-export interface VariableDisplayDTO {
-	/**
-	 * @type string
-	 */
-	description?: string;
-	/**
-	 * @type boolean
-	 */
-	hidden?: boolean;
-	/**
-	 * @type string
-	 */
-	name?: string;
-}
-
-export interface DashboardTextVariableSpecDTO {
-	/**
-	 * @type boolean
-	 */
-	constant?: boolean;
-	display?: VariableDisplayDTO;
-	/**
-	 * @type string
-	 */
-	name?: string;
-	/**
-	 * @type string
-	 */
-	value?: string;
-}
-
 export interface DashboardtypesAxesDTO {
 	/**
 	 * @type boolean
@@ -3292,6 +3185,9 @@ export interface DashboardtypesPanelFormattingDTO {
 	unit?: string;
 }

+export enum DashboardtypesLegendModeDTO {
+	list = 'list',
+}
 export enum DashboardtypesLegendPositionDTO {
 	bottom = 'bottom',
 	right = 'right',
@@ -3311,6 +3207,7 @@ export interface DashboardtypesLegendDTO {
 	 * @type object,null
 	 */
 	customColors?: DashboardtypesLegendDTOCustomColors;
+	mode?: DashboardtypesLegendModeDTO;
 	position?: DashboardtypesLegendPositionDTO;
 }

@@ -3322,7 +3219,7 @@ export interface DashboardtypesThresholdWithLabelDTO {
 	/**
 	 * @type string
 	 */
-	label: string;
+	label?: string;
 	/**
 	 * @type string
 	 */
@@ -3987,10 +3884,12 @@ export enum DashboardtypesLineStyleDTO {
 export interface DashboardtypesSpanGapsDTO {
 	/**
 	 * @type string
+	 * @description The maximum gap size to connect when fillOnlyBelow is true. Gaps larger than this duration are left disconnected.
 	 */
 	fillLessThan?: string;
 	/**
 	 * @type boolean
+	 * @description Controls whether lines connect across null values. When false (default), all gaps are connected. When true, only gaps smaller than fillLessThan are connected.
 	 */
 	fillOnlyBelow?: boolean;
 }
@@ -4622,6 +4521,15 @@ export type DashboardtypesVariablePluginDTO =
 	| DashboardtypesVariablePluginVariantGithubComSigNozSignozPkgTypesDashboardtypesQueryVariableSpecDTO
 	| DashboardtypesVariablePluginVariantGithubComSigNozSignozPkgTypesDashboardtypesCustomVariableSpecDTO;

+export enum DashboardtypesListVariableSpecSortDTO {
+	none = 'none',
+	'alphabetical-asc' = 'alphabetical-asc',
+	'alphabetical-desc' = 'alphabetical-desc',
+	'numerical-asc' = 'numerical-asc',
+	'numerical-desc' = 'numerical-desc',
+	'alphabetical-ci-asc' = 'alphabetical-ci-asc',
+	'alphabetical-ci-desc' = 'alphabetical-ci-desc',
+}
 export interface DashboardtypesListVariableSpecDTO {
 	/**
 	 * @type boolean
@@ -4640,16 +4548,14 @@ export interface DashboardtypesListVariableSpecDTO {
 	 */
 	customAllValue?: string;
 	defaultValue?: VariableDefaultValueDTO;
-	display: DashboardtypesDisplayDTO;
+	display?: DashboardtypesDisplayDTO;
 	/**
 	 * @type string
+	 * @minLength 1
 	 */
-	name?: string;
+	name: string;
 	plugin?: DashboardtypesVariablePluginDTO;
-	/**
-	 * @type string,null
-	 */
-	sort?: string | null;
+	sort?: DashboardtypesListVariableSpecSortDTO;
 }

 export interface DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesListVariableSpecDTO {
@@ -4661,21 +4567,38 @@ export interface DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDash
 	spec: DashboardtypesListVariableSpecDTO;
 }

-export enum DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpecDTOKind {
+export enum DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpecDTOKind {
 	TextVariable = 'TextVariable',
 }
-export interface DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpecDTO {
+export interface DashboardtypesTextVariableSpecDTO {
+	/**
+	 * @type boolean
+	 */
+	constant?: boolean;
+	display?: DashboardtypesDisplayDTO;
+	/**
+	 * @type string
+	 * @minLength 1
+	 */
+	name: string;
+	/**
+	 * @type string
+	 */
+	value?: string;
+}
+
+export interface DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpecDTO {
 	/**
 	 * @enum TextVariable
 	 * @type string
 	 */
-	kind: DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpecDTOKind;
-	spec: DashboardTextVariableSpecDTO;
+	kind: DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpecDTOKind;
+	spec: DashboardtypesTextVariableSpecDTO;
 }

 export type DashboardtypesVariableDTO =
 	| DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesListVariableSpecDTO
-	| DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpecDTO;
+	| DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpecDTO;

 export interface DashboardtypesDashboardSpecDTO {
 	/**
@@ -9526,16 +9449,6 @@ export type ListLLMPricingRulesParams = {
 	 * @description undefined
 	 */
 	limit?: number;
-	/**
-	 * @type string
-	 * @description undefined
-	 */
-	q?: string;
-	/**
-	 * @type boolean,null
-	 * @description undefined
-	 */
-	isOverride?: boolean | null;
 };

 export type ListLLMPricingRules200 = {
@@ -9645,7 +9558,7 @@ export type GetRolePathParameters = {
 	id: string;
 };
 export type GetRole200 = {
-	data: AuthtypesRoleWithTransactionGroupsDTO;
+	data: AuthtypesRoleDTO;
 	/**
 	 * @type string
 	 */
@@ -9655,9 +9568,6 @@ export type GetRole200 = {
 export type PatchRolePathParameters = {
 	id: string;
 };
-export type UpdateRolePathParameters = {
-	id: string;
-};
 export type GetObjectsPathParameters = {
 	id: string;
 	relation: string;
@@ -10833,14 +10743,6 @@ export type ListUsers200 = {
 	status: string;
 };

-export type CreateUser201 = {
-	data: TypesIdentifiableDTO;
-	/**
-	 * @type string
-	 */
-	status: string;
-};
-
 export type GetUserPathParameters = {
 	id: string;
 };
--- a/frontend/src/api/generated/services/users/index.ts
+++ b/frontend/src/api/generated/services/users/index.ts
@@ -18,11 +18,9 @@ import type {
 } from 'react-query';

 import type {
-	AuthtypesPostableUserDTO,
 	CreateInvite201,
 	CreateResetPasswordToken201,
 	CreateResetPasswordTokenPathParameters,
-	CreateUser201,
 	DeleteUserPathParameters,
 	GetMyUser200,
 	GetMyUserDeprecated200,
@@ -171,7 +169,6 @@ export const invalidateGetResetPasswordTokenDeprecated = async (

 /**
 * This endpoint creates an invite for a user
- * @deprecated
 * @summary Create invite
 */
 export const createInvite = (
@@ -233,7 +230,6 @@ export type CreateInviteMutationBody =
 export type CreateInviteMutationError = ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary Create invite
 */
 export const useCreateInvite = <
@@ -256,7 +252,6 @@ export const useCreateInvite = <
 };
 /**
 * This endpoint creates a bulk invite for a user
- * @deprecated
 * @summary Create bulk invite
 */
 export const createBulkInvite = (
@@ -318,7 +313,6 @@ export type CreateBulkInviteMutationBody =
 export type CreateBulkInviteMutationError = ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary Create bulk invite
 */
 export const useCreateBulkInvite = <
@@ -424,7 +418,6 @@ export const useResetPassword = <
 };
 /**
 * This endpoint lists all users
- * @deprecated
 * @summary List users
 */
 export const listUsersDeprecated = (signal?: AbortSignal) => {
@@ -470,7 +463,6 @@ export type ListUsersDeprecatedQueryResult = NonNullable<
 export type ListUsersDeprecatedQueryError = ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary List users
 */

@@ -494,7 +486,6 @@ export function useListUsersDeprecated<
 }

 /**
- * @deprecated
 * @summary List users
 */
 export const invalidateListUsersDeprecated = async (
@@ -590,7 +581,6 @@ export const useDeleteUser = <
 };
 /**
 * This endpoint returns the user by id
- * @deprecated
 * @summary Get user
 */
 export const getUserDeprecated = (
@@ -650,7 +640,6 @@ export type GetUserDeprecatedQueryResult = NonNullable<
 export type GetUserDeprecatedQueryError = ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary Get user
 */

@@ -677,7 +666,6 @@ export function useGetUserDeprecated<
 }

 /**
- * @deprecated
 * @summary Get user
 */
 export const invalidateGetUserDeprecated = async (
@@ -695,7 +683,6 @@ export const invalidateGetUserDeprecated = async (

 /**
 * This endpoint updates the user by id
- * @deprecated
 * @summary Update user
 */
 export const updateUserDeprecated = (
@@ -768,7 +755,6 @@ export type UpdateUserDeprecatedMutationError =
 	ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary Update user
 */
 export const useUpdateUserDeprecated = <
@@ -797,7 +783,6 @@ export const useUpdateUserDeprecated = <
 };
 /**
 * This endpoint returns the user I belong to
- * @deprecated
 * @summary Get my user
 */
 export const getMyUserDeprecated = (signal?: AbortSignal) => {
@@ -843,7 +828,6 @@ export type GetMyUserDeprecatedQueryResult = NonNullable<
 export type GetMyUserDeprecatedQueryError = ErrorType<RenderErrorResponseDTO>;

 /**
- * @deprecated
 * @summary Get my user
 */

@@ -867,7 +851,6 @@ export function useGetMyUserDeprecated<
 }

 /**
- * @deprecated
 * @summary Get my user
 */
 export const invalidateGetMyUserDeprecated = async (
@@ -1226,89 +1209,6 @@ export const invalidateListUsers = async (
 	return queryClient;
 };

-/**
- * This endpoint creates a user for the organization
- * @summary Create user
- */
-export const createUser = (
-	authtypesPostableUserDTO?: BodyType<AuthtypesPostableUserDTO>,
-	signal?: AbortSignal,
-) => {
-	return GeneratedAPIInstance<CreateUser201>({
-		url: `/api/v2/users`,
-		method: 'POST',
-		headers: { 'Content-Type': 'application/json' },
-		data: authtypesPostableUserDTO,
-		signal,
-	});
-};
-
-export const getCreateUserMutationOptions = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createUser>>,
-		TError,
-		{ data?: BodyType<AuthtypesPostableUserDTO> },
-		TContext
-	>;
-}): UseMutationOptions<
-	Awaited<ReturnType<typeof createUser>>,
-	TError,
-	{ data?: BodyType<AuthtypesPostableUserDTO> },
-	TContext
-> => {
-	const mutationKey = ['createUser'];
-	const { mutation: mutationOptions } = options
-		? options.mutation &&
-			'mutationKey' in options.mutation &&
-			options.mutation.mutationKey
-			? options
-			: { ...options, mutation: { ...options.mutation, mutationKey } }
-		: { mutation: { mutationKey } };
-
-	const mutationFn: MutationFunction<
-		Awaited<ReturnType<typeof createUser>>,
-		{ data?: BodyType<AuthtypesPostableUserDTO> }
-	> = (props) => {
-		const { data } = props ?? {};
-
-		return createUser(data);
-	};
-
-	return { mutationFn, ...mutationOptions };
-};
-
-export type CreateUserMutationResult = NonNullable<
-	Awaited<ReturnType<typeof createUser>>
->;
-export type CreateUserMutationBody =
-	| BodyType<AuthtypesPostableUserDTO>
-	| undefined;
-export type CreateUserMutationError = ErrorType<RenderErrorResponseDTO>;
-
-/**
- * @summary Create user
- */
-export const useCreateUser = <
-	TError = ErrorType<RenderErrorResponseDTO>,
-	TContext = unknown,
->(options?: {
-	mutation?: UseMutationOptions<
-		Awaited<ReturnType<typeof createUser>>,
-		TError,
-		{ data?: BodyType<AuthtypesPostableUserDTO> },
-		TContext
-	>;
-}): UseMutationResult<
-	Awaited<ReturnType<typeof createUser>>,
-	TError,
-	{ data?: BodyType<AuthtypesPostableUserDTO> },
-	TContext
-> => {
-	return useMutation(getCreateUserMutationOptions(options));
-};
 /**
 * This endpoint returns the user by id
 * @summary Get user by user id
--- a/frontend/src/api/generated/transactionGroups.schema.json
+++ b/frontend/src/api/generated/transactionGroups.schema.json
@@ -1,93 +0,0 @@
-{
-  "items": {
-    "$ref": "#/definitions/AuthtypesTransactionGroup"
-  },
-  "definitions": {
-    "AuthtypesRelation": {
-      "additionalProperties": false,
-      "enum": [
-        "create",
-        "read",
-        "update",
-        "delete",
-        "list",
-        "assignee",
-        "attach",
-        "detach"
-      ],
-      "type": "string"
-    },
-    "AuthtypesTransactionGroup": {
-      "required": [
-        "relation",
-        "objectGroup"
-      ],
-      "properties": {
-        "objectGroup": {
-          "$ref": "#/definitions/CoretypesObjectGroup"
-        },
-        "relation": {
-          "$ref": "#/definitions/AuthtypesRelation"
-        }
-      },
-      "type": "object"
-    },
-    "CoretypesKind": {
-      "additionalProperties": false,
-      "type": "string"
-    },
-    "CoretypesObjectGroup": {
-      "required": [
-        "resource",
-        "selectors"
-      ],
-      "additionalProperties": false,
-      "properties": {
-        "resource": {
-          "$ref": "#/definitions/CoretypesResourceRef"
-        },
-        "selectors": {
-          "items": {
-            "$ref": "#/definitions/CoretypesSelector"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "CoretypesResourceRef": {
-      "required": [
-        "type",
-        "kind"
-      ],
-      "additionalProperties": false,
-      "properties": {
-        "kind": {
-          "$ref": "#/definitions/CoretypesKind"
-        },
-        "type": {
-          "$ref": "#/definitions/CoretypesType"
-        }
-      },
-      "type": "object"
-    },
-    "CoretypesSelector": {
-      "additionalProperties": false,
-      "type": "string"
-    },
-    "CoretypesType": {
-      "additionalProperties": false,
-      "enum": [
-        "user",
-        "serviceaccount",
-        "anonymous",
-        "role",
-        "organization",
-        "metaresource",
-        "telemetryresource"
-      ],
-      "type": "string"
-    }
-  },
-  "type": "array"
-}
--- a/frontend/src/api/v5/queryRange/convertV5Response.test.ts
+++ b/frontend/src/api/v5/queryRange/convertV5Response.test.ts
@@ -274,110 +274,4 @@ describe('convertV5ResponseToLegacy', () => {
 			},
 		});
 	});
-
-	it('clickhouse_sql scalar keeps each value column distinct (regression: all-"A" collapse)', () => {
-		const scalar: ScalarData = {
-			columns: [
-				{
-					name: 'service.name',
-					queryName: 'A',
-					aggregationIndex: 0,
-					columnType: 'group',
-				} as unknown as ScalarData['columns'][number],
-				{
-					name: 'current_availability',
-					queryName: 'A',
-					aggregationIndex: 0,
-					columnType: 'aggregation',
-				} as unknown as ScalarData['columns'][number],
-				{
-					name: 'error_budget_remaining',
-					queryName: 'A',
-					aggregationIndex: 1,
-					columnType: 'aggregation',
-				} as unknown as ScalarData['columns'][number],
-				{
-					name: 'budget_status',
-					queryName: 'A',
-					aggregationIndex: 2,
-					columnType: 'group',
-				} as unknown as ScalarData['columns'][number],
-				{
-					name: 'total_requests',
-					queryName: 'A',
-					aggregationIndex: 4,
-					columnType: 'aggregation',
-				} as unknown as ScalarData['columns'][number],
-			],
-			data: [['kuja-api_gateway-service', 99.985, 0.985, 'Healthy ✅', 2181216]],
-		};
-
-		const v5Data: QueryRangeResponseV5 = {
-			type: 'scalar',
-			data: { results: [scalar] },
-			meta: { rowsScanned: 0, bytesScanned: 0, durationMs: 0, stepIntervals: {} },
-		};
-
-		// A clickhouse_sql envelope contributes no aggregation metadata.
-		const params = makeBaseParams('scalar', [
-			{
-				type: 'clickhouse_sql',
-				spec: {
-					name: 'A',
-					query: 'SELECT ...',
-					disabled: false,
-				},
-			} as unknown as QueryRangeRequestV5['compositeQuery']['queries'][number],
-		]);
-
-		const input: SuccessResponse<MetricRangePayloadV5, QueryRangeRequestV5> =
-			makeBaseSuccess({ data: v5Data }, params);
-		// formatForWeb=true is the table-panel path.
-		const result = convertV5ResponseToLegacy(input, { A: '' }, true);
-
-		const [tableEntry] = result.payload.data.result;
-		// Headers keep their real names instead of collapsing to "A".
-		expect(tableEntry.table?.columns).toStrictEqual([
-			{
-				name: 'service.name',
-				queryName: 'A',
-				isValueColumn: false,
-				id: 'service.name',
-			},
-			{
-				name: 'current_availability',
-				queryName: 'A',
-				isValueColumn: true,
-				id: 'current_availability',
-			},
-			{
-				name: 'error_budget_remaining',
-				queryName: 'A',
-				isValueColumn: true,
-				id: 'error_budget_remaining',
-			},
-			{
-				name: 'budget_status',
-				queryName: 'A',
-				isValueColumn: false,
-				id: 'budget_status',
-			},
-			{
-				name: 'total_requests',
-				queryName: 'A',
-				isValueColumn: true,
-				id: 'total_requests',
-			},
-		]);
-		// Ids are unique, so value columns don't overwrite each other in the row.
-		expect(tableEntry.table?.rows?.[0]).toStrictEqual({
-			data: {
-				'service.name': 'kuja-api_gateway-service',
-				current_availability: 99.985,
-				error_budget_remaining: 0.985,
-				budget_status: 'Healthy ✅',
-				total_requests: 2181216,
-			},
-		});
-	});
 });
--- a/frontend/src/api/v5/queryRange/convertV5Response.ts
+++ b/frontend/src/api/v5/queryRange/convertV5Response.ts
@@ -15,7 +15,6 @@ function getColName(
 	col: ScalarData['columns'][number],
 	legendMap: Record<string, string>,
 	aggregationPerQuery: Record<string, any>,
-	clickhouseQueryNames: Set<string>,
 ): string {
 	if (col.columnType === 'group') {
 		return col.name;
@@ -40,32 +39,16 @@ function getColName(
 		return alias || expression || col.queryName;
 	}

-	// clickhouse_sql value columns carry their real SQL alias in col.name — use
-	// it so each value column keeps its own header instead of collapsing onto
-	// the query name. Formulas/promql use placeholder names, so they fall back
-	// to legend || queryName.
-	if (clickhouseQueryNames.has(col.queryName)) {
-		return col.name;
-	}
 	return legend || col.queryName;
 }

 function getColId(
 	col: ScalarData['columns'][number],
 	aggregationPerQuery: Record<string, any>,
-	clickhouseQueryNames: Set<string>,
 ): string {
 	if (col.columnType === 'group') {
 		return col.name;
 	}
-
-	// clickhouse_sql value columns are keyed by their real SQL alias so multiple
-	// value columns stay unique instead of all collapsing onto the query name
-	// (which would overwrite every cell in the row with the last column's value).
-	if (clickhouseQueryNames.has(col.queryName)) {
-		return col.name;
-	}
-
 	const aggregation =
 		aggregationPerQuery?.[col.queryName]?.[col.aggregationIndex];
 	const expression = aggregation?.expression || '';
@@ -158,7 +141,6 @@ function convertScalarDataArrayToTable(
 	scalarDataArray: ScalarData[],
 	legendMap: Record<string, string>,
 	aggregationPerQuery: Record<string, any>,
-	clickhouseQueryNames: Set<string>,
 ): QueryDataV3[] {
 	// If no scalar data, return empty structure

@@ -184,10 +166,10 @@ function convertScalarDataArrayToTable(

 		// Collect columns for this specific query
 		const columns = scalarData?.columns?.map((col) => ({
-			name: getColName(col, legendMap, aggregationPerQuery, clickhouseQueryNames),
+			name: getColName(col, legendMap, aggregationPerQuery),
 			queryName: col.queryName,
 			isValueColumn: col.columnType === 'aggregation',
-			id: getColId(col, aggregationPerQuery, clickhouseQueryNames),
+			id: getColId(col, aggregationPerQuery),
 		}));

 		// Process rows for this specific query
@@ -195,13 +177,8 @@ function convertScalarDataArrayToTable(
 			const rowData: Record<string, any> = {};

 			scalarData?.columns?.forEach((col, colIndex) => {
-				const columnName = getColName(
-					col,
-					legendMap,
-					aggregationPerQuery,
-					clickhouseQueryNames,
-				);
-				const columnId = getColId(col, aggregationPerQuery, clickhouseQueryNames);
+				const columnName = getColName(col, legendMap, aggregationPerQuery);
+				const columnId = getColId(col, aggregationPerQuery);
 				rowData[columnId || columnName] = dataRow[colIndex];
 			});

@@ -225,7 +202,6 @@ function convertScalarWithFormatForWeb(
 	scalarDataArray: ScalarData[],
 	legendMap: Record<string, string>,
 	aggregationPerQuery: Record<string, any>,
-	clickhouseQueryNames: Set<string>,
 ): QueryDataV3[] {
 	if (!scalarDataArray || scalarDataArray.length === 0) {
 		return [];
@@ -234,18 +210,13 @@ function convertScalarWithFormatForWeb(
 	return scalarDataArray.map((scalarData) => {
 		const columns =
 			scalarData.columns?.map((col) => {
-				const colName = getColName(
-					col,
-					legendMap,
-					aggregationPerQuery,
-					clickhouseQueryNames,
-				);
+				const colName = getColName(col, legendMap, aggregationPerQuery);

 				return {
 					name: colName,
 					queryName: col.queryName,
 					isValueColumn: col.columnType === 'aggregation',
-					id: getColId(col, aggregationPerQuery, clickhouseQueryNames),
+					id: getColId(col, aggregationPerQuery),
 				};
 			}) || [];

@@ -318,7 +289,6 @@ function convertV5DataByType(
 	v5Data: any,
 	legendMap: Record<string, string>,
 	aggregationPerQuery: Record<string, any>,
-	clickhouseQueryNames: Set<string>,
 ): MetricRangePayloadV3['data'] {
 	switch (v5Data?.type) {
 		case 'time_series': {
@@ -337,7 +307,6 @@ function convertV5DataByType(
 				scalarData,
 				legendMap,
 				aggregationPerQuery,
-				clickhouseQueryNames,
 			);
 			return {
 				resultType: 'scalar',
@@ -404,15 +373,6 @@ export function convertV5ResponseToLegacy(
 				{} as Record<string, any>,
 			) || {};

-	// clickhouse_sql queries have no aggregation metadata; their value columns
-	// are named/keyed by the real SQL alias the response carries (see getColId).
-	const clickhouseQueryNames = new Set<string>(
-		(params?.compositeQuery?.queries ?? [])
-			.filter((query) => query.type === 'clickhouse_sql')
-			.map((query) => (query.spec as { name?: string })?.name)
-			.filter((name): name is string => !!name),
-	);
-
 	// If formatForWeb is true, return as-is (like existing logic)
 	if (formatForWeb && v5Data?.type === 'scalar') {
 		const scalarData = v5Data.data.results as ScalarData[];
@@ -420,7 +380,6 @@ export function convertV5ResponseToLegacy(
 			scalarData,
 			legendMap,
 			aggregationPerQuery,
-			clickhouseQueryNames,
 		);

 		return {
@@ -443,7 +402,6 @@ export function convertV5ResponseToLegacy(
 		v5Data,
 		legendMap,
 		aggregationPerQuery,
-		clickhouseQueryNames,
 	);

 	// Create legacy-compatible response structure
--- a/frontend/src/constants/features.ts
+++ b/frontend/src/constants/features.ts
@@ -12,5 +12,4 @@ export enum FeatureKeys {
 	USE_JSON_BODY = 'use_json_body',
 	USE_FINE_GRAINED_AUTHZ = 'use_fine_grained_authz',
 	USE_DASHBOARD_V2 = 'use_dashboard_v2',
-	EMABLE_AI_OBSERVABILITY = 'enable_ai_observability',
 }
--- a/frontend/src/constants/localStorage.ts
+++ b/frontend/src/constants/localStorage.ts
@@ -43,5 +43,4 @@ export enum LOCALSTORAGE {
 	DASHBOARD_PREFERENCES = 'DASHBOARD_PREFERENCES',
 	ACTIVE_SIGNOZ_INSTANCE_URL = 'ACTIVE_SIGNOZ_INSTANCE_URL',
 	DASHBOARDS_LIST_VISIBLE_COLUMNS = 'DASHBOARDS_LIST_VISIBLE_COLUMNS',
-	DASHBOARDS_LIST_VIEWS = 'DASHBOARDS_LIST_VIEWS',
 }
--- a/frontend/src/constants/routes.ts
+++ b/frontend/src/constants/routes.ts
@@ -24,16 +24,14 @@ const ROUTES = {
 	ALL_DASHBOARD: '/dashboard',
 	DASHBOARD: '/dashboard/:dashboardId',
 	DASHBOARD_WIDGET: '/dashboard/:dashboardId/:widgetId',
-	DASHBOARD_PANEL_EDITOR: '/dashboard/:dashboardId/panel/:panelId',
 	EDIT_ALERTS: '/alerts/edit',
 	LIST_ALL_ALERT: '/alerts',
 	ALERTS_NEW: '/alerts/new',
 	ALERT_HISTORY: '/alerts/history',
 	ALERT_OVERVIEW: '/alerts/overview',
-	// TODO(H4ad): Add test to forbidden ? in this map after https://github.com/SigNoz/engineering-pod/issues/5322
-	ALL_CHANNELS: '/alerts?tab=Channels',
-	CHANNELS_NEW: '/alerts/channels/new',
-	CHANNELS_EDIT: '/alerts/channels/edit/:channelId',
+	ALL_CHANNELS: '/settings/channels',
+	CHANNELS_NEW: '/settings/channels/new',
+	CHANNELS_EDIT: '/settings/channels/edit/:channelId',
 	ALL_ERROR: '/exceptions',
 	ERROR_DETAIL: '/error-detail',
 	VERSION: '/status',
--- a/frontend/src/container/AIAssistant/components/ActionsSection/utils/tests/openSavedView.test.ts
+++ b/frontend/src/container/AIAssistant/components/ActionsSection/utils/tests/openSavedView.test.ts
@@ -94,7 +94,7 @@ describe('resourceRoute', () => {

 	it('routes channels to the edit page', () => {
 		expect(resourceRoute(ResourceType.channel, 'channel-uuid-1')).toBe(
-			'/alerts/channels/edit/channel-uuid-1',
+			'/settings/channels/edit/channel-uuid-1',
 		);
 	});
 });
--- a/frontend/src/container/AllAlertChannels/AllAlertChannels.styles.scss
+++ b/frontend/src/container/AllAlertChannels/AllAlertChannels.styles.scss
@@ -1,4 +1,4 @@
 .alert-channels-container {
-	width: 100%;
-	padding: 0 var(--spacing-8);
+	width: 90%;
+	margin: 12px auto;
 }
--- a/frontend/src/container/AppLayout/index.tsx
+++ b/frontend/src/container/AppLayout/index.tsx
@@ -408,9 +408,6 @@ function AppLayout(props: AppLayoutProps): JSX.Element {

 	const isPublicDashboard = pathname.startsWith('/public/dashboard/');
 	const isAIAssistantPage = pathname.startsWith('/ai-assistant/');
-	// The V2 panel editor is a chromeless full-page route (no side nav / top nav),
-	// like the onboarding and public-dashboard screens.
-	const isPanelEditorV2 = routeKey === 'DASHBOARD_PANEL_EDITOR';

 	const renderFullScreen =
 		pathname === ROUTES.GET_STARTED ||
@@ -421,8 +418,7 @@ function AppLayout(props: AppLayoutProps): JSX.Element {
 		pathname === ROUTES.GET_STARTED_LOGS_MANAGEMENT ||
 		pathname === ROUTES.GET_STARTED_AWS_MONITORING ||
 		pathname === ROUTES.GET_STARTED_AZURE_MONITORING ||
-		isPublicDashboard ||
-		isPanelEditorV2;
+		isPublicDashboard;

 	const [showTrialExpiryBanner, setShowTrialExpiryBanner] = useState(false);

--- a/frontend/src/container/CreateAlertChannels/CreateAlertChannels.styles.scss
+++ b/frontend/src/container/CreateAlertChannels/CreateAlertChannels.styles.scss
@@ -1,5 +1,7 @@
 .create-alert-channels-container {
-	width: 100%;
+	width: 90%;
+	margin: 12px auto;
+
 	border: 1px solid var(--l1-border);
 	background: var(--l2-background);
 	border-radius: 3px;
--- a/frontend/src/container/DashboardContainer/visualization/layout/ChartLayout/ChartLayout.styles.scss
+++ b/frontend/src/container/DashboardContainer/visualization/layout/ChartLayout/ChartLayout.styles.scss
@@ -7,17 +7,15 @@

 	&--legend-right {
 		flex-direction: row;
+
+		.chart-layout__legend-wrapper {
+			padding-left: 0 !important;
+		}
 	}

 	&__legend-wrapper {
-		// The inline height is the legend rectangle from calculateChartDimensions;
-		// border-box keeps the padding inside it so the wrapper doesn't grow past
-		// that height and steal space from the chart. overflow:hidden clips to the
-		// rectangle so the virtualized legend scrolls within it.
-		box-sizing: border-box;
-		min-height: 0;
-		overflow: hidden;
 		padding-left: 12px;
 		padding-bottom: 12px;
+		overflow: auto;
 	}
 }
--- a/frontend/src/container/RolesSettings/RolesComponents/CreateRoleModal.tsx
+++ b/frontend/src/container/RolesSettings/RolesComponents/CreateRoleModal.tsx
@@ -116,8 +116,7 @@ function CreateRoleModal({
 			} else {
 				const data: AuthtypesPostableRoleDTO = {
 					name: values.name,
-					description: values.description || '',
-					transactionGroups: [],
+					...(values.description ? { description: values.description } : {}),
 				};
 				createRole({ data });
 			}
--- a/frontend/src/container/SideNav/SideNav.tsx
+++ b/frontend/src/container/SideNav/SideNav.tsx
@@ -80,7 +80,7 @@ import signozBrandLogoUrl from '@/assets/Logos/signoz-brand-logo.svg';

 import { useCmdK } from '../../providers/cmdKProvider';
 import { routeConfig } from './config';
-import { buildNavUrl, getQueryString } from './helper';
+import { getQueryString } from './helper';
 import {
 	defaultMoreMenuItems,
 	getUserSettingsDropdownMenuItems,
@@ -486,13 +486,12 @@ function SideNav({ isPinned }: { isPinned: boolean }): JSX.Element {
 			const availableParams = routeConfig[key];

 			const queryString = getQueryString(availableParams || [], params);
-			const url = buildNavUrl(key, queryString);

 			if (pathname !== key) {
 				if (event && isModifierKeyPressed(event)) {
-					openInNewTab(url);
+					openInNewTab(`${key}?${queryString.join('&')}`);
 				} else {
-					history.push(url, {
+					history.push(`${key}?${queryString.join('&')}`, {
 						from: pathname,
 					});
 				}
--- a/frontend/src/container/SideNav/helper.ts
+++ b/frontend/src/container/SideNav/helper.ts
@@ -8,14 +8,3 @@ export const getQueryString = (
 		}
 		return '';
 	});
-
-/**
- * @deprecated This should be removed after https://github.com/SigNoz/engineering-pod/issues/5322 is done
- */
-export const buildNavUrl = (key: string, queryString: string[]): string => {
-	if (key.includes('?')) {
-		const extra = queryString.filter(Boolean).join('&');
-		return extra ? `${key}&${extra}` : key;
-	}
-	return `${key}?${queryString.join('&')}`;
-};
--- a/frontend/src/container/SideNav/menuItems.tsx
+++ b/frontend/src/container/SideNav/menuItems.tsx
@@ -337,7 +337,6 @@ export const settingsNavSections: SettingsNavSection[] = [
 				isEnabled: true,
 				itemKey: 'account',
 			},
-			// TODO(@SigNoz/pulse-frontend): https://github.com/SigNoz/engineering-pod/issues/5323
 			{
 				key: ROUTES.ALL_CHANNELS,
 				label: 'Notification Channels',
--- a/frontend/src/hooks/tests/useConfirmableAction.test.ts
+++ b/frontend/src/hooks/tests/useConfirmableAction.test.ts
@@ -1,61 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-
-import { useConfirmableAction } from '../useConfirmableAction';
-
-describe('useConfirmableAction', () => {
-	it('starts closed and idle', () => {
-		const { result } = renderHook(() =>
-			useConfirmableAction(jest.fn().mockResolvedValue(undefined)),
-		);
-		expect(result.current.open).toBe(false);
-		expect(result.current.isPending).toBe(false);
-	});
-
-	it('request() opens the prompt without running the action', () => {
-		const action = jest.fn().mockResolvedValue(undefined);
-		const { result } = renderHook(() => useConfirmableAction(action));
-
-		act(() => result.current.request());
-
-		expect(result.current.open).toBe(true);
-		expect(action).not.toHaveBeenCalled();
-	});
-
-	it('confirm() runs the action and closes on success', async () => {
-		const action = jest.fn().mockResolvedValue(undefined);
-		const { result } = renderHook(() => useConfirmableAction(action));
-
-		act(() => result.current.request());
-		await act(async () => {
-			await result.current.confirm();
-		});
-
-		expect(action).toHaveBeenCalledTimes(1);
-		expect(result.current.open).toBe(false);
-		expect(result.current.isPending).toBe(false);
-	});
-
-	it('keeps the prompt open and resets pending when the action rejects', async () => {
-		const action = jest.fn().mockRejectedValue(new Error('boom'));
-		const { result } = renderHook(() => useConfirmableAction(action));
-
-		act(() => result.current.request());
-		await act(async () => {
-			await expect(result.current.confirm()).rejects.toThrow('boom');
-		});
-
-		expect(result.current.open).toBe(true);
-		expect(result.current.isPending).toBe(false);
-	});
-
-	it('cancel() closes the prompt without running the action', () => {
-		const action = jest.fn().mockResolvedValue(undefined);
-		const { result } = renderHook(() => useConfirmableAction(action));
-
-		act(() => result.current.request());
-		act(() => result.current.cancel());
-
-		expect(result.current.open).toBe(false);
-		expect(action).not.toHaveBeenCalled();
-	});
-});
--- a/frontend/src/hooks/useConfirmableAction.ts
+++ b/frontend/src/hooks/useConfirmableAction.ts
@@ -1,45 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-
-export interface ConfirmableAction {
-	/** Whether the confirmation prompt is open. */
-	open: boolean;
-	/** The confirmed action is in flight. */
-	isPending: boolean;
-	/** Open the confirmation prompt (e.g. from a menu item / button). */
-	request: () => void;
-	/** Run the action, tracking the in-flight flag; closes the prompt on success. */
-	confirm: () => Promise<void>;
-	/** Dismiss the prompt without acting. */
-	cancel: () => void;
-}
-
-/**
- * Generic two-step confirm flow for a (usually destructive) async action.
- * `request()` opens the prompt, `confirm()` runs `action` while tracking an
- * in-flight flag and closes on success, `cancel()` dismisses it. Owns only the
- * confirm state machine — what renders the prompt (dialog, popover) is the
- * caller's concern, so it stays reusable across confirm surfaces.
- */
-export function useConfirmableAction(
-	action: () => Promise<void>,
-): ConfirmableAction {
-	const [open, setOpen] = useState(false);
-	const [isPending, setIsPending] = useState(false);
-
-	const request = useCallback((): void => setOpen(true), []);
-	const cancel = useCallback((): void => setOpen(false), []);
-	const confirm = useCallback(async (): Promise<void> => {
-		setIsPending(true);
-		try {
-			await action();
-			setOpen(false);
-		} finally {
-			setIsPending(false);
-		}
-	}, [action]);
-
-	return useMemo(
-		() => ({ open, isPending, request, confirm, cancel }),
-		[open, isPending, request, confirm, cancel],
-	);
-}
--- a/frontend/src/lib/uPlotV2/components/Legend/Legend.styles.scss
+++ b/frontend/src/lib/uPlotV2/components/Legend/Legend.styles.scss
@@ -1,5 +1,3 @@
-@use '../../../../styles/scrollbar' as *;
-
 .legend-search-container {
 	flex-shrink: 0;
 	width: 100%;
@@ -17,10 +15,6 @@
 	gap: 12px;
 	height: 100%;
 	width: 100%;
-	// Allow the flex children to shrink below their content height so the
-	// virtualized grid scrolls within the capped legend height instead of
-	// overflowing the wrapper (default min-height:auto would block the shrink).
-	min-height: 0;

 	&:has(.legend-item-focused) .legend-item {
 		opacity: 0.3;
@@ -39,11 +33,6 @@
 	}

 	.legend-virtuoso-container {
-		// flex:1 + min-height:0 pins the scroller to the space left after the
-		// search box (RIGHT legend) and lets it scroll instead of growing to fit
-		// every row — without this the grid overflows a BOTTOM legend's fixed height.
-		flex: 1;
-		min-height: 0;
 		height: 100%;
 		width: 100%;

@@ -78,7 +67,18 @@
 			}
 		}

-		@include custom-scrollbar;
+		&::-webkit-scrollbar {
+			width: 0.3rem;
+		}
+
+		&::-webkit-scrollbar-track {
+			background: transparent;
+		}
+
+		&::-webkit-scrollbar-thumb {
+			background: var(--l3-background);
+			border-radius: 0.5rem;
+		}
 	}
 }

@@ -108,10 +108,6 @@
 	align-items: center;
 	gap: 6px;
 	padding: 4px 8px;
-	// Include padding within the width so a full-width row (legend-item-right) fits its
-	// column instead of overflowing by the 16px horizontal padding — there is no global
-	// border-box reset, so the default content-box would make it overflow.
-	box-sizing: border-box;
 	max-width: 100%;
 	overflow: hidden;
 	border-radius: 4px;
--- a/frontend/src/lib/uPlotV2/config/UPlotSeriesBuilder.ts
+++ b/frontend/src/lib/uPlotV2/config/UPlotSeriesBuilder.ts
@@ -87,7 +87,7 @@ export class UPlotSeriesBuilder extends ConfigBuilder<
 			lineConfig.fill = `${finalFillColor}40`;
 		} else if (fillMode && fillMode !== FillMode.None) {
 			if (fillMode === FillMode.Solid) {
-				lineConfig.fill = `${finalFillColor}70`;
+				lineConfig.fill = finalFillColor;
 			} else if (fillMode === FillMode.Gradient) {
 				lineConfig.fill = (self: uPlot): CanvasGradient =>
 					generateGradientFill(self, finalFillColor, 'rgba(0, 0, 0, 0)');
--- a/frontend/src/pages/AlertList/index.tsx
+++ b/frontend/src/pages/AlertList/index.tsx
@@ -4,17 +4,14 @@ import { Tabs, TabsProps } from 'antd';
 import ConfigureIcon from 'assets/AlertHistory/ConfigureIcon';
 import HeaderRightSection from 'components/HeaderRightSection/HeaderRightSection';
 import ROUTES from 'constants/routes';
-import AllAlertChannels from 'container/AllAlertChannels';
 import AllAlertRules from 'container/ListAlertRules';
 import { PlannedDowntime } from 'container/PlannedDowntime/PlannedDowntime';
 import RoutingPolicies from 'container/RoutingPolicies';
 import TriggeredAlerts from 'container/TriggeredAlerts';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';
 import useUrlQuery from 'hooks/useUrlQuery';
-import { Cable, GalleryVerticalEnd, Pyramid } from '@signozhq/icons';
+import { GalleryVerticalEnd, Pyramid } from '@signozhq/icons';
 import AlertDetails from 'pages/AlertDetails';
-import ChannelsEdit from 'pages/ChannelsEdit';
-import ChannelsNew from 'pages/ChannelsNew';

 import { AlertListSubTabs, AlertListTabs } from './types';

@@ -29,9 +26,6 @@ function AllAlertList(): JSX.Element {
 	const subTab = urlQuery.get('subTab');
 	const isAlertHistory = location.pathname === ROUTES.ALERT_HISTORY;
 	const isAlertOverview = location.pathname === ROUTES.ALERT_OVERVIEW;
-	const isChannelsNew = location.pathname === ROUTES.CHANNELS_NEW;
-	const isChannelsEdit = location.pathname.startsWith('/alerts/channels/edit/');
-	const isChannelDetails = isChannelsNew || isChannelsEdit;

 	const handleConfigurationTabChange = useCallback(
 		(subTab: string): void => {
@@ -92,22 +86,6 @@ function AllAlertList(): JSX.Element {
 				</div>
 			),
 		},
-		{
-			label: (
-				<div className="periscope-tab top-level-tab">
-					<Cable size={14} />
-					Notification Channels
-				</div>
-			),
-			key: AlertListTabs.CHANNELS,
-			children: (
-				<div className="alert-rules-container">
-					{isChannelsNew && <ChannelsNew />}
-					{isChannelsEdit && <ChannelsEdit />}
-					{!isChannelDetails && <AllAlertChannels />}
-				</div>
-			),
-		},
 		{
 			label: (
 				<div className="periscope-tab top-level-tab">
@@ -120,21 +98,11 @@ function AllAlertList(): JSX.Element {
 		},
 	];

-	const getActiveKey = (): string => {
-		if (isAlertHistory || isAlertOverview) {
-			return AlertListTabs.ALERT_RULES;
-		}
-		if (isChannelDetails) {
-			return AlertListTabs.CHANNELS;
-		}
-		return tab || AlertListTabs.ALERT_RULES;
-	};
-
 	return (
 		<Tabs
 			destroyInactiveTabPane
 			items={items}
-			activeKey={getActiveKey()}
+			activeKey={tab || AlertListTabs.ALERT_RULES}
 			onChange={(tab): void => {
 				const queryParams = new URLSearchParams();

@@ -152,9 +120,7 @@ function AllAlertList(): JSX.Element {
 				safeNavigate(`/alerts?${queryParams.toString()}`);
 			}}
 			className={`alerts-container ${
-				isAlertHistory || isAlertOverview || isChannelDetails
-					? 'alert-details-tabs'
-					: ''
+				isAlertHistory || isAlertOverview ? 'alert-details-tabs' : ''
 			}`}
 			tabBarExtraContent={
 				<HeaderRightSection
--- a/frontend/src/pages/AlertList/types.ts
+++ b/frontend/src/pages/AlertList/types.ts
@@ -7,5 +7,4 @@ export enum AlertListTabs {
 	TRIGGERED_ALERTS = 'TriggeredAlerts',
 	ALERT_RULES = 'AlertRules',
 	CONFIGURATION = 'Configuration',
-	CHANNELS = 'Channels',
 }
--- a/frontend/src/pages/ChannelsEdit/index.tsx
+++ b/frontend/src/pages/ChannelsEdit/index.tsx
@@ -4,9 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useQuery } from 'react-query';
 import { Typography } from '@signozhq/ui/typography';
 import get from 'api/channels/get';
-import AlertBreadcrumb from 'components/AlertBreadcrumb';
 import Spinner from 'components/Spinner';
-import ROUTES from 'constants/routes';
 import {
 	ChannelType,
 	MsTeamsChannel,
@@ -24,9 +22,9 @@ import './ChannelsEdit.styles.scss';
 function ChannelsEdit(): JSX.Element {
 	const { t } = useTranslation();

-	// Extract channelId from URL pathname
+	// Extract channelId from URL pathname since useParams doesn't work in nested routing
 	const { pathname } = window.location;
-	const channelIdMatch = pathname.match(/\/alerts\/channels\/edit\/([^/]+)/);
+	const channelIdMatch = pathname.match(/\/settings\/channels\/edit\/([^/]+)/);
 	const channelId = channelIdMatch ? channelIdMatch[1] : undefined;

 	const { isFetching, isError, data, error } = useQuery<
@@ -137,25 +135,17 @@ function ChannelsEdit(): JSX.Element {
 	const target = prepChannelConfig();

 	return (
-		<>
-			<AlertBreadcrumb
-				items={[
-					{ title: 'Channels', route: ROUTES.ALL_CHANNELS },
-					{ title: value.name || 'Edit Channel', isLast: true },
-				]}
+		<div className="edit-alert-channels-container">
+			<EditAlertChannels
+				{...{
+					initialValue: {
+						...target.channel,
+						type: target.type,
+						name: value.name,
+					},
+				}}
 			/>
-			<div className="edit-alert-channels-container">
-				<EditAlertChannels
-					{...{
-						initialValue: {
-							...target.channel,
-							type: target.type,
-							name: value.name,
-						},
-					}}
-				/>
-			</div>
-		</>
+		</div>
 	);
 }

--- a/frontend/src/pages/ChannelsNew/index.tsx
+++ b/frontend/src/pages/ChannelsNew/index.tsx
@@ -1,23 +0,0 @@
-import AlertBreadcrumb from 'components/AlertBreadcrumb';
-import ROUTES from 'constants/routes';
-import CreateAlertChannels from 'container/CreateAlertChannels';
-import { ChannelType } from 'container/CreateAlertChannels/config';
-import styles from './styles.module.scss';
-
-function ChannelsNew(): JSX.Element {
-	return (
-		<>
-			<AlertBreadcrumb
-				items={[
-					{ title: 'Channels', route: ROUTES.ALL_CHANNELS },
-					{ title: 'New Channel', isLast: true },
-				]}
-			/>
-			<div className={styles.content}>
-				<CreateAlertChannels preType={ChannelType.Slack} />
-			</div>
-		</>
-	);
-}
-
-export default ChannelsNew;
--- a/frontend/src/pages/ChannelsNew/styles.module.scss
+++ b/frontend/src/pages/ChannelsNew/styles.module.scss
@@ -1,4 +0,0 @@
-.content {
-	padding: var(--spacing-8);
-	padding-top: 0px;
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardPageToolbar/index.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardPageToolbar/index.tsx
@@ -20,7 +20,7 @@ import APIError from 'types/api/error';
 import DashboardActions from './DashboardActions/DashboardActions';
 import DashboardInfo from './DashboardInfo/DashboardInfo';
 import { useEditableTitle } from './DashboardInfo/useEditableTitle';
-import VariablesBar from '../VariablesBar/VariablesBar';
+import { usePublicDashboardMeta } from '../DashboardSettings/PublicDashboard/usePublicDashboardMeta';

 import styles from './DashboardPageToolbar.module.scss';

@@ -53,6 +53,10 @@ function DashboardPageToolbar(props: DashboardPageToolbarProps): JSX.Element {
 		(s) => s.setIsPanelTypeSelectionModalOpen,
 	);

+	// Single global fetch of the public-sharing meta (the drawer reuses this cache);
+	// drives the public-access badge.
+	const { isPublic: isPublicDashboard } = usePublicDashboardMeta(id);
+
 	const isAuthor =
 		!!user?.email && !!dashboard.createdBy && dashboard.createdBy === user.email;

@@ -118,7 +122,7 @@ function DashboardPageToolbar(props: DashboardPageToolbarProps): JSX.Element {
 					image={image}
 					tags={tags}
 					description={description}
-					isPublicDashboard={false}
+					isPublicDashboard={isPublicDashboard}
 					isDashboardLocked={isDashboardLocked}
 					isEditing={isEditing}
 					draft={draft}
@@ -138,8 +142,6 @@ function DashboardPageToolbar(props: DashboardPageToolbarProps): JSX.Element {
 					onOpenRename={startEdit}
 				/>
 			</div>
-
-			<VariablesBar dashboard={dashboard} />
 		</section>
 	);
 }
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/VariableForm/QueryVariableFields.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/VariableForm/QueryVariableFields.tsx
@@ -2,15 +2,16 @@ import { useState } from 'react';
 import { Button } from '@signozhq/ui/button';
 import { Typography } from '@signozhq/ui/typography';
 import dashboardVariablesQuery from 'api/dashboard/variables/dashboardVariablesQuery';
+import { DashboardtypesListVariableSpecSortDTO as VariableSortDTO } from 'api/generated/services/sigNoz.schemas';
 import Editor from 'components/Editor';
 import sortValues from 'lib/dashboardVariables/sortVariableValues';

-import type { VariableSort } from '../variableModel';
+import { sortDirectionOf } from '../variableModel';
 import styles from './VariableForm.module.scss';

 interface QueryVariableFieldsProps {
 	queryValue: string;
-	sort: VariableSort;
+	sort: VariableSortDTO;
 	onChange: (queryValue: string) => void;
 	onPreview: (values: (string | number)[]) => void;
 	onError: (message: string | null) => void;
@@ -36,7 +37,10 @@ function QueryVariableFields({
 			});
 			if (res.statusCode === 200 && res.payload) {
 				onPreview(
-					sortValues(res.payload.variableValues ?? [], sort) as (string | number)[],
+					sortValues(res.payload.variableValues ?? [], sortDirectionOf(sort)) as (
+						| string
+						| number
+					)[],
 				);
 			} else {
 				onError(res.error || 'Failed to run query');
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/VariableForm/VariableForm.tsx
@@ -12,10 +12,12 @@ import { Collapse, Input as AntdInput, Select } from 'antd';
 import { commaValuesParser } from 'lib/dashboardVariables/customCommaValuesParser';
 import sortValues from 'lib/dashboardVariables/sortVariableValues';

+import { DashboardtypesListVariableSpecSortDTO as VariableSortDTO } from 'api/generated/services/sigNoz.schemas';
+
 import {
+	sortDirectionOf,
 	VARIABLE_SORTS,
 	type VariableFormModel,
-	type VariableSort,
 	type VariableType,
 } from '../variableModel';
 import DynamicVariableFields from './DynamicVariableFields';
@@ -23,10 +25,16 @@ import QueryVariableFields from './QueryVariableFields';
 import VariableTypeSelector from './VariableTypeSelector';
 import styles from './VariableForm.module.scss';

-const SORT_LABEL: Record<VariableSort, string> = {
-	DISABLED: 'Disabled',
-	ASC: 'Ascending',
-	DESC: 'Descending',
+const SORT_LABEL: Record<VariableSortDTO, string> = {
+	[VariableSortDTO.none]: 'Disabled',
+	[VariableSortDTO['alphabetical-asc']]: 'Alphabetical (asc)',
+	[VariableSortDTO['alphabetical-desc']]: 'Alphabetical (desc)',
+	[VariableSortDTO['numerical-asc']]: 'Numerical (asc)',
+	[VariableSortDTO['numerical-desc']]: 'Numerical (desc)',
+	[VariableSortDTO['alphabetical-ci-asc']]:
+		'Alphabetical, case-insensitive (asc)',
+	[VariableSortDTO['alphabetical-ci-desc']]:
+		'Alphabetical, case-insensitive (desc)',
 };

 function getNameError(name: string, existingNames: string[]): string | null {
@@ -91,7 +99,10 @@ function VariableForm({
 	const onCustomChange = (value: string): void => {
 		set({ customValue: value });
 		setPreviewValues(
-			sortValues(commaValuesParser(value), model.sort) as (string | number)[],
+			sortValues(commaValuesParser(value), sortDirectionOf(model.sort)) as (
+				| string
+				| number
+			)[],
 		);
 	};

@@ -259,7 +270,7 @@ function VariableForm({
 										label: SORT_LABEL[sort],
 										value: sort,
 									}))}
-									onChange={(value): void => set({ sort: value as VariableSort })}
+									onChange={(value): void => set({ sort: value as VariableSortDTO })}
 									testId="variable-sort-select"
 								/>
 							</div>
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/variableAdapters.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/variableAdapters.ts
@@ -1,16 +1,17 @@
 import {
-	DashboardtypesVariableEnvelopeGithubComPersesSpecGoDashboardTextVariableSpecDTOKind as TextEnvelopeKind,
+	DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesTextVariableSpecDTOKind as TextEnvelopeKind,
 	DashboardtypesVariableEnvelopeGithubComSigNozSignozPkgTypesDashboardtypesListVariableSpecDTOKind as ListEnvelopeKind,
 	DashboardtypesVariablePluginVariantGithubComSigNozSignozPkgTypesDashboardtypesCustomVariableSpecDTOKind as CustomPluginKind,
 	DashboardtypesVariablePluginVariantGithubComSigNozSignozPkgTypesDashboardtypesDynamicVariableSpecDTOKind as DynamicPluginKind,
 	DashboardtypesVariablePluginVariantGithubComSigNozSignozPkgTypesDashboardtypesQueryVariableSpecDTOKind as QueryPluginKind,
+	DashboardtypesListVariableSpecSortDTO as VariableSortDTO,
 	TelemetrytypesSignalDTO,
 } from 'api/generated/services/sigNoz.schemas';
 import type {
 	DashboardtypesListVariableSpecDTO,
 	DashboardtypesVariableDTO,
 	DashboardtypesVariablePluginDTO,
-	DashboardTextVariableSpecDTO,
+	DashboardtypesTextVariableSpecDTO,
 } from 'api/generated/services/sigNoz.schemas';

 import {
@@ -18,7 +19,6 @@ import {
 	PLUGIN_KIND,
 	type TelemetrySignal,
 	type VariableFormModel,
-	type VariableSort,
 } from './variableModel';

 /** DTO envelope → flat form model (for display / editing). */
@@ -35,7 +35,7 @@ export function dtoToFormModel(

 	// Text variable — a distinct envelope (no list plugin).
 	if (dto.kind === TextEnvelopeKind.TextVariable) {
-		const spec = dto.spec as DashboardTextVariableSpecDTO;
+		const spec = dto.spec as DashboardtypesTextVariableSpecDTO;
 		return {
 			...common,
 			type: 'TEXT',
@@ -50,7 +50,7 @@ export function dtoToFormModel(
 		...common,
 		multiSelect: spec.allowMultiple ?? false,
 		showAllOption: spec.allowAllValue ?? false,
-		sort: (spec.sort as VariableSort) ?? 'DISABLED',
+		sort: spec.sort ?? VariableSortDTO.none,
 		defaultValue: spec.defaultValue,
 	};
 	const plugin = spec.plugin;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/variableModel.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardSettings/Variables/variableModel.ts
@@ -1,5 +1,6 @@
-import { sortBy } from 'lodash-es';
+import { DashboardtypesListVariableSpecSortDTO as VariableSortDTO } from 'api/generated/services/sigNoz.schemas';
 import type { VariableDefaultValueDTO } from 'api/generated/services/sigNoz.schemas';
+import type { TSortVariableValuesType } from 'types/api/dashboard/getAll';

 /**
 * Flat, UI-friendly representation of a V2 dashboard variable. The wire format
@@ -9,8 +10,6 @@ import type { VariableDefaultValueDTO } from 'api/generated/services/sigNoz.sche

 export type VariableType = 'QUERY' | 'CUSTOM' | 'TEXT' | 'DYNAMIC';

-export type VariableSort = 'DISABLED' | 'ASC' | 'DESC';
-
 export type TelemetrySignal = 'traces' | 'logs' | 'metrics';

 /** Wire `kind` discriminators (string values of the generated enums). */
@@ -25,7 +24,20 @@ export const PLUGIN_KIND = {
 	DYNAMIC: 'signoz/DynamicVariable',
 } as const;

-export const VARIABLE_SORTS: VariableSort[] = ['DISABLED', 'ASC', 'DESC'];
+export const VARIABLE_SORTS: VariableSortDTO[] = Object.values(VariableSortDTO);
+
+/** Direction the preview sorter should apply for a given wire sort value. */
+export function sortDirectionOf(
+	sort: VariableSortDTO,
+): TSortVariableValuesType {
+	if (sort.endsWith('-asc')) {
+		return 'ASC';
+	}
+	if (sort.endsWith('-desc')) {
+		return 'DESC';
+	}
+	return 'DISABLED';
+}

 export const TELEMETRY_SIGNALS: TelemetrySignal[] = [
 	'traces',
@@ -43,7 +55,7 @@ export interface VariableFormModel {
 	// List-variable common fields (Query / Custom / Dynamic).
 	multiSelect: boolean;
 	showAllOption: boolean;
-	sort: VariableSort;
+	sort: VariableSortDTO;

 	// Type-specific.
 	queryValue: string; // QUERY
@@ -68,7 +80,7 @@ export function emptyVariableFormModel(): VariableFormModel {
 		type: 'QUERY',
 		multiSelect: false,
 		showAllOption: false,
-		sort: 'DISABLED',
+		sort: VariableSortDTO.none,
 		queryValue: '',
 		customValue: '',
 		textValue: '',
@@ -77,26 +89,3 @@ export function emptyVariableFormModel(): VariableFormModel {
 		dynamicSignal: 'traces',
 	};
 }
-
-/** Maps the dynamic-variable signal to the field-values API signal. */
-export function signalForApi(
-	signal: TelemetrySignal,
-): TelemetrySignal | undefined {
-	return signal;
-}
-
-type SortableValues = (string | number | boolean)[];
-
-/** Sorts option/preview values by the variable's chosen order (no-op when disabled). */
-export function sortValuesByOrder(
-	values: SortableValues,
-	sort: VariableSort,
-): SortableValues {
-	if (sort === 'ASC') {
-		return sortBy(values);
-	}
-	if (sort === 'DESC') {
-		return sortBy(values).reverse();
-	}
-	return values;
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/Header/Header.module.scss
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/Header/Header.module.scss
@@ -1,22 +0,0 @@
-.header {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	gap: 12px;
-	padding: 12px 16px;
-	background-color: var(--l1-background-60);
-	border-bottom: 1px solid var(--l1-border);
-}
-
-.title {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	min-width: 0;
-}
-
-.actions {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/Header/Header.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/Header/Header.tsx
@@ -1,86 +0,0 @@
-import { useCallback } from 'react';
-import { SolidAlertTriangle, X } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { ConfirmDialog } from '@signozhq/ui/dialog';
-import { Divider } from '@signozhq/ui/divider';
-import { Typography } from '@signozhq/ui/typography';
-import { useConfirmableAction } from 'hooks/useConfirmableAction';
-
-import styles from './Header.module.scss';
-
-interface HeaderProps {
-	isDirty: boolean;
-	isSaving: boolean;
-	onSave: () => void;
-	onClose: () => void;
-}
-
-function Header({
-	isDirty,
-	isSaving,
-	onSave,
-	onClose,
-}: HeaderProps): JSX.Element {
-	const discard = useConfirmableAction(
-		useCallback(async (): Promise<void> => onClose(), [onClose]),
-	);
-
-	// Confirm before closing with unsaved edits; a pristine panel closes straight away.
-	const handleCloseClick = useCallback((): void => {
-		if (isDirty) {
-			discard.request();
-		} else {
-			onClose();
-		}
-	}, [isDirty, onClose, discard]);
-
-	return (
-		<div className={styles.header}>
-			<div className={styles.title}>
-				<Button
-					variant="ghost"
-					color="secondary"
-					size="icon"
-					suffix={<X size={14} />}
-					data-testid="panel-editor-v2-close"
-					onClick={handleCloseClick}
-				/>
-				<Divider type="vertical" />
-				<Typography.Text>Configure panel</Typography.Text>
-			</div>
-			<div className={styles.actions}>
-				<Button
-					variant="solid"
-					color="primary"
-					data-testid="panel-editor-v2-save"
-					disabled={!isDirty || isSaving}
-					loading={isSaving}
-					onClick={onSave}
-				>
-					Save changes
-				</Button>
-			</div>
-
-			<ConfirmDialog
-				open={discard.open}
-				onOpenChange={(next): void => {
-					if (!next) {
-						discard.cancel();
-					}
-				}}
-				title="Discard changes?"
-				titleIcon={<SolidAlertTriangle size={14} color="#fdd600" />}
-				confirmText="Discard"
-				confirmColor="destructive"
-				cancelText="Keep editing"
-				onConfirm={discard.confirm}
-				onCancel={discard.cancel}
-				data-testid="panel-editor-v2-discard-modal"
-			>
-				<Typography>Your unsaved edits to this panel will be lost.</Typography>
-			</ConfirmDialog>
-		</div>
-	);
-}
-
-export default Header;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PanelEditor.module.scss
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PanelEditor.module.scss
@@ -1,28 +0,0 @@
-// Full-page editor: fills the route's content area as a header-over-split
-// column (the editor is its own page now, not a modal overlay).
-.page {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-	min-height: 0;
-	overflow: hidden;
-	background: var(--l1-background);
-}
-
-.left {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-	min-height: 0;
-}
-
-.right {
-	display: flex;
-}
-
-.handle {
-	background: var(--l1-border);
-	&:hover {
-		background: var(--l2-border);
-	}
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.module.scss
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.module.scss
@@ -1,45 +0,0 @@
-@use '../../../../../styles/scrollbar' as *;
-.container {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-	min-height: 0;
-	overflow: auto;
-	background-color: var(--l1-background);
-	@include custom-scrollbar;
-}
-
-.scrollArea {
-	padding: 12px;
-}
-
-.tabsContainer {
-	width: 100%;
-
-	:global(.ant-tabs-tab) {
-		background-color: var(--l2-background) !important;
-		border-color: var(--l2-border) !important;
-	}
-	:global(.ant-tabs-tab-active) {
-		background-color: var(--l1-background) !important;
-	}
-	:global(.ant-tabs-nav) {
-		&::before {
-			border-color: var(--l2-border);
-		}
-	}
-}
-.queryTypeTab {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	gap: 4px;
-}
-.runQueryBtnContainer {
-	padding: 4px 0 8px 0;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: center;
-	gap: 1rem;
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PanelEditorQueryBuilder/PanelEditorQueryBuilder.tsx
@@ -1,165 +0,0 @@
-import {
-	type KeyboardEvent,
-	type ReactNode,
-	useCallback,
-	useMemo,
-} from 'react';
-import { Color } from '@signozhq/design-tokens';
-import { Atom, Terminal } from '@signozhq/icons';
-import { Tabs } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
-import PromQLIcon from 'assets/Dashboard/PromQl';
-import { QueryBuilderV2 } from 'components/QueryBuilderV2/QueryBuilderV2';
-import TextToolTip from 'components/TextToolTip';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import ClickHouseQueryContainer from 'container/NewWidget/LeftContainer/QuerySection/QueryBuilder/ClickHouse';
-import PromQLQueryContainer from 'container/NewWidget/LeftContainer/QuerySection/QueryBuilder/promQL';
-import { PANEL_TYPE_TO_QUERY_TYPES } from 'container/NewWidget/utils';
-import RunQueryBtn from 'container/QueryBuilder/components/RunQueryBtn/RunQueryBtn';
-import { QueryBuilderProps } from 'container/QueryBuilder/QueryBuilder.interfaces';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useIsDarkMode } from 'hooks/useDarkMode';
-import { EQueryType } from 'types/common/dashboard';
-
-import styles from './PanelEditorQueryBuilder.module.scss';
-
-interface PanelEditorQueryBuilderProps {
-	panelType: PANEL_TYPES;
-	/** Preview fetch in flight — drives the Stage & Run button's loading/cancel state. */
-	isLoadingQueries: boolean;
-	/** Run the current query (Stage & Run button / ⌘↵). Always re-runs. */
-	onStageRunQuery: () => void;
-	/** Abort the in-flight preview fetch (the button's cancel action). */
-	onCancelQuery: () => void;
-	/** Optional content pinned below the builder (e.g. the List columns editor). */
-	footer?: ReactNode;
-}
-
-/**
- * Builder UI for the V2 panel editor's left pane: queryType tabs (Query Builder /
- * ClickHouse / PromQL) plus the Stage & Run button, all reading/writing the global
- * `QueryBuilderProvider`. `usePanelEditorQuerySync` owns the panel↔provider sync.
- */
-function PanelEditorQueryBuilder({
-	panelType,
-	isLoadingQueries,
-	onStageRunQuery,
-	onCancelQuery,
-	footer,
-}: PanelEditorQueryBuilderProps): JSX.Element {
-	const { currentQuery, redirectWithQueryBuilderData } = useQueryBuilder();
-	const isDarkMode = useIsDarkMode();
-
-	const handleQueryCategoryChange = useCallback(
-		(queryType: string): void => {
-			redirectWithQueryBuilderData({
-				...currentQuery,
-				queryType: queryType as EQueryType,
-			});
-		},
-		[currentQuery, redirectWithQueryBuilderData],
-	);
-
-	// ⌘↵ / Ctrl+↵ stages and runs the query. Handled locally because the global
-	// hotkeys provider ignores keydowns from inputs / the query editor, and on the
-	// capture phase so it still fires for fields that stop bubbling (filter search,
-	// CodeMirror).
-	const handleKeyDownCapture = useCallback(
-		(event: KeyboardEvent<HTMLDivElement>): void => {
-			if ((event.metaKey || event.ctrlKey) && event.key === 'Enter') {
-				event.preventDefault();
-				onStageRunQuery();
-			}
-		},
-		[onStageRunQuery],
-	);
-
-	const filterConfigs: QueryBuilderProps['filterConfigs'] = useMemo(
-		() => ({ stepInterval: { isHidden: false, isDisabled: false } }),
-		[],
-	);
-
-	const items = useMemo(() => {
-		const supportedQueryTypes = PANEL_TYPE_TO_QUERY_TYPES[panelType] || [];
-
-		const queryTypeComponents = {
-			[EQueryType.QUERY_BUILDER]: {
-				icon: <Atom size={14} />,
-				label: 'Query Builder',
-				component: (
-					<div className="query-builder-v2-container">
-						<QueryBuilderV2
-							panelType={panelType}
-							filterConfigs={filterConfigs}
-							showTraceOperator={panelType !== PANEL_TYPES.LIST}
-							version="v3"
-							isListViewPanel={panelType === PANEL_TYPES.LIST}
-							queryComponents={{}}
-							signalSourceChangeEnabled
-							savePreviousQuery
-						/>
-					</div>
-				),
-			},
-			[EQueryType.CLICKHOUSE]: {
-				icon: <Terminal size={14} />,
-				label: 'ClickHouse Query',
-				component: <ClickHouseQueryContainer />,
-			},
-			[EQueryType.PROM]: {
-				icon: (
-					<PromQLIcon
-						fillColor={isDarkMode ? Color.BG_VANILLA_200 : Color.BG_INK_300}
-					/>
-				),
-				label: 'PromQL',
-				component: <PromQLQueryContainer />,
-			},
-		};
-
-		return supportedQueryTypes.map((queryType) => ({
-			key: queryType,
-			label: (
-				<div className={styles.queryTypeTab}>
-					{queryTypeComponents[queryType].icon}
-					<Typography>{queryTypeComponents[queryType].label}</Typography>
-				</div>
-			),
-			children: queryTypeComponents[queryType].component,
-		}));
-	}, [panelType, filterConfigs, isDarkMode]);
-
-	return (
-		<div
-			className={styles.container}
-			data-testid="panel-editor-v2-query-builder"
-			onKeyDownCapture={handleKeyDownCapture}
-			role="presentation"
-		>
-			<div className={styles.scrollArea}>
-				<Tabs
-					type="card"
-					className={styles.tabsContainer}
-					activeKey={currentQuery.queryType}
-					onChange={handleQueryCategoryChange}
-					tabBarExtraContent={
-						<span className={styles.runQueryBtnContainer}>
-							<TextToolTip text="This will temporarily save the current query and graph state. This will persist across tab change" />
-							<RunQueryBtn
-								className="run-query-dashboard-btn"
-								label="Stage & Run Query"
-								onStageRunQuery={onStageRunQuery}
-								isLoadingQueries={isLoadingQueries}
-								handleCancelQuery={onCancelQuery}
-							/>
-						</span>
-					}
-					items={items}
-				/>
-			</div>
-			{footer}
-		</div>
-	);
-}
-
-export default PanelEditorQueryBuilder;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PreviewPane/PreviewPane.module.scss
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PreviewPane/PreviewPane.module.scss
@@ -1,59 +0,0 @@
-.preview {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-	gap: 16px;
-	padding: 24px;
-	background-image: radial-gradient(var(--l2-border) 1px, transparent 0);
-	background-size: 20px 20px;
-	border-bottom: 1px solid var(--l1-border);
-}
-
-.header {
-	width: 100%;
-	box-sizing: border-box;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.queryType {
-	display: inline-flex;
-	padding: 4px 8px 4px 6px;
-	align-items: center;
-	gap: 6px;
-	border-radius: 4px;
-	background: var(--l3-background);
-	backdrop-filter: blur(6px);
-	width: fit-content;
-}
-
-.container {
-	display: flex;
-	flex: 1;
-	min-width: 0;
-	min-height: 0;
-}
-
-.surface {
-	flex: 1;
-	min-width: 0;
-	min-height: 0;
-	border: 1px solid var(--l2-border);
-	border-radius: 4px;
-	overflow: hidden;
-	display: flex;
-	background: var(--l2-background);
-	padding: 8px;
-}
-
-.state {
-	flex: 1;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	padding: 24px;
-	color: var(--l2-forground);
-	font-size: 13px;
-	text-align: center;
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PreviewPane/PreviewPane.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/PreviewPane/PreviewPane.tsx
@@ -1,83 +0,0 @@
-import { Spline } from '@signozhq/icons';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-import { PanelMode } from 'container/DashboardContainer/visualization/panels/types';
-import QueryTypeTag from 'container/NewWidget/LeftContainer/QueryTypeTag';
-import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
-import PanelBody from 'pages/DashboardPageV2/DashboardContainer/PanelsAndSectionsLayout/Panel/PanelBody/PanelBody';
-import type { RenderablePanelDefinition } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelDefinition';
-import type {
-	PanelPagination,
-	PanelQueryData,
-} from 'pages/DashboardPageV2/DashboardContainer/queryV5/types';
-import { EQueryType } from 'types/common/dashboard';
-
-import styles from './PreviewPane.module.scss';
-
-interface PreviewPaneProps {
-	panelId: string;
-	panel: DashboardtypesPanelDTO;
-	/** Resolved definition for the panel kind; undefined when the kind is unsupported. */
-	panelDef: RenderablePanelDefinition | undefined;
-	data: PanelQueryData;
-	isLoading: boolean;
-	error: Error | null;
-	/** Re-run the query (drives PanelBody's error-state retry). */
-	refetch: () => void;
-	/** Drag-to-zoom on a time-axis chart → updates the (URL-synced) time window. */
-	onDragSelect: (start: number, end: number) => void;
-	/** Server-side pager for raw/list panels; absent for non-paginated panels. */
-	pagination?: PanelPagination;
-}
-
-/**
- * Live preview for the panel editor. Renders the draft through the same `PanelBody`
- * the dashboard grid uses (only `panelMode={DASHBOARD_EDIT}` differs), so the preview
- * is the production render path. The query result is owned by the editor root.
- */
-function PreviewPane({
-	panelId,
-	panel,
-	panelDef,
-	data,
-	isLoading,
-	error,
-	refetch,
-	onDragSelect,
-	pagination,
-}: PreviewPaneProps): JSX.Element {
-	return (
-		<div className={styles.preview}>
-			<div className={styles.header}>
-				<div className={styles.queryType}>
-					<Spline size={14} />
-					Plotted with <QueryTypeTag queryType={EQueryType.QUERY_BUILDER} />
-				</div>
-				<DateTimeSelectionV2 showAutoRefresh hideShareModal />
-			</div>
-			<div className={styles.container}>
-				<div className={styles.surface}>
-					{panelDef ? (
-						<PanelBody
-							panelDefinition={panelDef}
-							panel={panel}
-							panelId={panelId}
-							data={data}
-							isLoading={isLoading}
-							error={error}
-							refetch={refetch}
-							onDragSelect={onDragSelect}
-							panelMode={PanelMode.DASHBOARD_EDIT}
-							pagination={pagination}
-						/>
-					) : (
-						<div className={styles.state} data-testid="panel-editor-v2-unknown-kind">
-							This panel type is not yet supported in V2.
-						</div>
-					)}
-				</div>
-			</div>
-		</div>
-	);
-}
-
-export default PreviewPane;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/tests/usePanelEditorDraft.test.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/tests/usePanelEditorDraft.test.ts
@@ -1,93 +0,0 @@
-import { act, renderHook } from '@testing-library/react';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { usePanelEditorDraft } from '../usePanelEditorDraft';
-
-function panel(name = 'CPU', description = 'usage'): DashboardtypesPanelDTO {
-	return {
-		kind: 'Panel',
-		spec: {
-			display: { name, description },
-			plugin: { kind: 'signoz/TimeSeriesPanel', spec: {} },
-			queries: [],
-		},
-	} as unknown as DashboardtypesPanelDTO;
-}
-
-describe('usePanelEditorDraft', () => {
-	it('exposes the panel spec and starts clean', () => {
-		const { result } = renderHook(() => usePanelEditorDraft(panel()));
-
-		expect(result.current.spec).toBe(result.current.draft.spec);
-		expect(result.current.spec.display?.name).toBe('CPU');
-		expect(result.current.isSpecDirty).toBe(false);
-	});
-
-	it('flags dirty and writes through on a display (title) edit via setSpec', () => {
-		const { result } = renderHook(() => usePanelEditorDraft(panel()));
-
-		act(() =>
-			result.current.setSpec({
-				...result.current.spec,
-				display: { ...result.current.spec.display, name: 'Memory' },
-			}),
-		);
-
-		expect(result.current.isSpecDirty).toBe(true);
-		expect(result.current.draft.spec?.display?.name).toBe('Memory');
-	});
-
-	it('flags dirty on a plugin-spec (non-display) edit', () => {
-		const { result } = renderHook(() => usePanelEditorDraft(panel()));
-
-		act(() =>
-			result.current.setSpec({
-				...result.current.spec,
-				plugin: {
-					kind: 'signoz/TimeSeriesPanel',
-					spec: { formatting: { unit: 'bytes' } },
-				},
-			} as typeof result.current.spec),
-		);
-
-		expect(result.current.isSpecDirty).toBe(true);
-		expect(
-			(
-				result.current.draft.spec?.plugin?.spec as {
-					formatting?: { unit?: string };
-				}
-			)?.formatting?.unit,
-		).toBe('bytes');
-	});
-
-	it('does not flag spec-dirty when only spec.queries changes (owned by the builder)', () => {
-		const { result } = renderHook(() => usePanelEditorDraft(panel()));
-
-		act(() =>
-			result.current.setSpec({
-				...result.current.spec,
-				queries: [{ id: 'committed-by-builder' }],
-			} as unknown as typeof result.current.spec),
-		);
-
-		expect(result.current.isSpecDirty).toBe(false);
-	});
-
-	it('reset restores the spec and clears dirty after an edit', () => {
-		const { result } = renderHook(() => usePanelEditorDraft(panel()));
-
-		act(() =>
-			result.current.setSpec({
-				...result.current.spec,
-				plugin: {
-					kind: 'signoz/TimeSeriesPanel',
-					spec: { formatting: { unit: 'ms' } },
-				},
-			} as typeof result.current.spec),
-		);
-		act(() => result.current.reset());
-
-		expect(result.current.isSpecDirty).toBe(false);
-		expect(result.current.spec.display?.name).toBe('CPU');
-	});
-});
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/tests/usePanelEditorQuerySync.test.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/tests/usePanelEditorQuerySync.test.ts
@@ -1,331 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import type {
-	DashboardtypesPanelDTO,
-	DashboardtypesPanelSpecDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { getIsQueryModified } from 'container/NewWidget/utils';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
-import type { Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import { fromPerses, toPerses } from '../../../queryV5/persesQueryAdapters';
-import { usePanelEditorQuerySync } from '../usePanelEditorQuerySync';
-
-jest.mock('hooks/queryBuilder/useQueryBuilder', () => ({
-	useQueryBuilder: jest.fn(),
-}));
-jest.mock('hooks/queryBuilder/useShareBuilderUrl', () => ({
-	useShareBuilderUrl: jest.fn(),
-}));
-jest.mock('container/NewWidget/utils', () => ({
-	getIsQueryModified: jest.fn(),
-}));
-jest.mock('../../../queryV5/persesQueryAdapters', () => ({
-	fromPerses: jest.fn(),
-	toPerses: jest.fn(),
-}));
-// commitQuery's no-op guard compares queries at the envelope level; with the
-// adapters mocked, unwrap identity-style so the opaque fixtures stay distinct
-// (CONVERTED vs SAVED) and the commit decisions are what's under test.
-jest.mock('../../../queryV5/buildQueryRangeRequest', () => ({
-	toQueryEnvelopes: jest.fn((queries: unknown) => queries),
-}));
-
-const mockUseQueryBuilder = useQueryBuilder as unknown as jest.Mock;
-const mockUseShareBuilderUrl = useShareBuilderUrl as unknown as jest.Mock;
-const mockGetIsQueryModified = getIsQueryModified as unknown as jest.Mock;
-const mockFromPerses = fromPerses as unknown as jest.Mock;
-const mockToPerses = toPerses as unknown as jest.Mock;
-
-// Opaque fixtures — the adapters are mocked, so only identity matters here.
-const SAVED_QUERIES = [{ id: 'saved' }] as unknown as NonNullable<
-	DashboardtypesPanelSpecDTO['queries']
->;
-const CONVERTED_QUERIES = [{ id: 'converted' }] as unknown as NonNullable<
-	DashboardtypesPanelSpecDTO['queries']
->;
-const SEED_V1 = { id: 'seed', queryType: 'builder' } as unknown as Query;
-const STAGED_V1 = { id: 'staged', queryType: 'builder' } as unknown as Query;
-
-function makeDraft(
-	queries = SAVED_QUERIES,
-	kind = 'signoz/TimeSeriesPanel',
-): DashboardtypesPanelDTO {
-	return {
-		kind: 'Panel',
-		spec: {
-			display: { name: 'Panel' },
-			plugin: { kind, spec: {} },
-			queries,
-		},
-	} as unknown as DashboardtypesPanelDTO;
-}
-
-function builderState(
-	overrides: Partial<{
-		currentQuery: Query;
-		stagedQuery: Query | null;
-		handleRunQuery: jest.Mock;
-	}> = {},
-): {
-	currentQuery: Query;
-	stagedQuery: Query | null;
-	handleRunQuery: jest.Mock;
-} {
-	return {
-		currentQuery: { id: 'current', queryType: 'builder' } as unknown as Query,
-		stagedQuery: STAGED_V1,
-		handleRunQuery: jest.fn(),
-		...overrides,
-	};
-}
-
-describe('usePanelEditorQuerySync', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockFromPerses.mockReturnValue(SEED_V1);
-		mockToPerses.mockReturnValue(CONVERTED_QUERIES);
-		mockGetIsQueryModified.mockReturnValue(false);
-		mockUseQueryBuilder.mockReturnValue(builderState());
-	});
-
-	function setup(
-		opts: {
-			draft?: DashboardtypesPanelDTO;
-			setSpec?: jest.Mock;
-			refetch?: jest.Mock;
-		} = {},
-	): {
-		result: {
-			current: {
-				runQuery: () => void;
-				isQueryDirty: boolean;
-				buildSaveSpec: (
-					spec: DashboardtypesPanelSpecDTO,
-				) => DashboardtypesPanelSpecDTO;
-			};
-		};
-		setSpec: jest.Mock;
-		refetch: jest.Mock;
-		rerender: () => void;
-	} {
-		const setSpec = opts.setSpec ?? jest.fn();
-		const refetch = opts.refetch ?? jest.fn();
-		const draft = opts.draft ?? makeDraft();
-		const { result, rerender } = renderHook(() =>
-			usePanelEditorQuerySync({
-				draft,
-				panelType: PANEL_TYPES.TIME_SERIES,
-				setSpec,
-				refetch,
-			}),
-		);
-		return { result, setSpec, refetch, rerender };
-	}
-
-	it('force-resets the builder to the saved queries on mount (discards stale URL)', () => {
-		setup();
-		expect(mockFromPerses).toHaveBeenCalledWith(
-			SAVED_QUERIES,
-			PANEL_TYPES.TIME_SERIES,
-		);
-		expect(mockUseShareBuilderUrl).toHaveBeenCalledWith({
-			defaultValue: SEED_V1,
-			forceReset: true,
-		});
-	});
-
-	it('does not touch the draft on mount for an unedited panel', () => {
-		const { setSpec, refetch } = setup();
-		// Mount runs the type-change effect once; an unedited query must no-op.
-		expect(setSpec).not.toHaveBeenCalled();
-		expect(refetch).not.toHaveBeenCalled();
-	});
-
-	it('compares the live query against the saved query (seed), not the staged query', () => {
-		const currentQuery = { id: 'current', queryType: 'builder' } as Query;
-		mockUseQueryBuilder.mockReturnValue(builderState({ currentQuery }));
-
-		const { result } = setup();
-		result.current.runQuery();
-
-		// Baseline is the saved seed — a stale staged/URL query must not be the
-		// reference, or a real datasource switch would read as "unchanged".
-		expect(mockGetIsQueryModified).toHaveBeenCalledWith(currentQuery, SEED_V1);
-	});
-
-	describe('runQuery', () => {
-		it('stages the query (handleRunQuery)', () => {
-			const handleRunQuery = jest.fn();
-			mockUseQueryBuilder.mockReturnValue(builderState({ handleRunQuery }));
-			const { result } = setup();
-
-			result.current.runQuery();
-
-			expect(handleRunQuery).toHaveBeenCalledTimes(1);
-		});
-
-		it('commits a modified query into the draft and does not force a refetch', () => {
-			mockGetIsQueryModified.mockReturnValue(true);
-			const { result, setSpec, refetch } = setup();
-
-			result.current.runQuery();
-
-			expect(setSpec).toHaveBeenCalledWith({
-				...makeDraft().spec,
-				queries: CONVERTED_QUERIES,
-			});
-			expect(refetch).not.toHaveBeenCalled();
-		});
-
-		it('forces a refetch and leaves the draft alone when the query is unchanged', () => {
-			mockGetIsQueryModified.mockReturnValue(false);
-			const { result, setSpec, refetch } = setup();
-
-			result.current.runQuery();
-
-			expect(setSpec).not.toHaveBeenCalled();
-			expect(refetch).toHaveBeenCalledTimes(1);
-		});
-
-		it('commits a datasource switch even when the staged query is stale (no revert to saved)', () => {
-			// A stale staged query (e.g. URL-restored after refresh) must not be used
-			// as the baseline; the switch is detected against the saved seed and the
-			// live query is committed so the preview fetches it.
-			mockUseQueryBuilder.mockReturnValue(builderState({ stagedQuery: null }));
-			mockGetIsQueryModified.mockReturnValue(true);
-			const { result, setSpec, refetch } = setup();
-
-			result.current.runQuery();
-
-			expect(setSpec).toHaveBeenCalledWith({
-				...makeDraft().spec,
-				queries: CONVERTED_QUERIES,
-			});
-			expect(refetch).not.toHaveBeenCalled();
-		});
-	});
-
-	describe('query-type switch', () => {
-		it('commits the active query when the query type changes', () => {
-			const state = builderState({
-				currentQuery: { id: 'a', queryType: 'builder' } as Query,
-			});
-			mockUseQueryBuilder.mockImplementation(() => state);
-			mockGetIsQueryModified.mockReturnValue(true);
-
-			const { setSpec, rerender } = setup();
-			setSpec.mockClear();
-
-			// Switch query type → the effect should commit.
-			state.currentQuery = { id: 'b', queryType: 'promql' } as Query;
-			rerender();
-
-			expect(setSpec).toHaveBeenCalledWith({
-				...makeDraft().spec,
-				queries: CONVERTED_QUERIES,
-			});
-		});
-
-		it('does not commit when the active query type is unchanged', () => {
-			const state = builderState({
-				currentQuery: { id: 'a', queryType: 'builder' } as Query,
-			});
-			mockUseQueryBuilder.mockImplementation(() => state);
-			mockGetIsQueryModified.mockReturnValue(true);
-
-			const { setSpec, rerender } = setup();
-			setSpec.mockClear();
-
-			// Same query type, different object → effect must not re-fire.
-			state.currentQuery = { id: 'b', queryType: 'builder' } as Query;
-			rerender();
-
-			expect(setSpec).not.toHaveBeenCalled();
-		});
-	});
-
-	describe('datasource switch', () => {
-		const withSource = (id: string, dataSource: string): Query =>
-			({
-				id,
-				queryType: 'builder',
-				builder: { queryData: [{ dataSource }] },
-			}) as unknown as Query;
-
-		it('commits the active query when a query datasource changes', () => {
-			const state = builderState({ currentQuery: withSource('a', 'logs') });
-			mockUseQueryBuilder.mockImplementation(() => state);
-			mockGetIsQueryModified.mockReturnValue(true);
-
-			const { setSpec, rerender } = setup();
-			setSpec.mockClear();
-
-			// Switch datasource logs → traces → the effect should commit (→ refetch).
-			state.currentQuery = withSource('b', 'traces');
-			rerender();
-
-			expect(setSpec).toHaveBeenCalledWith({
-				...makeDraft().spec,
-				queries: CONVERTED_QUERIES,
-			});
-		});
-
-		it('does not commit when the datasource is unchanged', () => {
-			const state = builderState({ currentQuery: withSource('a', 'logs') });
-			mockUseQueryBuilder.mockImplementation(() => state);
-			mockGetIsQueryModified.mockReturnValue(true);
-
-			const { setSpec, rerender } = setup();
-			setSpec.mockClear();
-
-			// Same datasource, different object → effect must not re-fire.
-			state.currentQuery = withSource('b', 'logs');
-			rerender();
-
-			expect(setSpec).not.toHaveBeenCalled();
-		});
-	});
-
-	describe('query dirty + save', () => {
-		it('compares the live query against the builder baseline (first staged query), not the raw seed', () => {
-			mockGetIsQueryModified.mockReturnValue(true);
-			const { result } = setup();
-
-			// Baseline is the builder's own normalized staged query — immune to the
-			// raw-seed vs builder-normalized serialization drift.
-			expect(mockGetIsQueryModified).toHaveBeenCalledWith(
-				expect.anything(),
-				STAGED_V1,
-			);
-			expect(result.current.isQueryDirty).toBe(true);
-		});
-
-		it('is not query-dirty when the live query matches the baseline', () => {
-			mockGetIsQueryModified.mockReturnValue(false);
-			const { result } = setup();
-
-			expect(result.current.isQueryDirty).toBe(false);
-		});
-
-		it('buildSaveSpec bakes the live query in when dirty', () => {
-			mockGetIsQueryModified.mockReturnValue(true);
-			const { result } = setup();
-			const { spec } = makeDraft();
-
-			expect(result.current.buildSaveSpec(spec)).toStrictEqual({
-				...spec,
-				queries: CONVERTED_QUERIES,
-			});
-		});
-
-		it('buildSaveSpec returns the spec untouched when the query is unchanged', () => {
-			mockGetIsQueryModified.mockReturnValue(false);
-			const { result } = setup();
-			const { spec } = makeDraft();
-
-			expect(result.current.buildSaveSpec(spec)).toBe(spec);
-		});
-	});
-});
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/tests/usePanelEditorSave.test.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/tests/usePanelEditorSave.test.ts
@@ -1,82 +0,0 @@
-import { renderHook } from '@testing-library/react';
-import {
-	getGetDashboardV2QueryKey,
-	usePatchDashboardV2,
-} from 'api/generated/services/dashboard';
-import type { DashboardtypesPanelSpecDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { usePanelEditorSave } from '../usePanelEditorSave';
-
-const mockInvalidateQueries = jest.fn();
-jest.mock('react-query', () => ({
-	useQueryClient: (): { invalidateQueries: jest.Mock } => ({
-		invalidateQueries: mockInvalidateQueries,
-	}),
-}));
-
-jest.mock('api/generated/services/dashboard', () => ({
-	usePatchDashboardV2: jest.fn(),
-	getGetDashboardV2QueryKey: jest.fn(() => ['/api/v2/dashboards/dash-1']),
-}));
-
-const mockUsePatch = usePatchDashboardV2 as unknown as jest.Mock;
-const mockGetQueryKey = getGetDashboardV2QueryKey as unknown as jest.Mock;
-
-describe('usePanelEditorSave', () => {
-	const mutateAsync = jest.fn().mockResolvedValue(undefined);
-
-	beforeEach(() => {
-		jest.clearAllMocks();
-		mockUsePatch.mockReturnValue({
-			mutateAsync,
-			isLoading: false,
-			error: null,
-		});
-	});
-
-	it('emits an add patch replacing the whole panel spec and invalidates the dashboard query', async () => {
-		const { result } = renderHook(() =>
-			usePanelEditorSave({ dashboardId: 'dash-1', panelId: 'panel-9' }),
-		);
-
-		const spec = {
-			display: { name: 'New title', description: 'desc' },
-			plugin: {
-				kind: 'signoz/TimeSeriesPanel',
-				spec: { formatting: { unit: 'bytes' } },
-			},
-			queries: [],
-		} as unknown as DashboardtypesPanelSpecDTO;
-
-		await result.current.save(spec);
-
-		expect(mutateAsync).toHaveBeenCalledWith({
-			pathParams: { id: 'dash-1' },
-			data: [
-				{
-					op: 'add',
-					path: '/spec/panels/panel-9/spec',
-					value: spec,
-				},
-			],
-		});
-		expect(mockGetQueryKey).toHaveBeenCalledWith({ id: 'dash-1' });
-		expect(mockInvalidateQueries).toHaveBeenCalledWith([
-			'/api/v2/dashboards/dash-1',
-		]);
-	});
-
-	it('surfaces the mutation loading state as isSaving', () => {
-		mockUsePatch.mockReturnValue({
-			mutateAsync,
-			isLoading: true,
-			error: null,
-		});
-
-		const { result } = renderHook(() =>
-			usePanelEditorSave({ dashboardId: 'dash-1', panelId: 'panel-9' }),
-		);
-
-		expect(result.current.isSaving).toBe(true);
-	});
-});
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/usePanelEditorDraft.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/usePanelEditorDraft.ts
@@ -1,50 +0,0 @@
-import { useCallback, useMemo, useState } from 'react';
-import type {
-	DashboardtypesPanelDTO,
-	DashboardtypesPanelSpecDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { isEqual } from 'lodash-es';
-
-import type { PanelEditorDraftApi } from '../types';
-
-/**
- * Owns the editable draft of a single panel, seeded once from the loaded panel and
- * mutated locally until save. Kept in the perses `DashboardtypesPanelDTO` shape so the
- * preview renders it through the dashboard's renderer registry and the save hook
- * patches it without conversion. Everything the config pane edits flows through the
- * single `spec`/`setSpec` pair.
- */
-export function usePanelEditorDraft(
-	initialPanel: DashboardtypesPanelDTO,
-): PanelEditorDraftApi {
-	const [draft, setDraft] = useState<DashboardtypesPanelDTO>(initialPanel);
-
-	const setSpec = useCallback((next: DashboardtypesPanelSpecDTO): void => {
-		setDraft((prev) => ({ ...prev, spec: next }));
-	}, []);
-
-	const reset = useCallback((): void => {
-		setDraft(initialPanel);
-	}, [initialPanel]);
-
-	// Deep compare, ignoring `spec.queries`: the query is owned by the builder and
-	// re-serialized into the draft as a preview cache, so its representation drifts
-	// without a real edit. Query dirtiness is tracked separately; here we only flag
-	// divergence in the display + plugin spec slices.
-	const isSpecDirty = useMemo(
-		() =>
-			!isEqual(
-				{ ...draft, spec: { ...draft.spec, queries: null } },
-				{ ...initialPanel, spec: { ...initialPanel.spec, queries: null } },
-			),
-		[draft, initialPanel],
-	);
-
-	return {
-		draft,
-		spec: draft.spec,
-		setSpec,
-		isSpecDirty,
-		reset,
-	};
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/usePanelEditorQuerySync.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/usePanelEditorQuerySync.ts
@@ -1,145 +0,0 @@
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import type {
-	DashboardtypesPanelDTO,
-	DashboardtypesPanelSpecDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { getIsQueryModified } from 'container/NewWidget/utils';
-import { useQueryBuilder } from 'hooks/queryBuilder/useQueryBuilder';
-import { useShareBuilderUrl } from 'hooks/queryBuilder/useShareBuilderUrl';
-import { isEqual } from 'lodash-es';
-import type { Query } from 'types/api/queryBuilder/queryBuilderData';
-
-import { toQueryEnvelopes } from '../../queryV5/buildQueryRangeRequest';
-import { fromPerses, toPerses } from '../../queryV5/persesQueryAdapters';
-
-interface UsePanelEditorQuerySyncArgs {
-	draft: DashboardtypesPanelDTO;
-	panelType: PANEL_TYPES;
-	setSpec: (next: DashboardtypesPanelSpecDTO) => void;
-	/** Re-fetch the preview when the query is unchanged (Stage & Run on a no-op). */
-	refetch: () => void;
-}
-
-interface UsePanelEditorQuerySyncApi {
-	/** Run the current query (Stage & Run / ⌘↵). */
-	runQuery: () => void;
-	/** True when the live builder query differs from the saved query (compared builder-normalized to avoid re-serialization noise). */
-	isQueryDirty: boolean;
-	/** Bake the live query into a spec for saving so unstaged edits persist; returns the spec untouched when unchanged. */
-	buildSaveSpec: (
-		spec: DashboardtypesPanelSpecDTO,
-	) => DashboardtypesPanelSpecDTO;
-}
-
-/**
- * Bridges the shared (URL-synced) query builder and the V2 editor draft: seeds the
- * builder from the saved panel, then commits the active query into `draft.spec.queries`
- * (what the preview fetches) on a query-type/datasource switch and on Stage & Run.
- */
-export function usePanelEditorQuerySync({
-	draft,
-	panelType,
-	setSpec,
-	refetch,
-}: UsePanelEditorQuerySyncArgs): UsePanelEditorQuerySyncApi {
-	const { currentQuery, stagedQuery, handleRunQuery } = useQueryBuilder();
-
-	// Saved queries, captured once: seed the builder and serve as the restore target.
-	// eslint-disable-next-line react-hooks/exhaustive-deps -- mount-only snapshot
-	const savedQueries = useMemo(() => draft.spec?.queries ?? [], []);
-	const seedQuery = useMemo(
-		() => fromPerses(savedQueries, panelType),
-		[savedQueries, panelType],
-	);
-	// Force-reset the builder to the SAVED panel on first render only, discarding any
-	// stale URL query from a prior edit — otherwise the QB and preview diverge and the
-	// dirty baseline gets captured from the URL. After mount the URL syncs normally.
-	const isInitialRenderRef = useRef(true);
-	useShareBuilderUrl({
-		defaultValue: seedQuery,
-		forceReset: isInitialRenderRef.current,
-	});
-	useEffect(() => {
-		isInitialRenderRef.current = false;
-	}, []);
-
-	// Commit the live query into the draft (what the preview fetches). The dirty check
-	// compares against the SAVED query (`seedQuery`), not the URL-synced staged query,
-	// which can carry stale state across a refresh and make a real switch read as
-	// "unchanged". Unchanged → restore saved queries; changed → commit. Returns whether
-	// the draft changed.
-	const commitQuery = useCallback(
-		(query: Query): boolean => {
-			const next = getIsQueryModified(query, seedQuery)
-				? toPerses(query, panelType)
-				: savedQueries;
-			// No-op guard at the V5 envelope level: equivalent wrappers (bare
-			// `signoz/BuilderQuery` vs `signoz/CompositeQuery`) unwrap to the same
-			// envelopes, so comparing them structurally would falsely dirty the draft.
-			const current = draft.spec?.queries ?? [];
-			if (isEqual(toQueryEnvelopes(next), toQueryEnvelopes(current))) {
-				return false;
-			}
-			setSpec({ ...draft.spec, queries: next });
-			return true;
-		},
-		[seedQuery, panelType, savedQueries, draft.spec, setSpec],
-	);
-
-	// Latest query/commit, read by the structural-change effect without re-subscribing.
-	const commitRef = useRef(commitQuery);
-	commitRef.current = commitQuery;
-	const queryRef = useRef(currentQuery);
-	queryRef.current = currentQuery;
-
-	// Re-commit on a query-type or datasource switch so the preview refetches. Skip
-	// mount: the draft already holds the saved queries the builder is force-reset to.
-	const dataSourceSignature = useMemo(
-		() =>
-			(currentQuery.builder?.queryData ?? []).map((q) => q.dataSource).join(','),
-		[currentQuery.builder],
-	);
-	const didMountRef = useRef(false);
-	useEffect(() => {
-		if (!didMountRef.current) {
-			didMountRef.current = true;
-			return;
-		}
-		commitRef.current(queryRef.current);
-		// eslint-disable-next-line react-hooks/exhaustive-deps -- structural change only
-	}, [currentQuery.queryType, dataSourceSignature]);
-
-	// Stage & Run / ⌘↵: stage, commit, and re-fetch when unchanged so it can be re-run.
-	const runQuery = useCallback((): void => {
-		handleRunQuery();
-		if (!commitQuery(currentQuery)) {
-			refetch();
-		}
-	}, [handleRunQuery, commitQuery, currentQuery, refetch]);
-
-	// Dirty baseline: the builder's OWN normalized saved query (first non-null
-	// `stagedQuery` after the mount reset). Comparing builder-normalized to
-	// builder-normalized avoids serialization drift reading an untouched query as
-	// modified. Held in state (not a ref) so capture re-triggers `isQueryDirty`;
-	// captured once and never moved by Stage & Run, so it stays anchored to saved.
-	const [queryBaseline, setQueryBaseline] = useState<Query | null>(null);
-	useEffect(() => {
-		if (queryBaseline === null && stagedQuery) {
-			setQueryBaseline(stagedQuery);
-		}
-	}, [queryBaseline, stagedQuery]);
-
-	const isQueryDirty =
-		queryBaseline !== null && getIsQueryModified(currentQuery, queryBaseline);
-
-	const buildSaveSpec = useCallback(
-		(spec: DashboardtypesPanelSpecDTO): DashboardtypesPanelSpecDTO =>
-			isQueryDirty
-				? { ...spec, queries: toPerses(currentQuery, panelType) }
-				: spec,
-		[isQueryDirty, currentQuery, panelType],
-	);
-
-	return { runQuery, isQueryDirty, buildSaveSpec };
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/usePanelEditorSave.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/hooks/usePanelEditorSave.ts
@@ -1,56 +0,0 @@
-import { useCallback } from 'react';
-import { useQueryClient } from 'react-query';
-import {
-	getGetDashboardV2QueryKey,
-	usePatchDashboardV2,
-} from 'api/generated/services/dashboard';
-import {
-	type DashboardtypesJSONPatchOperationDTO,
-	type DashboardtypesPanelSpecDTO,
-	DashboardtypesPatchOpDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-interface UsePanelEditorSaveArgs {
-	dashboardId: string;
-	panelId: string;
-}
-
-interface UsePanelEditorSaveApi {
-	save: (spec: DashboardtypesPanelSpecDTO) => Promise<void>;
-	isSaving: boolean;
-	error: Error | null;
-}
-
-/**
- * Persists panel edits via a single RFC-6902 `add` op that replaces the whole panel
- * spec at `/spec/panels/{panelId}/spec`, so every config-pane edit is saved (not just
- * title/description). `add` doubles as create-or-replace, avoiding a separate
- * existence check.
- */
-export function usePanelEditorSave({
-	dashboardId,
-	panelId,
-}: UsePanelEditorSaveArgs): UsePanelEditorSaveApi {
-	const queryClient = useQueryClient();
-	const { mutateAsync, isLoading, error } = usePatchDashboardV2();
-
-	const save = useCallback(
-		async (spec: DashboardtypesPanelSpecDTO): Promise<void> => {
-			const ops: DashboardtypesJSONPatchOperationDTO[] = [
-				{
-					op: DashboardtypesPatchOpDTO.add,
-					path: `/spec/panels/${panelId}/spec`,
-					value: spec,
-				},
-			];
-
-			await mutateAsync({ pathParams: { id: dashboardId }, data: ops });
-			await queryClient.invalidateQueries(
-				getGetDashboardV2QueryKey({ id: dashboardId }),
-			);
-		},
-		[dashboardId, panelId, mutateAsync, queryClient],
-	);
-
-	return { save, isSaving: isLoading, error: (error as Error) ?? null };
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/index.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/index.tsx
@@ -1,173 +0,0 @@
-import { useCallback } from 'react';
-import {
-	ResizableHandle,
-	ResizablePanel,
-	ResizablePanelGroup,
-	useDefaultLayout,
-} from '@signozhq/ui/resizable';
-import { toast } from '@signozhq/ui/sonner';
-import type { DashboardtypesPanelDTO } from 'api/generated/services/sigNoz.schemas';
-import { PANEL_TYPES } from 'constants/queryBuilder';
-import { getPanelDefinition } from 'pages/DashboardPageV2/DashboardContainer/Panels/registry';
-import {
-	PANEL_KIND_TO_PANEL_TYPE,
-	type PanelKind,
-} from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
-
-import { usePanelInteractions } from '../PanelsAndSectionsLayout/Panel/hooks/usePanelInteractions';
-import Header from './Header/Header';
-import layoutStorage from './layoutStorage';
-import PanelEditorQueryBuilder from './PanelEditorQueryBuilder/PanelEditorQueryBuilder';
-import PreviewPane from './PreviewPane/PreviewPane';
-import { usePanelQuery } from '../hooks/usePanelQuery';
-import { usePanelEditorDraft } from './hooks/usePanelEditorDraft';
-import { usePanelEditorQuerySync } from './hooks/usePanelEditorQuerySync';
-import { usePanelEditorSave } from './hooks/usePanelEditorSave';
-
-import styles from './PanelEditor.module.scss';
-
-interface PanelEditorContainerProps {
-	dashboardId: string;
-	panelId: string;
-	panel: DashboardtypesPanelDTO;
-	/** Leave the editor (navigate back to the dashboard) without saving. */
-	onClose: () => void;
-	/** Called after a successful save — navigates back to the dashboard. */
-	onSaved: () => void;
-}
-
-/**
- * V2 panel editor page body (rendered full-page by `PanelEditorPage`): a resizable
- * split with the live preview + query builder on the left and the config pane on the
- * right. Owns the draft state and the save round-trip.
- */
-function PanelEditorContainer({
-	dashboardId,
-	panelId,
-	panel,
-	onClose,
-	onSaved,
-}: PanelEditorContainerProps): JSX.Element {
-	const { draft, setSpec, isSpecDirty } = usePanelEditorDraft(panel);
-	const { save, isSaving } = usePanelEditorSave({ dashboardId, panelId });
-	const { defaultLayout, onLayoutChanged } = useDefaultLayout({
-		id: 'panel-editor-v2',
-		storage: layoutStorage,
-	});
-
-	const {
-		defaultLayout: mainDefaultLayout,
-		onLayoutChanged: onMainLayoutChanged,
-	} = useDefaultLayout({
-		id: 'panel-editor-v2-main',
-		storage: layoutStorage,
-	});
-
-	// Panel kind → V1 panel type, which drives the query builder and preview.
-	const fullKind = draft.spec.plugin.kind;
-	const panelType =
-		(fullKind && PANEL_KIND_TO_PANEL_TYPE[fullKind as PanelKind]) ??
-		PANEL_TYPES.TIME_SERIES;
-
-	// One shared query result for the whole editor; the preview renders it.
-	const panelDef = getPanelDefinition(draft.spec.plugin.kind);
-	const {
-		data,
-		isLoading,
-		isFetching,
-		error,
-		cancelQuery,
-		refetch,
-		pagination,
-	} = usePanelQuery({
-		panel: draft,
-		panelId,
-		enabled: !!panelDef,
-	});
-
-	// Seed the shared query builder from the draft and expose the Stage-&-Run action.
-	const { runQuery, isQueryDirty, buildSaveSpec } = usePanelEditorQuerySync({
-		draft,
-		panelType,
-		setSpec,
-		refetch,
-	});
-
-	// Spec and query dirtiness are tracked independently so query re-serialization
-	// never false-dirties.
-	const isDirty = isSpecDirty || isQueryDirty;
-
-	// Drag-to-zoom on the preview updates the URL-synced time window, as on the dashboard.
-	const { onDragSelect } = usePanelInteractions();
-
-	const onSave = useCallback(async (): Promise<void> => {
-		try {
-			// Bake the live query into the spec so unstaged edits are saved too.
-			await save(buildSaveSpec(draft.spec));
-			toast.success('Panel saved');
-			onSaved();
-		} catch {
-			toast.error('Failed to save panel');
-		}
-	}, [save, buildSaveSpec, draft.spec, onSaved]);
-
-	return (
-		<div className={styles.page} data-testid="panel-editor-v2">
-			<Header
-				isDirty={isDirty}
-				isSaving={isSaving}
-				onSave={onSave}
-				onClose={onClose}
-			/>
-			<ResizablePanelGroup
-				id="panel-editor-v2"
-				orientation="horizontal"
-				defaultLayout={defaultLayout}
-				onLayoutChanged={onLayoutChanged}
-			>
-				<ResizablePanel minSize="75%" maxSize="80%" defaultSize="80%">
-					<div className={styles.left}>
-						<ResizablePanelGroup
-							id="panel-editor-v2-main"
-							orientation="vertical"
-							defaultLayout={mainDefaultLayout}
-							onLayoutChanged={onMainLayoutChanged}
-						>
-							<ResizablePanel minSize="55%" maxSize="65%" defaultSize="60%">
-								<PreviewPane
-									panelId={panelId}
-									panel={draft}
-									panelDef={panelDef}
-									data={data}
-									isLoading={isLoading}
-									error={error}
-									refetch={refetch}
-									onDragSelect={onDragSelect}
-									pagination={pagination}
-								/>
-							</ResizablePanel>
-							<ResizableHandle withHandle className={styles.handle} />
-							<ResizablePanel minSize="35%" maxSize="45%" defaultSize="40%">
-								<PanelEditorQueryBuilder
-									panelType={panelType}
-									isLoadingQueries={isFetching}
-									onStageRunQuery={runQuery}
-									onCancelQuery={cancelQuery}
-								/>
-							</ResizablePanel>
-						</ResizablePanelGroup>
-					</div>
-				</ResizablePanel>
-				<ResizableHandle withHandle className={styles.handle} />
-				<ResizablePanel
-					minSize="20%"
-					maxSize="25%"
-					defaultSize="20%"
-					className={styles.right}
-				/>
-			</ResizablePanelGroup>
-		</div>
-	);
-}
-
-export default PanelEditorContainer;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/layoutStorage.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/layoutStorage.ts
@@ -1,15 +0,0 @@
-import getLocalStorageApi from 'api/browser/localstorage/get';
-import setLocalStorageApi from 'api/browser/localstorage/set';
-
-/**
- * `Storage`-shaped adapter for `useDefaultLayout`, backed by the scoped localStorage
- * wrappers that prefix keys with the URL base path so layout stays isolated per deployment.
- */
-const layoutStorage: Pick<Storage, 'getItem' | 'setItem'> = {
-	getItem: (key: string): string | null => getLocalStorageApi(key),
-	setItem: (key: string, value: string): void => {
-		setLocalStorageApi(key, value);
-	},
-};
-
-export default layoutStorage;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/types.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/types.ts
@@ -1,25 +0,0 @@
-import type {
-	DashboardtypesPanelDTO,
-	DashboardtypesPanelSpecDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-/**
- * Local draft state for the panel being edited, kept as a perses `DashboardtypesPanelDTO`
- * so the live preview and the save patch share one shape (no intermediate translation).
- */
-export interface PanelEditorDraftApi {
-	/** The current (possibly edited) panel. Always defined once seeded. */
-	draft: DashboardtypesPanelDTO;
-	/** The panel spec — the single editing surface for the config pane. */
-	spec: DashboardtypesPanelSpecDTO;
-	/** Replace the whole panel spec (the registry lens returns a new one per edit). */
-	setSpec: (next: DashboardtypesPanelSpecDTO) => void;
-	/**
-	 * True when the draft's display/plugin-spec slices diverge from the loaded panel.
-	 * Excludes `spec.queries` — owned by the shared builder, tracked via
-	 * `usePanelEditorQuerySync.isQueryDirty`.
-	 */
-	isSpecDirty: boolean;
-	/** Restore the draft to the originally-loaded panel. */
-	reset: () => void;
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/Renderer.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/Renderer.tsx
@@ -42,7 +42,9 @@ function BarPanelRenderer({
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();

-	// The registry guarantees the kind, so the cast is a boundary narrowing.
+	// The registry guarantees this Renderer only runs when
+	// `panel.spec.plugin.kind === 'signoz/BarChartPanel'`, so the cast is a
+	// documented boundary narrowing.
 	const spec = useMemo<DashboardtypesBarChartPanelSpecDTO>(
 		() => panel.spec.plugin.spec as DashboardtypesBarChartPanelSpecDTO,
 		[panel.spec.plugin.spec],
@@ -53,8 +55,9 @@ function BarPanelRenderer({
 		[panel.spec.queries],
 	);

-	// X-scale clamps come from the request that produced the data. The generated
-	// request DTO is structurally the V5 request; the cast is the boundary.
+	// X-scale clamps come from the request that produced the data (falls back
+	// to the global picker inside the helper). The generated request DTO is
+	// structurally the hand-written V5 request; the cast is the boundary.
 	const { minTimeScale, maxTimeScale } = useMemo(() => {
 		const { startTime, endTime } = getTimeRangeFromQueryRangeRequest(
 			data.requestPayload as unknown as QueryRangeRequestV5 | undefined,
@@ -97,8 +100,10 @@ function BarPanelRenderer({
 			minTimeScale,
 			maxTimeScale,
 			onDragSelect,
-			// TooltipPlugin mutates `config` for cursor sync; rebuild on syncMode change
-			// so a fresh instance doesn't inherit stale sync settings (e.g. "No Sync").
+			// `config` gets mutated by TooltipPlugin (config.setCursor for cursor sync).
+			// Rebuild it on syncMode changes so the new chart instance starts from a
+			// clean config — otherwise switching to "No Sync" would inherit stale sync
+			// settings from the previous mode.
 			dashboardPreference?.syncMode,
 		],
 	);
@@ -121,8 +126,10 @@ function BarPanelRenderer({
 		[panelId],
 	);

-	// Keying on sync prefs forces a full chart teardown/re-mount so stale sync
-	// settings aren't inherited — the only way to fully reset the uPlot instance.
+	// The uPlot key prop is the only way to force a full teardown and re-mount
+	// of the chart. Including syncMode/syncFilterMode in the key ensures changes
+	// to these preferences trigger a fresh chart instance, preventing stale
+	// sync wiring from being inherited.
 	const key = `${dashboardPreference?.syncMode}-${dashboardPreference?.syncFilterMode}`;

 	const handleChartClick = useCallback(
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/definition.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/definition.ts
@@ -10,12 +10,4 @@ export const definition: PanelDefinition<'signoz/BarChartPanel'> = {
 	Renderer,
 	sections,
 	supportedSignals: [DataSource.METRICS, DataSource.LOGS, DataSource.TRACES],
-	actions: {
-		view: true,
-		edit: true,
-		clone: true,
-		download: false,
-		createAlert: true,
-		search: false,
-	},
 };
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/sections.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/sections.ts
@@ -1,12 +1,9 @@
 import type { SectionConfig } from '../../types/sections';

-// Bar stacking lives in `visualization.stackedBarChart`, so it's a `visualization`
-// control, not `chartAppearance`. fillSpans is TimeSeries-only, so Bar omits it (V1 parity).
 export const sections: SectionConfig[] = [
-	{ kind: 'visualization', controls: { timePreference: true, stacking: true } },
 	{ kind: 'formatting', controls: { unit: true, decimals: true } },
-	{ kind: 'axes', controls: { minMax: true, logScale: true } },
-	{ kind: 'legend', controls: { position: true } },
-	{ kind: 'thresholds', controls: { variant: 'label' } },
-	{ kind: 'contextLinks' },
+	{ kind: 'axes', controls: { minMax: true, unit: true, logScale: true } },
+	{ kind: 'legend', controls: { position: true, mode: true } },
+	{ kind: 'thresholds', controls: { list: true } },
+	{ kind: 'chartAppearance', controls: { stacked: true } },
 ];
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/utils/buildConfig.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/BarChartPanel/utils/buildConfig.ts
@@ -16,7 +16,10 @@ import type { BuilderQuery } from 'types/api/v5/queryRange';
 export interface BuildBarChartConfigArgs {
 	panelId: string;
 	spec: DashboardtypesBarChartPanelSpecDTO;
-	/** Flat list of builder queries (see `getBuilderQueries`); powers per-query legend resolution. */
+	/**
+	 * Flat list of builder queries on this panel (see `getBuilderQueries`).
+	 * Powers per-query legend resolution; empty for non-builder panels.
+	 */
 	builderQueries: BuilderQuery[];
 	/** Flattened V5 series (see `flattenTimeSeries`). */
 	series: PanelSeries[];
@@ -31,7 +34,14 @@ export interface BuildBarChartConfigArgs {
 	maxTimeScale?: number;
 }

-/** Builds a `UPlotConfigBuilder` for a Bar chart panel: shared scaffolding, optional stacking, one bar series per result. */
+/**
+ * Builds a fully-wired `UPlotConfigBuilder` for a Bar chart panel.
+ *
+ * Delegates the panel-agnostic scaffolding (scales, thresholds, axes,
+ * drag-to-zoom, click plugin) to the shared `buildBaseConfig`, then layers
+ * in the Bar-specific concerns: optional stacking via uPlot bands, plus
+ * one bar series per result row.
+ */
 export function buildBarChartConfig({
 	panelId,
 	spec,
@@ -87,8 +97,11 @@ interface AddSeriesArgs {
 }

 /**
- * Adds one bar series per flattened V5 series (plus stacking bands). Each gets its
- * own per-query step interval so bar widths match the backend's sampling cadence.
+ * Adds one bar series per flattened V5 series, plus uPlot bands for stacking
+ * when `spec.visualization.stackedBarChart` is set. Each series receives its
+ * own per-query step interval so bar widths line up with the actual
+ * sampling cadence reported by the backend.
+ *
 * Order must match `prepareAlignedData` — both iterate the same flat list.
 */
 function addSeries({
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/Renderer.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/Renderer.tsx
@@ -34,7 +34,9 @@ function HistogramPanelRenderer({
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();

-	// The registry guarantees the kind, so the cast is a boundary narrowing.
+	// The registry guarantees this Renderer only runs when
+	// `panel.spec.plugin.kind === 'signoz/HistogramPanel'`, so the cast is a
+	// documented boundary narrowing.
 	const spec = useMemo<DashboardtypesHistogramPanelSpecDTO>(
 		() => panel.spec.plugin.spec as DashboardtypesHistogramPanelSpecDTO,
 		[panel.spec.plugin.spec],
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/definition.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/definition.ts
@@ -10,12 +10,4 @@ export const definition: PanelDefinition<'signoz/HistogramPanel'> = {
 	Renderer,
 	sections,
 	supportedSignals: [DataSource.METRICS, DataSource.LOGS, DataSource.TRACES],
-	actions: {
-		view: true,
-		edit: true,
-		clone: true,
-		download: false,
-		createAlert: true,
-		search: false,
-	},
 };
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/prepareData.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/prepareData.ts
@@ -22,10 +22,12 @@ const BUCKET_OFFSET = 0;
 const sortAscending = (a: number, b: number): number => a - b;

 /**
- * Bins raw series values into a uPlot-aligned histogram. Bucket size is the
- * `bucketWidth` override, else the smallest predefined Grafana bucket that fits
- * the `range / bucketCount` target while staying ≥ the input's smallest non-zero
- * delta (never sub-dividing below the input resolution).
+ * Bins raw series values into a uPlot-aligned histogram. Picks a bucket size
+ * either from `bucketWidth` (explicit override) or the smallest predefined
+ * Grafana bucket that fits the data's `range / bucketCount` target while
+ * staying ≥ the data's smallest non-zero delta (so we never sub-divide below
+ * the resolution of the input).
+ *
 * Empty input → `[[]]` (a valid empty AlignedData uPlot accepts).
 */
 export function prepareHistogramData({
@@ -56,9 +58,10 @@ export function prepareHistogramData({
 		roundDecimals(incrRoundDn(v - BUCKET_OFFSET, bucketSize) + BUCKET_OFFSET, 9);

 	const frames = buildFrames(series, mergeAllActiveQueries);
-	// Merged mode leaves trailing empty frames — drop those. Per-query mode keeps
-	// one column per result row (even empty ones), else the column count falls below
-	// the series count `buildHistogramConfig` adds per row → uPlot renders nothing.
+	// Merged mode folds every query into frame 0 and leaves trailing empty
+	// frames — drop those. Per-query mode must keep one column per result row
+	// (even empty queries), or the data column count drifts below the series
+	// count `buildHistogramConfig` adds per row → uPlot renders nothing.
 	const histograms: AlignedData[] = frames
 		.filter((frame) => !mergeAllActiveQueries || frame.length > 0)
 		.map((frame) => buildHistogramBuckets(frame, getBucket, sortAscending));
@@ -73,7 +76,7 @@ export function prepareHistogramData({
 	return merged;
 }

-/** Non-finite samples degrade to 0 (legacy `parseFloat(...) || 0` parity). */
+// Non-finite samples degrade to 0 (legacy `parseFloat(...) || 0` parity).
 function toBinnableValue(value: number): number {
 	return Number.isFinite(value) ? value : 0;
 }
@@ -125,10 +128,8 @@ function selectBucketSize({
 	return 0;
 }

-/**
- * When merging is on, fold all frames into the first; the trailing empty
- * frames stay in the array so downstream `.filter(length > 0)` drops them.
- */
+// When merging is on, fold all frames into the first; the trailing empty
+// frames stay in the array so downstream `.filter(length > 0)` drops them.
 function buildFrames(
 	series: PanelSeries[],
 	mergeAllActiveQueries: boolean,
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/sections.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/sections.ts
@@ -1,21 +1,6 @@
-import type { DashboardtypesHistogramPanelSpecDTO } from 'api/generated/services/sigNoz.schemas';
-
 import type { SectionConfig } from '../../types/sections';

 export const sections: SectionConfig[] = [
-	{
-		kind: 'legend',
-		controls: { position: true },
-		// Merging all queries collapses to one distribution with no legend.
-		isHidden: (spec): boolean =>
-			Boolean(
-				(spec.plugin.spec as DashboardtypesHistogramPanelSpecDTO).histogramBuckets
-					?.mergeAllActiveQueries,
-			),
-	},
-	{
-		kind: 'buckets',
-		controls: { count: true, width: true, mergeQueries: true },
-	},
-	{ kind: 'contextLinks' },
+	{ kind: 'legend', controls: { position: true, mode: true } },
+	{ kind: 'buckets', controls: { count: true } },
 ];
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/utils/buildConfig.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/HistogramPanel/utils/buildConfig.ts
@@ -12,7 +12,8 @@ import type { BuilderQuery } from 'types/api/v5/queryRange';

 const POINT_SIZE = 5;
 const BAR_WIDTH_FACTOR = 1;
-// Merged-series colors mirror the V1 default so the merged view looks unchanged.
+// Merged-series colors mirror the V1 default — single histogram bin gets a
+// fixed blue-ish pair so the merged view looks the same as before.
 const MERGED_SERIES_LINE_COLOR = '#3f5ecc';
 const MERGED_SERIES_FILL_COLOR = '#4E74F8';

@@ -29,9 +30,13 @@ export interface BuildHistogramConfigArgs {
 }

 /**
- * Builds a `UPlotConfigBuilder` for a Histogram panel. Unlike time-axis panels,
- * histograms have no time scale or drag-to-zoom: reuses `buildBaseConfig`, then
- * overrides the scales to auto-linear and installs a drag-disabled cursor.
+ * Builds a fully-wired `UPlotConfigBuilder` for a Histogram panel.
+ *
+ * Unlike time-axis panels, histograms have no time scale and no drag-to-zoom.
+ * We still reuse `buildBaseConfig` for the consistent scaffolding (thresholds,
+ * axes, click plugin) but then override the X/Y scales to be auto-linear
+ * (`time: false, auto: true`) and install a histogram-specific cursor that
+ * disables drag-pan and tightens focus proximity.
 */
 export function buildHistogramConfig({
 	panelId,
@@ -42,6 +47,8 @@ export function buildHistogramConfig({
 	timezone,
 	panelMode,
 }: BuildHistogramConfigArgs): UPlotConfigBuilder {
+	// Histograms have no time axis — no stepIntervals, and no click plugin
+	// (the renderer passes no onClick), so the base config needs no response.
 	const builder = buildBaseConfig({
 		panelId,
 		panelType: PANEL_TYPES.HISTOGRAM,
@@ -55,7 +62,8 @@ export function buildHistogramConfig({
 		focus: { prox: 1e3 },
 	});

-	// Override the time-axis scales — histograms are distribution plots, not time series.
+	// Override the time-axis scales from `buildBaseConfig` — histograms are
+	// distribution plots, not time series.
 	builder.addScale({ scaleKey: 'x', time: false, auto: true });
 	builder.addScale({ scaleKey: 'y', time: false, auto: true, min: 0 });

@@ -73,9 +81,10 @@ interface AddSeriesArgs {
 }

 /**
- * Adds histogram bar series. In `mergeAllActiveQueries` mode `prepareHistogramData`
- * produces a single Y column, so we add exactly one series with the fixed merged-mode
- * colors; otherwise one series per result row.
+ * Adds histogram bar series to the builder. When `mergeAllActiveQueries` is
+ * set, `prepareHistogramData` produces a single Y column, so we add exactly
+ * one series with the fixed merged-mode colors. Otherwise one series per
+ * result row, with labels resolved via the standard legend matrix.
 */
 function addSeries({
 	builder,
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/Renderer.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/Renderer.tsx
@@ -17,7 +17,9 @@ function NumberPanelRenderer({
 	panel,
 	data,
 }: PanelRendererProps<'signoz/NumberPanel'>): JSX.Element {
-	// The registry guarantees the kind, so the cast is a boundary narrowing.
+	// The registry guarantees this Renderer only runs when
+	// `panel.spec.plugin.kind === 'signoz/NumberPanel'`, so the cast is a
+	// documented boundary narrowing.
 	const spec = useMemo<DashboardtypesNumberPanelSpecDTO>(
 		() => panel.spec.plugin.spec as DashboardtypesNumberPanelSpecDTO,
 		[panel.spec.plugin.spec],
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/components/ValueDisplay/ValueDisplay.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/components/ValueDisplay/ValueDisplay.tsx
@@ -24,7 +24,9 @@ interface ValueDisplayProps {

 /**
 * Renders a single large scalar with optional prefix/suffix units and threshold
- * recoloring (text or background). V2-native replacement for the V1 `ValueGraph`.
+ * recoloring (text or background). A V2-native replacement for the V1
+ * `ValueGraph` — depends only on V2 threshold utilities and the shared icon/
+ * typography primitives.
 */
 function ValueDisplay({
 	value,
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/definition.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/definition.ts
@@ -10,12 +10,4 @@ export const definition: PanelDefinition<'signoz/NumberPanel'> = {
 	Renderer,
 	sections,
 	supportedSignals: [DataSource.METRICS, DataSource.LOGS, DataSource.TRACES],
-	actions: {
-		view: true,
-		edit: true,
-		clone: true,
-		download: false,
-		createAlert: true,
-		search: false,
-	},
 };
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/prepareData.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/prepareData.ts
@@ -1,10 +1,17 @@
 import type { PanelTable } from 'pages/DashboardPageV2/DashboardContainer/queryV5/types';

 /**
- * Reduces the scalar tables of a V5 response to the single number a NumberPanel
- * renders: the first row's `isValueColumn` cell of the first table with rows,
- * falling back to the row's first cell (mirrors the V1 `formatForWeb` read).
- * Returns `null` when there is no numeric value (renderer shows "No Data").
+ * Reduces the scalar tables of a V5 response to the single number a
+ * NumberPanel renders.
+ *
+ * V2 always issues `requestType: 'scalar'` for VALUE panels, so the response
+ * is a scalar table per query (see `prepareScalarTables`). The value is the
+ * first row's `isValueColumn` cell of the first table that has rows —
+ * falling back to the row's first cell when no column is marked as the
+ * value (mirrors the V1 `formatForWeb` fallback read).
+ *
+ * Returns `null` when there is no numeric value to show, which the renderer
+ * maps to the "No Data" state.
 */
 export function prepareNumberData(tables: PanelTable[]): number | null {
 	for (const table of tables) {
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/sections.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/sections.ts
@@ -1,8 +1,8 @@
 import type { SectionConfig } from '../../types/sections';

+// A number panel renders one scalar — no axes, legend, or stacking. Just value
+// formatting and thresholds that recolor the value/background.
 export const sections: SectionConfig[] = [
-	{ kind: 'visualization', controls: { timePreference: true } },
 	{ kind: 'formatting', controls: { unit: true, decimals: true } },
-	{ kind: 'thresholds', controls: { variant: 'comparison' } },
-	{ kind: 'contextLinks' },
+	{ kind: 'thresholds', controls: { list: true } },
 ];
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/utils.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/NumberPanel/utils.ts
@@ -1,9 +1,42 @@
-import type { DashboardtypesComparisonThresholdDTO } from 'api/generated/services/sigNoz.schemas';
+import {
+	DashboardtypesComparisonOperatorDTO,
+	DashboardtypesComparisonThresholdDTO,
+	DashboardtypesThresholdFormatDTO,
+} from 'api/generated/services/sigNoz.schemas';

-import type { PanelThreshold } from '../../types/threshold';
-import { toPanelThreshold } from '../../utils/mapComparisonThreshold';
+import type {
+	PanelThreshold,
+	ThresholdComparisonOperator,
+	ThresholdDisplayFormat,
+} from '../../types/threshold';

-/** Maps spec `ComparisonThresholdDTO`s onto the V2-native `PanelThreshold` (no V1 `ThresholdProps` dependency). */
+// Perses comparison operators → the symbol operators V2 threshold evaluation
+// uses.
+const OPERATOR_MAP: Record<
+	DashboardtypesComparisonOperatorDTO,
+	ThresholdComparisonOperator
+> = {
+	[DashboardtypesComparisonOperatorDTO.above]: '>',
+	[DashboardtypesComparisonOperatorDTO.below]: '<',
+	[DashboardtypesComparisonOperatorDTO.above_or_equal]: '>=',
+	[DashboardtypesComparisonOperatorDTO.below_or_equal]: '<=',
+	[DashboardtypesComparisonOperatorDTO.equal]: '=',
+	[DashboardtypesComparisonOperatorDTO.not_equal]: '!=',
+};
+
+const FORMAT_MAP: Record<
+	DashboardtypesThresholdFormatDTO,
+	ThresholdDisplayFormat
+> = {
+	[DashboardtypesThresholdFormatDTO.text]: 'text',
+	[DashboardtypesThresholdFormatDTO.background]: 'background',
+};
+
+/**
+ * Maps the panel-spec threshold shape (`ComparisonThresholdDTO`) onto the
+ * V2-native `PanelThreshold` consumed by `ValueDisplay` / threshold
+ * evaluation. No dependency on the V1 `ThresholdProps` shape.
+ */
 export function mapNumberThresholds(
 	thresholds: DashboardtypesComparisonThresholdDTO[] | null | undefined,
 ): PanelThreshold[] {
@@ -11,5 +44,11 @@ export function mapNumberThresholds(
 		return [];
 	}

-	return thresholds.map(toPanelThreshold);
+	return thresholds.map((threshold) => ({
+		color: threshold.color,
+		operator: threshold.operator ? OPERATOR_MAP[threshold.operator] : undefined,
+		value: threshold.value,
+		unit: threshold.unit,
+		format: threshold.format ? FORMAT_MAP[threshold.format] : undefined,
+	}));
 }
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/Renderer.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/Renderer.tsx
@@ -24,7 +24,9 @@ function PiePanelRenderer({
 }: PanelRendererProps<'signoz/PieChartPanel'>): JSX.Element {
 	const isDarkMode = useIsDarkMode();

-	// The registry guarantees the kind, so the cast is a boundary narrowing.
+	// The registry guarantees this Renderer only runs when
+	// `panel.spec.plugin.kind === 'signoz/PieChartPanel'`, so the cast is a
+	// documented boundary narrowing.
 	const spec = useMemo<DashboardtypesPieChartPanelSpecDTO>(
 		() => panel.spec.plugin.spec as DashboardtypesPieChartPanelSpecDTO,
 		[panel.spec.plugin.spec],
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/definition.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/definition.ts
@@ -10,12 +10,4 @@ export const definition: PanelDefinition<'signoz/PieChartPanel'> = {
 	Renderer,
 	sections,
 	supportedSignals: [DataSource.METRICS, DataSource.LOGS, DataSource.TRACES],
-	actions: {
-		view: true,
-		edit: true,
-		clone: true,
-		download: false,
-		createAlert: false,
-		search: false,
-	},
 };
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/prepareData.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/prepareData.ts
@@ -12,9 +12,11 @@ export interface PreparePieDataArgs {
 }

 /**
- * Turns the scalar tables of a V5 response into pie slices (one per group row):
- * value column → value, group column(s) → label. Colours honour `customColors`
- * then fall back to the deterministic palette; non-positive/non-numeric dropped.
+ * Turns the scalar tables of a V5 response into pie slices: one slice per
+ * group row. The aggregation column holds the value, the group column(s)
+ * form the label. Colours honour `customColors` then fall back to a
+ * deterministic palette colour; non-positive / non-numeric values are
+ * dropped.
 */
 export function preparePieData({
 	tables,
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/sections.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/PieChartPanel/sections.ts
@@ -1,10 +1,8 @@
 import type { SectionConfig } from '../../types/sections';

-// Pie has no axes, thresholds, or stacking — just value formatting and a legend.
-// Legend `colors` is omitted: the pie legend is always interactive swatches.
+// Pie has no axes, thresholds, or stacking — just value formatting and a
+// legend. `mode` is omitted: the pie legend is always interactive swatches.
 export const sections: SectionConfig[] = [
-	{ kind: 'visualization', controls: { timePreference: true } },
 	{ kind: 'formatting', controls: { unit: true, decimals: true } },
 	{ kind: 'legend', controls: { position: true } },
-	{ kind: 'contextLinks' },
 ];
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/Renderer.tsx
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/Renderer.tsx
@@ -42,8 +42,10 @@ function TimeSeriesPanelRenderer({
 	const isDarkMode = useIsDarkMode();
 	const { timezone } = useTimezone();

-	// The registry guarantees the kind, so the cast is a boundary narrowing.
-	// Memoized so the `?? {}` fallback doesn't produce a fresh object each render.
+	// The registry guarantees this Renderer only runs when
+	// `panel.spec.plugin.kind === 'signoz/TimeSeriesPanel'`, so the cast is a
+	// documented boundary narrowing — not a blind assertion. Memoized so the
+	// `?? {}` fallback doesn't produce a fresh object on each render.
 	const spec = useMemo<DashboardtypesTimeSeriesPanelSpecDTO>(
 		() => (panel.spec.plugin.spec ?? {}) as DashboardtypesTimeSeriesPanelSpecDTO,
 		[panel.spec.plugin.spec],
@@ -54,9 +56,12 @@ function TimeSeriesPanelRenderer({
 		[panel.spec.queries],
 	);

-	// X-scale clamps come from the request that produced the data, so each panel
-	// pins to the window it fetched — matters during drag-zoom transitions before
-	// new data arrives. The generated request DTO is structurally the V5 request.
+	// X-scale clamps come from the request that produced the data, so each
+	// panel pins to the window it actually fetched — important during
+	// drag-zoom transitions when the time picker has moved but new data
+	// hasn't arrived yet. Falls back to the global picker inside the helper.
+	// The generated request DTO is structurally the hand-written V5 request;
+	// the cast is the documented boundary.
 	const { minTimeScale, maxTimeScale } = useMemo(() => {
 		const { startTime, endTime } = getTimeRangeFromQueryRangeRequest(
 			data.requestPayload as unknown as QueryRangeRequestV5 | undefined,
@@ -99,8 +104,10 @@ function TimeSeriesPanelRenderer({
 			minTimeScale,
 			maxTimeScale,
 			onDragSelect,
-			// TooltipPlugin mutates `config` for cursor sync; rebuild on syncMode change
-			// so a fresh instance doesn't inherit stale sync settings (e.g. "No Sync").
+			// `config` gets mutated by TooltipPlugin (config.setCursor for cursor sync).
+			// Rebuild it on syncMode changes so the new chart instance starts from a
+			// clean config — otherwise switching to "No Sync" would inherit stale sync
+			// settings from the previous mode.
 			dashboardPreference?.syncMode,
 		],
 	);
@@ -123,8 +130,12 @@ function TimeSeriesPanelRenderer({
 		[panelId],
 	);

-	// Keying on sync prefs forces a full chart teardown/re-mount so stale sync
-	// settings aren't inherited — the only way to fully reset the uPlot instance.
+	/**
+	 * The uPlot key prop is the only way to force a full teardown and re-mount
+	 * of the chart. By including the syncMode and syncFilterMode in the key,
+	 * we ensure that changes to these preferences trigger a fresh chart instance,
+	 * preventing stale sync settings from being inherited.
+	 */
 	const key = `${dashboardPreference?.syncMode}-${dashboardPreference?.syncFilterMode}`;

 	const handleChartClick = useCallback(
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/definition.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/definition.ts
@@ -10,12 +10,4 @@ export const definition: PanelDefinition<'signoz/TimeSeriesPanel'> = {
 	Renderer,
 	sections,
 	supportedSignals: [DataSource.METRICS, DataSource.LOGS, DataSource.TRACES],
-	actions: {
-		view: true,
-		edit: true,
-		clone: true,
-		download: false,
-		createAlert: true,
-		search: false,
-	},
 };
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/sections.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/sections.ts
@@ -1,20 +1,15 @@
 import type { SectionConfig } from '../../types/sections';

 export const sections: SectionConfig[] = [
-	{ kind: 'visualization', controls: { timePreference: true, fillSpans: true } },
-	{ kind: 'formatting', controls: { unit: true, decimals: true } },
-	{ kind: 'axes', controls: { minMax: true, logScale: true } },
-	{ kind: 'legend', controls: { position: true, colors: true } },
 	{
-		kind: 'chartAppearance',
+		kind: 'formatting',
 		controls: {
-			lineStyle: true,
-			lineInterpolation: true,
-			fillMode: true,
-			showPoints: true,
-			spanGaps: true,
+			unit: true,
+			decimals: true,
 		},
 	},
-	{ kind: 'thresholds', controls: { variant: 'label' } },
-	{ kind: 'contextLinks' },
+	{ kind: 'axes', controls: { minMax: true, unit: true, logScale: true } },
+	{ kind: 'legend', controls: { position: true, mode: true } },
+	{ kind: 'thresholds', controls: { list: true } },
+	{ kind: 'chartAppearance', controls: { lineStyle: true, fillOpacity: true } },
 ];
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/utils/buildConfig.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/kinds/TimeSeriesPanel/utils/buildConfig.ts
@@ -31,7 +31,10 @@ const DEFAULT_POINT_SIZE = 5;
 export interface BuildTimeSeriesConfigArgs {
 	panelId: string;
 	spec: DashboardtypesTimeSeriesPanelSpecDTO;
-	/** Flat list of builder queries (see `getBuilderQueries`); powers per-query legend resolution. */
+	/**
+	 * Flat list of builder queries on this panel (see `getBuilderQueries`).
+	 * Powers per-query legend resolution; empty for non-builder panels.
+	 */
 	builderQueries: BuilderQuery[];
 	/** Flattened V5 series (see `flattenTimeSeries`). */
 	series: PanelSeries[];
@@ -46,7 +49,14 @@ export interface BuildTimeSeriesConfigArgs {
 	maxTimeScale?: number;
 }

-/** Builds a `UPlotConfigBuilder` for a TimeSeries panel: shared scaffolding plus one series per result. */
+/**
+ * Builds a fully-wired `UPlotConfigBuilder` for a TimeSeries panel.
+ *
+ * Delegates the panel-agnostic scaffolding (scales, thresholds, axes,
+ * drag-to-zoom, click plugin) to the shared `buildBaseConfig`, then layers
+ * in the TimeSeries-specific concern: one series per result, with visuals
+ * resolved from `spec.chartAppearance`.
+ */
 export function buildTimeSeriesConfig({
 	panelId,
 	spec,
@@ -94,7 +104,11 @@ interface AddSeriesArgs {
 }

 /**
- * Adds one uPlot series per flattened V5 series; mutates the builder in place.
+ * Adds one uPlot series per flattened V5 series to the scaffolded builder.
+ * The visual resolution (line style, interpolation, fill mode, span gaps)
+ * reads from `spec.chartAppearance`; the label is resolved via the legend
+ * matrix in `resolveSeriesLabelV5`. Mutates the builder in place.
+ *
 * Order must match `prepareAlignedData` — both iterate the same flat list.
 */
 function addSeries({
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/registry.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/registry.ts
@@ -7,7 +7,7 @@ import type {
 	PanelRegistry,
 	RenderablePanelDefinition,
 } from './types/panelDefinition';
-import { PanelKind } from './types/panelKind';
+import type { DashboardtypesPanelPluginKindDTO as PanelKind } from 'api/generated/services/sigNoz.schemas';

 // Pure assembly: each kind owns its own PanelDefinition (see
 // `kinds/<Kind>/definition.ts`). Registering a new panel = add its folder and a
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/interactions.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/interactions.ts
@@ -2,7 +2,12 @@ import type { ChartClickData } from 'lib/uPlotV2/plugins/TooltipPlugin/types';

 import type { PanelKind } from './panelKind';

-/** Source-tagged click events; each non-chart kind carries its own drill-down context. */
+/**
+ * Source-tagged click events. The three uPlot panels share `ChartClickEvent`;
+ * each non-chart kind carries the context its drill-down needs. The `source`
+ * tag lets a kind-agnostic consumer (the render boundary, a shared drill-down
+ * handler) discriminate without assuming a chart shape.
+ */
 export type ChartClickEvent = ChartClickData;
 export type TableClickEvent = {
 	rowData: Record<string, unknown>;
@@ -23,9 +28,11 @@ export type PanelClickEvent =
 type DragSelect = (start: number, end: number) => void;

 /**
- * Per-kind interaction props — each kind exposes only the gestures it supports.
- * Keyed by `PanelKind`; `PanelRendererProps<K>` indexes this, so a missing kind
- * is a compile error there.
+ * Per-kind interaction props. Each panel kind exposes ONLY the gestures it
+ * supports: chart panels get a chart-shaped `onClick`, time-axis charts add
+ * `onDragSelect`, histograms have no drag-to-zoom, a NumberPanel has no
+ * interactions at all. Keys mirror `PanelKind`; `PanelRendererProps<K>` in
+ * rendererProps.ts indexes this map, so a missing kind is a compile error there.
 */
 export type PanelInteractionMap = Record<PanelKind, object> & {
 	'signoz/TimeSeriesPanel': {
@@ -44,8 +51,9 @@ export type PanelInteractionMap = Record<PanelKind, object> & {
 };

 /**
- * Widest interaction surface — used where the kind isn't known statically (the
- * registry render boundary). The supertype the per-kind shapes are cast to once.
+ * Widest interaction surface — used where the panel kind is not known
+ * statically (the registry render boundary; see `getPanelDefinition`). It is
+ * the structural supertype the per-kind shapes are cast to exactly once.
 */
 export interface AnyPanelInteractionProps {
 	onClick?: (event: PanelClickEvent) => void;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/panelDefinition.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/panelDefinition.ts
@@ -6,45 +6,23 @@ import type { AnyPanelInteractionProps } from './interactions';
 import type { PanelKind } from './panelKind';
 import type { BaseRendererProps, PanelRendererProps } from './rendererProps';

-/**
- * Which panel actions a kind supports. Required field, so registering a new
- * kind forces an explicit decision for every action. Chrome actions (move to
- * section, clone, delete) are dashboard-layout concerns available to every
- * panel and are intentionally not declarable here.
- */
-export interface PanelActionCapabilities {
-	/** Kind has a full-screen view — gates the "View" action. */
-	view: boolean;
-	/** Kind is editable in the V2 panel editor — gates the "Edit panel" action. */
-	edit: boolean;
-	/** Kind can be cloned — gates the "Clone" action. */
-	clone: boolean;
-	/** Gates "Download as CSV". V1 parity: only table panels carry exportable data. */
-	download: boolean;
-	/** Kind's query can seed a new alert — gates "Create Alerts". */
-	createAlert: boolean;
-	/**
-	 * Header search box that filters rendered rows client-side (V1 parity: only
-	 * tabular kinds). Not a menu action — the renderer must consume `searchTerm`.
-	 */
-	search: boolean;
-}
-
 export interface PanelDefinition<K extends PanelKind = PanelKind> {
 	kind: K;
 	displayName: string;
 	Renderer: ComponentType<PanelRendererProps<K>>;
 	sections: SectionConfig[];
 	supportedSignals: DataSource[];
-	actions: PanelActionCapabilities;
 }

-// Indexing with a literal kind yields that kind's exactly-typed PanelDefinition.
+// Keyed registry that preserves the kind ↔ definition correlation: indexing
+// with a literal kind yields that kind's exactly-typed PanelDefinition.
 export type PanelRegistry = { [K in PanelKind]?: PanelDefinition<K> };

-// PanelDefinition with its Renderer widened to the kind-agnostic prop surface.
-// getPanelDefinition resolves to this, concentrating the unavoidable cast in one
-// place rather than leaking it to every call site (the kind isn't known statically).
+// A PanelDefinition whose Renderer is widened to the kind-agnostic prop surface.
+// At the render boundary the concrete kind isn't known statically (a registry
+// lookup returns a union over kinds), so getPanelDefinition resolves to this —
+// concentrating the single unavoidable cast in one place instead of leaking it
+// to every call site.
 export interface RenderablePanelDefinition extends Omit<
 	PanelDefinition,
 	'Renderer'
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind.ts
@@ -2,9 +2,11 @@ import { PANEL_TYPES } from 'constants/queryBuilder';
 import type { DashboardtypesPanelPluginKindDTO } from 'api/generated/services/sigNoz.schemas';

 /**
- * String-literal union of every panel kind, derived from the generated enum.
- * A `${enum}` union (not the nominal enum) so plain string-literal kinds stay
- * assignable without enum-member ceremony at every call site.
+ * String-literal union of every panel kind, derived from the generated enum so
+ * the contract stays the single source of truth. Kept as a `${enum}` union
+ * (not the nominal enum) so plain string-literal kinds — `PanelRendererProps<
+ * 'signoz/TimeSeriesPanel'>`, registry keys, `PanelInteractionMap` keys —
+ * remain assignable without enum-member ceremony at every call site.
 */
 export type PanelKind = `${DashboardtypesPanelPluginKindDTO}`;

--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/rendererProps.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/rendererProps.ts
@@ -4,32 +4,47 @@ import type {
 	SyncTooltipFilterMode,
 } from 'lib/uPlotV2/plugins/TooltipPlugin/types';
 import { PanelMode } from 'container/DashboardContainer/visualization/panels/types';
-import type {
-	PanelPagination,
-	PanelQueryData,
-} from 'pages/DashboardPageV2/DashboardContainer/queryV5/types';
+import type { PanelQueryData } from 'pages/DashboardPageV2/DashboardContainer/queryV5/types';

 import type { PanelInteractionMap } from './interactions';
 import type { PanelKind } from './panelKind';

-/** Dashboard-wide rendering preferences propagated to every panel renderer. */
+/**
+ * Dashboard-wide rendering preferences propagated down to every panel renderer
+ * on the same dashboard. Lets the shell push cross-panel concerns (cursor
+ * sync, tooltip filter mode, dashboard id for scoped state) without each
+ * renderer rediscovering them via hooks.
+ */
 export interface DashboardPreference {
-	/** Cursor-sync mode; always present — `DashboardCursorSync.None` is the off state. */
+	/**
+	 * Cursor-sync mode for the dashboard. Drives the uPlot tooltip plugin so
+	 * hovering one panel highlights the corresponding x on every other panel.
+	 * Always present — `DashboardCursorSync.None` is the off state.
+	 */
 	syncMode: DashboardCursorSync;
-	/** Filter applied to the synced tooltip across panels. */
+	/**
+	 * Filter applied to the synced tooltip across panels (e.g. only show series
+	 * whose label matches the hovered series).
+	 */
 	syncFilterMode?: SyncTooltipFilterMode;
-	/** Dashboard id, for renderers that scope per-dashboard state. */
+	/**
+	 * Dashboard id — useful for renderers that scope per-dashboard state
+	 * (e.g. pinned-tooltip persistence, drill-down history).
+	 */
 	dashboardId?: string;
 }

-// Kind-agnostic props every renderer receives. Kind-specific interaction props
-// are layered on per-kind by PanelRendererProps<K>.
+// Kind-agnostic props every renderer receives, regardless of panel kind. The
+// kind-specific interaction props (onClick payload, onDragSelect) are layered
+// on per-kind by PanelRendererProps<K>.
 export interface BaseRendererProps {
 	panelId: string;
 	/**
-	 * The whole perses panel — renderers derive `spec` and `queries` from this.
-	 * Required: the render boundary only mounts a renderer once the panel and its
-	 * kind are resolved, so a renderer never sees an absent panel.
+	 * The whole perses panel — renderers derive their concrete `spec` and the
+	 * perses-shaped `queries` from this. Passing the full panel keeps the prop
+	 * surface stable as new panel-level fields are added to the wire format.
+	 * Required: the render boundary (`Panel`) only mounts a renderer once the
+	 * panel and its kind are resolved, so a renderer never sees an absent panel.
 	 */
 	panel: DashboardtypesPanelDTO;
 	/** Raw V5 fetch result — response + the request that produced it. */
@@ -38,21 +53,24 @@ export interface BaseRendererProps {
 	error: Error | null;
 	/** Gate for the drill-down right-click menu. Off by default in V2. */
 	enableDrillDown?: boolean;
-	/** Render context (dashboard widget vs. standalone vs. editor); see PanelMode. */
-	panelMode: PanelMode;
-	/** Dashboard-level preferences propagated to every panel; shell resolves, renderer consumes. */
-	dashboardPreference?: DashboardPreference;
 	/**
-	 * Free-text filter from the header search box, applied client-side. Only
-	 * meaningful for kinds that declare `actions.search`; others ignore it.
+	 * Render context — varies behavior (e.g. dashboard widget vs. standalone
+	 * full-screen vs. inside the editor). See PanelMode for the contract.
 	 */
-	searchTerm?: string;
-	/** Server-side paging handles. Present only for raw/list panels; others ignore it. */
-	pagination?: PanelPagination;
+	panelMode: PanelMode;
+	/**
+	 * Dashboard-level preferences that should propagate to every panel
+	 * (cursor sync, tooltip filter mode, dashboard id). The shell owns
+	 * resolving these; the renderer just consumes them.
+	 */
+	dashboardPreference?: DashboardPreference;
 }

-// Renderer props for a specific kind: shared base plus that kind's interaction
-// surface. Indexing PanelInteractionMap forces it to cover every PanelKind; the
-// default K = PanelKind yields the widest surface (a union over all kinds).
+// Renderer props for a specific panel kind: the shared base plus that kind's
+// interaction surface (PanelInteractionMap[K]). Each renderer annotates with
+// its own kind — e.g. PanelRendererProps<'signoz/TimeSeriesPanel'> — so it can
+// only reference the gestures that kind supports. Indexing PanelInteractionMap
+// here forces the map to cover every PanelKind. The default K = PanelKind
+// yields the widest surface (a union over all kinds).
 export type PanelRendererProps<K extends PanelKind = PanelKind> =
 	BaseRendererProps & PanelInteractionMap[K];
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/sections.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/sections.ts
@@ -1,25 +1,8 @@
-import type {
-	DashboardLinkDTO,
-	DashboardtypesAxesDTO,
-	DashboardtypesBarChartVisualizationDTO,
-	DashboardtypesComparisonThresholdDTO,
-	DashboardtypesHistogramBucketsDTO,
-	DashboardtypesLegendDTO,
-	DashboardtypesPanelFormattingDTO,
-	DashboardtypesPanelSpecDTO,
-	DashboardtypesTableFormattingDTO,
-	DashboardtypesTableThresholdDTO,
-	DashboardtypesThresholdWithLabelDTO,
-	DashboardtypesTimeSeriesChartAppearanceDTO,
-	TelemetrytypesTelemetryFieldKeyDTO,
-} from 'api/generated/services/sigNoz.schemas';
 import {
 	BarChart,
 	Columns3,
 	Hash,
-	Layers,
-	LayoutDashboard,
-	Link,
+	ListEnd,
 	Palette,
 	Ruler,
 	SlidersHorizontal,
@@ -35,117 +18,38 @@ export interface SectionMetadata {
 	description?: string;
 }

-/**
- * Which threshold editor a kind uses. All three variants persist to the same
- * `plugin.spec.thresholds` key with different element shapes:
- * - `label` — value + color + label lines (TimeSeries / Bar)
- * - `comparison` — value crosses an operator → recolor (Number)
- * - `table` — per-column comparison (Table)
- */
-export type ThresholdVariant = 'label' | 'comparison' | 'table';
-
-/** Union of every threshold element shape stored under `plugin.spec.thresholds`. */
-export type AnyThreshold =
-	| DashboardtypesThresholdWithLabelDTO
-	| DashboardtypesComparisonThresholdDTO
-	| DashboardtypesTableThresholdDTO;
-
-/**
- * Each section ↔ one slice of the panel spec it edits. Most slices live under
- * `spec.plugin.spec.<key>`; `contextLinks` is panel-level (`spec.links`).
- */
-// Superset spanning every kind's formatting DTO; the `controls` bag gates which
-// fields a kind actually writes.
-export type PanelFormattingSlice = DashboardtypesPanelFormattingDTO &
-	Pick<DashboardtypesTableFormattingDTO, 'columnUnits'>;
-
-export interface SectionSpecMap {
-	formatting: PanelFormattingSlice; // spec.plugin.spec.formatting
-	axes: DashboardtypesAxesDTO; // spec.plugin.spec.axes
-	legend: DashboardtypesLegendDTO; // spec.plugin.spec.legend
-	chartAppearance: DashboardtypesTimeSeriesChartAppearanceDTO; // spec.plugin.spec.chartAppearance
-	buckets: DashboardtypesHistogramBucketsDTO; // spec.plugin.spec.histogramBuckets
-	// spec.plugin.spec.visualization — typed as the Bar shape (widest superset);
-	// the `controls` bag gates which fields each kind writes.
-	visualization: DashboardtypesBarChartVisualizationDTO;
-	thresholds: AnyThreshold[]; // spec.plugin.spec.thresholds (variant picks the editor)
-	contextLinks: DashboardLinkDTO[]; // spec.links (PANEL-level)
-	columns: TelemetrytypesTelemetryFieldKeyDTO[]; // spec.plugin.spec.selectFields (List)
-}
-
-/**
- * Controlled sections — a kind exposes a subset of the section's controls (V2
- * analogue of V1's `allowSoftMinMax` / `allowLegendColors` flags).
- */
-export interface SectionControls {
-	formatting: { unit?: boolean; decimals?: boolean; columnUnits?: boolean };
-	axes: { minMax?: boolean; logScale?: boolean }; // minMax → softMin/softMax
-	legend: { position?: boolean; colors?: boolean }; // colors → customColors
+// Per-kind control toggles (type-only — runtime metadata is in SECTIONS).
+// Section components type their controls prop via `SectionControls['axes']`.
+export type SectionControls = {
+	formatting: { unit?: boolean; decimals?: boolean };
+	axes: { minMax?: boolean; unit?: boolean; logScale?: boolean };
+	legend: { position?: boolean; mode?: boolean };
+	thresholds: { list?: boolean };
 	chartAppearance: {
 		lineStyle?: boolean;
-		lineInterpolation?: boolean;
-		fillMode?: boolean;
-		showPoints?: boolean;
-		spanGaps?: boolean;
+		fillOpacity?: boolean;
+		stacked?: boolean;
 	};
-	buckets: { count?: boolean; width?: boolean; mergeQueries?: boolean };
-	// stacking → stackedBarChart (Bar); fillSpans → fill gaps with 0 (TimeSeries).
-	visualization: {
-		timePreference?: boolean;
-		stacking?: boolean;
-		fillSpans?: boolean;
-	};
-	// Editor discriminator (not a spec field): which threshold variant a kind edits.
-	thresholds: { variant?: ThresholdVariant };
-}
+	columnUnits: { perColumnUnit?: boolean };
+	buckets: { count?: boolean; min?: boolean; max?: boolean };
+};

-export type ControlledSectionKind = keyof SectionControls;
-
-/** Atomic sections — no sub-controls; a kind either shows them or not. */
-export type AtomicSectionKind = 'contextLinks' | 'columns';
-
-export type SectionKind = ControlledSectionKind | AtomicSectionKind;
-
-/** Predicate to hide a section from the current spec; returning true removes it. */
-export type SectionVisibilityPredicate = (
-	spec: DashboardtypesPanelSpecDTO,
-) => boolean;
-
-/**
- * What a kind declares in `kinds/<Kind>/sections.ts`: a controlled section with
- * its `controls` subset, or an atomic section bare (`{ kind }`).
- */
-export type SectionConfig =
-	| {
-			[K in ControlledSectionKind]: {
-				kind: K;
-				controls: SectionControls[K];
-				isHidden?: SectionVisibilityPredicate;
-			};
-	  }[ControlledSectionKind]
-	| { kind: AtomicSectionKind; isHidden?: SectionVisibilityPredicate };
-
-// Per-section title + sidebar icon. Pure data; the editor component + spec lens
-// live in the ConfigPane section registry.
-export const SECTION_METADATA = {
+// Source of truth for sections. Its keys define SectionKind; its values are the
+// runtime UI metadata (consumed by PanelEditor in 1.8). Adding a new section =
+// one entry here + one entry in SectionControls.
+export const SECTIONS = {
 	formatting: { title: 'Formatting', icon: Hash },
 	axes: { title: 'Axes', icon: Ruler },
-	legend: { title: 'Legend', icon: Layers },
-	chartAppearance: { title: 'Chart appearance', icon: Palette },
-	visualization: { title: 'Visualization', icon: LayoutDashboard },
-	buckets: { title: 'Histogram / Buckets', icon: BarChart },
+	legend: { title: 'Legend', icon: ListEnd },
 	thresholds: { title: 'Thresholds', icon: SlidersHorizontal },
-	contextLinks: { title: 'Context Links', icon: Link },
-	columns: { title: 'Columns', icon: Columns3 },
-} as const satisfies Record<SectionKind, SectionMetadata>;
+	chartAppearance: { title: 'Chart appearance', icon: Palette },
+	columnUnits: { title: 'Column units', icon: Columns3 },
+	buckets: { title: 'Buckets', icon: BarChart },
+} as const satisfies Record<string, SectionMetadata>;

-/**
- * Props every section editor receives: its slice (`value`), an `onChange`, and
- * (controlled sections only) the per-kind `controls` subset.
- */
-export type SectionEditorProps<K extends SectionKind> = {
-	value: SectionSpecMap[K] | undefined;
-	onChange: (next: SectionSpecMap[K]) => void;
-} & (K extends ControlledSectionKind
-	? { controls: SectionControls[K] }
-	: unknown);
+export type SectionKind = keyof typeof SECTIONS;
+
+// Discriminated union derived from SectionControls — kept in lockstep automatically.
+export type SectionConfig = {
+	[K in SectionKind]: { kind: K; controls: SectionControls[K] };
+}[SectionKind];
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/threshold.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/types/threshold.ts
@@ -1,27 +1,13 @@
 /**
- * V2-native threshold model. The spec carries thresholds as DTOs (operator as
- * `above`/`below`/…); this maps them to symbol operators + lowercase formats so
- * V2 panels never reach into the V1 `container/NewWidget` `ThresholdProps` shape.
+ * V2-native threshold model.
+ *
+ * The panel spec carries thresholds as `DashboardtypesComparisonThresholdDTO`
+ * (operator/format expressed as `above`/`below`/`text`/`background`). For
+ * evaluation and rendering we work with the symbol operators and lowercase
+ * display formats, kept here so V2 panels never reach into the V1
+ * `container/NewWidget` `ThresholdProps` shape.
 */

-import type {
-	DashboardtypesComparisonOperatorDTO,
-	DashboardtypesThresholdFormatDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-/**
- * Comparison-shaped fields shared by every threshold DTO that recolors on an
- * operator crossing. Container DTOs add their own keys (e.g. a table threshold's
- * `columnName`) around this core.
- */
-export interface ComparisonThresholdShape {
-	color: string;
-	value: number;
-	operator?: DashboardtypesComparisonOperatorDTO;
-	unit?: string;
-	format?: DashboardtypesThresholdFormatDTO;
-}
-
 /** Comparison operators a threshold can use, as evaluable symbols. */
 export type ThresholdComparisonOperator = '>' | '<' | '>=' | '<=' | '=' | '!=';

@@ -30,8 +16,8 @@ export type ThresholdDisplayFormat = 'text' | 'background';

 /**
 * A threshold normalized for evaluation/rendering. `operator`/`format` are
- * optional because the spec allows partial config; a threshold with no operator
- * never matches.
+ * optional because the spec allows partially-configured thresholds; a
+ * threshold with no operator never matches.
 */
 export interface PanelThreshold {
 	color: string;
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/baseConfigBuilder.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/baseConfigBuilder.ts
@@ -20,9 +20,11 @@ import {
 } from './selectionPreferences';

 /**
- * Inputs for the shared V2 chart pipeline. Accepts perses-shaped inputs directly
- * so callers don't translate per panel. Wires only the scaffolding (scales,
- * thresholds, axes, drag-to-zoom, click plugin); series rendering is per-panel.
+ * Inputs for the shared V2 chart pipeline. Mirrors the V1 helper of the same
+ * name but accepts perses-shaped inputs directly (so callers don't translate
+ * once per panel). The series-rendering step is panel-specific and lives in
+ * each panel's `utils.ts` — this helper only wires the scaffolding (scales,
+ * thresholds, axes, drag-to-zoom, click plugin).
 */
 export interface BuildBaseConfigArgs {
 	panelId: string;
@@ -44,7 +46,10 @@ export interface BuildBaseConfigArgs {

 	/** Per-query step intervals from the response exec stats. */
 	stepIntervals?: Record<string, number>;
-	/** Payload for the shared click plugin; omitted by panels without click interactions. */
+	/**
+	 * Tuple-shaped payload for the shared click plugin (see
+	 * `toClickPluginPayload`). Omitted by panels without click interactions.
+	 */
 	clickPayload?: MetricRangePayloadProps;

 	/** Time-range clamps for the X scale (typically from `getTimeRange(apiResponse)`). */
@@ -57,9 +62,10 @@ export interface BuildBaseConfigArgs {
 }

 /**
- * Builds the panel-agnostic scaffolding of a uPlot chart (scales, thresholds,
- * axes, drag-to-zoom, click plugin). Callers then `addSeries`/`addPlugin` on the
- * returned builder for their own rendering.
+ * Builds the panel-agnostic scaffolding of a uPlot chart: scales, thresholds,
+ * axes, drag-to-zoom, click plugin. Callers (TimeSeriesPanel, BarPanel, …)
+ * then call `addSeries`/`addPlugin` on the returned builder for their own
+ * panel-specific rendering.
 */
 export function buildBaseConfig({
 	panelId,
@@ -159,10 +165,9 @@ function makeTzDate(
 		uPlot.tzDate(new Date(timestamp * 1e3), timezone.value);
 }

-/**
- * Perses-shape thresholds → the draw-hook shape uPlotV2 consumes. Exported so
- * panels feeding the same list elsewhere don't redo the mapping.
- */
+// Perses-shape thresholds → the draw-hook shape uPlotV2 consumes. Exported so
+// panels that need to feed the same threshold list elsewhere (e.g. to a series
+// `addSeries` thresholds hook) don't have to redo the mapping.
 export function mapThresholds(
 	thresholds: DashboardtypesThresholdWithLabelDTO[] | null | undefined,
 ): ThresholdsDrawHookOptions['thresholds'] {
@@ -178,9 +183,10 @@ export function mapThresholds(
 }

 /**
- * Smallest per-query step interval, fed to uPlot so tick density matches the
- * densest query. Falls back to `undefined` (uPlot "auto") on an empty map, since
- * `Math.min` returns `Infinity` there and would corrupt scale math.
+ * V5 backend reports per-query step intervals; we feed the smallest one through
+ * to uPlot so the X-axis tick density matches the densest query. An empty map
+ * yields `Infinity` from `Math.min`, which would corrupt downstream scale math —
+ * fall back to `undefined` (uPlot's "auto") in that case.
 */
 function minStepInterval(
 	stepIntervals: Record<string, number>,
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/chartAppearance/enumMaps.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/chartAppearance/enumMaps.ts
@@ -12,9 +12,12 @@ import {
 } from 'lib/uPlotV2/config/types';

 /**
- * Bridges the V2 wire-format enums to the uPlotV2 chart enums. String values
- * diverge between the two — don't coerce, map. Single source of truth shared by
- * every panel that reads chart-appearance fields.
+ * Bridges the V2 dashboard wire-format enums (snake_case, generated from Go)
+ * to the uPlotV2 chart enums (PascalCase). String values diverge between the
+ * two — don't coerce, map.
+ *
+ * Kept as a single source of truth so every panel that reads chart-appearance
+ * fields stays in sync as either side's enum evolves.
 */

 export const LINE_STYLE_MAP: Record<DashboardtypesLineStyleDTO, LineStyle> = {
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/chartAppearance/resolvers.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/chartAppearance/resolvers.ts
@@ -7,13 +7,16 @@ import { LegendPosition } from 'lib/uPlotV2/components/types';

 import { LEGEND_POSITION_MAP } from './enumMaps';

-// Resolvers turning raw `spec` chart-appearance fields into runtime chart
-// values, falling back to chart defaults for missing/unknown input.
+/**
+ * Resolvers that turn raw `spec` chart-appearance fields into the chart's
+ * runtime values, falling back to the chart defaults for missing/unknown input.
+ */

 /**
 * `spec.formatting.decimalPrecision` is a stringified-digit enum on the wire
- * (`'0'`–`'4'` plus the `'full'` sentinel). Maps to a numeric `PrecisionOption`
- * or the `'full'` sentinel; missing/unknown → `undefined` (chart default).
+ * (`'0'`–`'4'` plus the sentinel `'full'`). The chart consumes a numeric
+ * `PrecisionOption` (`0`–`4`) or the same `'full'` sentinel from its own
+ * enum. Missing / unknown → `undefined` (chart uses its default).
 */
 export function resolveDecimalPrecision(
 	precision: DashboardtypesPrecisionOptionDTO | undefined,
@@ -39,8 +42,8 @@ export function resolveDecimalPrecision(

 /**
 * `spec.chartAppearance.spanGaps.fillLessThan` is a stringified number on the
- * wire. Empty/missing → span all gaps (default); numeric → forward the threshold
- * so uPlot only bridges short runs of nulls.
+ * wire. Empty / missing → span all gaps (the chart default). Numeric → forward
+ * the threshold so uPlot only bridges short runs of nulls.
 */
 export function resolveSpanGaps(
 	fillLessThan: string | undefined,
@@ -52,7 +55,10 @@ export function resolveSpanGaps(
 	return Number.isFinite(parsed) ? parsed : true;
 }

-/** Legend position; missing/unknown falls back to `BOTTOM` (chart default, V1 parity). */
+/**
+ * Resolves the legend position for a panel. Missing / unknown values fall
+ * back to `BOTTOM` to match the chart's default and the V1 behavior.
+ */
 export function resolveLegendPosition(
 	position: DashboardtypesLegendPositionDTO | undefined,
 ): LegendPosition {
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/evaluateThresholds.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/evaluateThresholds.ts
@@ -13,8 +13,10 @@ import type {

 /**
 * Threshold evaluation for V2 panels — a self-contained port of the V1
- * `GridTableComponent`/`ValueGraph` logic, depending only on non-V1 primitives
- * (`convertValue`, the Y-axis unit catalog) so it never imports V1 surfaces.
+ * `GridTableComponent`/`ValueGraph` logic that depends only on shared,
+ * non-V1 primitives (`convertValue`, the Y-axis unit catalog). No imports
+ * from `container/NewWidget`, `container/GridTableComponent`, or
+ * `components/ValueGraph`.
 */

 /** Resolves which unit category a unit id belongs to, or null if unknown. */
@@ -23,8 +25,9 @@ function getCategoryName(unitId: string): YAxisCategoryNames | null {

 	const foundCategory = categories.find((category) =>
 		category.units.some((unit) => {
-			// Category units use universal ids; panel/threshold units may use
-			// Grafana-style ids. Match the universal id or its mapped Grafana id.
+			// Category units use universal ids; thresholds/panel units may use
+			// Grafana-style ids. Match either the universal id directly or its
+			// mapped Grafana id.
 			if (unit.id === unitId) {
 				return true;
 			}
@@ -35,7 +38,10 @@ function getCategoryName(unitId: string): YAxisCategoryNames | null {
 	return foundCategory ? foundCategory.name : null;
 }

-/** Converts `value` between units; null when invalid (unknown, or different categories). */
+/**
+ * Converts `value` from `fromUnit` to `toUnit`, returning null when the
+ * conversion is invalid (unknown unit, or units in different categories).
+ */
 function convertUnit(
 	value: number,
 	fromUnit?: string,
@@ -79,8 +85,9 @@ function evaluateCondition(
 }

 /**
- * Whether `value` (in `panelUnit`) satisfies `threshold`. Converts into the
- * threshold's unit before comparing; falls back to the raw value if invalid.
+ * Whether `value` (expressed in `panelUnit`) satisfies `threshold`. When the
+ * threshold declares its own unit, the panel value is converted into that unit
+ * before comparing; if the conversion is invalid we compare the raw value.
 */
 export function doesValueMatchThreshold(
 	value: number,
@@ -105,8 +112,9 @@ export interface ActiveThreshold {
 }

 /**
- * Resolves the threshold to apply for `value`. Earliest-declared match wins
- * (V1 precedence); more than one match flags a conflict.
+ * Resolves the threshold to apply for `value`. Among matching thresholds the
+ * one declared earliest (lowest index) wins, mirroring V1 precedence; a match
+ * count greater than one flags a conflict.
 */
 export function resolveActiveThreshold(
 	thresholds: PanelThreshold[],
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/formatPanelValue.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/formatPanelValue.ts
@@ -2,10 +2,16 @@ import type { PrecisionOption } from 'components/Graph/types';
 import { getYAxisFormattedValue } from 'components/Graph/yAxisConfig';

 /**
- * Formats a scalar for display in a V2 panel, honoring decimal precision. The
- * single seam through which panels touch `getYAxisFormattedValue`. Unitless
- * values format through the `'none'` unit, which still respects precision — so
- * precision isn't silently dropped when no unit is set.
+ * Formats a scalar for display in a V2 panel, honoring the configured decimal
+ * precision. The shared, unit-aware `getYAxisFormattedValue` is the single
+ * formatting helper across V2 panels (number/table/list/pie); this wrapper is
+ * the only seam through which panels touch it.
+ *
+ * Precision is applied REGARDLESS of whether a unit is set. When no unit is
+ * configured we format through the `'none'` unit, which still respects
+ * precision — this is the fix for decimal precision being silently dropped on
+ * unitless panels (the old `unit ? format() : value.toString()` gate threw the
+ * precision away whenever the unit was empty).
 */
 export function formatPanelValue(
 	value: number,
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/getBuilderQueries.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/getBuilderQueries.ts
@@ -2,10 +2,13 @@ import type { DashboardtypesQueryDTO } from 'api/generated/services/sigNoz.schem
 import type { BuilderQuery } from 'types/api/v5/queryRange';

 /**
- * Flattens a panel's queries into its builder queries, unwrapping
- * `CompositeQuery` envelopes. Non-builder kinds (PromQL, ClickHouseSQL, Formula,
- * TraceOperator) are dropped — they lack the legend/groupBy/aggregation context
- * downstream code needs. Returns the generated v5 `BuilderQuery` shape directly.
+ * Flattens a panel's queries into the list of builder queries it contains —
+ * unwrapping `CompositeQuery` envelopes along the way. Non-builder kinds
+ * (PromQL, ClickHouseSQL, Formula, TraceOperator) are dropped: they don't
+ * carry the legend / groupBy / aggregation context downstream code needs.
+ *
+ * Returns the generated v5 `BuilderQuery` shape directly — no intermediate
+ * summary type — so callers consume the same type the wire format defines.
 */
 export function getBuilderQueries(
 	queries: DashboardtypesQueryDTO[] | null | undefined,
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/mapComparisonThreshold.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/mapComparisonThreshold.ts
@@ -1,49 +0,0 @@
-import {
-	DashboardtypesComparisonOperatorDTO,
-	DashboardtypesThresholdFormatDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-import type {
-	ComparisonThresholdShape,
-	PanelThreshold,
-	ThresholdComparisonOperator,
-	ThresholdDisplayFormat,
-} from '../types/threshold';
-
-// Perses comparison operators → the symbol operators V2 threshold evaluation uses.
-const OPERATOR_MAP: Record<
-	DashboardtypesComparisonOperatorDTO,
-	ThresholdComparisonOperator
-> = {
-	[DashboardtypesComparisonOperatorDTO.above]: '>',
-	[DashboardtypesComparisonOperatorDTO.below]: '<',
-	[DashboardtypesComparisonOperatorDTO.above_or_equal]: '>=',
-	[DashboardtypesComparisonOperatorDTO.below_or_equal]: '<=',
-	[DashboardtypesComparisonOperatorDTO.equal]: '=',
-	[DashboardtypesComparisonOperatorDTO.not_equal]: '!=',
-};
-
-const FORMAT_MAP: Record<
-	DashboardtypesThresholdFormatDTO,
-	ThresholdDisplayFormat
-> = {
-	[DashboardtypesThresholdFormatDTO.text]: 'text',
-	[DashboardtypesThresholdFormatDTO.background]: 'background',
-};
-
-/**
- * Maps a comparison-shaped spec threshold onto the V2-native `PanelThreshold`.
- * The single place the Perses operator/format enums cross into the symbol model,
- * shared by every kind that carries comparison thresholds (Number, Table, …).
- */
-export function toPanelThreshold(
-	threshold: ComparisonThresholdShape,
-): PanelThreshold {
-	return {
-		color: threshold.color,
-		operator: threshold.operator ? OPERATOR_MAP[threshold.operator] : undefined,
-		value: threshold.value,
-		unit: threshold.unit,
-		format: threshold.format ? FORMAT_MAP[threshold.format] : undefined,
-	};
-}
--- a/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/parseFormattedValue.ts
+++ b/frontend/src/pages/DashboardPageV2/DashboardContainer/Panels/utils/parseFormattedValue.ts
@@ -8,9 +8,10 @@ export interface ParsedFormattedValue {
 }

 /**
- * Splits a formatted value (e.g. "$ 1.2K", "295.43 ms") into its numeric core
- * and prefix/suffix unit for independent styling. Non-matching input falls back
- * to the whole string as the numeric value.
+ * Splits a formatted value string (e.g. "$ 1.2K", "295.43 ms") into its
+ * numeric core and any prefix/suffix unit so each part can be styled
+ * independently. Falls back to treating the whole string as the numeric value
+ * when it doesn't match the expected shape.
 */
 export function parseFormattedValue(value: string): ParsedFormattedValue {
 	const matches = value.match(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Naman Verma	95b7331e42	Merge branch 'main' into nv/schema-changes	2026-06-18 21:09:40 +05:30
Naman Verma	3531ed86f1	fix: reject single-element list default when allowMultiple is false in list variables	2026-06-18 21:08:36 +05:30
Naman Verma	805543cd0d	Merge branch 'main' into nv/schema-changes	2026-06-18 20:54:49 +05:30
Naman Verma	9efa0f757d	fix: add back enum values	2026-06-18 20:54:16 +05:30
Ashwin Bhatkal	01897f7869	chore: fix variable sort type errors	2026-06-18 19:50:30 +05:30
Naman Verma	d1248ab5a3	chore: remove unsupported enum values (causing errors right now)	2026-06-18 18:00:56 +05:30
Naman Verma	ddf2f3ec53	chore: replicate variable.sort into signoz	2026-06-18 17:39:06 +05:30
Naman Verma	ad4e5b8b89	Merge branch 'main' into nv/schema-changes	2026-06-18 15:40:34 +05:30
Naman Verma	8be973ac14	Merge branch 'main' into nv/schema-changes	2026-06-17 22:00:28 +05:30
Naman Verma	f2422c1fdd	fix: replicate text variable spec in signoz to make name required	2026-06-17 22:00:11 +05:30
Naman Verma	6334f26e7d	fix: add validations to list variable that text variable has	2026-06-17 20:51:54 +05:30
Naman Verma	563bd2b004	fix: add additional error info on patch application error	2026-06-17 17:42:23 +05:30
Naman Verma	477be8073d	fix: reject dashbaords that have vars with the same name	2026-06-17 15:42:22 +05:30
Naman Verma	4e36b9a96a	test: add test for missing spec prefix in layout	2026-06-17 14:11:40 +05:30
Naman Verma	7c59e379bd	chore: extract out validate panels method	2026-06-17 13:42:29 +05:30
Naman Verma	eec3472e08	fix: check that panels referred in layouts exist	2026-06-17 13:39:33 +05:30
Naman Verma	b0a065591f	Merge branch 'main' into nv/schema-changes	2026-06-17 07:29:11 +05:30
Naman Verma	c0e0ebab4a	Merge branch 'main' into nv/schema-changes	2026-06-16 20:20:28 +05:30
Naman Verma	9e8464f3eb	Merge branch 'main' into nv/schema-changes	2026-06-16 11:40:23 +05:30
Naman Verma	845c88ec45	Merge branch 'main' into nv/schema-changes	2026-06-15 16:55:36 +05:30
Naman Verma	9b53561c31	fix: change schema properties based on UI integration review	2026-06-15 15:37:29 +05:30