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

Update VCollectionHeader.vue #3365

Merged
merged 1 commit into from
Nov 18, 2023
Merged

Update VCollectionHeader.vue #3365

merged 1 commit into from
Nov 18, 2023

Conversation

obulat
Copy link
Contributor

@obulat obulat commented Nov 16, 2023

Fixes

Updated implementation of #2729 by @obulat

Description

This PR is extracted from #3140 to make them easier to review.

When adding Nuxt page for the tag/source/creator collections in #3140, I first tried to add a single dynamic page for all of them to prevent code duplication.

I used a dynamic catch-all path _mediaType/_collection/_.vue, and thought that _mediaType would catch the image or audio path parameter, _collection would catch the first part of the path (tag or source), and _.vue would be the catch-all that collects the rest of the path parameters: tag/tagName, source/sourceName, source/sourceName/creator/creatorName.

However, this strategy catches more routes than expected. For instance, it would catch /<localePrefix>/non-existent-page, and would return the English error page because the collection page was seeing the locale prefix as _mediaType, and path validation would fail because the locale prefix does not match the _mediaType (image/audio).

This is why I added 4 pages that used less dynamic path parameters (/image/tag/_tag.vue, /image/source/_.vue).
Previously, I planned to use the page to compute all the necessary parameters, and have VCollectionHeader as a simple presentational component. However, now that there are 4 page component, moving the computation to the store and the component makes more sense.

Now VCollectionHeader accepts the collectionParams prop from the page component, and then computes the title, URL and the results label. There is a complication for the creator pages: we can only get the creator URL after we fetch the media, from the media item's creator_url param. This is why the creatorUrl is still computed in the page (which handles media fetching) and is passed as a prop to collectionParams.

This PR also converts the CollectionParams type to a discriminated union type to make it easier to narrow the type when handling it.

Testing Instructions

Check the Storybook to see that VCollectionHeader is rendered correctly: https://docs.openverse.org/_preview/3365/storybook/?path=/story/components-vcollectionheader--all-collections
To run the Storybook locally, you may need to run just frontend/run test:storybook to run Storybook inside docker (it currently does not run locally on Mac due to ssl errors).

