release(v2.0.3): fix Directory tab managed-filter bug and site-status 500 (#186)
- GET /api/directory-admin/resources let every kind:'host' resource through regardless of promotion status, so "Auto-promote to Directory" unchecked on a discovery plugin never kept unpromoted devices out of the Directory tab. - GET /api/directory-admin/site-status queried the nonexistent Resource.subType column instead of metadata.subType, throwing SequelizeDatabaseError. - Added a "Show ignored" toggle to Discovered Inventory (off by default). - Untracked nodejs/config/inventory.sqlite -- the app's default runtime DB, not a fixture, committed by mistake across 13 prior releases. Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Binary file not shown.
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "t42-theta-directory",
|
||||
"version": "2.0.2",
|
||||
"version": "2.0.3",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "t42-theta-directory",
|
||||
"version": "2.0.2",
|
||||
"version": "2.0.3",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@fortawesome/fontawesome-free": "^7.3.0",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "t42-theta-directory",
|
||||
"version": "2.0.2",
|
||||
"version": "2.0.3",
|
||||
"description": "A very simple LDAP management and SSO system",
|
||||
"author": [
|
||||
{
|
||||
|
||||
@@ -199,10 +199,17 @@ router.get('/resources', async (req, res, next) => {
|
||||
try {
|
||||
let resources = await Resource.list();
|
||||
resources = resources.filter(r => {
|
||||
if (r.kind === 'host' || r.kind === 'site') return true;
|
||||
const isAuto = r.metadata?.discovery_sources?.length > 0 && !r.metadata.discovery_sources.includes('manual');
|
||||
// Sites are structural containers, not discovery output -- always shown.
|
||||
if (r.kind === 'site') return true;
|
||||
// A resource discovery ever touched only belongs in the Directory once
|
||||
// it's explicitly managed (created by an agent, promoted by a user, or
|
||||
// merged into an already-managed resource). Until then it's pending
|
||||
// review in the Discovered Inventory tab. Anything discovery never
|
||||
// touched (created directly through this admin UI) has no
|
||||
// discovery_sources and is always shown.
|
||||
const isDiscovered = r.metadata?.discovery_sources?.length > 0;
|
||||
const isManaged = r.metadata?.managed === true;
|
||||
return !isAuto || isManaged;
|
||||
return !isDiscovered || isManaged;
|
||||
});
|
||||
// Even admins never receive secret metadata (e.g. client_secret_hash) over
|
||||
// the wire; projectResources strips it unconditionally.
|
||||
@@ -885,7 +892,8 @@ let localSiteConfig = {
|
||||
router.get('/site-status', async (req, res, next) => {
|
||||
try {
|
||||
const sites = await Resource.list({ where: { kind: 'site' } });
|
||||
const gateResources = await Resource.list({ where: { subType: 'wireguard' } });
|
||||
const allResources = await Resource.list();
|
||||
const gateResources = allResources.filter(r => r.metadata && r.metadata.subType === 'wireguard');
|
||||
|
||||
res.json({
|
||||
status: 'ok',
|
||||
|
||||
@@ -136,6 +136,10 @@
|
||||
<i class="fa-solid fa-network-wired"></i> Network Discovery Dashboard
|
||||
</div>
|
||||
<div class="d-flex flex-wrap gap-2 align-items-center">
|
||||
<div class="form-check form-switch mb-0">
|
||||
<input class="form-check-input" type="checkbox" id="discovery-show-ignored" onchange="renderDiscoveryTable()">
|
||||
<label class="form-check-label small" for="discovery-show-ignored">Show ignored</label>
|
||||
</div>
|
||||
<input type="text" id="discovery-search-filter" class="form-control form-control-sm shadow-sm" placeholder="Search resources..." onkeyup="renderDiscoveryTable()" style="width: 250px;">
|
||||
</div>
|
||||
</div>
|
||||
@@ -2258,11 +2262,14 @@
|
||||
|
||||
function renderDiscoveryTable() {
|
||||
const search = $('#discovery-search-filter').val().toLowerCase();
|
||||
const showIgnored = $('#discovery-show-ignored').is(':checked');
|
||||
const filtered = allDiscoveryResources.filter(r => {
|
||||
if (search && !r.name.toLowerCase().includes(search) && !r.slug.toLowerCase().includes(search)) return false;
|
||||
// Directory contains managed items; Discovered Inventory only shows unmanaged/pending items awaiting promotion
|
||||
const isExplicitManaged = r.metadata && (r.metadata.managed === true || r.metadata.managed === 'true');
|
||||
if (isExplicitManaged || r.kind === 'site' || r.kind === 'service') return false;
|
||||
const isIgnored = r.metadata && (r.metadata.ignored === true || r.metadata.ignored === 'true');
|
||||
if (isIgnored && !showIgnored) return false;
|
||||
return true;
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user