StatsHouse UI: update raw tag and add raw_kind int64

Author: vauweb

statshouse-ui/src/admin/api/saveMetric.ts

@@ -20,7 +20,7 @@ export function saveMetric(metric: IMetric) {
     tags: metric.tags.map((tag) => ({
       name: tag.name,
       description: tag.alias,
-      raw: tag.isRaw || false,
+      raw: tag.raw_kind != null,
       raw_kind: tag.raw_kind,
       value_comments:
         tag.customMapping.length > 0

statshouse-ui/src/admin/models/metric.ts

@@ -4,7 +4,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-import { RawValueKind } from '../../view/api';
+import { RawValueKind } from '@/view/api';
 
 export interface IShortMetric {
   readonly name: string;
@@ -13,6 +13,9 @@ export interface IShortMetric {
 export interface ITag {
   readonly name: string;
   readonly description?: string;
+  /**
+   * @deprecated
+   */
   readonly raw?: boolean;
   readonly raw_kind?: RawValueKind;
   readonly value_comments?: Readonly<Record<string, string>>;

statshouse-ui/src/admin/pages/FormPage.tsx

@@ -63,7 +63,7 @@ export function FormPage(props: { yAxisSize: number; adminMode: boolean }) {
                   to,
                 }))
               : [],
-            isRaw: tag.raw,
+            isRaw: tag.raw || tag.raw_kind != null,
             raw_kind: tag.raw_kind,
           })),
           tags_draft,
@@ -74,6 +74,9 @@ export function FormPage(props: { yAxisSize: number; adminMode: boolean }) {
           version: metric.version,
           group_id: metric.group_id,
           fair_key_tag_ids: metric.fair_key_tag_ids,
+          skip_max_host: !!metric.skip_max_host,
+          skip_min_host: !!metric.skip_min_host,
+          skip_sum_square: !!metric.skip_sum_square,
         });
       });
   }, [metricName]);
@@ -712,7 +715,12 @@ function AliasField(props: {
                     className="form-check-input"
                     type="checkbox"
                     disabled={tagNumber <= 0 || disabled}
-                    onChange={(e) => onChange({ isRaw: e.target.checked })}
+                    onChange={(e) =>
+                      onChange({
+                        isRaw: e.target.checked,
+                        raw_kind: e.target.checked ? (value.raw_kind ?? 'int') : undefined,
+                      })
+                    }
                   />
                   <label className="form-check-label" htmlFor={`roSelect_${tagNumber}`}>
                     Raw
@@ -722,10 +730,10 @@ function AliasField(props: {
               {!!value.isRaw && (
                 <select
                   className="form-control form-select"
-                  value={value.raw_kind ?? ''}
-                  onChange={(e) => onChange({raw_kind: e.target.value as RawValueKind})}
+                  value={value.raw_kind ?? 'int'}
+                  onChange={(e) => onChange({ raw_kind: e.target.value as RawValueKind })}
                 >
-                  <option value="">int</option>
+                  <option value="int">int</option>
                   <option value="uint">uint</option>
                   <option value="hex">hex</option>
                   <option value="hex_bswap">hex_bswap</option>
@@ -736,6 +744,8 @@ function AliasField(props: {
                   <option value="lexenc_float">lexenc_float</option>
                   <option value="int64">int64</option>
                   <option value="uint64">uint64</option>
+                  <option value="hex64">hex64</option>
+                  <option value="hex64_bswap">hex64_bswap</option>
                 </select>
               )}
             </div>

statshouse-ui/src/api/metric.ts

@@ -60,6 +60,9 @@ export type MetricMetaValue = {
 export type MetricMetaTag = {
   name?: string;
   description?: string;
+  /**
+   * @deprecated
+   */
   raw?: boolean;
   raw_kind?: MetricMetaTagRawKind;
   id2value?: Record<number, string>;

statshouse-ui/src/components2/Plot/PlotControl/PlotControlFilterTag.tsx

@@ -162,14 +162,14 @@ export const PlotControlFilterTag = memo(function PlotControlFilterTag({
 
   const customValue = useMemo(
     () =>
-      tagList?.more &&
+      (!tagList?.list?.length || tagList?.more) &&
       ((v: string): SelectOptionProps => {
         const value = getTagValue(meta, tagKey, v);
         const tagMeta = meta?.tags?.[+tagKey];
         const name = formatTagValue(value, tagMeta?.value_comments?.[value], tagMeta?.raw, tagMeta?.raw_kind);
         return { value, name };
       }),
-    [meta, tagKey, tagList?.more]
+    [meta, tagKey, tagList?.list?.length, tagList?.more]
   );
 
   return (

statshouse-ui/src/view/api.ts

@@ -118,8 +118,9 @@ export function formatTagValue(value: string, comment?: string, raw?: boolean, k
   if (value.length < 1 || value[0] !== ' ') {
     return value;
   }
-  if (raw && kind) {
-    return `⚡ ${convert(kind, parseInt(value))}`;
+  raw = raw || kind != null; // fix raw deprecated
+  if (raw || kind != null) {
+    return `⚡ ${convert(kind, value)}`;
   }
   const i = parseInt(value.substring(1));
   if (i === 0 && !raw) {
@@ -522,9 +523,10 @@ export type metricKind = 'counter' | 'value' | 'value_p' | 'unique' | 'mixed' |
  * hex_bswap:       same as hex, but do bswap after interpreting number bits as uint32
  * timestamp:       UNIX timestamp, show as is (in GMT)
  * timestamp_local: UNIX timestamp, show local time for this TS
- * EMPTY:           decimal number, can be negative
+ * '', EMPTY:       default int32 decimal number, can be negative
  */
 export type RawValueKind =
+  | 'int'
   | 'uint'
   | 'hex'
   | 'hex_bswap'
@@ -533,6 +535,10 @@ export type RawValueKind =
   | 'ip'
   | 'ip_bswap'
   | 'lexenc_float'
+  | 'int64'
+  | 'uint64'
+  | 'hex64'
+  | 'hex64_bswap'
   /** @deprecated 'float' raw value kind */
   | 'float';