metric-backend: unify "attribute kind" wording across the UI and backend

The resource/scope/data_point concept was named three different ways:
the group-by widget called it a "level", the attribute-filter widget an
"attribute kind", and the wire schema a "kind". The inconsistency made
the code harder to follow and invited mismatches between the widgets.

Standardize on the wire schema's name, "attribute kind", throughout,
with a single frontend source of truth for its ordering and labels.
The wire format is unchanged, so no stored data needs migrating.

Change-Id: I733ac20a09f878a1948f3b208d09ca4b6bfc03b7

Author: whme

packages/cmk-frontend-vue/src/graph-designer/FormMetricBackendCustomQuery.vue

@@ -198,10 +198,11 @@ const groupByInputType = computed<GroupByInputType>(() =>
   groupByInputTypeOf(consolidationFunction.value)
 )
 
-// The group-by pills pick from the same attribute keys as the where clause, and a group
-// level is an attribute kind, so the resolved kind is the pill's level.
-const { querySuggestions: groupByQuerySuggestions, resolveKind: groupByResolveLevel } =
-  useAttributeKeySuggestions(() => buildAutocompleteContext([], { metricName: metricName.value }))
+// The group-by pills pick from the same attribute keys as the where clause.
+const {
+  querySuggestions: groupByQuerySuggestions,
+  resolveAttributeKind: groupByResolveAttributeKind
+} = useAttributeKeySuggestions(() => buildAutocompleteContext([], { metricName: metricName.value }))
 </script>
 
 <template>