Checklist

  • My pull request has a descriptive title (not a vague title likeUpdate index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.
  • I ran the DAG documentation generator (if applicable).

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@github-actions github-actions bot added 🧱 stack: documentation Related to Sphinx documentation 🧱 stack: frontend Related to the Nuxt frontend labels Nov 16, 2023
@openverse-bot openverse-bot added the 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work label Nov 16, 2023
Copy link

github-actions bot commented Nov 16, 2023

Size Change: +902 B (0%)

Total Size: 974 kB

Filename Size Change
./frontend/.nuxt/dist/client/app.js 132 kB +280 B (0%)
./frontend/.nuxt/dist/client/app.modern.js 123 kB +232 B (0%)
./frontend/.nuxt/dist/client/components/v-collection-header.js 1.49 kB +185 B (+14%) ⚠️
./frontend/.nuxt/dist/client/components/v-collection-header.modern.js 1.51 kB +198 B (+15%) ⚠️
ℹ️ View Unchanged
Filename Size Change
./frontend/.nuxt/dist/client/242.js 343 B 0 B
./frontend/.nuxt/dist/client/242.modern.js 346 B 0 B
./frontend/.nuxt/dist/client/243.js 1.85 kB 0 B
./frontend/.nuxt/dist/client/commons/app.js 105 kB +2 B (0%)
./frontend/.nuxt/dist/client/commons/app.modern.js 87.4 kB -5 B (0%)
./frontend/.nuxt/dist/client/commons/components/v-error-section/components/v-external-search-form/components/v-external-source-li/4e2d09e1.js 5.18 kB 0 B
./frontend/.nuxt/dist/client/commons/components/v-error-section/components/v-external-search-form/components/v-external-source-li/4e2d09e1.modern.js 5.62 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/loading-icon.js 732 B 0 B
./frontend/.nuxt/dist/client/components/loading-icon.modern.js 736 B 0 B
./frontend/.nuxt/dist/client/components/table-sort-icon.js 514 B 0 B
./frontend/.nuxt/dist/client/components/table-sort-icon.modern.js 518 B 0 B
./frontend/.nuxt/dist/client/components/v-all-results-grid.js 6.85 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-all-results-grid.modern.js 6.68 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-audio-collection.js 4.5 kB +2 B (0%)
./frontend/.nuxt/dist/client/components/v-audio-collection.modern.js 4.37 kB 0 B
./frontend/.nuxt/dist/client/components/v-audio-list.js 1.43 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-audio-list.modern.js 1.4 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-audio-result.js 1.12 kB 0 B
./frontend/.nuxt/dist/client/components/v-audio-result.modern.js 1.1 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-audio-track-skeleton.js 956 B 0 B
./frontend/.nuxt/dist/client/components/v-audio-track-skeleton.modern.js 960 B 0 B
./frontend/.nuxt/dist/client/components/v-audio-track.js 5.99 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-audio-track.modern.js 5.96 kB -2 B (0%)
./frontend/.nuxt/dist/client/components/v-back-to-search-results-link.js 634 B 0 B
./frontend/.nuxt/dist/client/components/v-back-to-search-results-link.modern.js 640 B -1 B (0%)
./frontend/.nuxt/dist/client/components/v-bone.js 632 B 0 B
./frontend/.nuxt/dist/client/components/v-bone.modern.js 636 B 0 B
./frontend/.nuxt/dist/client/components/v-box-layout.js 1.15 kB 0 B
./frontend/.nuxt/dist/client/components/v-box-layout.modern.js 1.16 kB 0 B
./frontend/.nuxt/dist/client/components/v-content-link.js 1.06 kB 0 B
./frontend/.nuxt/dist/client/components/v-content-link.modern.js 1.06 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-content-page.js 530 B 0 B
./frontend/.nuxt/dist/client/components/v-content-page.modern.js 536 B 0 B
./frontend/.nuxt/dist/client/components/v-content-report-button.js 493 B 0 B
./frontend/.nuxt/dist/client/components/v-content-report-button.modern.js 496 B -1 B (0%)
./frontend/.nuxt/dist/client/components/v-content-report-form.js 3.35 kB 0 B
./frontend/.nuxt/dist/client/components/v-content-report-form.modern.js 3.23 kB 0 B
./frontend/.nuxt/dist/client/components/v-content-report-popover.js 3.82 kB 0 B
./frontend/.nuxt/dist/client/components/v-content-report-popover.modern.js 3.7 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-copy-button.js 3.8 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-copy-button.modern.js 3.8 kB -3 B (0%)
./frontend/.nuxt/dist/client/components/v-copy-license.js 2.34 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-copy-license.modern.js 2.31 kB 0 B
./frontend/.nuxt/dist/client/components/v-dmca-notice.js 795 B 0 B
./frontend/.nuxt/dist/client/components/v-dmca-notice.modern.js 801 B 0 B
./frontend/.nuxt/dist/client/components/v-error-image.js 2.51 kB -2 B (0%)
./frontend/.nuxt/dist/client/components/v-error-image.modern.js 2.47 kB 0 B
./frontend/.nuxt/dist/client/components/v-error-section.js 5.22 kB +2 B (0%)
./frontend/.nuxt/dist/client/components/v-error-section.modern.js 4.58 kB 0 B
./frontend/.nuxt/dist/client/components/v-external-search-form.js 4.1 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-external-search-form.modern.js 3.44 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-external-source-list.js 2.63 kB 0 B
./frontend/.nuxt/dist/client/components/v-external-source-list.modern.js 1.99 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-full-layout.js 1.66 kB 0 B
./frontend/.nuxt/dist/client/components/v-full-layout.modern.js 1.66 kB 0 B
./frontend/.nuxt/dist/client/components/v-get-media-button.js 622 B 0 B
./frontend/.nuxt/dist/client/components/v-get-media-button.modern.js 628 B 0 B
./frontend/.nuxt/dist/client/components/v-grid-skeleton.js 1.55 kB 0 B
./frontend/.nuxt/dist/client/components/v-grid-skeleton.modern.js 1.55 kB 0 B
./frontend/.nuxt/dist/client/components/v-hide-button.js 594 B 0 B
./frontend/.nuxt/dist/client/components/v-hide-button.modern.js 592 B 0 B
./frontend/.nuxt/dist/client/components/v-home-gallery.js 4.28 kB 0 B
./frontend/.nuxt/dist/client/components/v-home-gallery.modern.js 4.26 kB 0 B
./frontend/.nuxt/dist/client/components/v-homepage-content.js 1.82 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-homepage-content.modern.js 1.79 kB +2 B (0%)
./frontend/.nuxt/dist/client/components/v-image-cell.js 2.24 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-image-cell.modern.js 2.23 kB 0 B
./frontend/.nuxt/dist/client/components/v-image-grid.js 4.52 kB 0 B
./frontend/.nuxt/dist/client/components/v-image-grid.modern.js 4.4 kB 0 B
./frontend/.nuxt/dist/client/components/v-license-tab-panel.js 641 B 0 B
./frontend/.nuxt/dist/client/components/v-license-tab-panel.modern.js 649 B 0 B
./frontend/.nuxt/dist/client/components/v-load-more.js 1.18 kB 0 B
./frontend/.nuxt/dist/client/components/v-load-more.modern.js 1.07 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-media-details.js 5.84 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-media-details.modern.js 5.69 kB 0 B
./frontend/.nuxt/dist/client/components/v-media-license.js 930 B 0 B
./frontend/.nuxt/dist/client/components/v-media-license.modern.js 938 B 0 B
./frontend/.nuxt/dist/client/components/v-media-reuse.js 3 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-media-reuse.modern.js 2.97 kB 0 B
./frontend/.nuxt/dist/client/components/v-media-tag.js 416 B 0 B
./frontend/.nuxt/dist/client/components/v-media-tag.modern.js 419 B 0 B
./frontend/.nuxt/dist/client/components/v-media-tags.js 830 B 0 B
./frontend/.nuxt/dist/client/components/v-media-tags.modern.js 824 B 0 B
./frontend/.nuxt/dist/client/components/v-metadata-value.js 604 B 0 B
./frontend/.nuxt/dist/client/components/v-metadata-value.modern.js 609 B 0 B
./frontend/.nuxt/dist/client/components/v-metadata.js 1.32 kB 0 B
./frontend/.nuxt/dist/client/components/v-metadata.modern.js 1.32 kB 0 B
./frontend/.nuxt/dist/client/components/v-modal.js 981 B 0 B
./frontend/.nuxt/dist/client/components/v-modal.modern.js 973 B 0 B
./frontend/.nuxt/dist/client/components/v-no-results.js 2.67 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-no-results.modern.js 2.03 kB 0 B
./frontend/.nuxt/dist/client/components/v-old-icon-button.js 853 B 0 B
./frontend/.nuxt/dist/client/components/v-old-icon-button.modern.js 846 B -1 B (0%)
./frontend/.nuxt/dist/client/components/v-radio.js 1.02 kB 0 B
./frontend/.nuxt/dist/client/components/v-radio.modern.js 1.02 kB 0 B
./frontend/.nuxt/dist/client/components/v-related-audio.js 823 B 0 B
./frontend/.nuxt/dist/client/components/v-related-audio.modern.js 743 B 0 B
./frontend/.nuxt/dist/client/components/v-related-audio/pages/search/audio.js 4.49 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-related-audio/pages/search/audio.modern.js 4.36 kB 0 B
./frontend/.nuxt/dist/client/components/v-related-images.js 803 B 0 B
./frontend/.nuxt/dist/client/components/v-related-images.modern.js 719 B 0 B
./frontend/.nuxt/dist/client/components/v-report-desc-form.js 996 B 0 B
./frontend/.nuxt/dist/client/components/v-report-desc-form.modern.js 999 B 0 B
./frontend/.nuxt/dist/client/components/v-row-layout.js 2.04 kB 0 B
./frontend/.nuxt/dist/client/components/v-row-layout.modern.js 2.05 kB 0 B
./frontend/.nuxt/dist/client/components/v-safety-wall.js 1.45 kB -2 B (0%)
./frontend/.nuxt/dist/client/components/v-safety-wall.modern.js 1.46 kB 0 B
./frontend/.nuxt/dist/client/components/v-scroll-button.js 891 B 0 B
./frontend/.nuxt/dist/client/components/v-scroll-button.modern.js 892 B 0 B
./frontend/.nuxt/dist/client/components/v-search-results-title.js 616 B 0 B
./frontend/.nuxt/dist/client/components/v-search-results-title.modern.js 621 B 0 B
./frontend/.nuxt/dist/client/components/v-single-result-controls.js 1.18 kB 0 B
./frontend/.nuxt/dist/client/components/v-single-result-controls.modern.js 1.18 kB 0 B
./frontend/.nuxt/dist/client/components/v-sketch-fab-viewer.js 1.02 kB 0 B
./frontend/.nuxt/dist/client/components/v-sketch-fab-viewer.modern.js 916 B 0 B
./frontend/.nuxt/dist/client/components/v-snackbar.js 1.06 kB 0 B
./frontend/.nuxt/dist/client/components/v-snackbar.modern.js 1.07 kB 0 B
./frontend/.nuxt/dist/client/components/v-sources-table.js 15.1 kB -1 B (0%)
./frontend/.nuxt/dist/client/components/v-sources-table.modern.js 15.1 kB +1 B (0%)
./frontend/.nuxt/dist/client/components/v-tag.js 411 B 0 B
./frontend/.nuxt/dist/client/components/v-tag.modern.js 415 B 0 B
./frontend/.nuxt/dist/client/components/v-warning-suppressor.js 306 B 0 B
./frontend/.nuxt/dist/client/components/v-warning-suppressor.modern.js 311 B 0 B
./frontend/.nuxt/dist/client/pages/about.js 1.42 kB 0 B
./frontend/.nuxt/dist/client/pages/about.modern.js 1.42 kB 0 B
./frontend/.nuxt/dist/client/pages/audio/_id/index.js 17.5 kB -2 B (0%)
./frontend/.nuxt/dist/client/pages/audio/_id/index.modern.js 16.4 kB 0 B
./frontend/.nuxt/dist/client/pages/feedback.js 1.36 kB +1 B (0%)
./frontend/.nuxt/dist/client/pages/feedback.modern.js 1.36 kB 0 B
./frontend/.nuxt/dist/client/pages/image/_id/index.js 16.2 kB +2 B (0%)
./frontend/.nuxt/dist/client/pages/image/_id/index.modern.js 14.8 kB +1 B (0%)
./frontend/.nuxt/dist/client/pages/image/_id/report.js 5 kB -1 B (0%)
./frontend/.nuxt/dist/client/pages/image/_id/report.modern.js 4.75 kB 0 B
./frontend/.nuxt/dist/client/pages/index.js 6.41 kB +3 B (0%)
./frontend/.nuxt/dist/client/pages/index.modern.js 6.35 kB 0 B
./frontend/.nuxt/dist/client/pages/preferences.js 1.46 kB 0 B
./frontend/.nuxt/dist/client/pages/preferences.modern.js 1.46 kB 0 B
./frontend/.nuxt/dist/client/pages/privacy.js 1.26 kB 0 B
./frontend/.nuxt/dist/client/pages/privacy.modern.js 1.26 kB 0 B
./frontend/.nuxt/dist/client/pages/search-help.js 1.64 kB 0 B
./frontend/.nuxt/dist/client/pages/search-help.modern.js 1.62 kB 0 B
./frontend/.nuxt/dist/client/pages/search.js 5.82 kB -1 B (0%)
./frontend/.nuxt/dist/client/pages/search.modern.js 8.14 kB -1 B (0%)
./frontend/.nuxt/dist/client/pages/search/audio.js 498 B 0 B
./frontend/.nuxt/dist/client/pages/search/audio.modern.js 501 B 0 B
./frontend/.nuxt/dist/client/pages/search/image.js 453 B 0 B
./frontend/.nuxt/dist/client/pages/search/image.modern.js 454 B 0 B
./frontend/.nuxt/dist/client/pages/search/index.js 316 B 0 B
./frontend/.nuxt/dist/client/pages/search/index.modern.js 320 B 0 B
./frontend/.nuxt/dist/client/pages/search/model-3d.js 243 B 0 B
./frontend/.nuxt/dist/client/pages/search/model-3d.modern.js 246 B 0 B
./frontend/.nuxt/dist/client/pages/search/video.js 240 B 0 B
./frontend/.nuxt/dist/client/pages/search/video.modern.js 244 B 0 B
./frontend/.nuxt/dist/client/pages/sensitive-content.js 1.52 kB 0 B
./frontend/.nuxt/dist/client/pages/sensitive-content.modern.js 1.53 kB 0 B
./frontend/.nuxt/dist/client/pages/sources.js 1.53 kB 0 B
./frontend/.nuxt/dist/client/pages/sources.modern.js 1.54 kB 0 B
./frontend/.nuxt/dist/client/runtime.js 2.8 kB 0 B
./frontend/.nuxt/dist/client/runtime.modern.js 2.81 kB 0 B
./frontend/.nuxt/dist/client/vendors/app.js 68.5 kB +5 B (0%)
./frontend/.nuxt/dist/client/vendors/app.modern.js 68 kB +4 B (0%)

compressed-size-action

@obulat obulat added 🛠 goal: fix Bug fix 💻 aspect: code Concerns the software code in the repository 🟨 priority: medium Not blocking but should be addressed soon and removed 🚦 status: awaiting triage Has not been triaged & therefore, not ready for work 🧱 stack: documentation Related to Sphinx documentation labels Nov 16, 2023
@obulat obulat self-assigned this Nov 16, 2023
@obulat obulat force-pushed the update/VCollectionHeader branch from 8f9d82b to 4e6b00b Compare November 17, 2023 04:43
@github-actions github-actions bot added the 🧱 stack: documentation Related to Sphinx documentation label Nov 17, 2023
@obulat obulat force-pushed the update/VCollectionHeader branch from 4e6b00b to 8cc0cf3 Compare November 17, 2023 04:44
Copy link

Full-stack documentation: https://docs.openverse.org/_preview/3365

Please note that GitHub pages takes a little time to deploy newly pushed code, if the links above don't work or you see old versions, wait 5 minutes and try again.

You can check the GitHub pages deployment action list to see the current status of the deployments.

@obulat obulat marked this pull request as ready for review November 17, 2023 06:49
@obulat obulat requested a review from a team as a code owner November 17, 2023 06:49
Copy link
Collaborator

@AetherUnbound AetherUnbound left a comment

Choose a reason for hiding this comment

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

The code looks good and makes sense to me! One question about the translations, nothing to block a merge 🚀

Comment on lines +831 to +834
audio: {
zero: "No audio files by this creator in {source}",
count: "{count} audio file by this creator in {source}|{count} audio files by this creator in {source}",
countMore: "Over {count} audio files by this creator in {source}",
Copy link
Collaborator

Choose a reason for hiding this comment

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

These seem very similar, would it also be possible to interpolate the media type here too? Or is it just easier to define them separately?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think it's better to leave as much as possible fully written out because interpolation does not always work well for different languages, which might have very different pluralization and other grammar rules.

Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

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

The changes make sense, LGTM. Why did the snapshots change from "10000 images" to "No image", is it possible to get 10000 and avoid the diffs?

resultCountLabel: {
creator: {
audio: {
zero: "No audio files by this creator in {source}",
Copy link
Member

Choose a reason for hiding this comment

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

Is "track" a better word than "file" here? I would like us to identify a word that's more descriptive than "file" and use it consistently in the UI.

@obulat obulat force-pushed the update/VCollectionHeader branch from 8cc0cf3 to af65ff8 Compare November 18, 2023 06:52
@obulat
Copy link
Contributor Author

obulat commented Nov 18, 2023

The changes make sense, LGTM. Why did the snapshots change from "10000 images" to "No image", is it possible to get 10000 and avoid the diffs?

Thank you for this comment, I did update the test to keep the number. The snapshots still had to be changed, though, due to the fact that I didn't add "over" in the original implementation, and instead of "Over 10000 results", it was just "10000 results" before 😢
This is not accurate since 10000 is a cut-off that we return every time there are more than 10000 results.

@obulat obulat merged commit 7967abd into main Nov 18, 2023
@obulat obulat deleted the update/VCollectionHeader branch November 18, 2023 07:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟨 priority: medium Not blocking but should be addressed soon 🧱 stack: documentation Related to Sphinx documentation 🧱 stack: frontend Related to the Nuxt frontend
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants