diff --git a/frontend/src/assets/error_images.json b/frontend/src/assets/error_images.json index e8ed239a5d..f7d323810e 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 3f09a47b7f..97c3c5f8c8 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 66be71afd3..9654029dde 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 fd4a9771e2..852fcdc7b6 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 760c773cb5..eb48a9fdb4 100644 --- a/frontend/src/locales/scripts/en.json5 +++ b/frontend/src/locales/scripts/en.json5 @@ -807,6 +807,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 b44a82e33b..0ba673a1e2 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 566e01d7f1..714f653a70 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.license_url} + ${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,9 +181,10 @@ 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) { @@ -248,7 +267,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 58127b9b5b..9e48880a5a 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 5a4b13f756..93bfd7f923 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/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 8b92ca7d3c..f38ade59e2 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 80dcf6bc06..c26f7f36d2 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 97d6f549a4..6a191e2bbb 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 4f728af132..726e536f8b 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 d4e3853f22..e3deaa609a 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 ac5b173327..2691ef0b31 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 a04fed2d30..87d2da7cce 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 d406d68e64..45b04997f4 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 9fff959c4c..91b03c508c 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 af7e53c70c..7106b00e7e 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 6b9c84ed97..85acf01947 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 2837507e23..2d00abf125 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 ea58a92a1f..226e217572 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 b84bc9fcbc..5ff2a197ff 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 9245437c07..8c6cbd931a 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 b5b01709aa..2305c59991 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 d78614fc99..e77035d4e8 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 0000000000..82bd23072b 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 0000000000..69ae2b51f0 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 0000000000..d7b12527bf 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 0000000000..2d110bf16d 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 0000000000..0ba28dc052 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 0000000000..b7ff8523fb 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 2aeeba3d16..46e4a87bf0 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 e9de896752..dbfc057f0a 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 67d2b11211..b6d8178118 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 0bbaa3a570..c30a5628ed 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 90dadedb11..cf78b6b7e5 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 41cf322583..6766030d51 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 0000000000..7a103dbf0e 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 0000000000..e177e7c57c 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 0000000000..420716c120 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 0000000000..455ef6dd15 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 0000000000..1ffffcee96 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 0000000000..337f4ecde8 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/unit/specs/components/ImageDetails/v-copy-license.spec.js b/frontend/test/unit/specs/components/ImageDetails/v-copy-license.spec.js index 329fb802b6..d20f4a3f18 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 62cded6bc4..50e5ef68e6 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", () => {