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.

Sign up for GitHub

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

Amp 3054 media ac #494

Merged
merged 2 commits into from
Nov 2, 2023
Merged

Amp 3054 media ac #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5153ac5
AMP-3054: fix AC for media loading
yingfeng-iu Nov 2, 2023
d8dd9fe
AMP-3053:
yingfeng-iu Nov 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/components/entity/EntityList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,16 +1354,18 @@ export default {
self.showEdit = false;
}
} else if (self.baseUrl === "file") {
let mediaSourceUrl = await self.workflowResultService.getMediaSymlink(
self.selectedFile.id
);
console.log("mediaSourceUrl = " + mediaSourceUrl);
if (self.accessControl._primaryfile_media._read) {
let mediaSourceUrl = await self.workflowResultService.getMediaSymlink(
self.selectedFile.id
);
console.log("mediaSourceUrl = " + mediaSourceUrl);
self.entity["mediaSource"] = mediaSourceUrl;
}
let mediaSourceType = await self.primaryFileService.getPrimaryFile(
self.selectedFile.id
);
self.selectedFile["mediaInfo"] = mediaSourceType.mediaInfo;
self.entity = self.selectedFile;
self.entity["mediaSource"] = mediaSourceUrl;
self.entity["mediaType"] = mediaSourceType.mimeType.substring(0, 5);
self.showLoader = false;
}
Expand Down
4 changes: 2 additions & 2 deletions src/components/entity/OutputFile.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!-- -->
<tr v-for="output in listOfOutputList" :key="output.id">
<td>
<!-- <input type="text" :value="12/28/2021" class="form-control" disabled /> -->
<!-- <input type="text" :value="12/28/2021" class="form-control" disabled /> -->
<p>{{ new Date(output.dateCreated) | LOCAL_DATE_VALUE }}</p>
</td>
<td>
Expand Down Expand Up @@ -73,7 +73,7 @@
disabled
/> -->
<a
@click="workflowResultService.getSymlinkContent(output, true, $event)"
@click="workflowResultService.getSymlinkContent(output, true, null, $event)"
class="complete-output"
target="_blank"
v-if="
Expand Down
4 changes: 2 additions & 2 deletions src/components/evaluation/TestResultsVisualiz.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
<h6>
<a
class="scores-files"
@click="workflowResultService.getSymlinkContent(testResult.workflowResult, false, $event)"
@click="workflowResultService.getSymlinkContent(testResult.workflowResult, false, null, $event)"
target="_blank"
>{{ testResult.primaryFilename }}</a
>
(<a
class="scores-files"
@click="workflowResultService.getSymlinkContent(testResult.workflowResult, true, $event)"
@click="workflowResultService.getSymlinkContent(testResult.workflowResult, true, null, $event)"
target="_blank"
>{{
testResult.workflowResult.workflowStep
Expand Down
Loading