diff --git a/frontend/src/assets/error_images.json b/frontend/src/assets/error_images.json index e8ed239a5d1..f7d323810e6 100644 --- a/frontend/src/assets/error_images.json +++ b/frontend/src/assets/error_images.json @@ -10,7 +10,9 @@ "creator": "The British Library", "license": "cc0", "license_version": "1.0", - "license_url": "https://creativecommons.org/publicdomain/zero/1.0/" + "license_url": "https://creativecommons.org/publicdomain/zero/1.0/", + "frontendMediaType": "image", + "attribution": "\"Depressed musician vintage drawing\" by The British Library is marked with CC0 1.0. To view a copy of this license, visit https://creativecommons.org/publicdomain/zero/1.0/?ref=openverse." } }, { @@ -23,7 +25,9 @@ "creator": "Edward Lagarde, American, 19th century", "license": "cc0", "license_version": "1.0", - "license_url": "https://creativecommons.org/publicdomain/zero/1.0/" + "license_url": "https://creativecommons.org/publicdomain/zero/1.0/", + "frontendMediaType": "image", + "attribution": "\"Depressed musician vintage drawing\" by The British Library is marked with CC0 1.0. To view a copy of this license, visit https://creativecommons.org/publicdomain/zero/1.0/?ref=openverse." } } ] diff --git a/frontend/src/components/VErrorSection/VErrorImage.vue b/frontend/src/components/VErrorSection/VErrorImage.vue index 3f09a47b7fc..97c3c5f8c87 100644 --- a/frontend/src/components/VErrorSection/VErrorImage.vue +++ b/frontend/src/components/VErrorSection/VErrorImage.vue @@ -23,7 +23,6 @@ import imageInfo from "~/assets/error_images.json" interface ErrorImage extends AttributableMedia { src: string alt: string - attribution?: string } /** @@ -54,6 +53,7 @@ export default defineComponent({ alt: `errorImages.${image.id}`, license: image.license as License, license_version: image.license_version as LicenseVersion, + frontendMediaType: "image", } errorImage.attribution = getAttribution(errorImage, i18n) return [errorItem.error, errorImage] diff --git a/frontend/src/components/VMediaInfo/VCopyLicense.vue b/frontend/src/components/VMediaInfo/VCopyLicense.vue index 66be71afd3a..9654029dde6 100644 --- a/frontend/src/components/VMediaInfo/VCopyLicense.vue +++ b/frontend/src/components/VMediaInfo/VCopyLicense.vue @@ -39,6 +39,18 @@ >

{{ getAttributionMarkup({ isPlaintext: true }) }}

+ + 
{{ getAttributionMarkup({ isXml: true }) }}
+ @@ -55,7 +67,7 @@ import VTabs from "~/components/VTabs/VTabs.vue" import VTab from "~/components/VTabs/VTab.vue" import VLicenseTabPanel from "~/components/VMediaInfo/VLicenseTabPanel.vue" -const tabs = ["rich", "html", "plain"] as const +const tabs = ["rich", "html", "plain", "xml"] as const export default defineComponent({ name: "VCopyLicense", diff --git a/frontend/src/components/VMediaInfo/VLicenseTabPanel.vue b/frontend/src/components/VMediaInfo/VLicenseTabPanel.vue index fd4a9771e2d..852fcdc7b62 100644 --- a/frontend/src/components/VMediaInfo/VLicenseTabPanel.vue +++ b/frontend/src/components/VMediaInfo/VLicenseTabPanel.vue @@ -36,7 +36,7 @@ export default defineComponent({ * The kind of attribution shown in the tab. */ tab: { - type: String as PropType<"rich" | "html" | "plain">, + type: String as PropType<"rich" | "html" | "plain" | "xml">, required: true, }, /** diff --git a/frontend/src/locales/scripts/en.json5 b/frontend/src/locales/scripts/en.json5 index 04f8f9e49f0..253be484d72 100644 --- a/frontend/src/locales/scripts/en.json5 +++ b/frontend/src/locales/scripts/en.json5 @@ -801,6 +801,7 @@ plain: "Plain text", copyText: "Copy text", copied: "Copied!", + xml: "XML", }, attribution: "This image was marked with a {link} license:", }, diff --git a/frontend/src/types/analytics.ts b/frontend/src/types/analytics.ts index b44a82e33be..0ba673a1e2e 100644 --- a/frontend/src/types/analytics.ts +++ b/frontend/src/types/analytics.ts @@ -145,7 +145,7 @@ export type Events = { /** The unique ID of the media */ id: string /** The format of the copied attribution */ - format: "plain" | "rich" | "html" + format: "plain" | "rich" | "html" | "xml" /** The media type being searched */ mediaType: MediaType } diff --git a/frontend/src/utils/attribution-html.ts b/frontend/src/utils/attribution-html.ts index 566e01d7f16..fd83dfa29b5 100644 --- a/frontend/src/utils/attribution-html.ts +++ b/frontend/src/utils/attribution-html.ts @@ -124,6 +124,21 @@ const licenseElementImg = (licenseElement: LicenseElement): string => { const extLink = (href: string, text: string) => h("a", { rel: "noopener noreferrer", href }, [text]) +/** + * Generate a Dublin Core conforming XML attribution snippet. + * + * @param mediaItem - the media item being attributed + * @returns the XML markup of the attribution + */ +const xmlAttribution = (mediaItem: Record) => + ` + ${mediaItem.creator} + ${mediaItem.title} + ${mediaItem.attribution} + ${mediaItem.foreign_landing_url} + ${mediaItem.type} +` + /* Interfaces */ /** @@ -139,6 +154,8 @@ export type AttributableMedia = Pick< | "license" | "license_version" | "license_url" + | "frontendMediaType" + | "attribution" > /** @@ -148,6 +165,7 @@ export type AttributableMedia = Pick< export interface AttributionOptions { includeIcons?: boolean isPlaintext?: boolean + isXml?: boolean } /* Actual util */ @@ -163,15 +181,20 @@ export interface AttributionOptions { export const getAttribution = ( mediaItem: AttributableMedia, i18n: VueI18n | null = null, - { includeIcons, isPlaintext }: AttributionOptions = { + { includeIcons, isPlaintext, isXml }: AttributionOptions = { isPlaintext: false, includeIcons: true, + isXml: false, } ): string => { if (!mediaItem) { return "" } + if (isXml) { + isPlaintext = true + } + const isPd = isPublicDomain(mediaItem.license) const i18nBase = "mediaDetails.reuse.credit" @@ -248,7 +271,18 @@ export const getAttribution = ( .replace(/\s{2}/g, " ") .trim() - return isPlaintext - ? attribution - : h("p", { class: "attribution" }, [attribution]) + if (isXml) { + const { frontendMediaType, ...restMediaItem } = mediaItem + + const xmlAttributionParts = { + ...restMediaItem, + type: frontendMediaType === "audio" ? "Sound" : "StillImage", + } + + return xmlAttribution(xmlAttributionParts) + } else if (isPlaintext) { + return attribution + } else { + return h("p", { class: "attribution" }, [attribution]) + } } diff --git a/frontend/test/locales/ar.json b/frontend/test/locales/ar.json index 5edd90813df..22cdcbd4366 100644 --- a/frontend/test/locales/ar.json +++ b/frontend/test/locales/ar.json @@ -556,7 +556,8 @@ "html": "لغة البرمجة", "plain": "نص عادي", "copyText": "نسخ النص", - "copied": "نسخ!" + "copied": "نسخ!", + "xml": "إك سم إل" }, "attribution": "تم تمييز هذه الصورة بترخيص {link}:" }, diff --git a/frontend/test/locales/es.json b/frontend/test/locales/es.json index 5a4b13f7563..93bfd7f9236 100644 --- a/frontend/test/locales/es.json +++ b/frontend/test/locales/es.json @@ -556,7 +556,8 @@ "html": "HTML", "plain": "Texto sin formato", "copyText": "Copiar el texto", - "copied": "¡Copiado!" + "copied": "¡Copiado!", + "xml": "XML" }, "attribution": "Esta imagen se ha marcado con una licencia {link}:" }, diff --git a/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-ltr-png-xs-linux.png b/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-ltr-png-xs-linux.png index 91aced7cfe4..471bc91fa77 100644 Binary files a/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-ltr-png-xs-linux.png and b/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-ltr-png-xs-linux.png differ diff --git a/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-rtl-png-xs-linux.png b/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-rtl-png-xs-linux.png index c1ce6a28698..078558a7bec 100644 Binary files a/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-rtl-png-xs-linux.png and b/frontend/test/playwright/visual-regression/components/global-audio-player.spec.ts-snapshots/global-audio-player-on-search-rtl-png-xs-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-ltr-xl-linux.png b/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-ltr-xl-linux.png index d2b8362bbc3..19867bf70ae 100644 Binary files a/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-ltr-xl-linux.png and b/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-ltr-xl-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-rtl-xl-linux.png b/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-rtl-xl-linux.png index 5dfd9aca0b1..8a3a79abbc2 100644 Binary files a/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-rtl-xl-linux.png and b/frontend/test/playwright/visual-regression/pages/errors.spec.ts-snapshots/search-result-timeout-rtl-xl-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-md-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-md-linux.png index af49ddafd8a..0b8f8d8b771 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-md-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-md-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-xs-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-xs-linux.png index 1f07f48d956..1eb2bf9ad0e 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-xs-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-ltr-from-search-results-with-additional-search-views-xs-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-md-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-md-linux.png index 232e6742d02..1256cd309fc 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-md-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-md-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-xs-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-xs-linux.png index cafa5714373..d35fc0867db 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-xs-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/audio-rtl-from-search-results-with-additional-search-views-xs-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-md-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-md-linux.png index 6cb4f9daef2..a36d3c450e0 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-md-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-md-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-xs-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-xs-linux.png index c722b184a4b..36cda181e1b 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-xs-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-ltr-from-search-results-with-additional-search-views-xs-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-2xl-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-2xl-linux.png index 394aa768dfa..88997be209b 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-2xl-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-2xl-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-lg-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-lg-linux.png index a7321baa5ce..a17c8c6be7c 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-lg-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-lg-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-md-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-md-linux.png index aafa84bf523..3f2d6e549c6 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-md-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-md-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xl-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xl-linux.png index 776a49649b2..8ae6b44b038 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xl-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xl-linux.png differ diff --git a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xs-linux.png b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xs-linux.png index a0b3a5dc40d..c658a9e21cc 100644 Binary files a/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xs-linux.png and b/frontend/test/playwright/visual-regression/pages/pages-single-result.spec.ts-snapshots/image-rtl-from-search-results-with-additional-search-views-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts index 2837507e238..2d00abf125d 100644 --- a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts +++ b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts @@ -10,6 +10,7 @@ const tabs = [ { id: "rich", name: "Rich Text" }, { id: "html", name: "HTML" }, { id: "plain", name: "Plain text" }, + { id: "xml", name: "XML" }, ] const defaultUrl = "/iframe.html?id=components-vmediainfo-vmediareuse--default" const pageUrl = (dir: (typeof languageDirections)[number]) => diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-md-linux.png index ea58a92a1f1..226e2175724 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-md-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-xs-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-xs-linux.png index b84bc9fcbc1..5ff2a197ff7 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-xs-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-html-tab-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-plain-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-plain-tab-md-linux.png index 9245437c077..8c6cbd931a0 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-plain-tab-md-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-plain-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-md-linux.png index b5b01709aab..2305c59991b 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-md-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-xs-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-xs-linux.png index d78614fc991..e77035d4e83 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-xs-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-rich-tab-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-2xl-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-2xl-linux.png new file mode 100644 index 00000000000..82bd23072b3 Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-2xl-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-lg-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-lg-linux.png new file mode 100644 index 00000000000..69ae2b51f0d Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-lg-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-md-linux.png new file mode 100644 index 00000000000..d7b12527bfa Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-sm-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-sm-linux.png new file mode 100644 index 00000000000..2d110bf16d2 Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-sm-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-xl-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-xl-linux.png new file mode 100644 index 00000000000..0ba28dc0526 Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-xl-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-xs-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-xs-linux.png new file mode 100644 index 00000000000..b7ff8523fb9 Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-ltr-xml-tab-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-md-linux.png index 2aeeba3d165..46e4a87bf0f 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-md-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-xs-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-xs-linux.png index e9de896752e..dbfc057f0a1 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-xs-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-html-tab-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-md-linux.png index 67d2b112112..b6d81781186 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-md-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-xs-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-xs-linux.png index 0bbaa3a570c..c30a5628ed3 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-xs-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-plain-tab-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-md-linux.png index 90dadedb113..cf78b6b7e5a 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-md-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-xs-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-xs-linux.png index 41cf322583f..6766030d51c 100644 Binary files a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-xs-linux.png and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-rich-tab-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-2xl-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-2xl-linux.png new file mode 100644 index 00000000000..7a103dbf0e8 Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-2xl-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-lg-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-lg-linux.png new file mode 100644 index 00000000000..e177e7c57ce Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-lg-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-md-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-md-linux.png new file mode 100644 index 00000000000..420716c1207 Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-sm-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-sm-linux.png new file mode 100644 index 00000000000..455ef6dd15f Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-sm-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-xl-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-xl-linux.png new file mode 100644 index 00000000000..1ffffcee96f Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-xl-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-xs-linux.png b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-xs-linux.png new file mode 100644 index 00000000000..337f4ecde8c Binary files /dev/null and b/frontend/test/storybook/visual-regression/v-media-reuse.spec.ts-snapshots/media-reuse-rtl-xml-tab-xs-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-at-rest-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-at-rest-md-linux.png index 4e6615335f3..d161997096f 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-at-rest-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-at-rest-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-hovered-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-hovered-md-linux.png index 3eabee543e5..5afff8de9de 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-hovered-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-hovered-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-at-rest-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-at-rest-md-linux.png index 7ce33e24868..a138119c874 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-at-rest-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-at-rest-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-hovered-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-hovered-md-linux.png index 7d6ddcd65cb..6614846eb6a 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-hovered-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-with-text-label-pressed-hovered-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-at-rest-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-at-rest-md-linux.png index 3744946ef6c..8ea27ccdb7f 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-at-rest-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-at-rest-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-hovered-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-hovered-md-linux.png index b16f02d233e..bfe2ba359c1 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-hovered-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-hovered-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-at-rest-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-at-rest-md-linux.png index 4e7979f034f..a4301295e70 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-at-rest-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-at-rest-md-linux.png differ diff --git a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-hovered-md-linux.png b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-hovered-md-linux.png index 3a672f51800..bf14b4dc4be 100644 Binary files a/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-hovered-md-linux.png and b/frontend/test/storybook/visual-regression/v-search-type-button.spec.ts-snapshots/v-search-type-button-button-without-text-label-pressed-hovered-md-linux.png differ diff --git a/frontend/test/unit/specs/components/ImageDetails/v-copy-license.spec.js b/frontend/test/unit/specs/components/ImageDetails/v-copy-license.spec.js index 329fb802b6e..d20f4a3f181 100644 --- a/frontend/test/unit/specs/components/ImageDetails/v-copy-license.spec.js +++ b/frontend/test/unit/specs/components/ImageDetails/v-copy-license.spec.js @@ -31,6 +31,6 @@ describe("VCopyLicense", () => { it("should contain the correct contents", () => { const { queryAllByText } = render(VCopyLicense, options) - expect(queryAllByText(/Copy text/i)).toHaveLength(3) + expect(queryAllByText(/Copy text/i)).toHaveLength(4) }) }) diff --git a/frontend/test/unit/specs/utils/attribution-html.spec.ts b/frontend/test/unit/specs/utils/attribution-html.spec.ts index 62cded6bc44..50e5ef68e6e 100644 --- a/frontend/test/unit/specs/utils/attribution-html.spec.ts +++ b/frontend/test/unit/specs/utils/attribution-html.spec.ts @@ -18,6 +18,9 @@ const mediaItem: AttributableMedia = { license: "pdm", license_version: "1.0", license_url: "https://license/url", + frontendMediaType: "image", + attribution: + '"Title" by Creator is marked with Public Domain Mark 1.0 . To view a copy of this license, visit https://creativecommons.org/publicdomain/zero/1.0/?ref=openverse.', } describe("getAttribution", () => {