@@ -250,7 +251,7 @@ const { querySuggestions: groupByQuerySuggestions, resolveKind: groupByResolveLe
             v-model="groupBy"
             :input-type="groupByInputType"
             :query-suggestions="groupByQuerySuggestions"
-            :resolve-level="groupByResolveLevel"
+            :resolve-attribute-kind="groupByResolveAttributeKind"
           />
         </td>
       </tr>

packages/cmk-frontend-vue/src/graphing/designer/components/forms/MetricBackendForm.vue

@@ -277,10 +277,11 @@ function storedGroupBy(): GroupByModel {
 
 watch(groupBy, () => storeCurrentWith({}))
 
-// The group-by pills pick from the same attribute keys as the where clause, and a group
-// level is an attribute kind, so the resolved kind is the pill's level.
-const { querySuggestions: groupByQuerySuggestions, resolveKind: groupByResolveLevel } =
-  useAttributeKeySuggestions(() => buildAutocompleteContext([], { metricName: metricName.value }))
+// The group-by pills pick from the same attribute keys as the where clause.
+const {
+  querySuggestions: groupByQuerySuggestions,
+  resolveAttributeKind: groupByResolveAttributeKind
+} = useAttributeKeySuggestions(() => buildAutocompleteContext([], { metricName: metricName.value }))
 </script>
 
 <template>
@@ -328,7 +329,7 @@ const { querySuggestions: groupByQuerySuggestions, resolveKind: groupByResolveLe
             v-model="groupBy"
             :input-type="groupByInputType"
             :query-suggestions="groupByQuerySuggestions"
-            :resolve-level="groupByResolveLevel"
+            :resolve-attribute-kind="groupByResolveAttributeKind"
           />
         </td>
       </tr>

packages/cmk-frontend-vue/src/metric-backend/FormMetricBackendAttributes.vue

@@ -69,7 +69,7 @@ const validationMessages = ref<string[]>([])
 
 const {
   querySuggestions,
-  resolveKind: resolveAttributeKind,
+  resolveAttributeKind,
   cachedSuggestions,
   suggestionRevision,
   clearCache: clearSuggestionCache

packages/cmk-frontend-vue/src/metric-backend/attribute-filter/AttributeFilterPill.vue

@@ -12,7 +12,8 @@ import { computed, nextTick, ref, useTemplateRef, watch } from 'vue'
 
 import DropdownClearButton from '../DropdownClearButton.vue'
 import InlineEditPill from '../InlineEditPill.vue'
-import { ATTRIBUTE_KIND_LABELS, attributeKindPrefix, operatorPhrase, pillLabel } from './pill-label'
+import { ATTRIBUTE_KIND_ORDER, attributeKindLabel } from '../attribute-kind'
+import { attributeKindPrefix, operatorPhrase, pillLabel } from './pill-label'
 import {
   EXISTENCE_OPERATORS,
   STRING_OPERATORS,
@@ -53,7 +54,7 @@ const emit = defineEmits<{
   (e: 'edit'): void
   (e: 'done'): void
   (e: 'update:key', value: string): void
-  (e: 'update:attributeKind', value: AttributeKind): void
+  (e: 'update:attributeKind', value: AttributeKind | null): void
   (e: 'update:operator', value: Operator): void
   (e: 'update:value', value: string): void
 }>()
@@ -159,7 +160,7 @@ const attributeKindInput = computed<string | null>({
   get: () => props.condition.attributeKind,
   set: (value) => {
     const valid =
-      value !== null && Object.hasOwn(ATTRIBUTE_KIND_LABELS, value)
+      value !== null && (ATTRIBUTE_KIND_ORDER as string[]).includes(value)
         ? (value as AttributeKind)
         : null
     emit('update:attributeKind', valid)
@@ -215,11 +216,10 @@ watch(
 
 const attributeKindOptions = computed(() => ({
   type: 'fixed' as const,
-  suggestions: [
-    { name: 'resource', title: _t('Resource') },
-    { name: 'scope', title: _t('Scope') },
-    { name: 'data_point', title: _t('Data point') }
-  ]
+  suggestions: ATTRIBUTE_KIND_ORDER.map((attributeKind) => ({
+    name: attributeKind,
+    title: attributeKindLabel(attributeKind)
+  }))
 }))
 
 function operatorSuggestion(name: Operator) {

packages/cmk-frontend-vue/src/metric-backend/attribute-filter/FormAttributeFilter.vue

@@ -32,7 +32,7 @@ const props = withDefaults(
     querySuggestions: (condition: Condition, query: string) => ReturnType<QuerySuggestionsFn>
     queryValueSuggestions: (condition: Condition, query: string) => ReturnType<QuerySuggestionsFn>
     suggestionRevision?: number
-    resolveAttributeKind?: ((key: string) => AttributeKind) | undefined
+    resolveAttributeKind?: ((key: string) => AttributeKind | null) | undefined
     operators?: Operator[] | undefined
     allowOr?: boolean
     ariaLabel?: string | undefined
@@ -108,7 +108,7 @@ function updateKey(target: Condition, value: string): void {
   )
 }
 
-function updateAttributeKind(target: Condition, value: AttributeKind): void {
+function updateAttributeKind(target: Condition, value: AttributeKind | null): void {
   mapConditions((c) => (c.id === target.id ? { ...c, attributeKind: value } : c))
 }
 

packages/cmk-frontend-vue/src/metric-backend/attribute-filter/pill-label.ts

@@ -6,24 +6,10 @@
 import usei18n from 'cmk-ui-library/lib/i18n'
 import type { TranslatedString } from 'cmk-ui-library/lib/i18nString'
 
+import { attributeKindLabel } from '../attribute-kind'
 import { operatorTakesValue } from './types'
 import type { AttributeCondition, AttributeKind, Operator } from './types'
 
-export const ATTRIBUTE_KIND_LABELS: Record<Exclude<AttributeKind, null>, string> = {
-  resource: 'Resource',
-  scope: 'Scope',
-  data_point: 'Data point'
-}
-
-function attributeKindPrefixes(): Record<Exclude<AttributeKind, null>, TranslatedString> {
-  const { _t } = usei18n()
-  return {
-    resource: _t('[Resource]'),
-    scope: _t('[Scope]'),
-    data_point: _t('[Data point]')
-  }
-}
-
 function operatorPhrases(): Record<Operator, TranslatedString> {
   const { _t } = usei18n()
   return {
@@ -42,8 +28,8 @@ function operatorPhrases(): Record<Operator, TranslatedString> {
   }
 }
 
-export function attributeKindPrefix(attributeKind: AttributeKind): string {
-  return attributeKind === null ? '' : `${attributeKindPrefixes()[attributeKind]} `
+export function attributeKindPrefix(attributeKind: AttributeKind | null): string {
+  return attributeKind === null ? '' : `[${attributeKindLabel(attributeKind)}] `
 }
 
 export function operatorPhrase(operator: Operator): TranslatedString {

packages/cmk-frontend-vue/src/metric-backend/attribute-filter/types.ts

@@ -3,8 +3,9 @@
  * This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
  * conditions defined in the file COPYING, which is part of this source code package.
  */
+import type { AttributeKind } from '../attribute-kind'
 
-export type AttributeKind = 'resource' | 'scope' | 'data_point' | null
+export type { AttributeKind }
 
 export const STRING_OPERATORS = [
   'eq',
@@ -41,7 +42,7 @@ export function isOperator(value: string): value is Operator {
 }
 
 export interface AttributeCondition {
-  attributeKind: AttributeKind
+  attributeKind: AttributeKind | null
   key: string | null
   operator: Operator
   value: string

packages/cmk-frontend-vue/src/metric-backend/attribute-kind.ts

@@ -0,0 +1,25 @@
+/**
+ * Copyright (C) 2026 Checkmk GmbH - License: Checkmk Enterprise License
+ * This file is part of Checkmk (https://checkmk.com). It is subject to the terms and
+ * conditions defined in the file COPYING, which is part of this source code package.
+ */
+import type { AttributeKind } from 'cmk-shared-typing/typescript/attribute_filter'
+import usei18n from 'cmk-ui-library/lib/i18n'
+import type { TranslatedString } from 'cmk-ui-library/lib/i18nString'
+
+// Wire type, re-exported so the whole metric-backend UI shares one name for it.
+export type { AttributeKind }
+
+// Dropdown and suggestion-section order, shared by both metric-backend widgets.
+export const ATTRIBUTE_KIND_ORDER: AttributeKind[] = ['resource', 'scope', 'data_point']
+
+// Built at call time, not module load, because i18n is not yet set up then.
+export function attributeKindLabel(attributeKind: AttributeKind): TranslatedString {
+  const { _t } = usei18n()
+  const labels: Record<AttributeKind, TranslatedString> = {
+    resource: _t('Resource'),
+    scope: _t('Scope'),
+    data_point: _t('Data point')
+  }
+  return labels[attributeKind]
+}

packages/cmk-frontend-vue/src/metric-backend/attributeFilterAdapter.ts

@@ -24,11 +24,6 @@ import {
 // Flat key/value attribute list, as the autocomplete REST context and readonly rendering use it.
 type GraphLineQueryAttributes = Array<{ key: string; value: string }>
 
-// Pill kinds match the shared model's kinds verbatim, so a condition's kind crosses unchanged.
-export type AttributeKindKey = Exclude<AttributeKind, null>
-
-export const ATTRIBUTE_KIND_ORDER: AttributeKindKey[] = ['resource', 'scope', 'data_point']
-
 type PositiveLeaf =
   | SharedAttributeFilterEquals
   | SharedAttributeFilterContains
@@ -151,13 +146,13 @@ export function fromAttributeFilter(
     .filter((group) => group.conditions.length > 0)
 }
 
-export const KEY_IDENTS: Record<AttributeKindKey, string> = {
+export const KEY_IDENTS: Record<AttributeKind, string> = {
   resource: 'monitored_resource_attributes_keys_backend',
   scope: 'monitored_scope_attributes_keys_backend',
   data_point: 'monitored_data_point_attributes_keys_backend'
 }
 
-export const VALUE_IDENTS: Record<AttributeKindKey, string> = {
+export const VALUE_IDENTS: Record<AttributeKind, string> = {
   resource: 'monitored_resource_attributes_values_backend',
   scope: 'monitored_scope_attributes_values_backend',
   data_point: 'monitored_data_point_attributes_values_backend'

packages/cmk-frontend-vue/src/metric-backend/attributeKeySuggestions.ts

@@ -12,12 +12,12 @@ import {
   flattenSuggestions
 } from 'cmk-ui-library/components/CmkSuggestions'
 import { fetchSuggestions } from 'cmk-ui-library/components/FormAutocompleter/autocompleter'
-import usei18n, { untranslated } from 'cmk-ui-library/lib/i18n'
-import type { TranslatedString } from 'cmk-ui-library/lib/i18nString'
+import { untranslated } from 'cmk-ui-library/lib/i18n'
 import { type Ref, ref } from 'vue'
 
-import { ATTRIBUTE_KIND_ORDER, KEY_IDENTS } from './attributeFilterAdapter'
-import type { AttributeKindKey, AutoCompleteContext } from './attributeFilterAdapter'
+import { ATTRIBUTE_KIND_ORDER, type AttributeKind, attributeKindLabel } from './attribute-kind'
+import { KEY_IDENTS } from './attributeFilterAdapter'
+import type { AutoCompleteContext } from './attributeFilterAdapter'
 
 /**
  * Attribute-key autocomplete across the three attribute kinds, sectioned by kind.
@@ -30,16 +30,14 @@ export function useAttributeKeySuggestions(
   buildContext: (excludeId?: string) => AutoCompleteContext
 ): {
   querySuggestions: (query: string, excludeId?: string) => Promise<Response>
-  resolveKind: (key: string) => AttributeKindKey | null
+  resolveAttributeKind: (key: string) => AttributeKind | null
   cachedSuggestions: (
     autocompleter: Autocompleter,
     query: string
   ) => Response | ErrorResponse | undefined
   suggestionRevision: Ref<number>
   clearCache: () => void
 } {
-  const { _t } = usei18n()
-
   const suggestionCache = new Map<string, Response | ErrorResponse>()
   const inflightSuggestions = new Set<string>()
   const suggestionRevision = ref(0)
@@ -68,17 +66,11 @@ export function useAttributeKeySuggestions(
     suggestionCache.clear()
   }
 
-  const sectionTitles: Record<AttributeKindKey, TranslatedString> = {
-    resource: _t('Resource'),
-    scope: _t('Scope'),
-    data_point: _t('Data point')
-  }
-
   // A key may be offered under more than one attribute kind, so record the set of
-  // kinds each suggested key belongs to (see `resolveKind`).
-  const keyKindCache = new Map<string, Set<AttributeKindKey>>()
+  // kinds each suggested key belongs to (see `resolveAttributeKind`).
+  const keyKindCache = new Map<string, Set<AttributeKind>>()
 
-  function cacheKeyKind(name: string, attributeKind: AttributeKindKey): void {
+  function cacheKeyKind(name: string, attributeKind: AttributeKind): void {
     const kinds = keyKindCache.get(name)
     if (kinds) {
       kinds.add(attributeKind)
@@ -111,7 +103,7 @@ export function useAttributeKeySuggestions(
         }
       }
       if (suggestions.length > 0) {
-        sections.push({ title: sectionTitles[attributeKind], suggestions })
+        sections.push({ title: attributeKindLabel(attributeKind), suggestions })
       }
     })
     const userEntry: Section[] = query
@@ -120,12 +112,18 @@ export function useAttributeKeySuggestions(
     return new Response([...userEntry, ...sections])
   }
 
-  function resolveKind(key: string): AttributeKindKey | null {
+  function resolveAttributeKind(key: string): AttributeKind | null {
     // A key offered under more than one attribute kind is ambiguous: leave it
     // unresolved so the attribute-kind dropdown opens for the user to choose.
     const kinds = keyKindCache.get(key)
     return kinds?.size === 1 ? [...kinds][0]! : null
   }
 
-  return { querySuggestions, resolveKind, cachedSuggestions, suggestionRevision, clearCache }
+  return {
+    querySuggestions,
+    resolveAttributeKind,
+    cachedSuggestions,
+    suggestionRevision,
+    clearCache
+  }
 }