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

revert: Augment the category menu by system tags and already used categories #5498

Merged
merged 1 commit into from
Oct 2, 2023
Merged

revert: Augment the category menu by system tags and already used categories #5498

merged 1 commit into from
Oct 2, 2023

Conversation

miaulalala
Copy link
Contributor

Ref b3af4c3

@miaulalala miaulalala added 2. developing Work in progress bug labels Sep 28, 2023
@miaulalala miaulalala added this to the 4.5.2 milestone Sep 28, 2023
@miaulalala miaulalala self-assigned this Sep 28, 2023
@codecov
Copy link

codecov bot commented Sep 28, 2023 •
edited
Loading

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (babc444) 22.65% compared to head (eae6dea) 22.25%.
Report is 20 commits behind head on main.

Additional details and impacted files 
@@             Coverage Diff              @@
##               main    #5498      +/-   ##
============================================
- Coverage     22.65%   22.25%   -0.40%     
+ Complexity      397      388       -9     
============================================
  Files           241      240       -1     
  Lines         11863    11788      -75     
  Branches       2306     2301       -5     
============================================
- Hits           2687     2624      -63     
+ Misses         9176     9164      -12
Flag Coverage Δ
javascript 13.82% <ø> (+0.01%) ⬆️
php 63.25% <ø> (-1.12%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...nents/Editor/Properties/PropertySelectMultiple.vue 0.00% <ø> (ø)
...Properties/PropertySelectMultipleColoredOption.vue 0.00% <ø> (ø)
src/mixins/EditorMixin.js 3.51% <ø> (+0.04%) ⬆️
src/views/EditSidebar.vue 0.00% <ø> (ø)

... and 2 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ChristophWurst
Copy link
Member

This should also go into main (or even main first, then backport) so we don't have a blocked main branch for the next minor release.

Critical paths to test and offer a migration will be events that now have a custom category set. They should at least render and be editable. Ideally the category should be removable.

@miaulalala miaulalala changed the base branch from stable4.5 to main September 28, 2023 15:07
@miaulalala miaulalala changed the title [stable4.5] revert: Augment the category menu by system tags and already used categories revert: Augment the category menu by system tags and already used categories Sep 28, 2023
@miaulalala
revert: Augment the category menu by system tags and already used cat…
eae6dea 
…egories

Ref b3af4c3

Signed-off-by: Anna Larch <anna@nextcloud.com>
@miaulalala
Copy link
Contributor Author

Codecov upload is failing

@miaulalala
Copy link
Contributor Author

Tested the categories - I can manually add a separate category 'testing' and remove it again.

@ChristophWurst
Copy link
Member

Cc @rotdrop

This reverts #5161 to remedy #5476

ChristophWurst
ChristophWurst reviewed Sep 28, 2023
View reviewed changes
Copy link
Member

@ChristophWurst ChristophWurst left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change looks good

@rotdrop
Copy link
Contributor

rotdrop commented Sep 28, 2023

Cc @rotdrop

This reverts #5161 to remedy #5476

Sad story, but I understand that this is a problem. I'll have a look at the SQL things. Perhaps it would be possible to have some lazy autocompletion setup on-demand instead of just loading everything from the DB at page load.

@ChristophWurst
Copy link
Member

The change can be brought back once the performance issues are gone.

@tcitworld
Copy link
Member

Sad story, but I understand that this is a problem. I'll have a look at the SQL things. Perhaps it would be possible to have some lazy autocompletion setup on-demand instead of just loading everything from the DB at page load.

Yes, that is a good lead. Add with that some cache and it might be acceptable.

@miaulalala miaulalala marked this pull request as ready for review October 2, 2023 13:10
@miaulalala miaulalala mentioned this pull request Oct 2, 2023
Open
@miaulalala miaulalala linked an issue Oct 2, 2023 that may be closed by this pull request
With v4.5.0 web ui loads infinitely #5476
Closed
@miaulalala miaulalala merged commit 7d25157 into main Oct 2, 2023
41 of 42 checks passed
@miaulalala miaulalala deleted the fix/revert-b3af4c3 branch October 2, 2023 14:46
@miaulalala
Copy link
Contributor Author

/backport to stable4.5

@backportbot-nextcloud backportbot-nextcloud bot added the backport-request A backport was requested for this pull request label Oct 2, 2023
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Oct 2, 2023
Merged
@backportbot-nextcloud backportbot-nextcloud bot removed the backport-request A backport was requested for this pull request label Oct 2, 2023
@miaulalala miaulalala modified the milestones: 4.5.2, v4.6.0 Oct 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChristophWurst ChristophWurst ChristophWurst left review comments

@kesselb kesselb kesselb approved these changes

@st3iny st3iny Awaiting requested review from st3iny st3iny is a code owner

@tcitworld tcitworld Awaiting requested review from tcitworld tcitworld is a code owner

Assignees

@miaulalala miaulalala

Labels
2. developing Work in progress bug
Projects
💌 📅 👥 Groupware team
Archived in project
Milestone
v4.6.0
Development

Successfully merging this pull request may close these issues.

With v4.5.0 web ui loads infinitely
5 participants
@miaulalala @ChristophWurst @rotdrop @tcitworld @kesselb