@@ -83,6 +83,7 @@ type MetricOptsItem = LabelItem & {
83
83
is_agg ?: boolean
84
84
whereOnly ?: boolean
85
85
fromSelect ?: BasicDataWithId
86
+ not_supported_operators ?: string
86
87
}
87
88
88
89
export type MetricOpts = MetricOptsItem [ ]
@@ -249,7 +250,8 @@ export class QueryEditor extends PureComponent<Props> {
249
250
! tag . whereOnly &&
250
251
! SELECT_GROUP_BY_DISABLE_TAGS . find ( ( val : string ) => {
251
252
return ( tag . value as string ) . includes ( val )
252
- } )
253
+ } ) &&
254
+ ! tag . not_supported_operators ?. includes ( 'select' )
253
255
)
254
256
} )
255
257
}
@@ -1090,15 +1092,16 @@ export class QueryEditor extends PureComponent<Props> {
1090
1092
} )
1091
1093
. concat ( deprecatedTags )
1092
1094
. map ( ( item : any ) => {
1093
- const { name, client_name, server_name, display_name, type, deprecated } = item
1095
+ const { name, client_name, server_name, display_name, type, deprecated, not_supported_operators } = item
1094
1096
const operatorOpts = formatTagOperators ( item )
1095
1097
const displaySuffix = deprecated ? ' ⚠️' : ''
1096
1098
if ( name === client_name && name === server_name ) {
1097
1099
return {
1098
1100
label : ( display_name === name ? `${ name } ` : `${ name } (${ display_name } )` ) + displaySuffix ,
1099
1101
value : name ,
1100
1102
type,
1101
- operatorOpts
1103
+ operatorOpts,
1104
+ not_supported_operators
1102
1105
}
1103
1106
}
1104
1107
return [
@@ -1109,7 +1112,8 @@ export class QueryEditor extends PureComponent<Props> {
1109
1112
value : name ,
1110
1113
type,
1111
1114
whereOnly : true ,
1112
- operatorOpts
1115
+ operatorOpts,
1116
+ not_supported_operators
1113
1117
}
1114
1118
]
1115
1119
: [ ] ) ,
@@ -1120,7 +1124,8 @@ export class QueryEditor extends PureComponent<Props> {
1120
1124
value : client_name ,
1121
1125
type,
1122
1126
sideType : 'from' ,
1123
- operatorOpts
1127
+ operatorOpts,
1128
+ not_supported_operators
1124
1129
}
1125
1130
]
1126
1131
: [ ] ) ,
@@ -1131,7 +1136,8 @@ export class QueryEditor extends PureComponent<Props> {
1131
1136
value : server_name ,
1132
1137
type,
1133
1138
sideType : 'to' ,
1134
- operatorOpts
1139
+ operatorOpts,
1140
+ not_supported_operators
1135
1141
}
1136
1142
]
1137
1143
: [ ] )
@@ -1333,7 +1339,9 @@ export class QueryEditor extends PureComponent<Props> {
1333
1339
? tagOpts
1334
1340
. filter ( tag => {
1335
1341
return (
1336
- ! GROUP_BY_DISABLE_TAG_TYPES . includes ( tag . type as string ) && ! tag . whereOnly
1342
+ ! GROUP_BY_DISABLE_TAG_TYPES . includes ( tag . type as string ) &&
1343
+ ! tag . whereOnly &&
1344
+ ! tag . not_supported_operators ?. includes ( 'group' )
1337
1345
)
1338
1346
} )
1339
1347
. filter ( ( tag : MetricOptsItem ) => {
0 commit comments