From 25661a26dac8c792cc1bc39c1e04c0f3943c6c77 Mon Sep 17 00:00:00 2001 From: Sandwich <299465+dskvr@users.noreply.github.com> Date: Sun, 29 Dec 2024 20:21:58 -0800 Subject: [PATCH] fix formatters for table options --- .../lib/components/lists/table/TableOptions.svelte | 8 ++++---- apps/gui/src/lib/config/dataTable/relays.ts | 11 +++++++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/apps/gui/src/lib/components/lists/table/TableOptions.svelte b/apps/gui/src/lib/components/lists/table/TableOptions.svelte index f31138de..44ad393d 100644 --- a/apps/gui/src/lib/components/lists/table/TableOptions.svelte +++ b/apps/gui/src/lib/components/lists/table/TableOptions.svelte @@ -2,6 +2,8 @@ import { Nip66Event } from "@nostrwatch/nip66/models"; import Checkbox from "../../ui/checkbox/checkbox.svelte"; import { StateManager } from "@nostrwatch/nip66"; + import type { Writable } from "svelte/store"; + import { capitalize } from "@nostrwatch/utils"; export let tableKey: string; export let config: Writable; @@ -47,17 +49,15 @@ } -{JSON.stringify(config.humanReadableNames)} - {#each availableKeys as key}
  • toggleColumnShow(key)} value={key} class="mr-2" /> - {config?.humanReadableNames?.[key] || key} + {$config?.humanReadableNames?.[key] || capitalize(key)}
  • {/each} diff --git a/apps/gui/src/lib/config/dataTable/relays.ts b/apps/gui/src/lib/config/dataTable/relays.ts index a6259084..0ec63edf 100644 --- a/apps/gui/src/lib/config/dataTable/relays.ts +++ b/apps/gui/src/lib/config/dataTable/relays.ts @@ -15,7 +15,6 @@ let $monitorsMap: Map; monitorsMap.subscribe(value => $monitorsMap = value) - type Resolver = (input: any) => any class SpeedGroupResolver { @@ -56,13 +55,21 @@ export const normalizeKeys = (keys: DataKeys | string) => { return keys.map(k => k.toLowerCase()) } -export const columnsDisable: DataKeys = ['created_at', 'monitor_pubkey'] +export const columnsDisable: DataKeys = ['id', 'created_at', 'monitorPubkey', 'fees'] export const filtersDisable: DataKeys = ['as', 'asname'] export const columnsShow: DataKeys = ['relay', 'lastSeen', 'geocode', 'paymentRequired', 'authRequired'] export const filtersShow: DataKeys = ['networks', 'hasNip11', 'paymentRequired', 'authRequired', 'isp', 'software', 'supportedNips', 'geocode', 'operatorPubkeyValid'] export const humanReadableNames: NameFormatter = { + dd: 'Decimal Degrees', + geohash: 'Geohash', + ipv4: 'IPv4', + ipv6: 'IPv6', + as: 'AS', + asname: 'AS Name', + seenBy: 'Seen By', + seenTimes: 'Seen', networks: 'Network', lastSeen: 'Last Seen', supportedNips: 'NIPs',