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

Extend edit series block #1058

Merged

Conversation

geichelberger
Copy link
Contributor

Adds new series block configurable default values.

  • Extend video list order with the A-Z and Z-A options.
  • Add video list view options (List, Gallery, Slider)

grafik

@LukasKalbertodt
Copy link
Member

Thanks for the PR! I don't have time to look at it in detail yet, but this feature seems reasonable! And you can ignore the failing "admin UI check" for now, that's likely a temporary failure and not caused by your PR. Will come back to this PR soon (TM).

@github-actions github-actions bot added the status:conflicts This PR has conflicts that need to be resolved label Jan 11, 2024
Copy link

This pull request has conflicts ☹
Please resolve those so we can review the pull request.
Thanks.

@LukasKalbertodt
Copy link
Member

FYI: we will merge another PR that will cause some conflict with this one soon, so probably not worth it starting to resolve conflicts now. We did that because we wanted to include a bunch of stuff in a small release very soon, while yours would be in the release afterwards. If you want, we can resolve the conflicts for you, just let me know.

@github-actions github-actions bot removed the status:conflicts This PR has conflicts that need to be resolved label Jan 11, 2024
@geichelberger
Copy link
Contributor Author

I changed the CSS of the edit series form because the 400px max width wasn't enough to display all options. This is maybe a controversial change (9ab900b)

@owi92 owi92 mentioned this pull request Jan 12, 2024

This comment was marked as resolved.

@github-actions github-actions bot added the status:conflicts This PR has conflicts that need to be resolved label Jan 15, 2024
@LukasKalbertodt
Copy link
Member

Sorry, your PR is next, I promise 🙈

Copy link
Member

@LukasKalbertodt LukasKalbertodt left a comment

Choose a reason for hiding this comment

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

Looks really good! I only have very few small comments. After those are fixed and conflicts are resolved, this can be merged.

The offer still stands that I can rebase/fix conflicts for you. Then I can also fix my comments. Just let me know.

EDIT: and for the record, the failing "admin ui" GH action is no problem. Changing NewSeries would potentially break the admin UI, but you are only changing NewSeriesBlock. Due to an incorrect startsWith in our test script, it fails. So yeah: nothing to worry about. Lets just ignore it.

backend/src/db/migrations/29-extend-series-block.sql Outdated Show resolved Hide resolved
backend/src/db/migrations/29-extend-series-block.sql Outdated Show resolved Hide resolved
frontend/src/ui/Blocks/Series.tsx Outdated Show resolved Hide resolved
util/containers/docker-compose.yml Outdated Show resolved Hide resolved
Copy link
Member

@LukasKalbertodt LukasKalbertodt left a comment

Choose a reason for hiding this comment

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

I completely forgot to actually test it. It's clearly time to stop working for today.
I found one additional thing, but other than that it works nicely!

@github-actions github-actions bot removed the status:conflicts This PR has conflicts that need to be resolved label Jan 15, 2024
Adds new series block configurable default values.

- Extend video list order with the `A-Z` and `Z-A` options.
- Add video list view options (List, Gallery, Slider)

Signed-off-by: Gregor Eichelberger <gregor.eichelberger@tuwien.ac.at>
Signed-off-by: Gregor Eichelberger <gregor.eichelberger@tuwien.ac.at>
Fixing the migration script for existing databases by splitting the
`alter table` statement into two parts. The first statement adds the new
`videolist_view` column and sets the default value for existing rows. The
second statement removes the column default and updates the constraints.

Signed-off-by: Gregor Eichelberger <gregor.eichelberger@tuwien.ac.at>
Copy link
Member

@LukasKalbertodt LukasKalbertodt left a comment

Choose a reason for hiding this comment

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

Thanks again!

@LukasKalbertodt LukasKalbertodt merged commit 689f78b into elan-ev:master Jan 16, 2024
2 of 3 checks passed
@LukasKalbertodt LukasKalbertodt added the changelog:user User facing changes label Feb 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
changelog:user User facing changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants