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.

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 3417 wf select #540

Merged
merged 2 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions src/components/batch/BatchIngest.vue
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@
v-bind="filename"
type="file"
class="form-control-file btn btn-light btn-lg"
id="exampleFormControlFile1"
ref="inputFile"

:disabled="inProgress || unitName.length === 0"
accept=".csv"
@change="
Expand Down
16 changes: 8 additions & 8 deletions src/components/entity/EntityList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -972,30 +972,30 @@ export default {
configProperties: sync("configProperties"),
baseUrl() {
const self = this;
if (window.location.hash.toLowerCase().indexOf("unit") > -1) {
if (window.location.href.toLowerCase().indexOf("unit") > -1) {
return "unit";
} else if (window.location.hash.toLowerCase().indexOf("file") > -1) {
} else if (window.location.href.toLowerCase().indexOf("file") > -1) {
return "file";
} else if (
window.location.hash.toLowerCase().indexOf("collection") > -1 &&
window.location.hash.toLowerCase().indexOf("item") === -1
window.location.href.toLowerCase().indexOf("collection") > -1 &&
window.location.href.toLowerCase().indexOf("item") === -1
) {
this.getItemsConfig();
return "collection";
} else if (window.location.hash.toLowerCase().indexOf("item") > -1) {
} else if (window.location.href.toLowerCase().indexOf("item") > -1) {
return "item";
}
return "";
},
purpose() {
return window.location.hash.toLowerCase().indexOf("details") > -1
return window.location.href.toLowerCase().indexOf("details") > -1
? "details"
: "";
},
isCreatePage() {
return (
window.location.hash.toLowerCase().indexOf("create") > -1 ||
window.location.hash.toLowerCase().indexOf("add-item") > -1
window.location.href.toLowerCase().indexOf("create") > -1 ||
window.location.href.toLowerCase().indexOf("add-item") > -1
);
},
listOfTaskManager() {
Expand Down
5 changes: 1 addition & 4 deletions src/components/entity/ItemFiles.vue
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,9 @@
>
<div class="d-flex w-100 mt-3">
<div class="input-group image-preview col-11 p-0 mr-1">
<!-- <label for="exampleFormControlFile1" class="form-control-file btn btn-light btn-lg"><button>Browse</button></label> -->
<input
type="file"
class="form-control-file btn btn-light btn-lg"
id="exampleFormControlFile1"
value="Upload"
ref="fileupload"
@change="getFile"
/>
Expand Down Expand Up @@ -180,7 +177,7 @@ export default {
selectedFile: sync("selectedFile"),
accessControl: sync("accessControl"),
isCreatePage() {
return window.location.hash.toLowerCase().indexOf("add-item") > -1;
return window.location.href.toLowerCase().indexOf("add-item") > -1;
},
},
methods: {
Expand Down
2 changes: 0 additions & 2 deletions src/components/evaluation/GroundTruthModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,6 @@
type="file"
:accept="'.' + mstDetails.groundtruthFormat"
class="form-control-file btn btn-light btn"
id="exampleFormControlFile1"
value="Upload"
ref="fileupload"
@change="getFile"
:disabled="uploadGtFiles.length > 0"
Expand Down
2 changes: 0 additions & 2 deletions src/components/supplement/SupplementFile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
<input
type="file"
class="form-control-file btn btn-light btn-lg"
id="exampleFormControlFile1"
value="upload"
@change="filesChange"
/>
</label>
Expand Down
4 changes: 2 additions & 2 deletions src/components/supplement/SupplementList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,11 @@ export default {
baseUrl() {
const self = this;
if (
window.location.hash.toLowerCase().indexOf("supplemental-files/") > -1
window.location.href.toLowerCase().indexOf("supplemental-files/") > -1
) {
return "supplement";
} else if (
window.location.hash.toLowerCase().indexOf("supplemental-files") > -1
window.location.href.toLowerCase().indexOf("supplemental-files") > -1
) {
return "list-supplement";
}
Expand Down
7 changes: 2 additions & 5 deletions src/components/workflow/SelectWorkflow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -288,17 +288,14 @@
</h5>
</template>
<template #default>
<b-form-group v-slot="{ ariaDescribedby }">
<b-form-radio-group v-model="selectedSupplement">
<b-form-radio
v-for="(supplement, index) in supplementList"
v-bind:key="index"
v-model="selectedSupplement"
:aria-describedby="ariaDescribedby"
name="some-radios"
:value="supplement"
>{{ supplement.name }}</b-form-radio
>
</b-form-group>
</b-form-radio-group>
<div class="row pad-all-2">
<div class="float-left">
<label class="switch">
Expand Down
Loading