Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add simple filters for collections #5575

Merged
merged 89 commits into from
Feb 3, 2023
Merged
Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
bbaa891
Add missing pagination in some endpoints
zhiltsov-max Jan 9, 2023
9542c8d
Update SDK
zhiltsov-max Jan 9, 2023
c498fa5
Update tests
zhiltsov-max Jan 9, 2023
fbcc345
Update changelog
zhiltsov-max Jan 9, 2023
26473e8
Fix formatting
zhiltsov-max Jan 9, 2023
c20991a
Fix changelog
zhiltsov-max Jan 9, 2023
fb2516c
t
zhiltsov-max Jan 10, 2023
d3c4ca7
Merge branch 'zm/add-missing-pagination' into zm/redirect-duplicated-…
zhiltsov-max Jan 10, 2023
3dcf328
Merge branch 'develop' into zm/improve-some-endpoints
nmanovic Jan 10, 2023
3e507bf
Added fetchAll aggregator
bsekachev Jan 11, 2023
c65ac32
Add simple redirects
zhiltsov-max Jan 10, 2023
895aa16
Merge branch 'develop' into zm/improve-some-endpoints
zhiltsov-max Jan 11, 2023
3ca2026
Update test assets
zhiltsov-max Jan 11, 2023
e73cbf6
Merge remote-tracking branch 'origin/zm/improve-some-endpoints' into …
zhiltsov-max Jan 11, 2023
ca7c732
Update UI tests
zhiltsov-max Jan 11, 2023
97bfb9f
t
zhiltsov-max Jan 11, 2023
6d314f6
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 11, 2023
4f6f365
Merge branch 'zm/improve-some-endpoints' into zm/redirect-duplicated-…
zhiltsov-max Jan 11, 2023
af23b06
Implement simple filters support
zhiltsov-max Jan 11, 2023
6689ca2
Simplify implementation
zhiltsov-max Jan 11, 2023
44944e7
Update filtering fields in views
zhiltsov-max Jan 12, 2023
3f0f5d1
Remove extra fields from schema
zhiltsov-max Jan 12, 2023
afba94c
Fix prefetch use
zhiltsov-max Jan 13, 2023
ecbb364
Change string filter to inclusion
zhiltsov-max Jan 13, 2023
7ebab92
Update search fields and add tests
zhiltsov-max Jan 17, 2023
c322136
Refactor some code
zhiltsov-max Jan 17, 2023
92e6a69
Update webhook filters
zhiltsov-max Jan 17, 2023
0815eca
Polish some code
zhiltsov-max Jan 17, 2023
23eabd3
Fix schema errors
zhiltsov-max Jan 17, 2023
fbc52cc
Remove extra parameters from endpoints
zhiltsov-max Jan 17, 2023
0e235b4
Fix redirects and restore extra parameters
zhiltsov-max Jan 18, 2023
49e4b61
Restore permission check behavior
zhiltsov-max Jan 18, 2023
f645f40
Update issue tests
zhiltsov-max Jan 18, 2023
b19e581
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 18, 2023
b58f121
Fix linter problems
zhiltsov-max Jan 18, 2023
0bec884
Update license headers
zhiltsov-max Jan 18, 2023
ecf8dcb
Fix linter warning
zhiltsov-max Jan 18, 2023
ee31c85
Update changelog
zhiltsov-max Jan 18, 2023
f72024d
Fix issue tests
zhiltsov-max Jan 19, 2023
2a24b80
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 19, 2023
073037d
Refactor some code
zhiltsov-max Jan 19, 2023
7fd4e56
Fix merge
zhiltsov-max Jan 19, 2023
f12884e
Fix linter
zhiltsov-max Jan 19, 2023
056e8cc
Implement filters using JsonFilter
zhiltsov-max Jan 20, 2023
403b547
Remove extra import
zhiltsov-max Jan 20, 2023
a2792f2
Fix check
zhiltsov-max Jan 20, 2023
9009179
Fix type description
zhiltsov-max Jan 20, 2023
6b343cf
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 20, 2023
4b79078
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 23, 2023
b014016
Merge remote-tracking branch 'origin/zm/redirect-duplicated-endpoints…
zhiltsov-max Jan 23, 2023
e3aa275
Fix api tests
zhiltsov-max Jan 23, 2023
71f5b20
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 23, 2023
b59e6ea
Revert switching to json filter
zhiltsov-max Jan 23, 2023
03325cb
Fix tests
zhiltsov-max Jan 23, 2023
43795a0
Fix license headers
zhiltsov-max Jan 26, 2023
101a8de
Implement extra fields in serializers, update test data
zhiltsov-max Jan 26, 2023
2484bf9
Refactored previews & projects
bsekachev Jan 27, 2023
31686a7
Fetching jobs workarounded
bsekachev Jan 27, 2023
bf7e420
Fixed code
bsekachev Jan 27, 2023
db797c4
Fixed issue comments
bsekachev Jan 27, 2023
1b806e0
update some tests
zhiltsov-max Jan 27, 2023
94516c3
Fixed comments
bsekachev Jan 27, 2023
ab7e92c
Merge branch 'zm/redirect-duplicated-endpoints' of github.com:opencv/…
bsekachev Jan 27, 2023
9eb136f
Fixed page size
bsekachev Jan 27, 2023
81508b0
Reworked fetching issue comments
bsekachev Jan 27, 2023
f69d708
Simplified sorting
bsekachev Jan 27, 2023
afdf454
Fix tests
zhiltsov-max Jan 30, 2023
fd2311d
Merge remote-tracking branch 'origin/zm/redirect-duplicated-endpoints…
zhiltsov-max Jan 30, 2023
3ba32f3
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 30, 2023
cfcfec5
Fix merge
zhiltsov-max Jan 30, 2023
b489edc
Fix linter issues
zhiltsov-max Jan 30, 2023
2539dc4
Fix test
zhiltsov-max Jan 30, 2023
f7c1cdc
Fix pytorch adapter
zhiltsov-max Jan 30, 2023
c7c6cf7
Update changelog
zhiltsov-max Jan 30, 2023
9efe98d
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Jan 30, 2023
e49b578
Fix test
zhiltsov-max Jan 31, 2023
65d0c0d
Merge remote-tracking branch 'origin/zm/redirect-duplicated-endpoints…
zhiltsov-max Jan 31, 2023
327fc9f
Fix ui problem with jobs
zhiltsov-max Jan 31, 2023
a379b2b
Fix some tests
zhiltsov-max Feb 1, 2023
dfea00d
Fixed jest tests
klakhov Feb 1, 2023
8448c98
fixed getJobs method
klakhov Feb 1, 2023
cfae321
Fixed remaining tests
klakhov Feb 1, 2023
27c5e16
progress count by segments, removed jobs fetching
klakhov Feb 1, 2023
7920f29
added waiting for task load
klakhov Feb 1, 2023
c5d0032
Add new fields to the server schema
zhiltsov-max Feb 1, 2023
48a8810
Merge branch 'develop' into zm/redirect-duplicated-endpoints
zhiltsov-max Feb 1, 2023
24d469a
Merge branch 'develop' into zm/redirect-duplicated-endpoints
nmanovic Feb 1, 2023
00961b4
Merge branch 'develop' into zm/redirect-duplicated-endpoints
nmanovic Feb 2, 2023
7ad2c5e
added additinal checks for opening task job
klakhov Feb 3, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove extra fields from schema
  • Loading branch information
zhiltsov-max committed Jan 12, 2023
commit 3f0f5d16de7206383649bc2171cb3f9e18b26355
2 changes: 0 additions & 2 deletions cvat/apps/engine/filters.py
Original file line number Diff line number Diff line change
@@ -310,7 +310,6 @@ def get_schema_fields(self, view):
coreapi.Field(
name=field_name,
location='query',
required=False,
schema={
'type': 'string',
}
@@ -324,7 +323,6 @@ def get_schema_operation_parameters(self, view):
for field_name in filter_fields:
parameters.append({
'name': field_name,
'required': False,
'in': 'query',
'description': force_str(self.filter_desc.format_map({'field_name': field_name})),
'schema': {