-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
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
Use custom search for each filter type in dashboard #2343
Use custom search for each filter type in dashboard #2343
Conversation
4278a1b
to
aa6a2c9
Compare
models/repo_list.go
Outdated
@@ -110,11 +110,37 @@ type SearchRepoOptions struct { | |||
// maximum: setting.ExplorePagingNum | |||
// in: query | |||
PageSize int `json:"limit"` // Can be smaller than or equal to setting.ExplorePagingNum | |||
// Type of repository to search | |||
// | |||
// in: query |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you please run make generate-swagger
to regenerate the swagger spec? This might resolve the conflict. If not please resolve the conflicts manually.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I did. Conflicts are new due to new master. I'll rebase and run it again.
models/repo_list.go
Outdated
} | ||
|
||
// RepoType contains possible types of repository |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add swagger:parameter
like here: https://github.com/Morlinest/gitea/blob/aa6a2c996252707a1ada79c52661e1f464bccee9/models/repo_list.go#L92
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK
public/swagger.v1.json
Outdated
@@ -232,6 +232,14 @@ | |||
"description": "Limit of result\n\nmaximum: setting.ExplorePagingNum", | |||
"name": "limit", | |||
"in": "query" | |||
}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do not add swagger stuff manually because it will be overwritten if you run make generate-swagger
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Never touched this file manually. It was generated by make generate-swagger
(exactly mingw32-make generate-swagger
).
2f0a8a2
to
2b16b01
Compare
f1289e2
to
8cf8380
Compare
8cf8380
to
9a7a5a0
Compare
Codecov Report
@@ Coverage Diff @@
## master #2343 +/- ##
=======================================
Coverage 26.84% 26.84%
=======================================
Files 89 89
Lines 17608 17608
=======================================
Hits 4727 4727
Misses 12195 12195
Partials 686 686 Continue to review full report at Codecov.
|
c520dfc
to
62655d8
Compare
d96fd6a
to
dd7b4e5
Compare
PR reopened as all needed features were merged. Rebased on master, ready for testing, review and comments. |
@JonasFranzDEV please review again |
c2d1538
to
86a07f8
Compare
@lafriks FYI he was actually reviewing another PR code (as this PR was not based on master). That code is not part of this PR anymore. |
Changed UI by removing second loader that was causing "flickering" effect if search was fast. Now the repository counter is reset on each filter change. Adding new screenshots (limit set to 5 repositories for this tests). Edit: Screenshots moved to PR description. |
LGTM |
LGTM |
Make LG-TM work |
@JonasFranzDEV I hope you had no requested changes anymore. Just after merging noticed that you have not approved yet |
Based on #2326 (need to be merged first)
Discussion on #2312
Fast network (no restrictions):
Slow network ("Slow 3G" through Chrome network setting):
Edit: Updated screnshots/gifs.