Skip to content

Commit ecb18f0

Browse files
dgarrosdgarros
authored
Merge pull request #53 from opsmill/dga-20241003-ifc-filters
Remove filters from the schemas in the fixtures directory
2 parents 935aabc + ca3acf2 commit ecb18f0

File tree

5 files changed

+1137
-7943
lines changed

5 files changed

+1137
-7943
lines changed

‎tests/fixtures/schema_01.json‎

Lines changed: 53 additions & 175 deletions
Original file line numberDiff line numberDiff line change
@@ -49,52 +49,13 @@
4949
"inherited": false,
5050
"cardinality": "many",
5151
"branch": "aware",
52-
"optional": true,
53-
"filters": [
54-
{
55-
"name": "id",
56-
"kind": "String",
57-
"description": null
58-
},
59-
{
60-
"name": "name__value",
61-
"kind": "String",
62-
"description": null
63-
},
64-
{
65-
"name": "description__value",
66-
"kind": "String",
67-
"description": null
68-
}
69-
]
52+
"optional": true
7053
}
7154
],
7255
"label": null,
7356
"inherit_from": [],
7457
"branch": "aware",
75-
"default_filter": "name__value",
76-
"filters": [
77-
{
78-
"name": "ids",
79-
"kind": "List",
80-
"description": null
81-
},
82-
{
83-
"name": "query__value",
84-
"kind": "String",
85-
"description": null
86-
},
87-
{
88-
"name": "description__value",
89-
"kind": "String",
90-
"description": null
91-
},
92-
{
93-
"name": "name__value",
94-
"kind": "String",
95-
"description": null
96-
}
97-
]
58+
"default_filter": "name__value"
9859
},
9960
{
10061
"name": "Repository",
@@ -200,24 +161,7 @@
200161
"inherited": false,
201162
"cardinality": "many",
202163
"branch": "aware",
203-
"optional": true,
204-
"filters": [
205-
{
206-
"name": "id",
207-
"kind": "String",
208-
"description": null
209-
},
210-
{
211-
"name": "name__value",
212-
"kind": "String",
213-
"description": null
214-
},
215-
{
216-
"name": "description__value",
217-
"kind": "String",
218-
"description": null
219-
}
220-
]
164+
"optional": true
221165
},
222166
{
223167
"name": "queries",
@@ -228,29 +172,7 @@
228172
"inherited": false,
229173
"cardinality": "many",
230174
"branch": "aware",
231-
"optional": true,
232-
"filters": [
233-
{
234-
"name": "id",
235-
"kind": "String",
236-
"description": null
237-
},
238-
{
239-
"name": "query__value",
240-
"kind": "String",
241-
"description": null
242-
},
243-
{
244-
"name": "description__value",
245-
"kind": "String",
246-
"description": null
247-
},
248-
{
249-
"name": "name__value",
250-
"kind": "String",
251-
"description": null
252-
}
253-
]
175+
"optional": true
254176
}
255177
],
256178
"label": null,
@@ -260,58 +182,8 @@
260182
],
261183
"branch": "aware",
262184
"default_filter": "name__value",
263-
"human_friendly_id": ["name__value"],
264-
"filters": [
265-
{
266-
"name": "ids",
267-
"kind": "List",
268-
"description": null
269-
},
270-
{
271-
"name": "hfid",
272-
"kind": "List",
273-
"description": null
274-
},
275-
{
276-
"name": "username__value",
277-
"kind": "String",
278-
"description": null
279-
},
280-
{
281-
"name": "type__value",
282-
"kind": "String",
283-
"description": null
284-
},
285-
{
286-
"name": "name__value",
287-
"kind": "String",
288-
"description": null
289-
},
290-
{
291-
"name": "description__value",
292-
"kind": "String",
293-
"description": null
294-
},
295-
{
296-
"name": "commit__value",
297-
"kind": "String",
298-
"description": null
299-
},
300-
{
301-
"name": "location__value",
302-
"kind": "String",
303-
"description": null
304-
},
305-
{
306-
"name": "password__value",
307-
"kind": "String",
308-
"description": null
309-
},
310-
{
311-
"name": "default_branch__value",
312-
"kind": "String",
313-
"description": null
314-
}
185+
"human_friendly_id": [
186+
"name__value"
315187
]
316188
},
317189
{
@@ -341,64 +213,70 @@
341213
"branch": "aware",
342214
"optional": true
343215
},
344-
{
345-
"name": "status",
346-
"kind": "Dropdown",
216+
{
217+
"name": "status",
218+
"kind": "Dropdown",
347219
"branch": "aware",
348-
"optional": true,
349-
"choices": [
350-
{
351-
"name": "active",
352-
"label": "Active",
353-
"description": "A status",
354-
"color": "#ffffff"
355-
}
356-
]
357-
},
358-
{
359-
"name": "mode",
360-
"kind": "Text",
220+
"optional": true,
221+
"choices": [
222+
{
223+
"name": "active",
224+
"label": "Active",
225+
"description": "A status",
226+
"color": "#ffffff"
227+
}
228+
]
229+
},
230+
{
231+
"name": "mode",
232+
"kind": "Text",
361233
"branch": "aware",
362-
"optional": true,
363-
"enum": ["easy"]
364-
}
234+
"optional": true,
235+
"enum": [
236+
"easy"
237+
]
238+
}
365239
],
366240
"relationships": [],
367241
"label": null,
368242
"inherit_from": [],
369243
"branch": "aware",
244+
"default_filter": "name__value"
245+
},
246+
{
247+
"name": "Location",
248+
"namespace": "Builtin",
370249
"default_filter": "name__value",
371-
"filters": [
250+
"attributes": [
372251
{
373-
"name": "ids",
374-
"kind": "List",
375-
"description": null
252+
"name": "name",
253+
"kind": "String",
254+
"unique": true
376255
},
377256
{
378-
"name": "name__value",
257+
"name": "description",
379258
"kind": "String",
380-
"description": null
259+
"optional": true
381260
},
382261
{
383-
"name": "description__value",
384-
"kind": "String",
385-
"description": null
262+
"name": "type",
263+
"kind": "String"
386264
}
387-
]
388-
},
389-
{
390-
"name": "Location",
391-
"namespace": "Builtin",
392-
"default_filter": "name__value",
393-
"attributes": [
394-
{"name": "name", "kind": "String", "unique": true},
395-
{"name": "description", "kind": "String", "optional": true},
396-
{"name": "type", "kind": "String"}
397265
],
398266
"relationships": [
399-
{"name": "tags", "peer": "BuiltinTag", "optional": true, "cardinality": "many"},
400-
{"name": "primary_tag", "peer": "BuiltinTag", "optional": true, "cardinality": "one"}
267+
{
268+
"name": "tags",
269+
"peer": "BuiltinTag",
270+
"optional": true,
271+
"cardinality": "many"
272+
},
273+
{
274+
"name": "primary_tag",
275+
"peer": "BuiltinTag",
276+
"optional": true,
277+
"cardinality": "one"
278+
}
401279
]
402280
}
403281
]
404-
}
282+
}

0 commit comments

Comments
 (0)