Unverified Commit 480ef5a0 authored by Marius van den Beek's avatar Marius van den Beek Committed by GitHub
Browse files

Merge pull request #14176 from dannon/fix-link-copy

[22.05] Fix dataset link copy
parents 0f033804 d06ea7ca
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -63,13 +63,14 @@
import { legacyNavigationMixin } from "components/plugins/legacyNavigation";
import { copy as sendToClipboard } from "utils/clipboard";
import { absPath } from "utils/redirect";
import { downloadUrlMixin } from "./mixins.js";
import DatasetDownload from "./DatasetDownload";

export default {
    components: {
        DatasetDownload,
    },
    mixins: [legacyNavigationMixin],
    mixins: [legacyNavigationMixin, downloadUrlMixin],
    props: {
        item: { type: Object, required: true },
        showHighlight: { type: Boolean, default: false },
+3 −4
Original line number Diff line number Diff line
<template>
    <b-dropdown
        v-if="hasMetaFiles"
        v-b-tooltip.top.hover
        dropup
        no-caret
        no-flip
        v-b-tooltip.top.hover
        size="sm"
        variant="link"
        toggle-class="text-decoration-none"
@@ -36,15 +36,14 @@

<script>
import { prependPath } from "utils/redirect";
import { downloadUrlMixin } from "./mixins.js";

export default {
    mixins: [downloadUrlMixin],
    props: {
        item: { type: Object, required: true },
    },
    computed: {
        downloadUrl() {
            return prependPath(`api/datasets/${this.item.id}/display?to_ext=${this.item.extension}`);
        },
        hasMetaFiles() {
            return this.metaFiles && this.metaFiles.length > 0;
        },
+10 −0
Original line number Diff line number Diff line
import { prependPath } from "utils/redirect";

/* VueJS mixin with dataset downloadUrl */
export const downloadUrlMixin = {
    computed: {
        downloadUrl() {
            return prependPath(`api/datasets/${this.item.id}/display?to_ext=${this.item.extension}`);
        },
    },
};