Skip to content

Commit 801fcad

Browse files
authored
BC-9616 Remove merlin code (#3962)
1 parent 6dacda4 commit 801fcad

File tree

7 files changed

+3
-78
lines changed

7 files changed

+3
-78
lines changed

src/components/lern-store/AddContentButton.vue

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
:url="url"
2222
:client="client"
2323
:title="title"
24-
:merlin-reference="merlinReference"
2524
:items="selectedElements"
2625
@close="performAPICall"
2726
/>
@@ -48,7 +47,7 @@ import LoadingModal from "@/components/lern-store/LoadingModal";
4847
import NotificationModal from "@/components/lern-store/NotificationModal";
4948
import { contentModule } from "@/store";
5049
import { $axios } from "@/utils/api";
51-
import { getID, getMediatype, getMerlinReference, getMetadataAttribute, getTitle, getUrl } from "@/utils/helpers";
50+
import { getID, getMediatype, getMetadataAttribute, getTitle, getUrl } from "@/utils/helpers";
5251
import { mdiPlusCircleOutline } from "@icons/material";
5352
5453
let slowAPICall;
@@ -115,9 +114,6 @@ export default {
115114
}
116115
return getUrl(this.resource);
117116
},
118-
merlinReference() {
119-
return getMerlinReference(this.resource);
120-
},
121117
},
122118
watch: {
123119
selected() {
@@ -140,7 +136,6 @@ export default {
140136
url: elementUrl,
141137
title: getTitle(element),
142138
client: this.client,
143-
merlinReference: getMerlinReference(element),
144139
};
145140
});
146141
}
@@ -158,16 +153,11 @@ export default {
158153
methods: {
159154
async addResourceAndClose() {
160155
const getElementInfo = async (element) => {
161-
let url = element.url;
162-
if (element.merlinReference) {
163-
const requestUrl = `/v1/edu-sharing-merlinToken/?merlinReference=${element.merlinReference}`;
164-
url = (await $axios.get(requestUrl)).data || element.url;
165-
}
156+
const url = element.url;
166157
return {
167158
title: element.title,
168159
client: element.client,
169160
url,
170-
merlinReference: element.merlinReference,
171161
};
172162
};
173163

src/components/lern-store/AddContentModal.vue

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ export default {
6767
title: { type: String, default: "" },
6868
url: { type: String, default: "" },
6969
client: { type: String, default: "Schul-Cloud" },
70-
merlinReference: { type: String, default: "" },
7170
items: { type: Array, default: () => [] },
7271
showCopyModal: {
7372
type: Boolean,
@@ -140,15 +139,13 @@ export default {
140139
title: element.title,
141140
client: element.client,
142141
url: element.url,
143-
merlinReference: element.merlinReference,
144142
});
145143
});
146144
} else {
147145
payload.material = {
148146
title: this.title,
149147
client: this.client,
150148
url: this.url,
151-
merlinReference: this.merlinReference,
152149
};
153150
}
154151
contentModule.addToLesson(payload);

src/components/lern-store/LernstoreDetailView.vue

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -59,21 +59,6 @@
5959
</div>
6060
<div v-else>
6161
<v-btn
62-
v-if="isMerlin"
63-
variant="outlined"
64-
class="content-button"
65-
data-testid="learningstore-to-content-link"
66-
@click="
67-
() => {
68-
goToMerlinContent(merlinTokenReference);
69-
}
70-
"
71-
>
72-
<v-icon size="20" class="mr-1">{{ mdiOpenInNew }}</v-icon>
73-
{{ $t("pages.content.material.toMaterial") }}
74-
</v-btn>
75-
<v-btn
76-
v-else
7762
variant="outlined"
7863
:href="downloadUrl"
7964
class="content-button"
@@ -158,17 +143,7 @@ import LernStorePlayer from "@/components/lern-store/LernStorePlayer.vue";
158143
import contentMeta from "@/mixins/contentMeta";
159144
import { printDateFromTimestamp } from "@/plugins/datetime";
160145
import { SchulcloudTheme } from "@/serverApi/v3";
161-
import { $axios } from "@/utils/api";
162-
import {
163-
getAuthor,
164-
getDescription,
165-
getMerlinReference,
166-
getMetadataAttribute,
167-
getProvider,
168-
getTags,
169-
isMerlinContent,
170-
isVideoContent,
171-
} from "@/utils/helpers";
146+
import { getAuthor, getDescription, getMetadataAttribute, getProvider, getTags, isVideoContent } from "@/utils/helpers";
172147
import { buildPageTitle } from "@/utils/pageTitle";
173148
import { RenderHTML } from "@feature-render-html";
174149
import { mdiCalendar, mdiClose, mdiOpenInNew, mdiPound } from "@icons/material";
@@ -254,12 +229,6 @@ export default {
254229
isInline() {
255230
return !!this.$route.query.inline;
256231
},
257-
isMerlin() {
258-
return isMerlinContent(this.resource);
259-
},
260-
merlinTokenReference() {
261-
return getMerlinReference(this.resource);
262-
},
263232
provider() {
264233
const provider = getProvider(this.resource.properties);
265234
return provider ? provider.replace(/ {2,}/g, "") : undefined;
@@ -296,11 +265,6 @@ export default {
296265
document.title = buildPageTitle(pageTitle);
297266
},
298267
methods: {
299-
async goToMerlinContent(merlinReference) {
300-
const requestUrl = `/v1/edu-sharing-merlinToken/?merlinReference=${merlinReference}`;
301-
const url = (await $axios.get(requestUrl)).data;
302-
window.open(url, "_blank");
303-
},
304268
isNotStudent(roles) {
305269
return this.role === "" ? roles.some((role) => !role.startsWith("student")) : this.role;
306270
},

src/serverApi/v3/api.ts

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4863,12 +4863,6 @@ export interface LernstoreResources {
48634863
* @memberof LernstoreResources
48644864
*/
48654865
description: string;
4866-
/**
4867-
* merlinReference
4868-
* @type {string}
4869-
* @memberof LernstoreResources
4870-
*/
4871-
merlinReference?: string;
48724866
/**
48734867
* title
48744868
* @type {string}
@@ -5806,12 +5800,6 @@ export interface MaterialResponse {
58065800
* @memberof MaterialResponse
58075801
*/
58085802
license: Array<string>;
5809-
/**
5810-
* For material from Merlin, the Merlin reference
5811-
* @type {string}
5812-
* @memberof MaterialResponse
5813-
*/
5814-
merlinReference: string;
58155803
}
58165804
/**
58175805
*

src/store/content.unit.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,6 @@ describe("content module", () => {
313313
event: {},
314314
material: {
315315
client: "",
316-
merlinReference: "",
317316
title: "",
318317
url: "",
319318
},
@@ -337,7 +336,6 @@ describe("content module", () => {
337336
event: {},
338337
material: {
339338
client: "",
340-
merlinReference: "",
341339
title: "",
342340
url: "",
343341
},
@@ -355,7 +353,6 @@ describe("content module", () => {
355353
event: {},
356354
material: {
357355
client: "",
358-
merlinReference: "",
359356
title: "",
360357
url: "",
361358
},

src/store/types/content.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ export type AddToLessonQuery = {
124124
event: object;
125125
material: {
126126
client: string;
127-
merlinReference: string;
128127
title: string;
129128
url: string;
130129
};

src/utils/helpers.js

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -95,16 +95,6 @@ export const getUrl = (resource) => {
9595
export const isVideoContent = (resource) =>
9696
resource.size && (resource.mediatype === "file-h5p" || resource.mediatype === "file-video");
9797

98-
export const isMerlinContent = (resource) =>
99-
resource.properties && getMetadataAttribute(resource.properties, "ccm:replicationsource").includes("merlin");
100-
101-
export const getMerlinReference = (resource) => {
102-
if (resource.properties && isMerlinContent(resource)) {
103-
return getMetadataAttribute(resource.properties, "ccm:replicationsourceid");
104-
}
105-
return "";
106-
};
107-
10898
export const getID = (resource) => {
10999
if (resource.properties) {
110100
return getMetadataAttribute(resource.properties, "ccm:replicationsourceuuid");

0 commit comments

Comments
 (0)