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.

Sign up for GitHub

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

Jump to bottom

Hide archived labels when filtering by labels on the issue list #27115

Merged
merged 44 commits into from
Oct 1, 2023
Merged

Hide archived labels when filtering by labels on the issue list #27115

merged 44 commits into from
Oct 1, 2023
+237 −162

Conversation

puni9869
Copy link
Member

@puni9869 puni9869 commented Sep 18, 2023 •
edited
Loading

Followup #26820

Archived labels UI for issue filter and issue filter actions for issues/pull request pages.

Changed:

  • Enhanced the Issue filter and Issue filter actions UI page to seamlessly incorporate a list of archived labels.
  • Pagination functionality is same as before. If archived label checkbox is checked then we are adding a query stringarchived=true in the url to save the state of page.
  • Issue filter actions menu is separated into different template.
  • Adding the archived flag in issue url labels.
  • Pull Request page is also work the same.

Outsourced:

  • Defer the implementation of specialized handling for archived labels to upcoming pull requests. This step will be undertaken subsequent to the successful merge of this pull request.

Screenshots

Issue page

image

Issue page with label filter on archived label checkbox when not checked --> No archived label is there in list

image

Issue page with label filter on archived label checkbox when checked --> Show archived label in the list.

image

Issue page with label filter on issue action menu on archived label checkbox when checked --> Show archived label in the list.

image

Applied the archived=true in Issue labels when archived checkbox is checked.

image

Part of #25237

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Sep 18, 2023
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Sep 18, 2023
@silverwind
Copy link
Member

PR is empty.

@delvh delvh marked this pull request as draft September 19, 2023 09:11
@delvh delvh changed the title Hide the archive label on issue filter page label filter. WIP: Hide archived labels when filtering by labels on the issue list Sep 19, 2023
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 23, 2023
@puni9869 puni9869 marked this pull request as ready for review September 23, 2023 11:55
@github-actions github-actions bot added the topic/ui Change the appearance of the Gitea UI label Sep 23, 2023
puni9869 and others added 2 commits September 24, 2023 03:37
@puni9869
Merge branch 'main' into punit/issue-filter-label-restructure
2b7e751
@puni9869
Adding filter functionality for archived label
9dce826 
When archived label checkbox is checked then we show archived label; when checked is uncheked we will hide the archived labels

Signed-off-by: puni9869 <punitinani1@hotmail.com>
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 24, 2023
@puni9869
* Splitting issue filter actions into different template
eba3cce 
* Adding archived param into querystring of pagination.
* Adding locals for issue filter actions labels for archived labels hinting.

Signed-off-by: puni9869 <punitinani1@hotmail.com>
@pull-request-size pull-request-size bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 24, 2023
@puni9869
Reverting the unnecessary code change
f6a1c09 
Signed-off-by: puni9869 <punitinani1@hotmail.com>
@puni9869 puni9869 changed the title WIP: Hide archived labels when filtering by labels on the issue list Hide archived labels when filtering by labels on the issue list Sep 24, 2023
@puni9869
Copy link
Member Author

PR is empty.

Ready for review

@puni9869
* Adding the archived flag in issue url labels
a2754ab 
Signed-off-by: puni9869 <punitinani1@hotmail.com>
@puni9869
* Adding archivedLabel true in all the filters
6e568f7 
Signed-off-by: puni9869 <punitinani1@hotmail.com>
@delvh delvh modified the milestones: 1.22.0, 1.21.0 Oct 1, 2023
@delvh delvh added the backport/v1.21 This PR should be backported to Gitea 1.21 label Oct 1, 2023
@delvh
Copy link
Member

delvh commented Oct 1, 2023 •
edited
Loading

This PR should be backported as the functionality is simply missing in 1.21 otherwise although the rest of the feature exists there.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Oct 1, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 1, 2023
@puni9869
Copy link
Member Author

puni9869 commented Oct 1, 2023

Backport 1.21

