-
Notifications
You must be signed in to change notification settings - Fork 19
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
Slugify Collectives and Pages #1424
base: main
Are you sure you want to change the base?
Conversation
1cc11f7
to
e179382
Compare
Hey @Koc, thanks for looking into this. Definitely a good idea to slugify collectives and page titles for cleaner URLs. Without looking into all the details, I wonder if we could implement this in a way that doesn't need the sluggified string to be persisted in the database. Why not make calculate the slug of titles/names on demand in the backend and add them as attribute to the collectives and pages in the API responses? Then the frontend could always check for name/title match first and for slug match second. What do you think about this approach? |
@mejo- we have a lot of pages in collectives, so I would like to reduce amount of runtime operations to speedup backend endpoints. |
24eca7a
to
6eb5ed6
Compare
I've achieved some progress. Now it more or less works, we have even redirects if slugs have been renamed. You can observe how it works in the video that attached to PR description |
Hello there, We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process. Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6 Thank you for contributing to Nextcloud and we hope to hear from you soon! (If you believe you should not receive this message, you can add yourself to the blocklist.) |
4941808
to
f8372d7
Compare
@mejo- there is one more reason to persist |
4f66821
to
122a2b3
Compare
For some reason migrations stop work for me (even previous). Both autoloading and dependency injection resolving not works. Any idea how to fix that?
|
c9fd222
to
7d50cb3
Compare
8cff15d
to
cc30509
Compare
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.
Thanks for the PR, @Koc, much appreciated! Sorry for taking so long with a proper review.
I have a few comments and ran into a few problems testing it, but I also have s general topic that I would like to discuss within our team:
With the PR, Collectives URLs will always include collectiveId and pageId, e.g. /apps/collectives/MyCollective/MyPage?fileId=123
will become /apps/collectives/MyCollective-1/MyPage-123
in the future. I see the advantages and I don't have strong objections, but it's a user experience change and makes the URLs less readable for collectives and pages that only had short ascii names anyway. I think this is out-weighted by the fact that URLs become way cleaner by longer and non-ascii names. The IDs are required to prevent duplicates - and they also allow cleaner URL parsing in the frontend.
@juliusknorr @max-nextcloud @jancborchardt @nimishavijay what do you think about this?
while ($rowCollective = $resultCollectives->fetch()) { | ||
$circle = $this->circleHelper->getCircle($rowCollective['circle_unique_id'], null, true); | ||
/** @var PageInfo[] $pageInfos */ | ||
$pageInfos = $this->service->findAll($rowCollective['id'], $circle->getOwner()->getUserId()); |
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.
Unfortunately this won't work for trashed pages and neither for trashed collectives. I guess it's cleaner to write a dedicated function that unconditionally gets the filenames for all pages from oc_collectives_pages
for a specific collective and iterates over it.
Please make sure you have trashed collectives and active collectives with trashed pages when testing it 😉
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 will double check with trashed collectives/pages but IMHO this is fine™. Code should work properly even if slugs are not generated.
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.
Well, with a collective in the collectives trash, the commented line throws a NotFoundException
for me. This can be mitigated by adjusting the query to fetch collectives to only take into account non-trashed collectives:
--- a/lib/Migration/Version021500Date20240820000001.php
+++ b/lib/Migration/Version021500Date20240820000001.php
@@ -57,7 +57,9 @@ class Version021500Date20240820000001 extends SimpleMigrationStep {
}
$queryCollectives = $this->connection->getQueryBuilder();
- $queryCollectives->select(['id', 'circle_unique_id'])->from('collectives');
+ $queryCollectives->select(['id', 'circle_unique_id'])
+ ->from('collectives')
+ ->where('trash_timestamp IS NULL');
$resultCollectives = $queryCollectives->executeQuery();
$queryPages = $this->connection->getQueryBuilder();
But still the commented line breaks in my tests with NotFoundException
as the collective folder cannot be accessed - at least when I run the migration by calling occ upgrade
on the commandline. I would have to further look into it, but I guess it's because the occ command doesn't run as a specific user, so the collective mountpoints are not accessible.
Could you check if the migration works smoothly if you have different users with collectives and pages and if you trigger the migration via running occ upgrade
?
You can easily test the migrations again after the following SQL statements:
ALTER TABLE oc_collectives DROP COLUMN `slug`;
ALTER TABLE oc_collectives_pages DROP COLUMN `slug`;
DELETE FROM oc_migrations WHERE app='collectives' AND version='021500Date20240820000000';
DELETE FROM oc_migrations WHERE app='collectives' AND version='021500Date20240820000001';
Since the migration versions changed now, you might have to adjust this.
Afterwards just change the app version number in appinfo/info.xml
(doesn't matter if you bump or lower it). This will make Nextcloud run the upgrade steps which will run all migrations that are not registered as already executed.
If I do this with pages in the trash, the commented line will throw a NotFoundException
. This can be mitigated by the following code:
try {
$pageInfos = $this->service->findAll($rowCollective['id'], $circle->getOwner()->getUserId());
} catch (NotFoundException
lib/Service/PageService.php
Outdated
return null; | ||
} | ||
|
||
return $this->slugGeneratorService->generatePageSlug($title); |
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 guess that you wanted to pass the $fileId
here and add it to the sluggified title in generatePageSlug
?
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.
This still seems broken to me. The backend code doesn't add the page fileId to the slug, but the frontend code expects it to be there.
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.
no, it's not needed. We're matching pageId
and pageSlug
separately on FE. This needed because slug can change and we should redirect user to a new slug based on pageId
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.
cc30509
to
f8d46e3
Compare
691dcf1
to
10f73c4
Compare
Signed-off-by: Kostiantyn Miakshyn <[email protected]>
10f73c4
to
011cac1
Compare
📝 Summary
This is a very beginning of my PR to slugify urls for Collectives and Pages. For now urls are too long and hard to understand if using cyrylic in this entities.
Here an example of some of them:
http://localhost/index.php/apps/collectives/%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%81%D1%8C%D0%BA%D1%96%20%D1%84%D1%83%D1%82%D0%B1%D0%BE%D0%BB%D1%96%D1%81%D1%82%D0%B8/%D0%AF%D1%80%D0%BC%D0%BE%D0%BB%D0%B5%D0%BD%D0%BA%D0%BE%20%D0%90%D0%BD%D0%B4%D1%80%D1%96%D0%B9%20%D0%9C%D0%B8%D0%BA%D0%BE%D0%BB%D0%B0%D0%B9%D0%BE%D0%B2%D0%B8%D1%87?fileId=187
. Just compare it with slugified version:http://localhost/index-php/apps/collectives/ukrayinski-futbolisti-1/page-1-yurchenko-andriy-mykolayovich
. Easy to read, 3 times shorter.🖼️ Video
Screencast.from.2024-09-01.17-18-46.webm
🚧 TODO
🏁 Checklist
npm run lint
/npm run stylelint
/composer run cs:check
)