Merge branch 'main' into nv/schema-changes

.github/CODEOWNERS

@@ -189,13 +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

docs/api/openapi.yml

@@ -647,12 +647,8 @@ components:
           type: string
         name:
           type: string
-        transactionGroups:
-          $ref: '#/components/schemas/AuthtypesTransactionGroups'
       required:
       - name
-      - description
-      - transactionGroups
       type: object
     AuthtypesPostableRotateToken:
       properties:
@@ -707,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:
@@ -768,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:
@@ -2493,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:
@@ -2868,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
@@ -2921,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:
@@ -3439,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:
@@ -3488,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
@@ -3507,7 +3475,6 @@ components:
       required:
       - value
       - color
-      - label
       type: object
     DashboardtypesTimePreference:
       enum:
@@ -3592,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:
@@ -3622,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:
@@ -7707,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:
@@ -10309,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:
@@ -11123,7 +11072,7 @@ paths:
               schema:
                 properties:
                   data:
-                    $ref: '#/components/schemas/AuthtypesRoleWithTransactionGroups'
+                    $ref: '#/components/schemas/AuthtypesRole'
                   status:
                     type: string
                 required:
@@ -11158,7 +11107,7 @@ paths:
       tags:
       - role
     patch:
-      deprecated: true
+      deprecated: false
       description: This endpoint patches a role
       operationId: PatchRole
       parameters:
@@ -11219,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
@@ -11360,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

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
 }

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/'],

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 {}

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"
   }
 }

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: {}
 

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,
 				}}

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');
-		});
-	});
 });

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(

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);
 

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 = <

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 {
@@ -2291,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
@@ -2345,14 +2295,6 @@ export interface AuthtypesUpdatableAuthDomainDTO {
 	config?: AuthtypesAuthDomainConfigDTO;
 }
 
-export interface AuthtypesUpdatableRoleDTO {
-	/**
-	 * @type string
-	 */
-	description: string;
-	transactionGroups: AuthtypesTransactionGroupsDTO;
-}
-
 export interface AuthtypesUserRoleDTO {
 	/**
 	 * @type string
@@ -3123,6 +3065,14 @@ export interface CommonJSONRefDTO {
 	$ref?: string;
 }
 
+export interface CoretypesObjectGroupDTO {
+	resource: CoretypesResourceRefDTO;
+	/**
+	 * @type array
+	 */
+	selectors: string[];
+}
+
 export interface CoretypesPatchableObjectsDTO {
 	/**
 	 * @type array,null
@@ -3204,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
@@ -3266,6 +3185,9 @@ export interface DashboardtypesPanelFormattingDTO {
 	unit?: string;
 }
 
+export enum DashboardtypesLegendModeDTO {
+	list = 'list',
+}
 export enum DashboardtypesLegendPositionDTO {
 	bottom = 'bottom',
 	right = 'right',
@@ -3285,6 +3207,7 @@ export interface DashboardtypesLegendDTO {
 	 * @type object,null
 	 */
 	customColors?: DashboardtypesLegendDTOCustomColors;
+	mode?: DashboardtypesLegendModeDTO;
 	position?: DashboardtypesLegendPositionDTO;
 }
 
@@ -3296,7 +3219,7 @@ export interface DashboardtypesThresholdWithLabelDTO {
 	/**
 	 * @type string
 	 */
-	label: string;
+	label?: string;
 	/**
 	 * @type string
 	 */
@@ -3961,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;
 }
@@ -4596,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
@@ -4614,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 {
@@ -4635,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 {
 	/**
@@ -9500,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 = {
@@ -9619,7 +9558,7 @@ export type GetRolePathParameters = {
 	id: string;
 };
 export type GetRole200 = {
-	data: AuthtypesRoleWithTransactionGroupsDTO;
+	data: AuthtypesRoleDTO;
 	/**
 	 * @type string
 	 */
@@ -9629,9 +9568,6 @@ export type GetRole200 = {
 export type PatchRolePathParameters = {
 	id: string;
 };
-export type UpdateRolePathParameters = {
-	id: string;
-};
 export type GetObjectsPathParameters = {
 	id: string;
 	relation: string;

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,
-			},
-		});
-	});
 });

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

frontend/src/constants/localStorage.ts

