From 244c5e37c6fd35d8f78d9d2a5df831120b73df21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Dugovi=C4=8D?= Date: Wed, 12 Aug 2026 14:29:03 +0200 Subject: [PATCH] HMS-11196: remove default filters for /systems Could not find a reason why they were added; perhaps it was some historic reason or just because it seemed logical at that time. The reason for removal is that in multiple places in FE, there is explicit filter for stale=in:true,false to counteract this. Moreover, I could not identify a single consumer that benefits from this default filter being set. --- manager/controllers/systems.go | 9 +-------- manager/controllers/systems_test.go | 19 ++----------------- 2 files changed, 3 insertions(+), 25 deletions(-) diff --git a/manager/controllers/systems.go b/manager/controllers/systems.go index 7eadcbbe8..7bcc30ca0 100644 --- a/manager/controllers/systems.go +++ b/manager/controllers/systems.go @@ -20,14 +20,7 @@ import ( var SystemsFields = database.MustGetQueryAttrs(&SystemDBLookupExtended{}) var SystemsSelect = database.MustGetSelect(&SystemDBLookup{}) var SystemOpts = ListOpts{ - Fields: SystemsFields, - // By default, we show only fresh systems. If all systems are required, you must pass in:true,false filter into the api - DefaultFilters: map[string]FilterData{ - "stale": { - Operator: "eq", - Values: []string{"false"}, - }, - }, + Fields: SystemsFields, DefaultSort: "-last_upload", StableSort: "si.id", SearchFields: []string{"si.display_name"}, diff --git a/manager/controllers/systems_test.go b/manager/controllers/systems_test.go index ab263216e..444d158d0 100644 --- a/manager/controllers/systems_test.go +++ b/manager/controllers/systems_test.go @@ -43,8 +43,8 @@ func TestSystemsDefault(t *testing.T) { assert.True(t, output.Data[0].Attributes.Bootc) // links - assert.Equal(t, "/?offset=0&limit=20&filter[stale]=eq:false&sort=-last_upload", output.Links.First) - assert.Equal(t, "/?offset=0&limit=20&filter[stale]=eq:false&sort=-last_upload", output.Links.Last) + assert.Equal(t, "/?offset=0&limit=20&sort=-last_upload", output.Links.First) + assert.Equal(t, "/?offset=0&limit=20&sort=-last_upload", output.Links.Last) assert.Nil(t, output.Links.Next) assert.Nil(t, output.Links.Previous) @@ -350,7 +350,6 @@ func TestSystemsTagsInMetadata(t *testing.T) { testMap := map[string]FilterData{ "ns1/k1": {Operator: "eq", Values: []string{"val1"}}, "ns1/k3": {Operator: "eq", Values: []string{"val4"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -359,7 +358,6 @@ func TestSAPSystemMeta1(t *testing.T) { output := testSystems(t, "?filter[system_profile][sap_sids]=ABC", 1) testMap := map[string]FilterData{ "system_profile][sap_sids": {Operator: "eq", Values: []string{"ABC"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -368,7 +366,6 @@ func TestSAPSystemMeta2(t *testing.T) { output := testSystems(t, "?filter[system_profile][sap_sids]=ABC", 1) testMap := map[string]FilterData{ "system_profile][sap_sids": {Operator: "eq", Values: []string{"ABC"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -378,7 +375,6 @@ func TestSAPSystemMeta3(t *testing.T) { testMap := map[string]FilterData{ "system_profile][sap_system": {Operator: "eq", Values: []string{"true"}}, "system_profile][sap_sids": {Operator: "eq", Values: []string{"ABC"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -387,7 +383,6 @@ func TestSAPSystemMeta4(t *testing.T) { output := testSystems(t, "?filter[system_profile][sap_sids]=ABC&filter[system_profile][sap_sids]=GHI", 1) testMap := map[string]FilterData{ "system_profile][sap_sids": {Operator: "eq", Values: []string{"GHI", "ABC"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -396,7 +391,6 @@ func TestAAPSystemMeta(t *testing.T) { output := testSystems(t, `?filter[system_profile][ansible][controller_version]=1.0`, 1) testMap := map[string]FilterData{ "system_profile][ansible][controller_version": {Operator: "eq", Values: []string{"1.0"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -405,7 +399,6 @@ func TestAAPSystemMeta2(t *testing.T) { output := testSystems(t, `?filter[system_profile][ansible]=not_nil`, 1) testMap := map[string]FilterData{ "system_profile][ansible": {Operator: "eq", Values: []string{"not_nil"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -420,7 +413,6 @@ func TestMSSQLSystemMeta(t *testing.T) { output := testSystems(t, `?filter[system_profile][mssql][version]=15.3.0`, 1) testMap := map[string]FilterData{ "system_profile][mssql][version": {Operator: "eq", Values: []string{"15.3.0"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -429,7 +421,6 @@ func TestMSSQLSystemMeta2(t *testing.T) { output := testSystems(t, `?filter[system_profile][mssql]=not_nil`, 1) testMap := map[string]FilterData{ "system_profile][mssql": {Operator: "eq", Values: []string{"not_nil"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, testMap, output.Meta.Filter) } @@ -444,7 +435,6 @@ func TestCrowdstrikeFilter(t *testing.T) { output := testSystems(t, `?filter[system_profile][crowdstrike]=true`, 1) testMap := map[string]FilterData{ "system_profile][crowdstrike": {Operator: "eq", Values: []string{"true"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, 1, output.Meta.TotalItems) assert.Equal(t, uuid.MustParse("00000000-0000-0000-0000-000000000017"), output.Data[0].ID) @@ -455,7 +445,6 @@ func TestIbmDb2Filter(t *testing.T) { output := testSystems(t, `?filter[system_profile][ibm_db2]=true`, 3) testMap := map[string]FilterData{ "system_profile][ibm_db2": {Operator: "eq", Values: []string{"true"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, 1, output.Meta.TotalItems) assert.Equal(t, uuid.MustParse("00000000-0000-0000-0000-000000000016"), output.Data[0].ID) @@ -466,7 +455,6 @@ func TestIntersystemsFilter(t *testing.T) { output := testSystems(t, `?filter[system_profile][intersystems]=true`, 3) testMap := map[string]FilterData{ "system_profile][intersystems": {Operator: "eq", Values: []string{"true"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, 1, output.Meta.TotalItems) assert.Equal(t, uuid.MustParse("00000000-0000-0000-0000-000000000016"), output.Data[0].ID) @@ -477,7 +465,6 @@ func TestOracleDbFilter(t *testing.T) { output := testSystems(t, `?filter[system_profile][oracle_db]=true`, 3) testMap := map[string]FilterData{ "system_profile][oracle_db": {Operator: "eq", Values: []string{"true"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, 1, output.Meta.TotalItems) assert.Equal(t, uuid.MustParse("00000000-0000-0000-0000-000000000016"), output.Data[0].ID) @@ -488,7 +475,6 @@ func TestRhelAiFilter(t *testing.T) { output := testSystems(t, `?filter[system_profile][rhel_ai]=true`, 1) testMap := map[string]FilterData{ "system_profile][rhel_ai": {Operator: "eq", Values: []string{"true"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, 1, output.Meta.TotalItems) assert.Equal(t, uuid.MustParse("00000000-0000-0000-0000-000000000017"), output.Data[0].ID) @@ -499,7 +485,6 @@ func TestSatelliteFilter(t *testing.T) { output := testSystems(t, `?filter[system_profile][satellite]=true`, 3) testMap := map[string]FilterData{ "system_profile][satellite": {Operator: "eq", Values: []string{"true"}}, - "stale": {Operator: "eq", Values: []string{"false"}}, } assert.Equal(t, 1, output.Meta.TotalItems) assert.Equal(t, uuid.MustParse("00000000-0000-0000-0000-000000000016"), output.Data[0].ID)