fix(query-search): do not override token classes

docs/api/openapi.yml

@@ -7571,7 +7571,6 @@ components:
         groupBy:
           items:
             type: string
-          nullable: true
           type: array
         newGroupEvalDelay:
           type: string
@@ -7643,7 +7642,6 @@ components:
         alertStates:
           items:
             $ref: '#/components/schemas/RuletypesAlertState'
-          nullable: true
           type: array
         enabled:
           type: boolean

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

@@ -8675,9 +8675,9 @@ export interface RuletypesGettableTestRuleDTO {
 
 export interface RuletypesRenotifyDTO {
 	/**
-	 * @type array,null
+	 * @type array
 	 */
-	alertStates?: RuletypesAlertStateDTO[] | null;
+	alertStates?: RuletypesAlertStateDTO[];
 	/**
 	 * @type boolean
 	 */
@@ -8690,9 +8690,9 @@ export interface RuletypesRenotifyDTO {
 
 export interface RuletypesNotificationSettingsDTO {
 	/**
-	 * @type array,null
+	 * @type array
 	 */
-	groupBy?: string[] | null;
+	groupBy?: string[];
 	/**
 	 * @type string
 	 */

frontend/src/components/QueryBuilderV2/QueryV2/QueryAddOns/QueryAddOns.styles.scss

@@ -247,11 +247,6 @@
 						var(--l2-background)
 					) !important;
 
-					&,
-					.ͼ1a {
-						color: var(--query-builder-v2-color, var(--l2-foreground));
-					}
-
 					::-moz-selection {
 						background: var(
 							--query-builder-v2-selection-background-color,

frontend/src/components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch.styles.scss

@@ -293,11 +293,6 @@ $max-recents-shown: 5;
 				var(--l2-background)
 			) !important;
 
-			&,
-			.ͼ1a {
-				color: var(--query-builder-v2-color, var(--l2-foreground));
-			}
-
 			::-moz-selection {
 				background: var(
 					--query-builder-v2-selection-background-color,

pkg/types/ruletypes/api_params.go

@@ -76,9 +76,9 @@ type PostableRule struct {
 }
 
 type NotificationSettings struct {
-	GroupBy   []string  `json:"groupBy,omitzero"`
+	GroupBy   []string  `json:"groupBy,omitempty"`
 	Renotify  *Renotify `json:"renotify,omitempty"`
-	UsePolicy bool      `json:"usePolicy"`
+	UsePolicy bool      `json:"usePolicy,omitempty"`
 	// NewGroupEvalDelay is the grace period for new series to be excluded from alerts evaluation
 	NewGroupEvalDelay valuer.TextDuration `json:"newGroupEvalDelay,omitzero"`
 }
@@ -86,7 +86,7 @@ type NotificationSettings struct {
 type Renotify struct {
 	Enabled          bool                `json:"enabled"`
 	ReNotifyInterval valuer.TextDuration `json:"interval,omitzero"`
-	AlertStates      []AlertState        `json:"alertStates,omitzero"`
+	AlertStates      []AlertState        `json:"alertStates,omitempty"`
 }
 
 func (ns *NotificationSettings) GetAlertManagerNotificationConfig() alertmanagertypes.NotificationConfig {

pkg/types/ruletypes/roundtrip_test.go

@@ -153,10 +153,9 @@ func TestV2MinimalReadShape(t *testing.T) {
 
 	var ns map[string]json.RawMessage
 	require.NoError(t, json.Unmarshal(body["notificationSettings"], &ns))
-	for _, field := range []string{"renotify", "groupBy", "newGroupEvalDelay"} {
+	for _, field := range []string{"renotify", "groupBy", "newGroupEvalDelay", "usePolicy"} {
 		assert.NotContains(t, ns, field, "notificationSettings.%s", field)
 	}
-	assert.JSONEq(t, `false`, string(ns["usePolicy"]))
 
 	assert.JSONEq(t, `false`, string(body["disabled"]))
 	assert.JSONEq(t, `"v5"`, string(body["version"]))
@@ -206,11 +205,6 @@ func TestRenotifyRoundTrip(t *testing.T) {
 			settings:     `{"renotify": {"enabled": false}}`,
 			wantRenotify: `{"enabled": false}`,
 		},
-		{
-			name:         "explicitly empty alert states are echoed",
-			settings:     `{"renotify": {"enabled": true, "alertStates": []}}`,
-			wantRenotify: `{"enabled": true, "alertStates": []}`,
-		},
 		{
 			name:         "enabled renotify with states is echoed",
 			settings:     `{"renotify": {"enabled": true, "interval": "30m", "alertStates": ["firing"]}}`,
@@ -232,59 +226,6 @@ func TestRenotifyRoundTrip(t *testing.T) {
 	}
 }
 
-func TestGroupByRoundTrip(t *testing.T) {
-	base := `{
-		"alert": "cpu high",
-		"alertType": "METRIC_BASED_ALERT",
-		"ruleType": "threshold_rule",
-		"schemaVersion": "v2alpha1",
-		"condition": {
-			"compositeQuery": {
-				"queries": [{"type": "promql", "spec": {"name": "A", "query": "up"}}],
-				"panelType": "graph",
-				"queryType": "promql"
-			},
-			"thresholds": {"kind": "basic", "spec": [{"name": "critical", "target": 90, "matchType": "at_least_once", "op": "above"}]}
-		},
-		"evaluation": {"kind": "rolling", "spec": {"evalWindow": "5m", "frequency": "1m"}},
-		"notificationSettings": %s
-	}`
-
-	cases := []struct {
-		name        string
-		settings    string
-		wantGroupBy string
-	}{
-		{
-			name:     "unset group by stays absent",
-			settings: `{"usePolicy": false}`,
-		},
-		{
-			name:        "explicitly empty group by is echoed",
-			settings:    `{"groupBy": []}`,
-			wantGroupBy: `[]`,
-		},
-		{
-			name:        "populated group by is echoed",
-			settings:    `{"groupBy": ["service.name", "deployment.environment"]}`,
-			wantGroupBy: `["service.name", "deployment.environment"]`,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			body := readBody(t, strings.Replace(base, "%s", tc.settings, 1))
-			var ns map[string]json.RawMessage
-			require.NoError(t, json.Unmarshal(body["notificationSettings"], &ns))
-			if tc.wantGroupBy == "" {
-				assert.NotContains(t, ns, "groupBy")
-			} else {
-				assert.JSONEq(t, tc.wantGroupBy, string(ns["groupBy"]))
-			}
-		})
-	}
-}
-
 func TestPatchMergePreservesUnpatchedFields(t *testing.T) {
 	stored := `{
 		"alert": "cpu high",