@techknowlogick techknowlogick merged commit 5007055 into go-gitea:main Oct 1, 2023
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 1, 2023
@puni9869 puni9869 deleted the punit/issue-filter-label-restructure branch October 1, 2023 13:06
@delvh delvh modified the milestones: 1.21.0, 1.22.0 Oct 1, 2023
@GiteaBot GiteaBot mentioned this pull request Oct 1, 2023
Merged
GiteaBot added a commit to GiteaBot/gitea that referenced this pull request Oct 1, 2023
@puni9869 @delvh @GiteaBot
Hide archived labels when filtering by labels on the issue list (go-g…
cc2abee 
…itea#27115)

Followup  go-gitea#26820
## Archived labels UI for issue filter and issue filter actions for
issues/pull request pages.

Changed:
* Enhanced the Issue filter and Issue filter actions UI page to
seamlessly incorporate a list of archived labels.
* Pagination functionality is same as before. If archived label checkbox
is checked then we are adding a query string`archived=true` in the url
to save the state of page.
* Issue filter actions menu is separated into different template.
* Adding the archived flag in issue url labels.
* Pull Request page is also work the same.

Outsourced:
* Defer the implementation of specialized handling for archived labels
to upcoming pull requests. This step will be undertaken subsequent to
the successful merge of this pull request.

Screenshots
### Issue page
<img width="1360" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/d7efb2ef-5b2b-449d-83f0-d430a32ec432">

### Issue page with label filter on archived label checkbox when not
checked --> No archived label is there in list
<img width="1249" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/ceea68ef-91f2-4693-910f-2e25e236bfc9">

### Issue page with label filter on archived label checkbox when checked
--> Show archived label in the list.
<img width="710" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/2414d26b-2079-4c3c-bd9e-f2f5411bcabf">

### Issue page with label filter on issue action menu on archived label
checkbox when checked --> Show archived label in the list.
<img width="409" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/259cac87-3e21-4778-99a2-a6a0b8c81178">


### Applied the archived=true in Issue labels when archived checkbox is
checked.
<img width="984" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/657ce3db-c0ae-402e-b12d-3b580d3c2ed0">

---




Part of go-gitea#25237

---------

Signed-off-by: puni9869 <punitinani1@hotmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: Giteabot <teabot@gitea.io>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Oct 1, 2023
techknowlogick pushed a commit that referenced this pull request Oct 2, 2023
@GiteaBot @puni9869 @delvh
Hide archived labels when filtering by labels on the issue list (#27115…
28d970e 
…) (#27381)

Backport #27115 by @puni9869

Followup  #26820
## Archived labels UI for issue filter and issue filter actions for
issues/pull request pages.

Changed:
* Enhanced the Issue filter and Issue filter actions UI page to
seamlessly incorporate a list of archived labels.
* Pagination functionality is same as before. If archived label checkbox
is checked then we are adding a query string`archived=true` in the url
to save the state of page.
* Issue filter actions menu is separated into different template.
* Adding the archived flag in issue url labels.
* Pull Request page is also work the same.

Outsourced:
* Defer the implementation of specialized handling for archived labels
to upcoming pull requests. This step will be undertaken subsequent to
the successful merge of this pull request.

Screenshots
### Issue page
<img width="1360" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/d7efb2ef-5b2b-449d-83f0-d430a32ec432">

### Issue page with label filter on archived label checkbox when not
checked --> No archived label is there in list
<img width="1249" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/ceea68ef-91f2-4693-910f-2e25e236bfc9">

### Issue page with label filter on archived label checkbox when checked
--> Show archived label in the list.
<img width="710" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/2414d26b-2079-4c3c-bd9e-f2f5411bcabf">

### Issue page with label filter on issue action menu on archived label
checkbox when checked --> Show archived label in the list.
<img width="409" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/259cac87-3e21-4778-99a2-a6a0b8c81178">


### Applied the archived=true in Issue labels when archived checkbox is
checked.
<img width="984" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/657ce3db-c0ae-402e-b12d-3b580d3c2ed0">

---




Part of #25237

Signed-off-by: puni9869 <punitinani1@hotmail.com>
Co-authored-by: puni9869 <80308335+puni9869@users.noreply.github.com>
Co-authored-by: delvh <dev.lh@web.de>
@puni9869 puni9869 mentioned this pull request Oct 5, 2023
Merged
@yp05327 yp05327 mentioned this pull request Oct 5, 2023
Merged
delvh pushed a commit that referenced this pull request Oct 17, 2023
@puni9869 @silverwind
Hide archived labels by default from the suggestions when assigning l…
4adc2a8 
…abels for an issue (#27451)

Followup of #27115
Finally closes #25237

## Screenshots
### Issue Sidebar
<img width="513" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/9f7fda2f-5a03-4684-8619-fd3498a95b41">

### PR sidebar
<img width="367" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/53db9b64-faec-4a67-91d6-76945596a469">

### PR sidebar with archived labels shown
<img width="352" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/9dc5050f-4e69-4f76-bb83-582480a2281e">

---------

Signed-off-by: puni9869 <punitinani1@hotmail.com>
Co-authored-by: silverwind <me@silverwind.io>
@GiteaBot GiteaBot mentioned this pull request Oct 17, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 17, 2023
@puni9869 @silverwind @GiteaBot
Hide archived labels by default from the suggestions when assigning l…
c1e3094 
…abels for an issue (go-gitea#27451)

Followup of go-gitea#27115
Finally closes go-gitea#25237

## Screenshots
### Issue Sidebar
<img width="513" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/9f7fda2f-5a03-4684-8619-fd3498a95b41">

### PR sidebar
<img width="367" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/53db9b64-faec-4a67-91d6-76945596a469">

### PR sidebar with archived labels shown
<img width="352" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/9dc5050f-4e69-4f76-bb83-582480a2281e">

---------

Signed-off-by: puni9869 <punitinani1@hotmail.com>
Co-authored-by: silverwind <me@silverwind.io>
6543 pushed a commit that referenced this pull request Oct 17, 2023
@GiteaBot @puni9869 @silverwind
Hide archived labels by default from the suggestions when assigning l…
bf76216 
…abels for an issue (#27451) (#27661)

Backport #27451 by @puni9869

Followup of #27115
Finally closes #25237

## Screenshots
### Issue Sidebar
<img width="513" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/9f7fda2f-5a03-4684-8619-fd3498a95b41">

### PR sidebar
<img width="367" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/53db9b64-faec-4a67-91d6-76945596a469">

### PR sidebar with archived labels shown
<img width="352" alt="image"
src="https://github.com/go-gitea/gitea/assets/80308335/9dc5050f-4e69-4f76-bb83-582480a2281e">

Signed-off-by: puni9869 <punitinani1@hotmail.com>
Co-authored-by: puni9869 <80308335+puni9869@users.noreply.github.com>
Co-authored-by: silverwind <me@silverwind.io>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Dec 30, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@denyskon denyskon denyskon approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.
7 participants
@puni9869 @silverwind @delvh @lunny @denyskon @techknowlogick @GiteaBot