@@ -43,6 +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',
-	DASHBOARD_V2_PANEL_COLUMN_WIDTHS = 'DASHBOARD_V2_PANEL_COLUMN_WIDTHS',
 }

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',

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',
 		);
 	});
 });

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;
 }

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);
 

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;

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;
 	}
 }

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 });
 			}

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,
 					});
 				}

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('&')}`;
-};

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',

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();
-	});
-});

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],
-	);
-}

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;

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

@@ -5,7 +5,6 @@ import { Button } from '@signozhq/ui/button';
 import { TooltipSimple } from '@signozhq/ui/tooltip';
 import cx from 'classnames';
 import { useCopyToClipboard } from 'hooks/useCopyToClipboard';
-import { useResizeObserver } from 'hooks/useDimensions';
 import { LegendItem } from 'lib/uPlotV2/config/types';
 import { Check, Copy } from '@signozhq/icons';
 
@@ -37,16 +36,17 @@ export default function Legend({
 
 	// Search is intrinsic to the right-positioned legend.
 	const searchEnabled = position === LegendPosition.RIGHT;
-	const { width: containerWidth } = useResizeObserver(legendContainerRef);
 
 	const isSingleRow = useMemo(() => {
-		if (position !== LegendPosition.BOTTOM || containerWidth <= 0) {
+		if (!legendContainerRef.current || position !== LegendPosition.BOTTOM) {
 			return false;
 		}
+		const containerWidth = legendContainerRef.current.clientWidth;
+
 		const totalLegendWidth = items.length * (averageLegendWidth + 16);
 		const totalRows = Math.ceil(totalLegendWidth / containerWidth);
 		return totalRows <= 1;
-	}, [averageLegendWidth, items.length, position, containerWidth]);
+	}, [averageLegendWidth, items.length, position]);
 
 	const visibleLegendItems = useMemo(() => {
 		if (!searchEnabled || !legendSearchQuery.trim()) {

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)');

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

frontend/src/pages/AlertList/types.ts

@@ -7,5 +7,4 @@ export enum AlertListTabs {
 	TRIGGERED_ALERTS = 'TriggeredAlerts',
 	ALERT_RULES = 'AlertRules',
 	CONFIGURATION = 'Configuration',
-	CHANNELS = 'Channels',
 }

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>
 	);
 }
 

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;

frontend/src/pages/ChannelsNew/styles.module.scss

@@ -1,4 +0,0 @@
-.content {
-	padding: var(--spacing-8);
-	padding-top: 0px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/DashboardPageToolbar/index.tsx

@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useMemo } from 'react';
 import { FullScreenHandle } from 'react-full-screen';
 import { toast } from '@signozhq/ui/sonner';
 import logEvent from 'api/common/logEvent';
@@ -13,15 +13,14 @@ import type {
 } from 'api/generated/services/sigNoz.schemas';
 import { Base64Icons } from 'container/DashboardContainer/DashboardSettings/General/utils';
 import { useAppContext } from 'providers/App/App';
+import { usePanelTypeSelectionModalStore } from 'providers/Dashboard/helpers/panelTypeSelectionModalHelper';
 import { useErrorModal } from 'providers/ErrorModalProvider';
 import APIError from 'types/api/error';
 
-import { useCreatePanel } from '../hooks/useCreatePanel';
-import PanelTypeSelectionModal from '../PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/PanelTypeSelectionModal';
 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';
 
@@ -50,8 +49,13 @@ function DashboardPageToolbar(props: DashboardPageToolbarProps): JSX.Element {
 
 	const { user } = useAppContext();
 	const { showErrorModal } = useErrorModal();
-	const createPanel = useCreatePanel();
-	const [isAddingPanel, setIsAddingPanel] = useState(false);
+	const setIsPanelTypeSelectionModalOpen = usePanelTypeSelectionModalStore(
+		(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;
@@ -107,8 +111,8 @@ function DashboardPageToolbar(props: DashboardPageToolbarProps): JSX.Element {
 		void logEvent('Dashboard Detail V2: Add new panel clicked', {
 			dashboardId: id,
 		});
-		setIsAddingPanel(true);
-	}, [id]);
+		setIsPanelTypeSelectionModalOpen(true);
+	}, [id, setIsPanelTypeSelectionModalOpen]);
 
 	return (
 		<section className={styles.dashboardPageToolbarContainer}>
@@ -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,16 +142,6 @@ function DashboardPageToolbar(props: DashboardPageToolbarProps): JSX.Element {
 					onOpenRename={startEdit}
 				/>
 			</div>
-
-			<VariablesBar dashboard={dashboard} />
-			<PanelTypeSelectionModal
-				open={isAddingPanel}
-				onClose={(): void => setIsAddingPanel(false)}
-				onSelect={(pluginKind): void => {
-					setIsAddingPanel(false);
-					createPanel({ pluginKind });
-				}}
-			/>
 		</section>
 	);
 }

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');

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>

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;

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;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/ConfigPane.module.scss

@@ -1,90 +0,0 @@
-.config {
-	display: flex;
-	flex-direction: column;
-	flex: 1;
-	// padding: 18px 18px 44px;
-	background-color: var(--l1-background);
-	overflow-y: auto;
-	overflow-x: hidden;
-
-	//TODO: replace this with custom-scrollbar mixin
-	// Thin, unobtrusive scrollbar (replaces the chunky native bar).
-	$thumb: color-mix(in srgb, var(--bg-vanilla-100) 16%, transparent);
-
-	scrollbar-width: thin;
-	scrollbar-color: $thumb transparent;
-
-	&::-webkit-scrollbar {
-		width: 8px;
-	}
-
-	&::-webkit-scrollbar-track {
-		background: transparent;
-	}
-
-	&::-webkit-scrollbar-thumb {
-		background: $thumb;
-		border-radius: 999px;
-		border: 2px solid transparent;
-		background-clip: padding-box;
-	}
-}
-
-.heading {
-	margin-bottom: 18px;
-	padding: 16px 16px 0 16px;
-}
-
-.title {
-	display: flex;
-	align-items: baseline;
-	gap: 9px;
-	white-space: nowrap;
-}
-
-.subtitle {
-	font-size: 12px;
-	color: var(--text-vanilla-400);
-}
-
-.eyebrow {
-	display: block;
-	margin: 0 2px 10px;
-	font-size: 11px;
-	font-weight: 600;
-	letter-spacing: 0.06em;
-	text-transform: uppercase;
-	color: var(--l1-foreground);
-}
-
-.group {
-	display: flex;
-	flex-direction: column;
-	gap: 16px;
-	padding: 0 16px;
-}
-
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}
-
-.divider {
-	height: 1px;
-	background: var(--l2-border);
-	margin: 18px 0;
-}
-
-.sectionsContainer {
-	padding: 0 16px;
-}
-
-.sections {
-	display: flex;
-	flex-direction: column;
-
-	& > * + * {
-		border-top: 1px solid var(--l2-border);
-	}
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/ConfigPane.tsx

@@ -1,113 +0,0 @@
-import { Input } from 'antd';
-import { Typography } from '@signozhq/ui/typography';
-import type {
-	DashboardtypesPanelSpecDTO,
-	TelemetrytypesSignalDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { getPanelDefinition } from 'pages/DashboardPageV2/DashboardContainer/Panels/registry';
-import { getBuilderQueries } from 'pages/DashboardPageV2/DashboardContainer/Panels/utils/getBuilderQueries';
-
-import type { LegendSeries } from '../hooks/useLegendSeries';
-import type { TableColumnOption } from '../hooks/useTableColumns';
-import SectionSlot from './SectionSlot/SectionSlot';
-
-import styles from './ConfigPane.module.scss';
-import { PanelKind } from '../../Panels/types/panelKind';
-
-interface ConfigPaneProps {
-	/** Full plugin kind (e.g. `signoz/TimeSeriesPanel`); drives which sections show. */
-	panelKind: PanelKind;
-	/** The panel spec — the single editing surface (title/description + section slices). */
-	spec: DashboardtypesPanelSpecDTO;
-	onChangeSpec: (next: DashboardtypesPanelSpecDTO) => void;
-	/** Switch the panel to another visualization kind. */
-	onChangePanelKind: (kind: PanelKind) => void;
-	/** Panel's resolved series, provided to sections that need them (legend colors). */
-	legendSeries: LegendSeries[];
-	/** Table panel's resolved value columns, for the table-only editors. */
-	tableColumns: TableColumnOption[];
-}
-
-/**
- * Right-hand configuration pane. Renders the always-present general fields (title +
- * description) followed by the panel kind's configuration sections (Formatting, Axes,
- * …). The section list is declared per kind (`PanelDefinition.sections`) and rendered
- * generically via the section registry — only sections with a built editor appear.
- */
-function ConfigPane({
-	panelKind,
-	spec,
-	onChangeSpec,
-	onChangePanelKind,
-	legendSeries,
-	tableColumns,
-}: ConfigPaneProps): JSX.Element {
-	const definition = getPanelDefinition(panelKind);
-	const sections = definition?.sections ?? [];
-
-	const signal = getBuilderQueries(spec.queries)[0]?.signal as
-		| TelemetrytypesSignalDTO
-		| undefined;
-
-	// Title/description are just a slice of the spec — edit them through the same
-	// onChangeSpec path the sections use, so there's a single editing surface.
-	const setDisplayField = (field: 'name' | 'description', value: string): void =>
-		onChangeSpec({ ...spec, display: { ...spec.display, [field]: value } });
-
-	return (
-		<div className={styles.config}>
-			<header className={styles.heading}>
-				<Typography.Text>Panel settings</Typography.Text>
-			</header>
-
-			<div className={styles.group}>
-				<div className={styles.field}>
-					<Typography.Text>Title</Typography.Text>
-					<Input
-						data-testid="panel-editor-v2-title"
-						value={spec.display.name}
-						placeholder="Panel title"
-						onChange={(e): void => setDisplayField('name', e.target.value)}
-					/>
-				</div>
-
-				<div className={styles.field}>
-					<Typography.Text>Description</Typography.Text>
-					<Input.TextArea
-						data-testid="panel-editor-v2-description"
-						value={spec.display.description ?? ''}
-						placeholder="Add a description"
-						rows={3}
-						onChange={(e): void => setDisplayField('description', e.target.value)}
-					/>
-				</div>
-			</div>
-
-			{sections.length > 0 && (
-				<>
-					<div className={styles.divider} />
-					<div className={styles.sectionsContainer}>
-						<span className={styles.eyebrow}>Display</span>
-						<div className={styles.sections}>
-							{sections.map((config) => (
-								<SectionSlot
-									key={config.kind}
-									config={config}
-									spec={spec}
-									onChangeSpec={onChangeSpec}
-									legendSeries={legendSeries}
-									tableColumns={tableColumns}
-									signal={signal}
-									panelKind={panelKind}
-									onChangePanelKind={onChangePanelKind}
-								/>
-							))}
-						</div>
-					</div>
-				</>
-			)}
-		</div>
-	);
-}
-
-export default ConfigPane;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.module.scss

@@ -1,6 +0,0 @@
-// Matches ConfigPane's `.field` so the switcher lines up with the title/description fields.
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/PanelTypeSwitcher.tsx

@@ -1,54 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import type { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
-
-import { getPanelDefinition } from '../../../Panels/registry';
-import type { PanelKind } from '../../../Panels/types/panelKind';
-import { PANEL_TYPES } from '../../../PanelsAndSectionsLayout/Panel/PanelTypeSelectionModal/constants';
-import ConfigSelect from '../controls/ConfigSelect/ConfigSelect';
-
-import styles from './PanelTypeSwitcher.module.scss';
-
-interface PanelTypeSwitcherProps {
-	/** The current panel kind (selected value). */
-	panelKind: PanelKind;
-	/** Panel's current datasource — drives the disabled rule. */
-	signal?: TelemetrytypesSignalDTO;
-	onChange: (kind: PanelKind) => void;
-}
-
-/**
- * Visualization-type selector (rendered inside the Visualization section). Types whose
- * supported signals exclude the panel's current datasource are disabled (V1 parity —
- * e.g. List needs logs/traces, not metrics). The datasource is unknown for
- * PromQL/ClickHouse queries, in which case no type is disabled.
- */
-function PanelTypeSwitcher({
-	panelKind,
-	signal,
-	onChange,
-}: PanelTypeSwitcherProps): JSX.Element {
-	const items = PANEL_TYPES.map((type) => {
-		const definition = getPanelDefinition(type.pluginKind as PanelKind);
-		return {
-			value: type.pluginKind,
-			label: type.label,
-			icon: type.icon,
-			disabled:
-				!!signal && !!definition && !definition.supportedSignals.includes(signal),
-		};
-	});
-
-	return (
-		<div className={styles.field}>
-			<Typography.Text>Panel Type</Typography.Text>
-			<ConfigSelect
-				testId="panel-editor-v2-type-switcher"
-				value={panelKind}
-				items={items}
-				onChange={(value): void => onChange(value as PanelKind)}
-			/>
-		</div>
-	);
-}
-
-export default PanelTypeSwitcher;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/PanelTypeSwitcher/__tests__/PanelTypeSwitcher.test.tsx

@@ -1,73 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import { getPanelDefinition } from 'pages/DashboardPageV2/DashboardContainer/Panels/registry';
-
-import PanelTypeSwitcher from '../PanelTypeSwitcher';
-import { TelemetrytypesSignalDTO } from 'api/generated/services/sigNoz.schemas';
-
-jest.mock('pages/DashboardPageV2/DashboardContainer/Panels/registry', () => ({
-	getPanelDefinition: jest.fn(),
-}));
-
-const mockGetPanelDefinition = getPanelDefinition as unknown as jest.Mock;
-
-function openDropdown(): void {
-	fireEvent.mouseDown(screen.getByRole('combobox'));
-}
-
-describe('PanelTypeSwitcher', () => {
-	beforeEach(() => {
-		jest.clearAllMocks();
-		// List supports only logs/traces; every other kind also supports metrics.
-		mockGetPanelDefinition.mockImplementation((kind: string) => ({
-			supportedSignals:
-				kind === 'signoz/ListPanel'
-					? ['logs', 'traces']
-					: ['metrics', 'logs', 'traces'],
-		}));
-	});
-
-	it('fires onChange with the chosen plugin kind', () => {
-		const onChange = jest.fn();
-		render(
-			<PanelTypeSwitcher panelKind="signoz/TimeSeriesPanel" onChange={onChange} />,
-		);
-
-		openDropdown();
-		fireEvent.click(screen.getByText('List'));
-
-		expect(onChange).toHaveBeenCalledWith('signoz/ListPanel');
-	});
-
-	it('disables types whose supported signals exclude the current datasource', () => {
-		render(
-			<PanelTypeSwitcher
-				panelKind="signoz/TimeSeriesPanel"
-				signal={TelemetrytypesSignalDTO.metrics}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		openDropdown();
-		const disabled = Array.from(
-			document.querySelectorAll('.ant-select-item-option-disabled'),
-		).map((el) => el.textContent);
-
-		// List can't render a metrics query, so it's disabled; Time Series stays enabled.
-		expect(disabled).toContain('List');
-		expect(disabled).not.toContain('Time Series');
-	});
-
-	it('does not disable any type when the datasource is unknown', () => {
-		render(
-			<PanelTypeSwitcher
-				panelKind="signoz/TimeSeriesPanel"
-				onChange={jest.fn()}
-			/>,
-		);
-
-		openDropdown();
-		expect(
-			document.querySelectorAll('.ant-select-item-option-disabled'),
-		).toHaveLength(0);
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/SectionSlot/SectionSlot.tsx

@@ -1,90 +0,0 @@
-import type {
-	DashboardtypesPanelSpecDTO,
-	TelemetrytypesSignalDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import {
-	type PanelFormattingSlice,
-	SECTION_METADATA,
-	type SectionConfig,
-} from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import type { PanelKind } from '../../../Panels/types/panelKind';
-import type { LegendSeries } from '../../hooks/useLegendSeries';
-import type { TableColumnOption } from '../../hooks/useTableColumns';
-import { resolveSectionEditor } from '../sectionRegistry';
-import SettingsSection from '../SettingsSection/SettingsSection';
-
-interface SectionSlotProps {
-	config: SectionConfig;
-	spec: DashboardtypesPanelSpecDTO;
-	onChangeSpec: (next: DashboardtypesPanelSpecDTO) => void;
-	/** Resolved series, forwarded to editors that need them (legend colors). */
-	legendSeries: LegendSeries[];
-	/** Table panel's resolved value columns, for the table-only editors. */
-	tableColumns: TableColumnOption[];
-	/** Panel's telemetry signal, for editors that fetch field suggestions (List columns). */
-	signal?: TelemetrytypesSignalDTO;
-	/** Current panel kind + switch handler, for the visualization section's type switcher. */
-	panelKind: PanelKind;
-	onChangePanelKind: (kind: PanelKind) => void;
-}
-
-/**
- * Renders one configuration section: its collapsible wrapper plus the registered editor
- * for `config.kind`, wired through the registry's spec lens. Renders nothing when the
- * kind has no editor yet (sections roll out incrementally), so a kind can declare a
- * section before its editor exists.
- */
-function SectionSlot({
-	config,
-	spec,
-	onChangeSpec,
-	legendSeries,
-	tableColumns,
-	signal,
-	panelKind,
-	onChangePanelKind,
-}: SectionSlotProps): JSX.Element | null {
-	// A kind can hide a section based on current spec state (e.g. Histogram legend once
-	// queries are merged) — skip it before resolving the editor.
-	if (config.isHidden?.(spec)) {
-		return null;
-	}
-
-	const editor = resolveSectionEditor(config.kind);
-	if (!editor) {
-		return null;
-	}
-
-	const { title, icon: Icon } = SECTION_METADATA[config.kind];
-	const { Component, get, update } = editor;
-	// Atomic sections carry no `controls`; controlled ones do.
-	const controls = 'controls' in config ? config.controls : undefined;
-	// The panel's formatting unit, forwarded to editors that scope to it (thresholds
-	// restrict their unit picker to this unit's category, as in V1).
-	const yAxisUnit = (spec.plugin.spec as { formatting?: PanelFormattingSlice })
-		.formatting?.unit;
-
-	return (
-		<SettingsSection
-			title={title}
-			icon={<Icon size={15} />}
-			// Open Visualization by default so the type switcher is visible.
-			defaultOpen={config.kind === 'visualization'}
-		>
-			<Component
-				value={get(spec)}
-				controls={controls}
-				onChange={(next): void => onChangeSpec(update(spec, next))}
-				legendSeries={legendSeries}
-				yAxisUnit={yAxisUnit}
-				tableColumns={tableColumns}
-				signal={signal}
-				panelKind={panelKind}
-				onChangePanelKind={onChangePanelKind}
-			/>
-		</SettingsSection>
-	);
-}
-
-export default SectionSlot;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/SettingsSection/SettingsSection.module.scss

@@ -1,54 +0,0 @@
-.header {
-	display: flex;
-	align-items: center;
-	gap: 11px;
-	width: 100%;
-	height: 44px;
-	padding: 0 4px;
-	border: none;
-	background: transparent;
-	cursor: pointer;
-	color: var(--text-vanilla-100);
-	border-radius: 4px;
-}
-
-.iconTile {
-	display: grid;
-	place-items: center;
-	width: 27px;
-	height: 27px;
-	flex: none;
-	border-radius: 3px;
-	background: var(--l3-background);
-	color: var(--l3-foreground);
-	transition: all 0.15s ease;
-}
-
-.iconTileOpen {
-	background: color-mix(in srgb, var(--bg-robin-400) 14%, transparent);
-	color: var(--bg-robin-400);
-}
-
-.title {
-	flex: 1;
-	text-align: left;
-	font-weight: 600;
-	color: var(--l2-foreground);
-}
-
-.chevron {
-	flex: none;
-	color: var(--l2-border);
-	transition: transform 0.15s ease;
-
-	&.open {
-		transform: rotate(180deg);
-	}
-}
-
-.body {
-	display: flex;
-	flex-direction: column;
-	gap: 16px;
-	padding: 2px 0 18px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/SettingsSection/SettingsSection.tsx

@@ -1,54 +0,0 @@
-import { type ReactNode, useState } from 'react';
-import { ChevronDown } from '@signozhq/icons';
-import { Typography } from '@signozhq/ui/typography';
-import cx from 'classnames';
-
-import styles from './SettingsSection.module.scss';
-
-interface SettingsSectionProps {
-	title: string;
-	icon?: ReactNode;
-	defaultOpen?: boolean;
-	children: ReactNode;
-}
-
-/**
- * Collapsible container for one configuration section in the V2 panel editor's
- * ConfigPane. Header shows an icon tile (accented when expanded), the title, and a
- * rotating chevron; sections are separated by hairline dividers (no surrounding boxes),
- * matching the Configure-panel design.
- */
-function SettingsSection({
-	title,
-	icon,
-	defaultOpen = false,
-	children,
-}: SettingsSectionProps): JSX.Element {
-	const [isOpen, setIsOpen] = useState(defaultOpen);
-
-	return (
-		<section className={styles.section}>
-			<button
-				type="button"
-				className={styles.header}
-				aria-expanded={isOpen}
-				data-testid={`config-section-${title}`}
-				onClick={(): void => setIsOpen((prev) => !prev)}
-			>
-				{icon && (
-					<span className={cx(styles.iconTile, { [styles.iconTileOpen]: isOpen })}>
-						{icon}
-					</span>
-				)}
-				<Typography.Text className={styles.title}>{title}</Typography.Text>
-				<ChevronDown
-					size={15}
-					className={cx(styles.chevron, { [styles.open]: isOpen })}
-				/>
-			</button>
-			{isOpen && <div className={styles.body}>{children}</div>}
-		</section>
-	);
-}
-
-export default SettingsSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/__tests__/ConfigPane.test.tsx

@@ -1,70 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import type { DashboardtypesPanelSpecDTO } from 'api/generated/services/sigNoz.schemas';
-
-import ConfigPane from '../ConfigPane';
-import { PanelKind } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/panelKind';
-
-function spec(unit?: string): DashboardtypesPanelSpecDTO {
-	return {
-		display: { name: 'CPU', description: 'usage' },
-		plugin: {
-			kind: 'signoz/TimeSeriesPanel',
-			spec: unit ? { formatting: { unit } } : {},
-		},
-		queries: [],
-	} as unknown as DashboardtypesPanelSpecDTO;
-}
-
-function renderConfigPane(
-	overrides: Partial<React.ComponentProps<typeof ConfigPane>> = {},
-): React.ComponentProps<typeof ConfigPane> {
-	const props: React.ComponentProps<typeof ConfigPane> = {
-		panelKind: 'signoz/TimeSeriesPanel',
-		spec: spec(),
-		onChangeSpec: jest.fn(),
-		onChangePanelKind: jest.fn(),
-		legendSeries: [],
-		tableColumns: [],
-		...overrides,
-	};
-	render(<ConfigPane {...props} />);
-	return props;
-}
-
-describe('ConfigPane', () => {
-	it('renders the seeded title and description', () => {
-		renderConfigPane();
-
-		expect(screen.getByTestId('panel-editor-v2-title')).toHaveValue('CPU');
-		expect(screen.getByTestId('panel-editor-v2-description')).toHaveValue(
-			'usage',
-		);
-	});
-
-	it('reports title edits through onChangeSpec (into spec.display)', () => {
-		const { onChangeSpec } = renderConfigPane();
-
-		fireEvent.change(screen.getByTestId('panel-editor-v2-title'), {
-			target: { value: 'Memory' },
-		});
-
-		expect(onChangeSpec).toHaveBeenCalledWith(
-			expect.objectContaining({
-				display: { name: 'Memory', description: 'usage' },
-			}),
-		);
-	});
-
-	it('renders the Formatting section for a kind that declares it', () => {
-		renderConfigPane();
-		// The TimeSeries kind declares a Formatting section; its collapsible header shows.
-		expect(screen.getByTestId('config-section-Formatting')).toBeInTheDocument();
-	});
-
-	it('omits the Formatting section for an unknown kind', () => {
-		renderConfigPane({ panelKind: 'signoz/UnknownPanel' as PanelKind });
-		expect(
-			screen.queryByTestId('config-section-Formatting'),
-		).not.toBeInTheDocument();
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSegmented/ConfigSegmented.module.scss

@@ -1,10 +0,0 @@
-.group {
-	width: 100%;
-}
-
-.segment {
-	display: inline-flex;
-	align-items: center;
-	gap: 6px;
-	white-space: nowrap;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSegmented/ConfigSegmented.tsx

@@ -1,59 +0,0 @@
-import { ToggleGroupSimple } from '@signozhq/ui/toggle-group';
-
-import { SegmentIcon, type SegmentIconName } from '../segmentIcons';
-
-import styles from './ConfigSegmented.module.scss';
-
-export interface ConfigSegmentedItem {
-	value: string;
-	label: string;
-	icon?: SegmentIconName;
-}
-
-interface ConfigSegmentedProps {
-	testId: string;
-	value: string | undefined;
-	items: ConfigSegmentedItem[];
-	onChange: (value: string) => void;
-}
-
-/**
- * Inline segmented control for short option sets in the config pane (line style, fill
- * mode, axis scale, legend position). Each segment carries an optional muted glyph that
- * brightens with the selected state (it inherits the toggle's `currentColor`). Built on
- * the Periscope ToggleGroup so it stays theme-faithful.
- */
-function ConfigSegmented({
-	testId,
-	value,
-	items,
-	onChange,
-}: ConfigSegmentedProps): JSX.Element {
-	return (
-		<ToggleGroupSimple
-			type="single"
-			testId={testId}
-			className={styles.group}
-			value={value}
-			items={items.map((item) => ({
-				value: item.value,
-				'aria-label': item.label,
-				label: (
-					<span className={styles.segment}>
-						{item.icon && <SegmentIcon name={item.icon} />}
-						{item.label}
-					</span>
-				),
-			}))}
-			// Single toggle-groups emit '' when the active segment is re-clicked; ignore that
-			// so a required choice (e.g. scale, position) can't be cleared to an empty value.
-			onChange={(next: string): void => {
-				if (next) {
-					onChange(next);
-				}
-			}}
-		/>
-	);
-}
-
-export default ConfigSegmented;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSelect/ConfigSelect.module.scss

@@ -1,10 +0,0 @@
-// Fill the section field so the select lines up with the other full-width controls.
-.select {
-	width: 100%;
-}
-
-.item {
-	display: inline-flex;
-	align-items: center;
-	gap: 9px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSelect/ConfigSelect.tsx

@@ -1,64 +0,0 @@
-import type { ReactNode } from 'react';
-import { Select } from 'antd';
-
-import { SegmentIcon, type SegmentIconName } from '../segmentIcons';
-
-import styles from './ConfigSelect.module.scss';
-
-export interface ConfigSelectItem {
-	value: string;
-	label: string;
-	/** A `SegmentIconName` string (resolved to a glyph), or an arbitrary icon node. */
-	icon?: ReactNode;
-	disabled?: boolean;
-}
-
-interface ConfigSelectProps {
-	testId: string;
-	value: string | undefined;
-	placeholder?: string;
-	items: ConfigSelectItem[];
-	onChange: (value: string) => void;
-}
-
-/**
- * Single-select dropdown for the panel editor's config sections. Built on antd's
- * `Select` so it matches the rest of the editor's antd controls; the menu portals to
- * `document.body` (antd default) so the surrounding `overflow:auto` pane can't clip it.
- */
-function ConfigSelect({
-	testId,
-	value,
-	placeholder,
-	items,
-	onChange,
-}: ConfigSelectProps): JSX.Element {
-	return (
-		<Select<string>
-			className={styles.select}
-			data-testid={testId}
-			value={value}
-			placeholder={placeholder}
-			onChange={onChange}
-			virtual={false}
-			options={items.map((item) => ({
-				value: item.value,
-				disabled: item.disabled,
-				label: item.icon ? (
-					<span className={styles.item}>
-						{typeof item.icon === 'string' ? (
-							<SegmentIcon name={item.icon as SegmentIconName} />
-						) : (
-							item.icon
-						)}
-						{item.label}
-					</span>
-				) : (
-					item.label
-				),
-			}))}
-		/>
-	);
-}
-
-export default ConfigSelect;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.module.scss

@@ -1,30 +0,0 @@
-.card {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	gap: 12px;
-	padding: 12px 14px;
-	border: 1px solid var(--l2-border);
-	border-radius: 6px;
-	background: var(--l2-background-60);
-}
-
-.text {
-	display: flex;
-	flex-direction: column;
-	gap: 2px;
-	min-width: 0;
-}
-
-.title {
-	font-size: 12px;
-	font-weight: 600;
-	letter-spacing: 0.06em;
-	text-transform: uppercase;
-	color: var(--l2-foreground);
-}
-
-.description {
-	font-size: 12px;
-	color: var(--l3-foreground);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/ConfigSwitch/ConfigSwitch.tsx

@@ -1,43 +0,0 @@
-import { Switch } from '@signozhq/ui/switch';
-import { Typography } from '@signozhq/ui/typography';
-
-import styles from './ConfigSwitch.module.scss';
-
-interface ConfigSwitchProps {
-	testId: string;
-	/** Shown uppercased as the card title. */
-	title: string;
-	/** Optional helper line under the title. */
-	description?: string;
-	value: boolean;
-	onChange: (checked: boolean) => void;
-}
-
-/**
- * Boolean toggle rendered as a bordered card: an uppercase title with an optional
- * description on the left and a Switch on the right. The standard presentation for
- * on/off panel-config controls (e.g. "Show points").
- */
-function ConfigSwitch({
-	testId,
-	title,
-	description,
-	value,
-	onChange,
-}: ConfigSwitchProps): JSX.Element {
-	return (
-		<div className={styles.card}>
-			<div className={styles.text}>
-				<span className={styles.title}>{title}</span>
-				{description && (
-					<Typography.Text className={styles.description}>
-						{description}
-					</Typography.Text>
-				)}
-			</div>
-			<Switch testId={testId} value={value} onChange={onChange} />
-		</div>
-	);
-}
-
-export default ConfigSwitch;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/LegendColorRow.tsx

@@ -1,64 +0,0 @@
-import { ColorPicker } from 'antd';
-import { Button } from '@signozhq/ui/button';
-import { Typography } from '@signozhq/ui/typography';
-
-import styles from './LegendColors.module.scss';
-
-interface LegendColorRowProps {
-	label: string;
-	/** Effective color shown in the swatch (override or auto). */
-	color: string;
-	/** True when the series has an explicit override (enables Reset). */
-	isOverridden: boolean;
-	onChange: (hex: string) => void;
-	onReset: () => void;
-}
-
-/**
- * One series row in the legend-colors list: an antd ColorPicker swatch trigger, the
- * series label, and a Reset action shown only when the color is overridden. `onChange`
- * fires on commit (`onChangeComplete`) so dragging the picker doesn't churn the spec.
- */
-function LegendColorRow({
-	label,
-	color,
-	isOverridden,
-	onChange,
-	onReset,
-}: LegendColorRowProps): JSX.Element {
-	return (
-		<div className={styles.row}>
-			<ColorPicker
-				value={color}
-				size="small"
-				showText={false}
-				trigger="click"
-				onChangeComplete={(next): void => onChange(next.toHexString())}
-			>
-				<button
-					type="button"
-					className={styles.trigger}
-					data-testid={`legend-color-${label}`}
-				>
-					<span className={styles.swatch} style={{ backgroundColor: color }} />
-					<Typography.Text className={styles.label} title={label}>
-						{label}
-					</Typography.Text>
-				</button>
-			</ColorPicker>
-			{isOverridden && (
-				<Button
-					size="sm"
-					color="secondary"
-					variant="ghost"
-					onClick={onReset}
-					testId={`legend-color-reset-${label}`}
-				>
-					Reset
-				</Button>
-			)}
-		</div>
-	);
-}
-
-export default LegendColorRow;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/LegendColors.module.scss

@@ -1,51 +0,0 @@
-.container {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}
-
-.list {
-	width: 100%;
-}
-
-.row {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	min-width: 0;
-	height: 34px;
-}
-
-.trigger {
-	display: flex;
-	flex: 1;
-	align-items: center;
-	gap: 10px;
-	min-width: 0;
-	padding: 0;
-	border: none;
-	background: transparent;
-	cursor: pointer;
-	text-align: left;
-}
-
-.swatch {
-	width: 18px;
-	height: 18px;
-	flex: none;
-	border: 1px solid var(--l2-border);
-	border-radius: 4px;
-}
-
-.label {
-	overflow: hidden;
-	font-size: 12px;
-	color: var(--l2-foreground);
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-.empty {
-	font-size: 12px;
-	color: var(--text-vanilla-400);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/LegendColors.tsx

@@ -1,83 +0,0 @@
-import { useState } from 'react';
-import { Search } from '@signozhq/icons';
-import { Typography } from '@signozhq/ui/typography';
-import { Input } from 'antd';
-import type { DashboardtypesLegendDTOCustomColors } from 'api/generated/services/sigNoz.schemas';
-import { Virtuoso } from 'react-virtuoso';
-
-import type { LegendSeries } from '../../../hooks/useLegendSeries';
-import LegendColorRow from './LegendColorRow';
-import {
-	clearSeriesColor,
-	filterLegendSeries,
-	resolveSeriesColor,
-	setSeriesColor,
-} from './legendColors.utils';
-
-import styles from './LegendColors.module.scss';
-
-interface LegendColorsProps {
-	/** Panel's resolved series (from the shared preview query). */
-	series: LegendSeries[];
-	value: DashboardtypesLegendDTOCustomColors | undefined;
-	onChange: (next: Record<string, string>) => void;
-}
-
-/**
- * Per-series color overrides for the legend: a searchable, virtualized list of the
- * panel's resolved series, each with an antd ColorPicker swatch. Picking a color writes
- * `{ [seriesLabel]: hex }` into `legend.customColors` — the same label the chart keys its
- * color lookup on; Reset drops the override. Virtualized so panels with hundreds of
- * series stay responsive. Until the query produces series, shows a hint.
- */
-function LegendColors({
-	series,
-	value,
-	onChange,
-}: LegendColorsProps): JSX.Element {
-	const [query, setQuery] = useState('');
-
-	if (series.length === 0) {
-		return (
-			<Typography.Text className={styles.empty}>
-				Run the panel to customise series colors.
-			</Typography.Text>
-		);
-	}
-
-	const filtered = filterLegendSeries(series, query);
-
-	return (
-		<div className={styles.container} data-testid="panel-editor-v2-legend-colors">
-			<Input
-				data-testid="panel-editor-v2-legend-search"
-				placeholder="Search series…"
-				value={query}
-				prefix={<Search size={14} />}
-				onChange={(e): void => setQuery(e.target.value)}
-			/>
-			{filtered.length === 0 ? (
-				<Typography.Text className={styles.empty}>
-					No series match “{query}”.
-				</Typography.Text>
-			) : (
-				<Virtuoso
-					className={styles.list}
-					style={{ height: Math.min(filtered.length * 34, 240) }}
-					data={filtered}
-					itemContent={(_, s): JSX.Element => (
-						<LegendColorRow
-							label={s.label}
-							color={resolveSeriesColor(value, s.label, s.defaultColor)}
-							isOverridden={value?.[s.label] !== undefined}
-							onChange={(hex): void => onChange(setSeriesColor(value, s.label, hex))}
-							onReset={(): void => onChange(clearSeriesColor(value, s.label))}
-						/>
-					)}
-				/>
-			)}
-		</div>
-	);
-}
-
-export default LegendColors;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/__tests__/LegendColors.test.tsx

@@ -1,42 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-
-import type { LegendSeries } from '../../../../hooks/useLegendSeries';
-import LegendColors from '../LegendColors';
-
-const SERIES: LegendSeries[] = [
-	{ label: 'frontend', defaultColor: '#ff0000' },
-	{ label: 'cartservice', defaultColor: '#00ff00' },
-];
-
-describe('LegendColors', () => {
-	it('shows a hint when there are no resolved series', () => {
-		render(<LegendColors series={[]} value={undefined} onChange={jest.fn()} />);
-
-		expect(
-			screen.queryByTestId('panel-editor-v2-legend-colors'),
-		).not.toBeInTheDocument();
-		expect(screen.getByText(/run the panel/i)).toBeInTheDocument();
-	});
-
-	it('renders the search box once series are present', () => {
-		render(
-			<LegendColors series={SERIES} value={undefined} onChange={jest.fn()} />,
-		);
-
-		expect(
-			screen.getByTestId('panel-editor-v2-legend-search'),
-		).toBeInTheDocument();
-	});
-
-	it('shows a no-match message when the search filters everything out', () => {
-		render(
-			<LegendColors series={SERIES} value={undefined} onChange={jest.fn()} />,
-		);
-
-		fireEvent.change(screen.getByTestId('panel-editor-v2-legend-search'), {
-			target: { value: 'zzz' },
-		});
-
-		expect(screen.getByText(/no series match/i)).toBeInTheDocument();
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/__tests__/legendColors.utils.test.ts

@@ -1,63 +0,0 @@
-import type { LegendSeries } from '../../../../hooks/useLegendSeries';
-import {
-	clearSeriesColor,
-	filterLegendSeries,
-	resolveSeriesColor,
-	setSeriesColor,
-} from '../legendColors.utils';
-
-const SERIES: LegendSeries[] = [
-	{ label: 'frontend', defaultColor: '#ff0000' },
-	{ label: 'cartservice', defaultColor: '#00ff00' },
-	{ label: 'frontendproxy', defaultColor: '#0000ff' },
-];
-
-describe('legendColors.utils', () => {
-	describe('filterLegendSeries', () => {
-		it('returns all series for an empty/whitespace query', () => {
-			expect(filterLegendSeries(SERIES, '')).toHaveLength(3);
-			expect(filterLegendSeries(SERIES, '   ')).toHaveLength(3);
-		});
-
-		it('matches case-insensitive substrings', () => {
-			expect(
-				filterLegendSeries(SERIES, 'FRONT').map((s) => s.label),
-			).toStrictEqual(['frontend', 'frontendproxy']);
-			expect(filterLegendSeries(SERIES, 'cart')).toHaveLength(1);
-			expect(filterLegendSeries(SERIES, 'zzz')).toHaveLength(0);
-		});
-	});
-
-	describe('resolveSeriesColor', () => {
-		it('prefers the override, falling back to the default', () => {
-			expect(resolveSeriesColor({ frontend: '#111' }, 'frontend', '#ff0000')).toBe(
-				'#111',
-			);
-			expect(resolveSeriesColor(undefined, 'frontend', '#ff0000')).toBe('#ff0000');
-			expect(resolveSeriesColor(null, 'frontend', '#ff0000')).toBe('#ff0000');
-		});
-	});
-
-	describe('setSeriesColor', () => {
-		it('adds/overwrites a label without mutating the input', () => {
-			const value = { frontend: '#111' };
-			const next = setSeriesColor(value, 'cartservice', '#222');
-			expect(next).toStrictEqual({ frontend: '#111', cartservice: '#222' });
-			expect(value).toStrictEqual({ frontend: '#111' });
-		});
-
-		it('handles null/undefined base', () => {
-			expect(setSeriesColor(undefined, 'a', '#1')).toStrictEqual({ a: '#1' });
-			expect(setSeriesColor(null, 'a', '#1')).toStrictEqual({ a: '#1' });
-		});
-	});
-
-	describe('clearSeriesColor', () => {
-		it('removes a label without mutating the input', () => {
-			const value = { frontend: '#111', cartservice: '#222' };
-			const next = clearSeriesColor(value, 'frontend');
-			expect(next).toStrictEqual({ cartservice: '#222' });
-			expect(value).toStrictEqual({ frontend: '#111', cartservice: '#222' });
-		});
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/LegendColors/legendColors.utils.ts

@@ -1,43 +0,0 @@
-import type { DashboardtypesLegendDTOCustomColors } from 'api/generated/services/sigNoz.schemas';
-
-import type { LegendSeries } from '../../../hooks/useLegendSeries';
-
-/** Case-insensitive substring filter over series labels. Empty query → all series. */
-export function filterLegendSeries(
-	series: LegendSeries[],
-	query: string,
-): LegendSeries[] {
-	const q = query.trim().toLowerCase();
-	if (!q) {
-		return series;
-	}
-	return series.filter((s) => s.label.toLowerCase().includes(q));
-}
-
-/** The effective color for a series: the override if set, else its auto color. */
-export function resolveSeriesColor(
-	value: DashboardtypesLegendDTOCustomColors | undefined,
-	label: string,
-	defaultColor: string,
-): string {
-	return value?.[label] ?? defaultColor;
-}
-
-/** Set an override for `label`, returning a new customColors record. */
-export function setSeriesColor(
-	value: DashboardtypesLegendDTOCustomColors | undefined,
-	label: string,
-	hex: string,
-): Record<string, string> {
-	return { ...value, [label]: hex };
-}
-
-/** Drop the override for `label` (revert to the auto color), returning a new record. */
-export function clearSeriesColor(
-	value: DashboardtypesLegendDTOCustomColors | undefined,
-	label: string,
-): Record<string, string> {
-	const next = { ...value };
-	delete next[label];
-	return next;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/controls/segmentIcons.tsx

@@ -1,145 +0,0 @@
-/**
- * Small glyph icons for the panel-editor segmented/select controls, ported from the
- * Configure-panel design. They render at 14px and inherit `currentColor` so the
- * surrounding control can dim them when unselected and brighten them when active.
- */
-export type SegmentIconName =
-	| 'solid-line'
-	| 'dashed-line'
-	| 'fill-none'
-	| 'fill-solid'
-	| 'fill-gradient'
-	| 'pos-bottom'
-	| 'pos-right'
-	| 'scale-linear'
-	| 'scale-log'
-	| 'interp-linear'
-	| 'interp-spline'
-	| 'interp-step-before'
-	| 'interp-step-after';
-
-function Svg({ children }: { children: React.ReactNode }): JSX.Element {
-	return (
-		<svg
-			width={14}
-			height={14}
-			viewBox="0 0 16 16"
-			fill="none"
-			stroke="currentColor"
-			strokeWidth={1.5}
-			strokeLinecap="round"
-			strokeLinejoin="round"
-			style={{ flex: 'none' }}
-			aria-hidden
-		>
-			{children}
-		</svg>
-	);
-}
-
-const FILLED = { fill: 'currentColor', stroke: 'none' } as const;
-
-export function SegmentIcon({
-	name,
-}: {
-	name: SegmentIconName;
-}): JSX.Element | null {
-	switch (name) {
-		case 'solid-line':
-			return (
-				<Svg>
-					<path d="M2 8 H14" />
-				</Svg>
-			);
-		case 'dashed-line':
-			return (
-				<Svg>
-					<path d="M2 8 H4.5" />
-					<path d="M6.75 8 H9.25" />
-					<path d="M11.5 8 H14" />
-				</Svg>
-			);
-		case 'fill-none':
-			return (
-				<Svg>
-					<path d="M2 11 L6 6 L10 9 L14 5" />
-				</Svg>
-			);
-		case 'fill-solid':
-			return (
-				<Svg>
-					<path
-						d="M2 10.5 L6 5.5 L10 8.5 L14 4.5 V13.5 H2 Z"
-						fill="currentColor"
-						fillOpacity={0.85}
-						stroke="none"
-					/>
-					<path d="M2 10.5 L6 5.5 L10 8.5 L14 4.5" />
-				</Svg>
-			);
-		case 'fill-gradient':
-			return (
-				<Svg>
-					<path
-						d="M2 10.5 L6 5.5 L10 8.5 L14 4.5 V13.5 H2 Z"
-						fill="currentColor"
-						fillOpacity={0.3}
-						stroke="none"
-					/>
-					<path d="M2 10.5 L6 5.5 L10 8.5 L14 4.5" />
-				</Svg>
-			);
-		case 'pos-bottom':
-			return (
-				<Svg>
-					<rect x={2} y={2.5} width={12} height={9} rx={1.2} />
-					<rect x={2} y={9} width={12} height={2.5} {...FILLED} />
-				</Svg>
-			);
-		case 'pos-right':
-			return (
-				<Svg>
-					<rect x={2} y={2.5} width={12} height={9} rx={1.2} />
-					<rect x={10.5} y={2.5} width={3.5} height={9} {...FILLED} />
-				</Svg>
-			);
-		case 'scale-linear':
-			return (
-				<Svg>
-					<path d="M2.5 13 L13.5 3" />
-				</Svg>
-			);
-		case 'scale-log':
-			return (
-				<Svg>
-					<path d="M2.5 13 C5 13, 8 4.5, 13.5 3" />
-				</Svg>
-			);
-		case 'interp-linear':
-			return (
-				<Svg>
-					<path d="M2 12 L6 5 L10 9 L14 4" />
-				</Svg>
-			);
-		case 'interp-spline':
-			return (
-				<Svg>
-					<path d="M2 12 C5 3, 9 3, 14 8" />
-				</Svg>
-			);
-		case 'interp-step-before':
-			return (
-				<Svg>
-					<path d="M2 6 H6 V10 H10 V4.5 H14" />
-				</Svg>
-			);
-		case 'interp-step-after':
-			return (
-				<Svg>
-					<path d="M2 10 H6 V5 H10 V9.5 H14" />
-				</Svg>
-			);
-		default:
-			return null;
-	}
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sectionRegistry.tsx

@@ -1,175 +0,0 @@
-import type { ComponentType } from 'react';
-import type {
-	DashboardLinkDTO,
-	DashboardtypesAxesDTO,
-	DashboardtypesBarChartVisualizationDTO,
-	DashboardtypesHistogramBucketsDTO,
-	DashboardtypesLegendDTO,
-	DashboardtypesPanelSpecDTO,
-	DashboardtypesTimeSeriesChartAppearanceDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type {
-	AnyThreshold,
-	PanelFormattingSlice,
-	SectionEditorProps,
-	SectionKind,
-	SectionSpecMap,
-} from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import AxesSection from './sections/AxesSection/AxesSection';
-import BucketsSection from './sections/BucketsSection/BucketsSection';
-import ChartAppearanceSection from './sections/ChartAppearanceSection/ChartAppearanceSection';
-import ContextLinksSection from './sections/ContextLinksSection/ContextLinksSection';
-import FormattingSection from './sections/FormattingSection/FormattingSection';
-import LegendSection from './sections/LegendSection/LegendSection';
-import ThresholdsSection from './sections/ThresholdsSection/ThresholdsSection';
-import VisualizationSection from './sections/VisualizationSection/VisualizationSection';
-
-type PanelSpec = DashboardtypesPanelSpecDTO;
-
-/**
- * Pairs a section kind with its editor component and a typed lens into the panel spec.
- * The lens reads/writes over the WHOLE panel spec, so a section can target either the
- * plugin spec (`spec.plugin.spec.<key>`) or a panel-level field (e.g. `spec.links`).
- */
-export interface SectionDescriptor<K extends SectionKind> {
-	Component: ComponentType<SectionEditorProps<K>>;
-	get: (spec: PanelSpec) => SectionSpecMap[K] | undefined;
-	update: (spec: PanelSpec, value: SectionSpecMap[K]) => PanelSpec;
-}
-
-// The plugin spec is a discriminated union over panel kinds; reading/writing a shared
-// slice (formatting, axes, …) by key is the one place the union must be narrowed. The
-// helper concentrates that cast so the registry entries stay declarative.
-type PluginSpecSlice = Partial<Record<string, unknown>>;
-
-function getPluginSlice<T>(spec: PanelSpec, key: string): T | undefined {
-	return (spec.plugin.spec as PluginSpecSlice)[key] as T | undefined;
-}
-
-function updatePluginSlice(
-	spec: PanelSpec,
-	key: string,
-	value: unknown,
-): PanelSpec {
-	return {
-		...spec,
-		plugin: {
-			...spec.plugin,
-			spec: { ...(spec.plugin.spec as PluginSpecSlice), [key]: value },
-		},
-	} as PanelSpec;
-}
-
-/**
- * Registry of section editors. Partial by design: only sections with a built editor
- * appear here, so ConfigPane renders exactly those and silently skips the rest. Adding
- * a section editor = one entry here + one component file.
- */
-export const SECTION_REGISTRY: {
-	[K in SectionKind]?: SectionDescriptor<K>;
-} = {
-	formatting: {
-		Component: FormattingSection,
-		get: (spec): PanelFormattingSlice | undefined =>
-			getPluginSlice<PanelFormattingSlice>(spec, 'formatting'),
-		update: (spec, formatting): PanelSpec =>
-			updatePluginSlice(spec, 'formatting', formatting),
-	},
-	axes: {
-		Component: AxesSection,
-		get: (spec): DashboardtypesAxesDTO | undefined =>
-			getPluginSlice<DashboardtypesAxesDTO>(spec, 'axes'),
-		update: (spec, axes): PanelSpec => updatePluginSlice(spec, 'axes', axes),
-	},
-	legend: {
-		Component: LegendSection,
-		get: (spec): DashboardtypesLegendDTO | undefined =>
-			getPluginSlice<DashboardtypesLegendDTO>(spec, 'legend'),
-		update: (spec, legend): PanelSpec =>
-			updatePluginSlice(spec, 'legend', legend),
-	},
-	chartAppearance: {
-		Component: ChartAppearanceSection,
-		get: (spec): DashboardtypesTimeSeriesChartAppearanceDTO | undefined =>
-			getPluginSlice<DashboardtypesTimeSeriesChartAppearanceDTO>(
-				spec,
-				'chartAppearance',
-			),
-		update: (spec, chartAppearance): PanelSpec =>
-			updatePluginSlice(spec, 'chartAppearance', chartAppearance),
-	},
-	visualization: {
-		Component: VisualizationSection,
-		get: (spec): DashboardtypesBarChartVisualizationDTO | undefined =>
-			getPluginSlice<DashboardtypesBarChartVisualizationDTO>(
-				spec,
-				'visualization',
-			),
-		update: (spec, visualization): PanelSpec =>
-			updatePluginSlice(spec, 'visualization', visualization),
-	},
-	buckets: {
-		Component: BucketsSection,
-		get: (spec): DashboardtypesHistogramBucketsDTO | undefined =>
-			getPluginSlice<DashboardtypesHistogramBucketsDTO>(spec, 'histogramBuckets'),
-		update: (spec, buckets): PanelSpec =>
-			updatePluginSlice(spec, 'histogramBuckets', buckets),
-	},
-	contextLinks: {
-		Component: ContextLinksSection,
-		// Panel-level slice (spec.links), not under the plugin spec — no cast needed.
-		get: (spec): DashboardLinkDTO[] | undefined => spec.links,
-		update: (spec, links): PanelSpec => ({ ...spec, links }),
-	},
-	// One editor for every threshold variant (label / comparison / table); the kind's
-	// `controls.variant` picks the row editor + element shape. All persist to the same
-	// plugin.spec.thresholds key.
-	thresholds: {
-		Component: ThresholdsSection,
-		get: (spec): AnyThreshold[] | undefined =>
-			getPluginSlice<AnyThreshold[]>(spec, 'thresholds'),
-		update: (spec, thresholds): PanelSpec =>
-			updatePluginSlice(spec, 'thresholds', thresholds),
-	},
-};
-
-/**
- * A section descriptor with the kind correlation erased. `SECTION_REGISTRY[kind]` and a
- * `SectionConfig` are both unions keyed by the same `kind`, but TS can't prove the lookup
- * and the config refer to the same member — the classic correlated-union limitation. The
- * resolver below narrows once here (the single localized cast), so render sites compose
- * `get` → `Component` → `update` without any further casts.
- */
-export interface ErasedSectionDescriptor {
-	Component: ComponentType<{
-		value: unknown;
-		controls?: unknown;
-		onChange: (next: unknown) => void;
-		// Forwarded to every editor; only sections that need the panel's resolved series
-		// (legend colors) read it. Optional so editors can ignore it.
-		legendSeries?: unknown;
-		// The panel's formatting unit; read by editors that scope to it (thresholds).
-		yAxisUnit?: unknown;
-		// The Table panel's resolved value columns; read by the table-only editors
-		// (column units, per-column thresholds) to offer real columns.
-		tableColumns?: unknown;
-		// The panel's telemetry signal; read by editors that fetch field-key
-		// suggestions scoped to it (List column picker).
-		signal?: unknown;
-		// Current panel kind + switch handler; read by the visualization section's
-		// type switcher.
-		panelKind?: unknown;
-		onChangePanelKind?: unknown;
-	}>;
-	get: (spec: PanelSpec) => unknown;
-	update: (spec: PanelSpec, value: unknown) => PanelSpec;
-}
-
-export function resolveSectionEditor(
-	kind: SectionKind,
-): ErasedSectionDescriptor | undefined {
-	return SECTION_REGISTRY[kind] as unknown as
-		| ErasedSectionDescriptor
-		| undefined;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/AxesSection.module.scss

@@ -1,11 +0,0 @@
-.bounds {
-	display: flex;
-	gap: 8px;
-}
-
-.field {
-	display: flex;
-	flex: 1;
-	flex-direction: column;
-	gap: 8px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/AxesSection.tsx

@@ -1,80 +0,0 @@
-import type { ChangeEvent } from 'react';
-import { Typography } from '@signozhq/ui/typography';
-import { Input } from 'antd';
-import type { SectionEditorProps } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
-
-import styles from './AxesSection.module.scss';
-
-type SoftBound = 'softMin' | 'softMax';
-
-const SCALE_OPTIONS = [
-	{ value: 'linear', label: 'Linear', icon: 'scale-linear' as const },
-	{ value: 'log', label: 'Log', icon: 'scale-log' as const },
-];
-
-/**
- * Edits the `axes` slice of a panel spec: soft Y-axis min/max bounds and the
- * linear/logarithmic scale toggle. Each control is gated by its `controls` flag.
- */
-function AxesSection({
-	value,
-	controls,
-	onChange,
-}: SectionEditorProps<'axes'>): JSX.Element {
-	// An empty field clears the bound (null); otherwise parse to a number, ignoring
-	// transient non-numeric input (e.g. a lone "-") by leaving the bound unset.
-	const handleBound =
-		(bound: SoftBound) =>
-		(e: ChangeEvent<HTMLInputElement>): void => {
-			const raw = e.target.value;
-			const next = raw === '' || Number.isNaN(Number(raw)) ? null : Number(raw);
-			onChange({ ...value, [bound]: next });
-		};
-
-	return (
-		<>
-			{controls.minMax && (
-				<div className={styles.bounds}>
-					<div className={styles.field}>
-						<Typography.Text>Soft min</Typography.Text>
-						<Input
-							data-testid="panel-editor-v2-soft-min"
-							type="number"
-							placeholder="Auto"
-							value={value?.softMin ?? ''}
-							onChange={handleBound('softMin')}
-						/>
-					</div>
-					<div className={styles.field}>
-						<Typography.Text>Soft max</Typography.Text>
-						<Input
-							data-testid="panel-editor-v2-soft-max"
-							type="number"
-							placeholder="Auto"
-							value={value?.softMax ?? ''}
-							onChange={handleBound('softMax')}
-						/>
-					</div>
-				</div>
-			)}
-
-			{controls.logScale && (
-				<div className={styles.field}>
-					<Typography.Text>Y-axis scale</Typography.Text>
-					<ConfigSegmented
-						testId="panel-editor-v2-log-scale"
-						value={value?.isLogScale ? 'log' : 'linear'}
-						items={SCALE_OPTIONS}
-						onChange={(next): void =>
-							onChange({ ...value, isLogScale: next === 'log' })
-						}
-					/>
-				</div>
-			)}
-		</>
-	);
-}
-
-export default AxesSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/AxesSection/__tests__/AxesSection.test.tsx

@@ -1,82 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import AxesSection from '../AxesSection';
-
-describe('AxesSection', () => {
-	it('renders soft bounds and the log-scale switch when both controls are enabled', () => {
-		render(
-			<AxesSection
-				value={undefined}
-				controls={{ minMax: true, logScale: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('panel-editor-v2-soft-min')).toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-soft-max')).toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-log-scale')).toBeInTheDocument();
-	});
-
-	it('hides the soft bounds when minMax is off', () => {
-		render(
-			<AxesSection
-				value={undefined}
-				controls={{ logScale: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(
-			screen.queryByTestId('panel-editor-v2-soft-min'),
-		).not.toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-log-scale')).toBeInTheDocument();
-	});
-
-	it('writes a numeric soft min through onChange', async () => {
-		const user = userEvent.setup();
-		const onChange = jest.fn();
-		render(
-			<AxesSection
-				value={undefined}
-				controls={{ minMax: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.type(screen.getByTestId('panel-editor-v2-soft-min'), '5');
-
-		expect(onChange).toHaveBeenCalledWith({ softMin: 5 });
-	});
-
-	it('clears a soft bound to null when the field is emptied', async () => {
-		const user = userEvent.setup();
-		const onChange = jest.fn();
-		render(
-			<AxesSection
-				value={{ softMax: 100 }}
-				controls={{ minMax: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.clear(screen.getByTestId('panel-editor-v2-soft-max'));
-
-		expect(onChange).toHaveBeenCalledWith({ softMax: null });
-	});
-
-	it('toggles the logarithmic scale through onChange', async () => {
-		const user = userEvent.setup();
-		const onChange = jest.fn();
-		render(
-			<AxesSection
-				value={{ isLogScale: false }}
-				controls={{ logScale: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.click(screen.getByText('Log'));
-
-		expect(onChange).toHaveBeenCalledWith({ isLogScale: true });
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/BucketsSection/BucketsSection.module.scss

@@ -1,5 +0,0 @@
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/BucketsSection/BucketsSection.tsx

@@ -1,80 +0,0 @@
-import type { ChangeEvent } from 'react';
-import { Typography } from '@signozhq/ui/typography';
-import { Input } from 'antd';
-import type { DashboardtypesHistogramBucketsDTO } from 'api/generated/services/sigNoz.schemas';
-import type { SectionEditorProps } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import ConfigSwitch from '../../controls/ConfigSwitch/ConfigSwitch';
-
-import styles from './BucketsSection.module.scss';
-
-// The two numeric bounds of the histogram-buckets spec (derived from the BE DTO).
-type NumericBound = keyof Pick<
-	DashboardtypesHistogramBucketsDTO,
-	'bucketCount' | 'bucketWidth'
->;
-
-/**
- * Edits the `histogramBuckets` slice of a Histogram panel spec: bucket count / width
- * and whether to merge all active queries into one set of buckets. Each control is gated
- * by its `controls` flag.
- */
-function BucketsSection({
-	value,
-	controls,
-	onChange,
-}: SectionEditorProps<'buckets'>): JSX.Element {
-	// Empty clears the bound to null (chart auto-sizes); otherwise parse to a number,
-	// ignoring transient non-numeric input by leaving it unset.
-	const handleNumber =
-		(bound: NumericBound) =>
-		(e: ChangeEvent<HTMLInputElement>): void => {
-			const raw = e.target.value;
-			const next = raw === '' || Number.isNaN(Number(raw)) ? null : Number(raw);
-			onChange({ ...value, [bound]: next });
-		};
-
-	return (
-		<>
-			{controls.count && (
-				<div className={styles.field}>
-					<Typography.Text>Bucket count</Typography.Text>
-					<Input
-						data-testid="panel-editor-v2-bucket-count"
-						type="number"
-						placeholder="Auto"
-						value={value?.bucketCount ?? ''}
-						onChange={handleNumber('bucketCount')}
-					/>
-				</div>
-			)}
-
-			{controls.width && (
-				<div className={styles.field}>
-					<Typography.Text>Bucket width</Typography.Text>
-					<Input
-						data-testid="panel-editor-v2-bucket-width"
-						type="number"
-						placeholder="Auto"
-						value={value?.bucketWidth ?? ''}
-						onChange={handleNumber('bucketWidth')}
-					/>
-				</div>
-			)}
-
-			{controls.mergeQueries && (
-				<ConfigSwitch
-					testId="panel-editor-v2-merge-queries"
-					title="Merge active queries"
-					description="Bucket all active queries together into one distribution"
-					value={value?.mergeAllActiveQueries ?? false}
-					onChange={(checked): void =>
-						onChange({ ...value, mergeAllActiveQueries: checked })
-					}
-				/>
-			)}
-		</>
-	);
-}
-
-export default BucketsSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/BucketsSection/__tests__/BucketsSection.test.tsx

@@ -1,41 +0,0 @@
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import BucketsSection from '../BucketsSection';
-
-describe('BucketsSection', () => {
-	it('renders only the controls whose flag is set', () => {
-		render(
-			<BucketsSection
-				value={undefined}
-				controls={{ count: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(
-			screen.getByTestId('panel-editor-v2-bucket-count'),
-		).toBeInTheDocument();
-		expect(
-			screen.queryByTestId('panel-editor-v2-bucket-width'),
-		).not.toBeInTheDocument();
-		expect(
-			screen.queryByTestId('panel-editor-v2-merge-queries'),
-		).not.toBeInTheDocument();
-	});
-
-	it('toggles merge-active-queries through onChange', async () => {
-		const user = userEvent.setup();
-		const onChange = jest.fn();
-		render(
-			<BucketsSection
-				value={{ mergeAllActiveQueries: false }}
-				controls={{ mergeQueries: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('panel-editor-v2-merge-queries'));
-
-		expect(onChange).toHaveBeenCalledWith({ mergeAllActiveQueries: true });
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/ChartAppearanceSection.module.scss

@@ -1,5 +0,0 @@
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/ChartAppearanceSection.tsx

@@ -1,164 +0,0 @@
-import type { ChangeEvent } from 'react';
-import { Typography } from '@signozhq/ui/typography';
-import { Input } from 'antd';
-import {
-	DashboardtypesFillModeDTO,
-	DashboardtypesLineInterpolationDTO,
-	DashboardtypesLineStyleDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type { SectionEditorProps } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
-import ConfigSelect from '../../controls/ConfigSelect/ConfigSelect';
-import ConfigSwitch from '../../controls/ConfigSwitch/ConfigSwitch';
-
-import styles from './ChartAppearanceSection.module.scss';
-
-const LINE_STYLE_OPTIONS = [
-	{
-		value: DashboardtypesLineStyleDTO.solid,
-		label: 'Solid',
-		icon: 'solid-line' as const,
-	},
-	{
-		value: DashboardtypesLineStyleDTO.dashed,
-		label: 'Dashed',
-		icon: 'dashed-line' as const,
-	},
-];
-
-const LINE_INTERPOLATION_OPTIONS = [
-	{
-		value: DashboardtypesLineInterpolationDTO.linear,
-		label: 'Linear',
-		icon: 'interp-linear' as const,
-	},
-	{
-		value: DashboardtypesLineInterpolationDTO.spline,
-		label: 'Spline',
-		icon: 'interp-spline' as const,
-	},
-	{
-		value: DashboardtypesLineInterpolationDTO.step_before,
-		label: 'Step before',
-		icon: 'interp-step-before' as const,
-	},
-	{
-		value: DashboardtypesLineInterpolationDTO.step_after,
-		label: 'Step after',
-		icon: 'interp-step-after' as const,
-	},
-];
-
-const FILL_MODE_OPTIONS = [
-	{
-		value: DashboardtypesFillModeDTO.none,
-		label: 'None',
-		icon: 'fill-none' as const,
-	},
-	{
-		value: DashboardtypesFillModeDTO.solid,
-		label: 'Solid',
-		icon: 'fill-solid' as const,
-	},
-	{
-		value: DashboardtypesFillModeDTO.gradient,
-		label: 'Gradient',
-		icon: 'fill-gradient' as const,
-	},
-];
-
-/**
- * Edits the `chartAppearance` slice of a TimeSeries panel spec: line style /
- * interpolation, fill mode, point markers, and the connect-null-gaps threshold. Each
- * control is gated by its `controls` flag.
- */
-function ChartAppearanceSection({
-	value,
-	controls,
-	onChange,
-}: SectionEditorProps<'chartAppearance'>): JSX.Element {
-	// `spanGaps.fillLessThan` is a stringified seconds threshold: empty means "connect
-	// every gap" (the chart default), a number means "only bridge gaps shorter than this".
-	const handleSpanGaps = (e: ChangeEvent<HTMLInputElement>): void => {
-		const raw = e.target.value;
-		onChange({
-			...value,
-			spanGaps: raw === '' ? undefined : { ...value?.spanGaps, fillLessThan: raw },
-		});
-	};
-	return (
-		<>
-			{controls.lineStyle && (
-				<div className={styles.field}>
-					<Typography.Text>Line style</Typography.Text>
-					<ConfigSegmented
-						testId="panel-editor-v2-line-style"
-						value={value?.lineStyle}
-						items={LINE_STYLE_OPTIONS}
-						onChange={(next): void =>
-							onChange({ ...value, lineStyle: next as DashboardtypesLineStyleDTO })
-						}
-					/>
-				</div>
-			)}
-
-			{controls.lineInterpolation && (
-				<div className={styles.field}>
-					<Typography.Text>Line interpolation</Typography.Text>
-					<ConfigSelect
-						testId="panel-editor-v2-line-interpolation"
-						placeholder="Select interpolation…"
-						value={value?.lineInterpolation}
-						items={LINE_INTERPOLATION_OPTIONS}
-						onChange={(next): void =>
-							onChange({
-								...value,
-								lineInterpolation: next as DashboardtypesLineInterpolationDTO,
-							})
-						}
-					/>
-				</div>
-			)}
-
-			{controls.fillMode && (
-				<div className={styles.field}>
-					<Typography.Text>Fill mode</Typography.Text>
-					<ConfigSegmented
-						testId="panel-editor-v2-fill-mode"
-						value={value?.fillMode}
-						items={FILL_MODE_OPTIONS}
-						onChange={(next): void =>
-							onChange({ ...value, fillMode: next as DashboardtypesFillModeDTO })
-						}
-					/>
-				</div>
-			)}
-
-			{controls.showPoints && (
-				<ConfigSwitch
-					testId="panel-editor-v2-show-points"
-					title="Show points"
-					description="Display individual data points on the chart"
-					value={value?.showPoints ?? false}
-					onChange={(checked): void => onChange({ ...value, showPoints: checked })}
-				/>
-			)}
-
-			{controls.spanGaps && (
-				<div className={styles.field}>
-					<Typography.Text>Connect gaps shorter than (s)</Typography.Text>
-					<Input
-						data-testid="panel-editor-v2-span-gaps"
-						type="number"
-						placeholder="All gaps"
-						value={value?.spanGaps?.fillLessThan ?? ''}
-						onChange={handleSpanGaps}
-					/>
-				</div>
-			)}
-		</>
-	);
-}
-
-export default ChartAppearanceSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ChartAppearanceSection/__tests__/ChartAppearanceSection.test.tsx

@@ -1,140 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { DashboardtypesLineStyleDTO } from 'api/generated/services/sigNoz.schemas';
-
-import ChartAppearanceSection from '../ChartAppearanceSection';
-
-// Open the antd Select by clicking its selector, then pick the option by label. The
-// line-style and fill-mode controls are ConfigSegmented (buttons), so this helper is
-// only used for the line-interpolation ConfigSelect.
-async function pickOption(triggerTestId: string, label: string): Promise<void> {
-	const user = userEvent.setup();
-	const trigger = screen.getByTestId(triggerTestId);
-	await user.click(trigger.querySelector('.ant-select-selector') as HTMLElement);
-	await user.click(await screen.findByRole('option', { name: label }));
-}
-
-const ALL_CONTROLS = {
-	lineStyle: true,
-	lineInterpolation: true,
-	fillMode: true,
-	showPoints: true,
-	spanGaps: true,
-};
-
-describe('ChartAppearanceSection', () => {
-	it('renders every control that is enabled', () => {
-		render(
-			<ChartAppearanceSection
-				value={undefined}
-				controls={ALL_CONTROLS}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('panel-editor-v2-line-style')).toBeInTheDocument();
-		expect(
-			screen.getByTestId('panel-editor-v2-line-interpolation'),
-		).toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-fill-mode')).toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-show-points')).toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-span-gaps')).toBeInTheDocument();
-	});
-
-	it('renders only the controls whose flag is set', () => {
-		render(
-			<ChartAppearanceSection
-				value={undefined}
-				controls={{ lineStyle: true, fillMode: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('panel-editor-v2-line-style')).toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-fill-mode')).toBeInTheDocument();
-		expect(
-			screen.queryByTestId('panel-editor-v2-line-interpolation'),
-		).not.toBeInTheDocument();
-		expect(
-			screen.queryByTestId('panel-editor-v2-show-points'),
-		).not.toBeInTheDocument();
-	});
-
-	it('writes the chosen fill mode through the segmented control', () => {
-		const onChange = jest.fn();
-		render(
-			<ChartAppearanceSection
-				value={{ lineStyle: DashboardtypesLineStyleDTO.solid }}
-				controls={{ fillMode: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.click(screen.getByText('Gradient'));
-
-		expect(onChange).toHaveBeenCalledWith({
-			lineStyle: 'solid',
-			fillMode: 'gradient',
-		});
-	});
-
-	it('writes the chosen line interpolation through the dropdown', async () => {
-		const onChange = jest.fn();
-		render(
-			<ChartAppearanceSection
-				value={undefined}
-				controls={{ lineInterpolation: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await pickOption('panel-editor-v2-line-interpolation', 'Spline');
-
-		expect(onChange).toHaveBeenCalledWith({ lineInterpolation: 'spline' });
-	});
-
-	it('toggles show points through onChange', () => {
-		const onChange = jest.fn();
-		render(
-			<ChartAppearanceSection
-				value={{ showPoints: false }}
-				controls={{ showPoints: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.click(screen.getByTestId('panel-editor-v2-show-points'));
-
-		expect(onChange).toHaveBeenCalledWith({ showPoints: true });
-	});
-
-	it('writes a span-gaps threshold and clears it when emptied', () => {
-		const onChange = jest.fn();
-		const { rerender } = render(
-			<ChartAppearanceSection
-				value={undefined}
-				controls={{ spanGaps: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.change(screen.getByTestId('panel-editor-v2-span-gaps'), {
-			target: { value: '60' },
-		});
-		expect(onChange).toHaveBeenLastCalledWith({
-			spanGaps: { fillLessThan: '60' },
-		});
-
-		rerender(
-			<ChartAppearanceSection
-				value={{ spanGaps: { fillLessThan: '60' } }}
-				controls={{ spanGaps: true }}
-				onChange={onChange}
-			/>,
-		);
-		fireEvent.change(screen.getByTestId('panel-editor-v2-span-gaps'), {
-			target: { value: '' },
-		});
-		expect(onChange).toHaveBeenLastCalledWith({ spanGaps: undefined });
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.module.scss

@@ -1,32 +0,0 @@
-.list {
-	display: flex;
-	flex-direction: column;
-	gap: 12px;
-}
-
-.row {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-	padding: 10px;
-	border: 1px solid var(--l2-border);
-	border-radius: 6px;
-}
-
-.rowFooter {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-}
-
-.newTab {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	cursor: pointer;
-}
-
-.newTabLabel {
-	font-size: 12px;
-	color: var(--text-vanilla-400);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/ContextLinksSection.tsx

@@ -1,94 +0,0 @@
-import { Plus, Trash2 } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import { Switch } from '@signozhq/ui/switch';
-import { Typography } from '@signozhq/ui/typography';
-import { Input } from 'antd';
-import type { DashboardLinkDTO } from 'api/generated/services/sigNoz.schemas';
-import type { SectionEditorProps } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import styles from './ContextLinksSection.module.scss';
-
-/**
- * Edits the panel's context links (`spec.links`): a list of label + URL rows with an
- * "open in new tab" toggle, plus add/remove. Atomic section — no per-kind sub-controls.
- * URLs may reference dashboard/query variables; that interpolation is resolved at render
- * time, so this editor just captures the raw strings.
- */
-function ContextLinksSection({
-	value,
-	onChange,
-}: SectionEditorProps<'contextLinks'>): JSX.Element {
-	const links = value ?? [];
-
-	const updateAt = (index: number, patch: Partial<DashboardLinkDTO>): void =>
-		onChange(
-			links.map((link, i) => (i === index ? { ...link, ...patch } : link)),
-		);
-
-	const addLink = (): void =>
-		onChange([...links, { name: '', url: '', targetBlank: true }]);
-
-	const removeAt = (index: number): void =>
-		onChange(links.filter((_, i) => i !== index));
-
-	return (
-		<div className={styles.list}>
-			{links.map((link, index) => (
-				// Links have no stable id on the wire; index is the row identity here.
-				// eslint-disable-next-line react/no-array-index-key
-				<div className={styles.row} key={index}>
-					<Input
-						data-testid={`context-link-label-${index}`}
-						placeholder="Label"
-						value={link.name ?? ''}
-						onChange={(e): void => updateAt(index, { name: e.target.value })}
-					/>
-					<Input
-						data-testid={`context-link-url-${index}`}
-						placeholder="https://… or /path?var=$variable"
-						value={link.url ?? ''}
-						onChange={(e): void => updateAt(index, { url: e.target.value })}
-					/>
-					<div className={styles.rowFooter}>
-						<div className={styles.newTab}>
-							<Switch
-								testId={`context-link-newtab-${index}`}
-								value={link.targetBlank ?? false}
-								onChange={(checked: boolean): void =>
-									updateAt(index, { targetBlank: checked })
-								}
-							/>
-							<Typography.Text className={styles.newTabLabel}>
-								Open in new tab
-							</Typography.Text>
-						</div>
-						<Button
-							type="button"
-							variant="ghost"
-							color="destructive"
-							size="icon"
-							aria-label={`Remove link ${index + 1}`}
-							data-testid={`context-link-remove-${index}`}
-							onClick={(): void => removeAt(index)}
-						>
-							<Trash2 size={14} />
-						</Button>
-					</div>
-				</div>
-			))}
-
-			<Button
-				type="button"
-				variant="dashed"
-				color="secondary"
-				prefix={<Plus size={14} />}
-				data-testid="panel-editor-v2-add-link"
-				onClick={addLink}
-			>
-				Add link
-			</Button>
-		</div>
-	);
-}
-
-export default ContextLinksSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ContextLinksSection/__tests__/ContextLinksSection.test.tsx

@@ -1,54 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import type { DashboardLinkDTO } from 'api/generated/services/sigNoz.schemas';
-
-import ContextLinksSection from '../ContextLinksSection';
-
-const LINKS: DashboardLinkDTO[] = [
-	{ name: 'Docs', url: 'https://signoz.io', targetBlank: true },
-];
-
-describe('ContextLinksSection', () => {
-	it('renders only the add button when there are no links', () => {
-		render(<ContextLinksSection value={undefined} onChange={jest.fn()} />);
-
-		expect(screen.getByTestId('panel-editor-v2-add-link')).toBeInTheDocument();
-		expect(screen.queryByTestId('context-link-label-0')).not.toBeInTheDocument();
-	});
-
-	it('appends a blank link (open-in-new-tab on) when Add link is clicked', () => {
-		const onChange = jest.fn();
-		render(<ContextLinksSection value={[]} onChange={onChange} />);
-
-		fireEvent.click(screen.getByTestId('panel-editor-v2-add-link'));
-
-		expect(onChange).toHaveBeenCalledWith([
-			{ name: '', url: '', targetBlank: true },
-		]);
-	});
-
-	it('renders existing links and edits a label through onChange', () => {
-		const onChange = jest.fn();
-		render(<ContextLinksSection value={LINKS} onChange={onChange} />);
-
-		expect(screen.getByTestId('context-link-label-0')).toHaveValue('Docs');
-		expect(screen.getByTestId('context-link-url-0')).toHaveValue(
-			'https://signoz.io',
-		);
-
-		fireEvent.change(screen.getByTestId('context-link-label-0'), {
-			target: { value: 'Runbook' },
-		});
-		expect(onChange).toHaveBeenCalledWith([
-			{ name: 'Runbook', url: 'https://signoz.io', targetBlank: true },
-		]);
-	});
-
-	it('removes a link through onChange', () => {
-		const onChange = jest.fn();
-		render(<ContextLinksSection value={LINKS} onChange={onChange} />);
-
-		fireEvent.click(screen.getByTestId('context-link-remove-0'));
-
-		expect(onChange).toHaveBeenCalledWith([]);
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/ColumnUnits.tsx

@@ -1,65 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import YAxisUnitSelector from 'components/YAxisUnitSelector';
-import { YAxisSource } from 'components/YAxisUnitSelector/types';
-
-import type { TableColumnOption } from '../../../hooks/useTableColumns';
-
-import styles from './FormattingSection.module.scss';
-
-interface ColumnUnitsProps {
-	/** Resolved value columns of the panel's current table result. */
-	columns: TableColumnOption[];
-	/** Current per-column unit map (`formatting.columnUnits`), keyed by column key. */
-	value: Record<string, string>;
-	onChange: (next: Record<string, string>) => void;
-}
-
-/**
- * Per-column unit picker for Table panels: one unit selector per resolved value
- * column, writing `{ [columnKey]: unitId }` keyed by the query identifier (V1
- * parity). Clearing a column's unit drops its entry. Until the panel produces
- * columns, shows a hint.
- */
-function ColumnUnits({
-	columns,
-	value,
-	onChange,
-}: ColumnUnitsProps): JSX.Element {
-	if (columns.length === 0) {
-		return (
-			<Typography.Text className={styles.columnUnitsHint}>
-				Run the panel to set per-column units.
-			</Typography.Text>
-		);
-	}
-
-	const setUnit = (columnKey: string, unit: string | undefined): void => {
-		const next = { ...value };
-		if (unit) {
-			next[columnKey] = unit;
-		} else {
-			delete next[columnKey];
-		}
-		onChange(next);
-	};
-
-	return (
-		<div className={styles.columnUnits}>
-			{columns.map((column) => (
-				<div className={styles.columnField} key={column.key}>
-					<Typography.Text>{column.label}</Typography.Text>
-					<YAxisUnitSelector
-						data-testid={`panel-editor-v2-column-unit-${column.key}`}
-						placeholder="Select unit"
-						source={YAxisSource.DASHBOARDS}
-						value={value[column.key]}
-						containerClassName={styles.columnUnitSelector}
-						onChange={(unit): void => setUnit(column.key, unit)}
-					/>
-				</div>
-			))}
-		</div>
-	);
-}
-
-export default ColumnUnits;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/FormattingSection.module.scss

@@ -1,37 +0,0 @@
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}
-
-.unitSelector {
-	:global(.ant-select) {
-		width: 100%;
-	}
-}
-
-// Stacked per-column unit pickers; each column keeps the standard field layout.
-.columnUnits {
-	display: flex;
-	flex-direction: column;
-	gap: 12px;
-
-	:global(.ant-select) {
-		width: 100%;
-	}
-}
-
-.columnUnitsHint {
-	font-size: 12px;
-	color: var(--l2-foreground);
-}
-
-.columnField {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	gap: 16px;
-}
-.columnUnitSelector {
-	flex: 1;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/FormattingSection.tsx

@@ -1,89 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import { DashboardtypesPrecisionOptionDTO } from 'api/generated/services/sigNoz.schemas';
-import YAxisUnitSelector from 'components/YAxisUnitSelector';
-import { YAxisSource } from 'components/YAxisUnitSelector/types';
-import type { SectionEditorProps } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import type { TableColumnOption } from '../../../hooks/useTableColumns';
-import ConfigSelect from '../../controls/ConfigSelect/ConfigSelect';
-import ColumnUnits from './ColumnUnits';
-
-import styles from './FormattingSection.module.scss';
-
-type FormattingSectionProps = SectionEditorProps<'formatting'> & {
-	/** Table panel's resolved value columns; required for the column-units editor. */
-	tableColumns?: TableColumnOption[];
-};
-
-// `full` means "show the raw value, no rounding"; the digits round to that many places.
-const DECIMAL_OPTIONS: {
-	value: DashboardtypesPrecisionOptionDTO;
-	label: string;
-}[] = [
-	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_0, label: '0 decimals' },
-	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_1, label: '1 decimal' },
-	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_2, label: '2 decimals' },
-	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_3, label: '3 decimals' },
-	{ value: DashboardtypesPrecisionOptionDTO.NUMBER_4, label: '4 decimals' },
-	{ value: DashboardtypesPrecisionOptionDTO.full, label: 'Full' },
-];
-
-/**
- * Edits the `formatting` slice of a panel spec (unit + decimal precision). Which
- * controls show is driven by the per-kind `controls` flags; the spec slice itself
- * is uniform across every kind that declares the Formatting section.
- */
-function FormattingSection({
-	value,
-	controls,
-	onChange,
-	tableColumns = [],
-}: FormattingSectionProps): JSX.Element {
-	return (
-		<>
-			{controls.unit && (
-				<div className={styles.field}>
-					<Typography.Text>Unit</Typography.Text>
-					<YAxisUnitSelector
-						containerClassName={styles.unitSelector}
-						data-testid="panel-editor-v2-unit"
-						source={YAxisSource.DASHBOARDS}
-						value={value?.unit}
-						onChange={(unit): void => onChange({ ...value, unit })}
-					/>
-				</div>
-			)}
-
-			{controls.decimals && (
-				<div className={styles.field}>
-					<Typography.Text>Decimals</Typography.Text>
-					<ConfigSelect
-						testId="panel-editor-v2-decimals"
-						placeholder="Select decimals…"
-						value={value?.decimalPrecision}
-						items={DECIMAL_OPTIONS}
-						onChange={(next): void =>
-							onChange({
-								...value,
-								decimalPrecision: next as DashboardtypesPrecisionOptionDTO,
-							})
-						}
-					/>
-				</div>
-			)}
-
-			{controls.columnUnits && (
-				<div className={styles.field}>
-					<Typography.Text>Column units</Typography.Text>
-					<ColumnUnits
-						columns={tableColumns}
-						value={value?.columnUnits ?? {}}
-						onChange={(columnUnits): void => onChange({ ...value, columnUnits })}
-					/>
-				</div>
-			)}
-		</>
-	);
-}
-
-export default FormattingSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/FormattingSection/__tests__/FormattingSection.test.tsx

@@ -1,74 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import FormattingSection from '../FormattingSection';
-
-// Open the Decimals select (clicking its antd selector) and pick the option with the
-// given visible label.
-async function pickDecimal(label: string): Promise<void> {
-	const user = userEvent.setup();
-	const trigger = screen.getByTestId('panel-editor-v2-decimals');
-	await user.click(trigger.querySelector('.ant-select-selector') as HTMLElement);
-	await user.click(await screen.findByRole('option', { name: label }));
-}
-
-describe('FormattingSection', () => {
-	it('renders Unit and Decimals when both controls are enabled', () => {
-		render(
-			<FormattingSection
-				value={undefined}
-				controls={{ unit: true, decimals: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.getByTestId('panel-editor-v2-unit')).toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-decimals')).toBeInTheDocument();
-	});
-
-	it('hides a control when its flag is off', () => {
-		render(
-			<FormattingSection
-				value={undefined}
-				controls={{ decimals: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(screen.queryByTestId('panel-editor-v2-unit')).not.toBeInTheDocument();
-		expect(screen.getByTestId('panel-editor-v2-decimals')).toBeInTheDocument();
-	});
-
-	it('writes the chosen decimal precision through onChange', async () => {
-		const onChange = jest.fn();
-		render(
-			<FormattingSection
-				value={undefined}
-				controls={{ decimals: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await pickDecimal('Full');
-
-		expect(onChange).toHaveBeenCalledWith({ decimalPrecision: 'full' });
-	});
-
-	it('merges the edit into the existing formatting slice', async () => {
-		const onChange = jest.fn();
-		render(
-			<FormattingSection
-				value={{ unit: 'bytes' }}
-				controls={{ decimals: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		await pickDecimal('2 decimals');
-
-		expect(onChange).toHaveBeenCalledWith({
-			unit: 'bytes',
-			decimalPrecision: '2',
-		});
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/LegendSection.module.scss

@@ -1,5 +0,0 @@
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/LegendSection.tsx

@@ -1,73 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import { DashboardtypesLegendPositionDTO } from 'api/generated/services/sigNoz.schemas';
-import type { SectionEditorProps } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import ConfigSegmented from '../../controls/ConfigSegmented/ConfigSegmented';
-import LegendColors from '../../controls/LegendColors/LegendColors';
-import type { LegendSeries } from '../../../hooks/useLegendSeries';
-
-import styles from './LegendSection.module.scss';
-
-type LegendSectionProps = SectionEditorProps<'legend'> & {
-	/** Panel's resolved series, forwarded by SectionSlot for the colors control. */
-	legendSeries?: LegendSeries[];
-};
-
-const POSITION_OPTIONS = [
-	{
-		value: DashboardtypesLegendPositionDTO.bottom,
-		label: 'Bottom',
-		icon: 'pos-bottom' as const,
-	},
-	{
-		value: DashboardtypesLegendPositionDTO.right,
-		label: 'Right',
-		icon: 'pos-right' as const,
-	},
-];
-
-/**
- * Edits the `legend` slice of a panel spec: legend position and per-series color
- * overrides. The colors control reads the panel's resolved series from context (the
- * shared preview query) and writes `customColors` keyed by series label.
- */
-function LegendSection({
-	value,
-	controls,
-	onChange,
-	legendSeries,
-}: LegendSectionProps): JSX.Element {
-	return (
-		<>
-			{controls.position && (
-				<div className={styles.field}>
-					<Typography.Text>Position</Typography.Text>
-					<ConfigSegmented
-						testId="panel-editor-v2-legend-position"
-						items={POSITION_OPTIONS}
-						value={value?.position}
-						onChange={(next): void =>
-							onChange({
-								...value,
-								position: next as DashboardtypesLegendPositionDTO,
-							})
-						}
-					/>
-				</div>
-			)}
-
-			{controls.colors && (
-				<div className={styles.field}>
-					<Typography.Text>Series colors</Typography.Text>
-					<LegendColors
-						series={legendSeries ?? []}
-						value={value?.customColors}
-						onChange={(customColors): void => onChange({ ...value, customColors })}
-					/>
-				</div>
-			)}
-		</>
-	);
-}
-
-export default LegendSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/LegendSection/__tests__/LegendSection.test.tsx

@@ -1,68 +0,0 @@
-import { fireEvent, render, screen } from '@testing-library/react';
-import { DashboardtypesLegendPositionDTO } from 'api/generated/services/sigNoz.schemas';
-
-import LegendSection from '../LegendSection';
-
-describe('LegendSection', () => {
-	it('renders the position toggle with both options when position is enabled', () => {
-		render(
-			<LegendSection
-				value={undefined}
-				controls={{ position: true }}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		expect(
-			screen.getByTestId('panel-editor-v2-legend-position'),
-		).toBeInTheDocument();
-		expect(screen.getByText('Bottom')).toBeInTheDocument();
-		expect(screen.getByText('Right')).toBeInTheDocument();
-	});
-
-	it('renders nothing when position is not enabled', () => {
-		render(
-			<LegendSection value={undefined} controls={{}} onChange={jest.fn()} />,
-		);
-
-		expect(
-			screen.queryByTestId('panel-editor-v2-legend-position'),
-		).not.toBeInTheDocument();
-	});
-
-	it('writes the chosen position through onChange', () => {
-		const onChange = jest.fn();
-		render(
-			<LegendSection
-				value={{ position: undefined }}
-				controls={{ position: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.click(screen.getByText('Right'));
-
-		expect(onChange).toHaveBeenCalledWith({ position: 'right' });
-	});
-
-	it('preserves other legend fields when changing position', () => {
-		const onChange = jest.fn();
-		render(
-			<LegendSection
-				value={{
-					position: DashboardtypesLegendPositionDTO.bottom,
-					customColors: { a: '#fff' },
-				}}
-				controls={{ position: true }}
-				onChange={onChange}
-			/>,
-		);
-
-		fireEvent.click(screen.getByText('Right'));
-
-		expect(onChange).toHaveBeenCalledWith({
-			position: 'right',
-			customColors: { a: '#fff' },
-		});
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdColorSelect.tsx

@@ -1,50 +0,0 @@
-import { ChevronDown } from '@signozhq/icons';
-import { ColorPicker } from 'antd';
-
-import styles from './ThresholdsSection.module.scss';
-
-interface ThresholdColorSelectProps {
-	value: string;
-	testId?: string;
-	onChange: (hex: string) => void;
-}
-
-// Named presets from the SigNoz palette (cherry / amber / forest / robin). They surface
-// as quick swatches in the picker; the full picker below covers any custom color.
-const PRESETS: { label: string; value: string }[] = [
-	{ label: 'Red', value: '#F1575F' },
-	{ label: 'Orange', value: '#F5B225' },
-	{ label: 'Green', value: '#2BB673' },
-	{ label: 'Blue', value: '#4E74F8' },
-];
-
-/**
- * Threshold color control: an antd ColorPicker with the palette presets plus a full
- * custom picker, in a single popover (so moving from the trigger into the picker never
- * dismisses it). The trigger shows the current swatch and its preset name, or "Custom".
- */
-function ThresholdColorSelect({
-	value,
-	testId,
-	onChange,
-}: ThresholdColorSelectProps): JSX.Element {
-	const current = PRESETS.find(
-		(p) => p.value.toLowerCase() === value?.toLowerCase(),
-	);
-
-	return (
-		<ColorPicker
-			value={value}
-			onChangeComplete={(c): void => onChange(c.toHexString())}
-			presets={[{ label: 'Defaults', colors: PRESETS.map((p) => p.value) }]}
-		>
-			<button type="button" className={styles.colorTrigger} data-testid={testId}>
-				<span className={styles.dot} style={{ backgroundColor: value }} />
-				<span className={styles.colorLabel}>{current?.label ?? 'Custom'}</span>
-				<ChevronDown size={13} />
-			</button>
-		</ColorPicker>
-	);
-}
-
-export default ThresholdColorSelect;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.module.scss

@@ -1,104 +0,0 @@
-.list {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}
-
-// ── View mode: compact summary row ──────────────────────────────────────────
-.viewRow {
-	display: flex;
-	align-items: center;
-	gap: 8px;
-	height: 40px;
-	padding: 0 4px 0 10px;
-	border: 1px solid var(--l2-border);
-	background-color: var(--l2-background);
-	border-radius: 6px;
-}
-
-.viewValue {
-	flex: none;
-	font-size: 13px;
-	font-weight: 500;
-	color: var(--text-vanilla-100);
-}
-
-.viewLabel {
-	overflow: hidden;
-	font-size: 12px;
-	color: var(--text-vanilla-400);
-	white-space: nowrap;
-	text-overflow: ellipsis;
-}
-
-.spacer {
-	flex: 1;
-}
-
-// ── Edit mode: labelled form ────────────────────────────────────────────────
-.editRow {
-	display: flex;
-	flex-direction: column;
-	gap: 12px;
-	padding: 12px;
-	background-color: var(--l2-background);
-	border: 1px solid var(--bg-robin-400);
-	border-radius: 6px;
-}
-
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 6px;
-}
-
-.fieldLabel {
-	font-size: 12px;
-	color: var(--text-vanilla-400);
-}
-
-.actions {
-	display: flex;
-	justify-content: flex-end;
-	gap: 8px;
-}
-
-// ── Shared ──────────────────────────────────────────────────────────────────
-.dot {
-	width: 12px;
-	height: 12px;
-	flex: none;
-	border-radius: 50%;
-}
-
-.colorTrigger {
-	display: flex;
-	align-items: center;
-	gap: 6px;
-	width: 100%;
-	height: 36px;
-	padding: 0 10px;
-	border: 1px solid var(--l2-border);
-	border-radius: 4px;
-	background: transparent;
-	color: var(--text-vanilla-100);
-	cursor: pointer;
-}
-
-.colorLabel {
-	flex: 1;
-	font-size: 13px;
-	text-align: left;
-}
-
-// Match Formatting: make the YAxisUnitSelector fill the row width.
-.unitSelector {
-	:global(.ant-select) {
-		width: 100%;
-	}
-}
-
-.invalidUnit {
-	font-size: 11px;
-	color: var(--bg-cherry-400);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/ThresholdsSection.tsx

@@ -1,181 +0,0 @@
-import { useState } from 'react';
-import { Plus } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-import {
-	DashboardtypesComparisonOperatorDTO,
-	type DashboardtypesComparisonThresholdDTO,
-	type DashboardtypesTableThresholdDTO,
-	DashboardtypesThresholdFormatDTO,
-	type DashboardtypesThresholdWithLabelDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type {
-	AnyThreshold,
-	ThresholdVariant,
-} from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import type { TableColumnOption } from '../../../hooks/useTableColumns';
-import ComparisonThresholdRow from './rows/ComparisonThresholdRow';
-import LabelThresholdRow from './rows/LabelThresholdRow';
-import TableThresholdRow from './rows/TableThresholdRow';
-
-import styles from './ThresholdsSection.module.scss';
-
-// New thresholds default to red (the first palette preset); the user recolors per rule.
-const DEFAULT_THRESHOLD_COLOR = '#F1575F';
-
-// Add-button testId per variant — kept stable so existing E2E/unit selectors hold.
-const ADD_TESTID: Record<ThresholdVariant, string> = {
-	label: 'panel-editor-v2-add-threshold',
-	comparison: 'panel-editor-v2-add-comparison-threshold',
-	table: 'panel-editor-v2-add-table-threshold',
-};
-
-// Seed for a freshly-added row, in the shape the variant's editor + spec expect.
-function defaultThreshold(
-	variant: ThresholdVariant,
-	tableColumns: TableColumnOption[],
-): AnyThreshold {
-	switch (variant) {
-		case 'comparison':
-			return {
-				value: 0,
-				color: DEFAULT_THRESHOLD_COLOR,
-				operator: DashboardtypesComparisonOperatorDTO.above,
-				format: DashboardtypesThresholdFormatDTO.text,
-			};
-		case 'table':
-			return {
-				columnName: tableColumns[0]?.key ?? '',
-				value: 0,
-				color: DEFAULT_THRESHOLD_COLOR,
-				operator: DashboardtypesComparisonOperatorDTO.above,
-				format: DashboardtypesThresholdFormatDTO.background,
-			};
-		default:
-			return { value: 0, color: DEFAULT_THRESHOLD_COLOR, label: '' };
-	}
-}
-
-type ThresholdsSectionProps = {
-	value: AnyThreshold[] | undefined;
-	/** `variant` picks the row editor + element shape; defaults to `label`. */
-	controls?: { variant?: ThresholdVariant };
-	onChange: (next: AnyThreshold[]) => void;
-	/** Panel formatting unit; scopes each row's unit picker to its category (V1 parity). */
-	yAxisUnit?: string;
-	/** Table panel's resolved value columns (table variant only). */
-	tableColumns?: TableColumnOption[];
-};
-
-/**
- * Edits the `thresholds` slice for every panel kind. All variants share the same
- * list mechanics (one row edits at a time; a freshly-added row opens in edit mode and
- * is removed if discarded before saving) and differ only in the row editor, picked by
- * `controls.variant`: `label` (TimeSeries/Bar), `comparison` (Number), `table` (Table).
- */
-function ThresholdsSection({
-	value,
-	controls,
-	onChange,
-	yAxisUnit,
-	tableColumns = [],
-}: ThresholdsSectionProps): JSX.Element {
-	const variant = controls?.variant ?? 'label';
-	const thresholds = value ?? [];
-	// Which row is being edited, and whether it was just added (so Discard removes it).
-	const [editingIndex, setEditingIndex] = useState<number | null>(null);
-	const [unsavedIndex, setUnsavedIndex] = useState<number | null>(null);
-
-	const addThreshold = (): void => {
-		const nextIndex = thresholds.length;
-		onChange([...thresholds, defaultThreshold(variant, tableColumns)]);
-		setEditingIndex(nextIndex);
-		setUnsavedIndex(nextIndex);
-	};
-
-	const saveAt =
-		(index: number) =>
-		(next: AnyThreshold): void => {
-			onChange(thresholds.map((t, i) => (i === index ? next : t)));
-			setEditingIndex(null);
-			setUnsavedIndex(null);
-		};
-
-	const removeAt = (index: number): void => {
-		onChange(thresholds.filter((_, i) => i !== index));
-		setEditingIndex(null);
-		setUnsavedIndex(null);
-	};
-
-	const discardAt = (index: number) => (): void => {
-		// Discarding a row that was never saved removes it; otherwise just exit edit.
-		if (index === unsavedIndex) {
-			removeAt(index);
-			return;
-		}
-		setEditingIndex(null);
-	};
-
-	const renderRow = (threshold: AnyThreshold, index: number): JSX.Element => {
-		// Shared row controls; the threshold value is narrowed per variant at this
-		// branch boundary — the slice only ever holds the active variant's shape.
-		const common = {
-			index,
-			yAxisUnit,
-			isEditing: editingIndex === index,
-			onEdit: (): void => setEditingIndex(index),
-			onSave: saveAt(index),
-			onDiscard: discardAt(index),
-			onRemove: (): void => removeAt(index),
-		};
-
-		if (variant === 'comparison') {
-			return (
-				<ComparisonThresholdRow
-					// eslint-disable-next-line react/no-array-index-key
-					key={index}
-					threshold={threshold as DashboardtypesComparisonThresholdDTO}
-					{...common}
-				/>
-			);
-		}
-		if (variant === 'table') {
-			return (
-				<TableThresholdRow
-					// eslint-disable-next-line react/no-array-index-key
-					key={index}
-					threshold={threshold as DashboardtypesTableThresholdDTO}
-					tableColumns={tableColumns}
-					{...common}
-				/>
-			);
-		}
-		return (
-			<LabelThresholdRow
-				// eslint-disable-next-line react/no-array-index-key
-				key={index}
-				threshold={threshold as DashboardtypesThresholdWithLabelDTO}
-				{...common}
-			/>
-		);
-	};
-
-	return (
-		<div className={styles.list}>
-			{thresholds.map(renderRow)}
-
-			<Button
-				type="button"
-				variant="dashed"
-				color="secondary"
-				prefix={<Plus size={14} />}
-				data-testid={ADD_TESTID[variant]}
-				onClick={addThreshold}
-			>
-				Add threshold
-			</Button>
-		</div>
-	);
-}
-
-export default ThresholdsSection;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/__tests__/ThresholdsSection.comparison.test.tsx

@@ -1,202 +0,0 @@
-import { useState } from 'react';
-import {
-	DashboardtypesComparisonOperatorDTO,
-	type DashboardtypesComparisonThresholdDTO,
-	DashboardtypesThresholdFormatDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import type { AnyThreshold } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-import { render, screen, userEvent } from 'tests/test-utils';
-
-import UnifiedThresholdsSection from '../ThresholdsSection';
-
-// The comparison editor is the unified ThresholdsSection in its `comparison` variant;
-// this wrapper pins the variant so the suite reads as the comparison editor's spec.
-function ComparisonThresholdsSection(props: {
-	value: DashboardtypesComparisonThresholdDTO[] | undefined;
-	onChange: (next: DashboardtypesComparisonThresholdDTO[]) => void;
-	yAxisUnit?: string;
-}): JSX.Element {
-	return (
-		<UnifiedThresholdsSection
-			value={props.value}
-			onChange={props.onChange as (next: AnyThreshold[]) => void}
-			yAxisUnit={props.yAxisUnit}
-			controls={{ variant: 'comparison' }}
-		/>
-	);
-}
-
-const THRESHOLDS: DashboardtypesComparisonThresholdDTO[] = [
-	{
-		value: 80,
-		color: '#F5B225',
-		operator: DashboardtypesComparisonOperatorDTO.above,
-		unit: 'percent',
-		format: DashboardtypesThresholdFormatDTO.background,
-	},
-];
-
-// Stateful harness for flows that depend on the value updating (add/discard).
-function Harness({ yAxisUnit }: { yAxisUnit?: string }): JSX.Element {
-	const [value, setValue] = useState<DashboardtypesComparisonThresholdDTO[]>([]);
-	return (
-		<ComparisonThresholdsSection
-			value={value}
-			onChange={setValue}
-			yAxisUnit={yAxisUnit}
-		/>
-	);
-}
-
-describe('ComparisonThresholdsSection', () => {
-	it('renders only the add button when there are no thresholds', () => {
-		render(
-			<ComparisonThresholdsSection value={undefined} onChange={jest.fn()} />,
-		);
-
-		expect(
-			screen.getByTestId('panel-editor-v2-add-comparison-threshold'),
-		).toBeInTheDocument();
-		expect(
-			screen.queryByTestId('comparison-threshold-edit-0'),
-		).not.toBeInTheDocument();
-	});
-
-	it('shows an existing threshold in view mode (no form until Edit)', () => {
-		render(
-			<ComparisonThresholdsSection value={THRESHOLDS} onChange={jest.fn()} />,
-		);
-
-		expect(screen.getByTestId('comparison-threshold-edit-0')).toBeInTheDocument();
-		// Operator symbol + value render in the summary.
-		expect(screen.getByText(/> 80/)).toBeInTheDocument();
-		// The editable fields are hidden until the row is edited.
-		expect(
-			screen.queryByTestId('comparison-threshold-value-0'),
-		).not.toBeInTheDocument();
-	});
-
-	it('formats the view-mode value through its unit (e.g. currency symbol)', () => {
-		render(
-			<ComparisonThresholdsSection
-				value={[
-					{
-						value: 3100,
-						color: '#F5B225',
-						operator: DashboardtypesComparisonOperatorDTO.below,
-						unit: 'currencyUSD',
-					},
-				]}
-				onChange={jest.fn()}
-			/>,
-		);
-
-		const row = screen.getByTestId('comparison-threshold-edit-0').closest('div');
-		// Unit-aware: shows the currency symbol, never the raw unit id.
-		expect(row).toHaveTextContent('$');
-		expect(row).not.toHaveTextContent('currencyUSD');
-	});
-
-	it('edits a threshold value and commits it on Save', async () => {
-		const user = userEvent.setup();
-		const onChange = jest.fn();
-		render(
-			<ComparisonThresholdsSection value={THRESHOLDS} onChange={onChange} />,
-		);
-
-		await user.click(screen.getByTestId('comparison-threshold-edit-0'));
-		const valueInput = screen.getByTestId('comparison-threshold-value-0');
-		expect(valueInput).toHaveValue(80);
-
-		await user.clear(valueInput);
-		await user.type(valueInput, '90');
-		await user.click(screen.getByTestId('comparison-threshold-save-0'));
-
-		expect(onChange).toHaveBeenCalledWith([
-			{
-				value: 90,
-				color: '#F5B225',
-				operator: DashboardtypesComparisonOperatorDTO.above,
-				unit: 'percent',
-				format: DashboardtypesThresholdFormatDTO.background,
-			},
-		]);
-	});
-
-	it('does not commit edits when Discard is clicked', async () => {
-		const user = userEvent.setup();
-		const onChange = jest.fn();
-		render(
-			<ComparisonThresholdsSection value={THRESHOLDS} onChange={onChange} />,
-		);
-
-		await user.click(screen.getByTestId('comparison-threshold-edit-0'));
-		await user.clear(screen.getByTestId('comparison-threshold-value-0'));
-		await user.type(screen.getByTestId('comparison-threshold-value-0'), '90');
-		await user.click(screen.getByTestId('comparison-threshold-discard-0'));
-
-		expect(onChange).not.toHaveBeenCalled();
-		// Back to view mode.
-		expect(
-			screen.queryByTestId('comparison-threshold-value-0'),
-		).not.toBeInTheDocument();
-		expect(screen.getByTestId('comparison-threshold-edit-0')).toBeInTheDocument();
-	});
-
-	it('removes a threshold from view mode', async () => {
-		const user = userEvent.setup();
-		const onChange = jest.fn();
-		render(
-			<ComparisonThresholdsSection value={THRESHOLDS} onChange={onChange} />,
-		);
-
-		await user.click(screen.getByTestId('comparison-threshold-remove-0'));
-
-		expect(onChange).toHaveBeenCalledWith([]);
-	});
-
-	it('adds a threshold that opens in edit mode, and discards it away', async () => {
-		const user = userEvent.setup();
-		render(<Harness />);
-
-		await user.click(
-			screen.getByTestId('panel-editor-v2-add-comparison-threshold'),
-		);
-		// New row opens in edit mode.
-		expect(
-			screen.getByTestId('comparison-threshold-value-0'),
-		).toBeInTheDocument();
-
-		await user.click(screen.getByTestId('comparison-threshold-discard-0'));
-		// Discarding a never-saved row removes it entirely.
-		expect(
-			screen.queryByTestId('comparison-threshold-value-0'),
-		).not.toBeInTheDocument();
-		expect(
-			screen.queryByTestId('comparison-threshold-edit-0'),
-		).not.toBeInTheDocument();
-	});
-
-	it('flags a threshold unit in a different category than the y-axis unit', async () => {
-		const user = userEvent.setup();
-		render(
-			<ComparisonThresholdsSection
-				value={[
-					{
-						value: 80,
-						color: '#F5B225',
-						operator: DashboardtypesComparisonOperatorDTO.above,
-						unit: 'ms',
-					},
-				]}
-				yAxisUnit="bytes"
-				onChange={jest.fn()}
-			/>,
-		);
-
-		await user.click(screen.getByTestId('comparison-threshold-edit-0'));
-		expect(
-			screen.getByTestId('comparison-threshold-unit-invalid-0'),
-		).toBeInTheDocument();
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/__tests__/ThresholdsSection.test.tsx

@@ -1,134 +0,0 @@
-import { useState } from 'react';
-import { fireEvent, render, screen } from '@testing-library/react';
-import type { DashboardtypesThresholdWithLabelDTO } from 'api/generated/services/sigNoz.schemas';
-import type { AnyThreshold } from 'pages/DashboardPageV2/DashboardContainer/Panels/types/sections';
-
-import ThresholdsSection from '../ThresholdsSection';
-
-const THRESHOLDS: DashboardtypesThresholdWithLabelDTO[] = [
-	{ value: 80, color: '#F5B225', label: 'High', unit: 'percent' },
-];
-
-// Stateful harness for flows that depend on the value updating (add/discard);
-// omits `controls` to exercise the default `label` variant.
-function Harness({ yAxisUnit }: { yAxisUnit?: string }): JSX.Element {
-	const [value, setValue] = useState<AnyThreshold[]>([]);
-	return (
-		<ThresholdsSection value={value} onChange={setValue} yAxisUnit={yAxisUnit} />
-	);
-}
-
-describe('ThresholdsSection', () => {
-	it('renders only the add button when there are no thresholds', () => {
-		render(<ThresholdsSection value={undefined} onChange={jest.fn()} />);
-
-		expect(
-			screen.getByTestId('panel-editor-v2-add-threshold'),
-		).toBeInTheDocument();
-		expect(screen.queryByTestId('threshold-edit-0')).not.toBeInTheDocument();
-	});
-
-	it('shows an existing threshold in view mode (no form until Edit)', () => {
-		render(<ThresholdsSection value={THRESHOLDS} onChange={jest.fn()} />);
-
-		expect(screen.getByTestId('threshold-edit-0')).toBeInTheDocument();
-		expect(screen.getByText('High')).toBeInTheDocument();
-		expect(screen.queryByTestId('threshold-value-0')).not.toBeInTheDocument();
-	});
-
-	it('edits a threshold value and commits it on Save', () => {
-		const onChange = jest.fn();
-		render(<ThresholdsSection value={THRESHOLDS} onChange={onChange} />);
-
-		fireEvent.click(screen.getByTestId('threshold-edit-0'));
-		expect(screen.getByTestId('threshold-value-0')).toHaveValue(80);
-
-		fireEvent.change(screen.getByTestId('threshold-value-0'), {
-			target: { value: '90' },
-		});
-		fireEvent.click(screen.getByTestId('threshold-save-0'));
-
-		expect(onChange).toHaveBeenCalledWith([
-			{ value: 90, color: '#F5B225', label: 'High', unit: 'percent' },
-		]);
-	});
-
-	it('persists an empty-string label when none is provided', () => {
-		const onChange = jest.fn();
-		// Label absent (e.g. a pre-existing spec); spec requires a string, so save
-		// must send '' not undefined.
-		const noLabel = [{ value: 50, color: '#F1575F' }] as AnyThreshold[];
-		render(<ThresholdsSection value={noLabel} onChange={onChange} />);
-
-		fireEvent.click(screen.getByTestId('threshold-edit-0'));
-		fireEvent.click(screen.getByTestId('threshold-save-0'));
-
-		expect(onChange).toHaveBeenCalledWith([
-			{ value: 50, color: '#F1575F', label: '' },
-		]);
-	});
-
-	it('does not commit edits when Discard is clicked', () => {
-		const onChange = jest.fn();
-		render(<ThresholdsSection value={THRESHOLDS} onChange={onChange} />);
-
-		fireEvent.click(screen.getByTestId('threshold-edit-0'));
-		fireEvent.change(screen.getByTestId('threshold-value-0'), {
-			target: { value: '90' },
-		});
-		fireEvent.click(screen.getByTestId('threshold-discard-0'));
-
-		expect(onChange).not.toHaveBeenCalled();
-		expect(screen.queryByTestId('threshold-value-0')).not.toBeInTheDocument();
-		expect(screen.getByTestId('threshold-edit-0')).toBeInTheDocument();
-	});
-
-	it('removes a threshold from view mode', () => {
-		const onChange = jest.fn();
-		render(<ThresholdsSection value={THRESHOLDS} onChange={onChange} />);
-
-		fireEvent.click(screen.getByTestId('threshold-remove-0'));
-
-		expect(onChange).toHaveBeenCalledWith([]);
-	});
-
-	it('adds a threshold that opens in edit mode, and discards it away', () => {
-		render(<Harness />);
-
-		fireEvent.click(screen.getByTestId('panel-editor-v2-add-threshold'));
-		expect(screen.getByTestId('threshold-value-0')).toBeInTheDocument();
-
-		// Discarding a never-saved row removes it entirely.
-		fireEvent.click(screen.getByTestId('threshold-discard-0'));
-		expect(screen.queryByTestId('threshold-value-0')).not.toBeInTheDocument();
-		expect(screen.queryByTestId('threshold-edit-0')).not.toBeInTheDocument();
-	});
-
-	it('flags a threshold unit in a different category than the y-axis unit', () => {
-		render(
-			<ThresholdsSection
-				value={[{ value: 80, color: '#F5B225', label: '', unit: 'ms' }]}
-				yAxisUnit="bytes"
-				onChange={jest.fn()}
-			/>,
-		);
-
-		fireEvent.click(screen.getByTestId('threshold-edit-0'));
-		expect(screen.getByTestId('threshold-unit-invalid-0')).toBeInTheDocument();
-	});
-
-	it('does not flag a threshold unit in the same category as the y-axis unit', () => {
-		render(
-			<ThresholdsSection
-				value={[{ value: 80, color: '#F5B225', label: '', unit: 'ms' }]}
-				yAxisUnit="s"
-				onChange={jest.fn()}
-			/>,
-		);
-
-		fireEvent.click(screen.getByTestId('threshold-edit-0'));
-		expect(
-			screen.queryByTestId('threshold-unit-invalid-0'),
-		).not.toBeInTheDocument();
-	});
-});

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/ComparisonThresholdRow.tsx

@@ -1,117 +0,0 @@
-import {
-	type DashboardtypesComparisonOperatorDTO,
-	type DashboardtypesComparisonThresholdDTO,
-	type DashboardtypesThresholdFormatDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { formatPanelValue } from 'pages/DashboardPageV2/DashboardContainer/Panels/utils/formatPanelValue';
-
-import {
-	FORMAT_OPTIONS,
-	OPERATOR_OPTIONS,
-	OPERATOR_SYMBOL,
-} from '../thresholdOptions';
-import ThresholdColorField from './shared/ThresholdColorField';
-import ThresholdRowShell from './shared/ThresholdRowShell';
-import ThresholdSelectField from './shared/ThresholdSelectField';
-import ThresholdUnitField from './shared/ThresholdUnitField';
-import { useThresholdDraft } from './shared/useThresholdDraft';
-import ThresholdValueField from './shared/ThresholdValueField';
-
-import styles from '../ThresholdsSection.module.scss';
-
-interface ComparisonThresholdRowProps {
-	index: number;
-	threshold: DashboardtypesComparisonThresholdDTO;
-	/** Panel formatting unit — scopes the unit picker to its category (V1 parity). */
-	yAxisUnit?: string;
-	isEditing: boolean;
-	onEdit: () => void;
-	onSave: (next: DashboardtypesComparisonThresholdDTO) => void;
-	onDiscard: () => void;
-	onRemove: () => void;
-}
-
-/**
- * Comparison threshold (Number): value crosses an operator → recolor. Edit form is
- * condition (operator), value, unit, color, display format.
- */
-function ComparisonThresholdRow({
-	index,
-	threshold,
-	yAxisUnit,
-	isEditing,
-	onEdit,
-	onSave,
-	onDiscard,
-	onRemove,
-}: ComparisonThresholdRowProps): JSX.Element {
-	const { draft, setDraft, setValue } = useThresholdDraft(threshold, isEditing);
-
-	const symbol = threshold.operator ? OPERATOR_SYMBOL[threshold.operator] : '';
-	const summary = (
-		<span className={styles.viewValue}>
-			{symbol} {formatPanelValue(threshold.value, threshold.unit)}
-		</span>
-	);
-
-	return (
-		<ThresholdRowShell
-			index={index}
-			testIdPrefix="comparison-threshold"
-			color={threshold.color}
-			isEditing={isEditing}
-			summary={summary}
-			onEdit={onEdit}
-			onSave={(): void => onSave(draft)}
-			onDiscard={onDiscard}
-			onRemove={onRemove}
-		>
-			<ThresholdSelectField
-				label="If value is"
-				testId={`comparison-threshold-operator-${index}`}
-				placeholder="Select condition"
-				value={draft.operator}
-				items={OPERATOR_OPTIONS}
-				onChange={(operator): void =>
-					setDraft((d) => ({
-						...d,
-						operator: operator as DashboardtypesComparisonOperatorDTO,
-					}))
-				}
-			/>
-			<ThresholdValueField
-				testId={`comparison-threshold-value-${index}`}
-				value={draft.value}
-				onChange={setValue}
-			/>
-			<ThresholdUnitField
-				testId={`comparison-threshold-unit-${index}`}
-				invalidTestId={`comparison-threshold-unit-invalid-${index}`}
-				value={draft.unit}
-				scopeUnit={yAxisUnit}
-				scopeLabel="y-axis unit"
-				onChange={(unit): void => setDraft((d) => ({ ...d, unit }))}
-			/>
-			<ThresholdColorField
-				testId={`comparison-threshold-color-${index}`}
-				value={draft.color}
-				onChange={(color): void => setDraft((d) => ({ ...d, color }))}
-			/>
-			<ThresholdSelectField
-				label="Display"
-				testId={`comparison-threshold-format-${index}`}
-				placeholder="Select display"
-				value={draft.format}
-				items={FORMAT_OPTIONS}
-				onChange={(format): void =>
-					setDraft((d) => ({
-						...d,
-						format: format as DashboardtypesThresholdFormatDTO,
-					}))
-				}
-			/>
-		</ThresholdRowShell>
-	);
-}
-
-export default ComparisonThresholdRow;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/LabelThresholdRow.tsx

@@ -1,93 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import { Input } from 'antd';
-import type { DashboardtypesThresholdWithLabelDTO } from 'api/generated/services/sigNoz.schemas';
-import { formatPanelValue } from 'pages/DashboardPageV2/DashboardContainer/Panels/utils/formatPanelValue';
-
-import ThresholdColorField from './shared/ThresholdColorField';
-import ThresholdRowShell from './shared/ThresholdRowShell';
-import ThresholdUnitField from './shared/ThresholdUnitField';
-import { useThresholdDraft } from './shared/useThresholdDraft';
-import ThresholdValueField from './shared/ThresholdValueField';
-
-import styles from '../ThresholdsSection.module.scss';
-
-interface LabelThresholdRowProps {
-	index: number;
-	threshold: DashboardtypesThresholdWithLabelDTO;
-	/** Panel formatting unit — scopes the unit picker to its category (V1 parity). */
-	yAxisUnit?: string;
-	isEditing: boolean;
-	onEdit: () => void;
-	onSave: (next: DashboardtypesThresholdWithLabelDTO) => void;
-	onDiscard: () => void;
-	onRemove: () => void;
-}
-
-/** Value + color + label threshold (TimeSeries / Bar): a line drawn on the chart. */
-function LabelThresholdRow({
-	index,
-	threshold,
-	yAxisUnit,
-	isEditing,
-	onEdit,
-	onSave,
-	onDiscard,
-	onRemove,
-}: LabelThresholdRowProps): JSX.Element {
-	const { draft, setDraft, setValue } = useThresholdDraft(threshold, isEditing);
-
-	const summary = (
-		<>
-			<span className={styles.viewValue}>
-				{formatPanelValue(threshold.value, threshold.unit)}
-			</span>
-			{threshold.label && (
-				<span className={styles.viewLabel}>{threshold.label}</span>
-			)}
-		</>
-	);
-
-	return (
-		<ThresholdRowShell
-			index={index}
-			testIdPrefix="threshold"
-			color={threshold.color}
-			isEditing={isEditing}
-			summary={summary}
-			onEdit={onEdit}
-			onSave={(): void => onSave({ ...draft, label: draft.label ?? '' })}
-			onDiscard={onDiscard}
-			onRemove={onRemove}
-		>
-			<ThresholdColorField
-				testId={`threshold-color-${index}`}
-				value={draft.color}
-				onChange={(color): void => setDraft((d) => ({ ...d, color }))}
-			/>
-			<ThresholdValueField
-				testId={`threshold-value-${index}`}
-				value={draft.value}
-				onChange={setValue}
-			/>
-			<ThresholdUnitField
-				testId={`threshold-unit-${index}`}
-				invalidTestId={`threshold-unit-invalid-${index}`}
-				value={draft.unit}
-				scopeUnit={yAxisUnit}
-				scopeLabel="y-axis unit"
-				onChange={(unit): void => setDraft((d) => ({ ...d, unit }))}
-			/>
-			<div className={styles.field}>
-				<Typography.Text className={styles.fieldLabel}>Label</Typography.Text>
-				<Input
-					data-testid={`threshold-label-${index}`}
-					placeholder="Optional"
-					value={draft.label ?? ''}
-					onChange={(e): void => setDraft((d) => ({ ...d, label: e.target.value }))}
-				/>
-			</div>
-		</ThresholdRowShell>
-	);
-}
-
-export default LabelThresholdRow;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/TableThresholdRow.tsx

@@ -1,141 +0,0 @@
-import {
-	type DashboardtypesComparisonOperatorDTO,
-	type DashboardtypesTableThresholdDTO,
-	type DashboardtypesThresholdFormatDTO,
-} from 'api/generated/services/sigNoz.schemas';
-import { formatPanelValue } from 'pages/DashboardPageV2/DashboardContainer/Panels/utils/formatPanelValue';
-
-import type { TableColumnOption } from '../../../../hooks/useTableColumns';
-import {
-	FORMAT_OPTIONS,
-	OPERATOR_OPTIONS,
-	OPERATOR_SYMBOL,
-} from '../thresholdOptions';
-import ThresholdColorField from './shared/ThresholdColorField';
-import ThresholdRowShell from './shared/ThresholdRowShell';
-import ThresholdSelectField from './shared/ThresholdSelectField';
-import ThresholdUnitField from './shared/ThresholdUnitField';
-import { useThresholdDraft } from './shared/useThresholdDraft';
-import ThresholdValueField from './shared/ThresholdValueField';
-
-import styles from '../ThresholdsSection.module.scss';
-
-interface TableThresholdRowProps {
-	index: number;
-	threshold: DashboardtypesTableThresholdDTO;
-	/** Resolved value columns (with their configured units); the rule targets one. */
-	tableColumns: TableColumnOption[];
-	isEditing: boolean;
-	onEdit: () => void;
-	onSave: (next: DashboardtypesTableThresholdDTO) => void;
-	onDiscard: () => void;
-	onRemove: () => void;
-}
-
-/**
- * Per-column comparison threshold (Table): value in a column crosses an operator →
- * recolor that column's cells. Edit form is column, condition (operator), value, unit,
- * color, display format. The unit picker scopes to the selected column's unit (Table
- * panels have no single panel-wide unit — V1 parity).
- */
-function TableThresholdRow({
-	index,
-	threshold,
-	tableColumns,
-	isEditing,
-	onEdit,
-	onSave,
-	onDiscard,
-	onRemove,
-}: TableThresholdRowProps): JSX.Element {
-	const { draft, setDraft, setValue } = useThresholdDraft(threshold, isEditing);
-
-	// Stored columnName is the query key; resolve its label + configured unit.
-	const columnUnit = tableColumns.find((c) => c.key === draft.columnName)?.unit;
-	const columnLabel =
-		tableColumns.find((c) => c.key === threshold.columnName)?.label ??
-		threshold.columnName;
-	const columnItems = tableColumns.map((column) => ({
-		value: column.key,
-		label: column.label,
-	}));
-
-	const symbol = threshold.operator ? OPERATOR_SYMBOL[threshold.operator] : '';
-	const summary = (
-		<>
-			<span className={styles.viewLabel}>{columnLabel}</span>
-			<span className={styles.viewValue}>
-				{symbol} {formatPanelValue(threshold.value, threshold.unit)}
-			</span>
-		</>
-	);
-
-	return (
-		<ThresholdRowShell
-			index={index}
-			testIdPrefix="table-threshold"
-			color={threshold.color}
-			isEditing={isEditing}
-			summary={summary}
-			onEdit={onEdit}
-			onSave={(): void => onSave(draft)}
-			onDiscard={onDiscard}
-			onRemove={onRemove}
-		>
-			<ThresholdSelectField
-				label="Column"
-				testId={`table-threshold-column-${index}`}
-				placeholder="Select column"
-				value={draft.columnName || undefined}
-				items={columnItems}
-				onChange={(columnName): void => setDraft((d) => ({ ...d, columnName }))}
-			/>
-			<ThresholdSelectField
-				label="If value is"
-				testId={`table-threshold-operator-${index}`}
-				placeholder="Select condition"
-				value={draft.operator}
-				items={OPERATOR_OPTIONS}
-				onChange={(operator): void =>
-					setDraft((d) => ({
-						...d,
-						operator: operator as DashboardtypesComparisonOperatorDTO,
-					}))
-				}
-			/>
-			<ThresholdValueField
-				testId={`table-threshold-value-${index}`}
-				value={draft.value}
-				onChange={setValue}
-			/>
-			<ThresholdUnitField
-				testId={`table-threshold-unit-${index}`}
-				invalidTestId={`table-threshold-unit-invalid-${index}`}
-				value={draft.unit}
-				scopeUnit={columnUnit}
-				scopeLabel="column unit"
-				onChange={(unit): void => setDraft((d) => ({ ...d, unit }))}
-			/>
-			<ThresholdColorField
-				testId={`table-threshold-color-${index}`}
-				value={draft.color}
-				onChange={(color): void => setDraft((d) => ({ ...d, color }))}
-			/>
-			<ThresholdSelectField
-				label="Display"
-				testId={`table-threshold-format-${index}`}
-				placeholder="Select display"
-				value={draft.format}
-				items={FORMAT_OPTIONS}
-				onChange={(format): void =>
-					setDraft((d) => ({
-						...d,
-						format: format as DashboardtypesThresholdFormatDTO,
-					}))
-				}
-			/>
-		</ThresholdRowShell>
-	);
-}
-
-export default TableThresholdRow;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdColorField.tsx

@@ -1,27 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-
-import ThresholdColorSelect from '../../ThresholdColorSelect';
-
-import styles from '../../ThresholdsSection.module.scss';
-
-interface ThresholdColorFieldProps {
-	testId: string;
-	value: string;
-	onChange: (hex: string) => void;
-}
-
-/** Labelled color picker, shared by every threshold variant. */
-function ThresholdColorField({
-	testId,
-	value,
-	onChange,
-}: ThresholdColorFieldProps): JSX.Element {
-	return (
-		<div className={styles.field}>
-			<Typography.Text className={styles.fieldLabel}>Color</Typography.Text>
-			<ThresholdColorSelect value={value} testId={testId} onChange={onChange} />
-		</div>
-	);
-}
-
-export default ThresholdColorField;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdRowShell.tsx

@@ -1,103 +0,0 @@
-import type { ReactNode } from 'react';
-import { Check, Pencil, Trash2, X } from '@signozhq/icons';
-import { Button } from '@signozhq/ui/button';
-
-import styles from '../../ThresholdsSection.module.scss';
-
-interface ThresholdRowShellProps {
-	index: number;
-	/** testId prefix per variant: `threshold` | `comparison-threshold` | `table-threshold`. */
-	testIdPrefix: string;
-	/** Swatch color shown in view mode. */
-	color: string;
-	isEditing: boolean;
-	/** Compact view-mode summary, rendered between the color dot and the actions. */
-	summary: ReactNode;
-	/** Edit-mode fields. */
-	children: ReactNode;
-	onEdit: () => void;
-	onSave: () => void;
-	onDiscard: () => void;
-	onRemove: () => void;
-}
-
-/**
- * Shared chrome for a threshold row's V1-style view/edit modes: the view summary with
- * Edit/Delete, and the edit form's Discard/Save actions. Each variant supplies its own
- * `summary` and field `children`; everything else (layout, buttons, testIds) is shared.
- */
-function ThresholdRowShell({
-	index,
-	testIdPrefix,
-	color,
-	isEditing,
-	summary,
-	children,
-	onEdit,
-	onSave,
-	onDiscard,
-	onRemove,
-}: ThresholdRowShellProps): JSX.Element {
-	if (!isEditing) {
-		return (
-			<div className={styles.viewRow}>
-				<span className={styles.dot} style={{ backgroundColor: color }} />
-				{summary}
-				<div className={styles.spacer} />
-				<Button
-					type="button"
-					variant="ghost"
-					color="secondary"
-					size="icon"
-					aria-label={`Edit threshold ${index + 1}`}
-					data-testid={`${testIdPrefix}-edit-${index}`}
-					onClick={onEdit}
-				>
-					<Pencil size={14} />
-				</Button>
-				<Button
-					type="button"
-					variant="ghost"
-					color="destructive"
-					size="icon"
-					aria-label={`Remove threshold ${index + 1}`}
-					data-testid={`${testIdPrefix}-remove-${index}`}
-					onClick={onRemove}
-				>
-					<Trash2 size={14} />
-				</Button>
-			</div>
-		);
-	}
-
-	return (
-		<div className={styles.editRow}>
-			{children}
-
-			<div className={styles.actions}>
-				<Button
-					type="button"
-					variant="outlined"
-					color="secondary"
-					prefix={<X size={14} />}
-					data-testid={`${testIdPrefix}-discard-${index}`}
-					onClick={onDiscard}
-				>
-					Discard
-				</Button>
-				<Button
-					type="button"
-					variant="solid"
-					color="primary"
-					prefix={<Check size={14} />}
-					data-testid={`${testIdPrefix}-save-${index}`}
-					onClick={onSave}
-				>
-					Save
-				</Button>
-			</div>
-		</div>
-	);
-}
-
-export default ThresholdRowShell;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdSelectField.tsx

@@ -1,44 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-
-import ConfigSelect, {
-	type ConfigSelectItem,
-} from '../../../../controls/ConfigSelect/ConfigSelect';
-
-import styles from '../../ThresholdsSection.module.scss';
-
-interface ThresholdSelectFieldProps {
-	label: string;
-	testId: string;
-	placeholder?: string;
-	value: string | undefined;
-	items: ConfigSelectItem[];
-	onChange: (value: string) => void;
-}
-
-/**
- * Labelled single-select, shared by the threshold variants' enum fields
- * (operator / display format / column).
- */
-function ThresholdSelectField({
-	label,
-	testId,
-	placeholder,
-	value,
-	items,
-	onChange,
-}: ThresholdSelectFieldProps): JSX.Element {
-	return (
-		<div className={styles.field}>
-			<Typography.Text className={styles.fieldLabel}>{label}</Typography.Text>
-			<ConfigSelect
-				testId={testId}
-				placeholder={placeholder}
-				value={value}
-				items={items}
-				onChange={onChange}
-			/>
-		</div>
-	);
-}
-
-export default ThresholdSelectField;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdUnitField.tsx

@@ -1,57 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import YAxisUnitSelector from 'components/YAxisUnitSelector';
-import { YAxisSource } from 'components/YAxisUnitSelector/types';
-
-import {
-	isThresholdUnitIncompatible,
-	thresholdUnitCategories,
-} from '../../thresholdUnitCategories';
-
-import styles from '../../ThresholdsSection.module.scss';
-
-interface ThresholdUnitFieldProps {
-	testId: string;
-	invalidTestId: string;
-	value: string | undefined;
-	/** Unit whose category scopes the picker (panel y-axis unit, or the column's unit). */
-	scopeUnit: string | undefined;
-	/** How the scope reads in the mismatch message, e.g. "y-axis unit" / "column unit". */
-	scopeLabel: string;
-	onChange: (unit: string) => void;
-}
-
-/**
- * Labelled unit picker, scoped to `scopeUnit`'s category (V1 parity) and flagging a
- * threshold unit that resolves to a different category. Shared by every variant; only
- * the scope source and its wording differ.
- */
-function ThresholdUnitField({
-	testId,
-	invalidTestId,
-	value,
-	scopeUnit,
-	scopeLabel,
-	onChange,
-}: ThresholdUnitFieldProps): JSX.Element {
-	return (
-		<div className={styles.field}>
-			<Typography.Text className={styles.fieldLabel}>Unit</Typography.Text>
-			<YAxisUnitSelector
-				containerClassName={styles.unitSelector}
-				data-testid={testId}
-				placeholder="Select unit"
-				source={YAxisSource.DASHBOARDS}
-				categoriesOverride={thresholdUnitCategories(scopeUnit)}
-				value={value}
-				onChange={onChange}
-			/>
-			{isThresholdUnitIncompatible(value, scopeUnit) && (
-				<Typography.Text className={styles.invalidUnit} data-testid={invalidTestId}>
-					Threshold unit ({value}) is not valid with the {scopeLabel} ({scopeUnit})
-				</Typography.Text>
-			)}
-		</div>
-	);
-}
-
-export default ThresholdUnitField;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/ThresholdValueField.tsx

@@ -1,33 +0,0 @@
-import { Typography } from '@signozhq/ui/typography';
-import { Input } from 'antd';
-
-import styles from '../../ThresholdsSection.module.scss';
-
-interface ThresholdValueFieldProps {
-	testId: string;
-	value: number;
-	/** Receives the raw input string; the draft hook parses it. */
-	onChange: (raw: string) => void;
-}
-
-/** Labelled numeric "Value" input, shared by every threshold variant. */
-function ThresholdValueField({
-	testId,
-	value,
-	onChange,
-}: ThresholdValueFieldProps): JSX.Element {
-	return (
-		<div className={styles.field}>
-			<Typography.Text className={styles.fieldLabel}>Value</Typography.Text>
-			<Input
-				data-testid={testId}
-				type="number"
-				placeholder="Value"
-				value={value}
-				onChange={(e): void => onChange(e.target.value)}
-			/>
-		</div>
-	);
-}
-
-export default ThresholdValueField;

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/rows/shared/useThresholdDraft.ts

@@ -1,34 +0,0 @@
-import { type Dispatch, type SetStateAction, useEffect, useState } from 'react';
-
-interface ThresholdDraft<T> {
-	draft: T;
-	setDraft: Dispatch<SetStateAction<T>>;
-	/** Parse a raw input string into `value`, ignoring transient non-numeric input. */
-	setValue: (raw: string) => void;
-}
-
-/**
- * Local draft for a threshold row, shared by every variant. Snapshots the saved
- * threshold on each entry into edit mode (so Discard simply drops the draft and the
- * next edit starts clean) and exposes the numeric `value` setter all variants use.
- */
-export function useThresholdDraft<T extends { value: number }>(
-	threshold: T,
-	isEditing: boolean,
-): ThresholdDraft<T> {
-	const [draft, setDraft] = useState<T>(threshold);
-
-	useEffect(() => {
-		if (isEditing) {
-			setDraft(threshold);
-		}
-		// eslint-disable-next-line react-hooks/exhaustive-deps -- snapshot only on edit entry
-	}, [isEditing]);
-
-	const setValue = (raw: string): void => {
-		const next = Number(raw);
-		setDraft((d) => ({ ...d, value: Number.isNaN(next) ? d.value : next }));
-	};
-
-	return { draft, setDraft, setValue };
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/thresholdOptions.ts

@@ -1,47 +0,0 @@
-import {
-	DashboardtypesComparisonOperatorDTO,
-	DashboardtypesThresholdFormatDTO,
-} from 'api/generated/services/sigNoz.schemas';
-
-import type { ConfigSelectItem } from '../../controls/ConfigSelect/ConfigSelect';
-
-// Comparison operators offered in the "If value is" condition picker. Labels pair a
-// word with its math symbol so the dropdown reads clearly while the view row can show
-// the compact symbol (OPERATOR_SYMBOL below).
-export const OPERATOR_OPTIONS: ConfigSelectItem[] = [
-	{ value: DashboardtypesComparisonOperatorDTO.above, label: 'Above (>)' },
-	{
-		value: DashboardtypesComparisonOperatorDTO.above_or_equal,
-		label: 'Above or equal (≥)',
-	},
-	{ value: DashboardtypesComparisonOperatorDTO.below, label: 'Below (<)' },
-	{
-		value: DashboardtypesComparisonOperatorDTO.below_or_equal,
-		label: 'Below or equal (≤)',
-	},
-	{ value: DashboardtypesComparisonOperatorDTO.equal, label: 'Equal (=)' },
-	{
-		value: DashboardtypesComparisonOperatorDTO.not_equal,
-		label: 'Not equal (≠)',
-	},
-];
-
-// Compact symbol shown in the collapsed (view-mode) summary row.
-export const OPERATOR_SYMBOL: Record<
-	DashboardtypesComparisonOperatorDTO,
-	string
-> = {
-	[DashboardtypesComparisonOperatorDTO.above]: '>',
-	[DashboardtypesComparisonOperatorDTO.above_or_equal]: '≥',
-	[DashboardtypesComparisonOperatorDTO.below]: '<',
-	[DashboardtypesComparisonOperatorDTO.below_or_equal]: '≤',
-	[DashboardtypesComparisonOperatorDTO.equal]: '=',
-	[DashboardtypesComparisonOperatorDTO.not_equal]: '≠',
-};
-
-// How the threshold recolors the panel: just the number ("text") or the whole tile
-// ("background").
-export const FORMAT_OPTIONS: ConfigSelectItem[] = [
-	{ value: DashboardtypesThresholdFormatDTO.background, label: 'Background' },
-	{ value: DashboardtypesThresholdFormatDTO.text, label: 'Text' },
-];

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/ThresholdsSection/thresholdUnitCategories.ts

@@ -1,54 +0,0 @@
-import {
-	type YAxisCategory,
-	YAxisSource,
-} from 'components/YAxisUnitSelector/types';
-import {
-	getYAxisCategories,
-	mapMetricUnitToUniversalUnit,
-} from 'components/YAxisUnitSelector/utils';
-
-// The unit category (Time, Data, …) a unit belongs to, or undefined if unrecognized.
-function categoryForUnit(unit: string): YAxisCategory | undefined {
-	const universal = mapMetricUnitToUniversalUnit(unit);
-	return getYAxisCategories(YAxisSource.DASHBOARDS).find((c) =>
-		c.units.some((u) => u.id === universal),
-	);
-}
-
-/**
- * Restricts the threshold unit picker to the panel's y-axis unit family, mirroring V1:
- * a threshold is only meaningfully comparable to the axis when it shares its category
- * (e.g. an `ms` axis → only Time units). Returns the single matching category, or
- * `undefined` (all categories) when the panel has no unit set or it can't be mapped.
- */
-export function thresholdUnitCategories(
-	yAxisUnit: string | undefined,
-): YAxisCategory[] | undefined {
-	if (!yAxisUnit) {
-		return undefined;
-	}
-	const category = categoryForUnit(yAxisUnit);
-	return category ? [category] : undefined;
-}
-
-/**
- * True when a threshold's unit belongs to a different category than the panel's y-axis
- * unit (so the values can't be compared) — drives the V1-style mismatch message. Only
- * flags when both units are set and resolve to distinct categories (e.g. a stale `ms`
- * threshold left over after the axis unit was changed to bytes).
- */
-export function isThresholdUnitIncompatible(
-	thresholdUnit: string | undefined,
-	yAxisUnit: string | undefined,
-): boolean {
-	if (!thresholdUnit || !yAxisUnit) {
-		return false;
-	}
-	const thresholdCategory = categoryForUnit(thresholdUnit);
-	const axisCategory = categoryForUnit(yAxisUnit);
-	return Boolean(
-		thresholdCategory &&
-		axisCategory &&
-		thresholdCategory.name !== axisCategory.name,
-	);
-}

frontend/src/pages/DashboardPageV2/DashboardContainer/PanelEditor/ConfigPane/sections/VisualizationSection/VisualizationSection.module.scss

@@ -1,5 +0,0 @@
-.field {
-	display: flex;
-	flex-direction: column;
-	gap: 8px;
-}