Skip to content

Commit

Permalink
AMP-3404
Browse files Browse the repository at this point in the history
- remove vuera from package.json
- fix bvForm undefined issue (globallyy)
- fix template #default issue (globallyy)
  • Loading branch information
yingfeng-iu committed Sep 26, 2024
1 parent 51daba5 commit 55c31f7
Show file tree
Hide file tree
Showing 12 changed files with 18 additions and 19 deletions.
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"vue-router": "^4.4.0",
"vue3-mediaelement": "^0.0.8",
"vuejs3-datepicker": "^1.0.19",
"vuera": "^0.2.7",
"vuex": "^4.1.0",
"vuex-pathify": "^3.0.0-beta",
"vuex-persistedstate": "^4.1.0"
Expand Down
3 changes: 2 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>W
<html lang="en">
<head>
<meta charset="utf-8">
Expand All @@ -9,6 +9,7 @@
<!-- TODO need to switch to BT 5 -->
<!-- <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous"> -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
<!-- <link rel="stylesheet" href="https://unpkg.com/bootstrap-vue@latest/dist/bootstrap-vue.css"/> -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Roboto:wght@400;700&display=swap">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.1.1/css/all.min.css" />
<link rel="stylesheet" type="text/css" href="/css/jquery.dataTables.min.css">
Expand Down
2 changes: 1 addition & 1 deletion src/components/dashboard/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1188,7 +1188,7 @@ export default {
break;
}
this.$bvModal.show("modal-lg");
this.$bvModal?.show("modal-lg");
},
getDateString() {
const date = new Date();
Expand Down
4 changes: 2 additions & 2 deletions src/components/dashboard/DashboardTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -292,12 +292,12 @@

<!-- Modal for delete confirmation -->
<b-modal v-model="showModal" id="modal-center" centered>
<template #modal-header="{}">
<template #modal-header>
<h5 class="text-capitalize">
Confirm
</h5>
</template>
<template #default="{}">
<template #default>
<div class="row pad-all-2">
Are you sure you want to delete this result from the Dashboard? This
action cannot be rolled back.
Expand Down
2 changes: 1 addition & 1 deletion src/components/entity/EntityList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1445,7 +1445,7 @@ export default {
},
onSearch(type) {
this.searchType = type;
this.$bvModal.show("modal-lg");
this.$bvModal?.show("modal-lg");
},
onSearchDone(records) {
this.records = records && records.length ? records : this.masterRecords;
Expand Down
2 changes: 1 addition & 1 deletion src/components/entity/ItemSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default {
// pop up child component (the Search pop-up ialog)
onSearch() {
this.$bvModal.show("modal-lg");
this.$bvModal?.show("modal-lg");
},
// call item search API
Expand Down
4 changes: 2 additions & 2 deletions src/components/evaluation/GroundTruthModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
no-close-on-backdrop
size="xl"
>
<template #modal-header="{}">
<template #modal-header>
<h5 class="modal-title" id="exampleModalLongTitle">
Upload/Select Ground Truth
</h5>
Expand All @@ -22,7 +22,7 @@
<span @click="onCancel()">×</span>
</button>
</template>
<template #default="{}">
<template #default>
<div class="form-row body-m">
<div class="col-12">
<h3>Select a Ground Truth</h3>
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/Search.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
@show="processModalData()"
:no-close-on-backdrop="type === 'item-search'"
>
<template #modal-header="{}">
<template #modal-header>
<!-- Emulate built in modal header close button action -->

<h5 class="text-capitalize" v-if="!isEntityList">
Expand All @@ -24,7 +24,7 @@
<h5 class="text-capitalize" v-if="isEntityList">Search</h5>
</template>

<template #default="{}">
<template #default>
<div v-if="type === 'item-search'" class="form-group">
<div class="container-fluid">
<div class="row">
Expand Down
2 changes: 1 addition & 1 deletion src/components/supplement/SupplementList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ export default {
},
onSearch(type) {
this.searchType = type;
this.$bvModal.show("modal-lg");
this.$bvModal?.show("modal-lg");
},
onSearchDone(records) {
this.records = records && records.length ? records : this.masterRecords;
Expand Down
4 changes: 2 additions & 2 deletions src/components/workflow/SelectWorkflow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -281,13 +281,13 @@
class="spl-fr-btn"
></b-button>
<b-modal v-model="showFRModal" id="modal-center" centered>
<template #modal-header="{}">
<template #modal-header>
<h5 class="text-capitalize">
Choose the Facial Recognition input file for
{{ supplementList[0].primaryFileName }}:
</h5>
</template>
<template #default="{}">
<template #default>
<b-form-group v-slot="{ ariaDescribedby }">
<b-form-radio
v-for="(supplement, index) in supplementList"
Expand Down
4 changes: 2 additions & 2 deletions src/components/workflow/WorkflowEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
</div>
</div>
<b-modal v-model="showModal" id="modal-center" centered>
<template #modal-header="{}">
<template #modal-header>
<h5 class="text-capitalize">
Confirm
</h5>
</template>
<template #default="{}">
<template #default>
<div class="row pad-all-2">
Any unsaved changes will be lost. Do you want to continue?
</div>
Expand Down
5 changes: 2 additions & 3 deletions src/components/workflow/WorkflowList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,6 @@ export default {
methods: {
canCreate() {
let actionKey = env.getEnv("VUE_APP_AC_ACTIONTYPE_CREATE") + "-" + env.getEnv("VUE_APP_AC_TARGETTYPE_WORKFLOW")
console.log("actionKey" + actionKey);
return this.acIsAdmin || this.acActions.includes(actionKey);
},
canUpdate() {
Expand Down Expand Up @@ -317,8 +316,8 @@ export default {
self.listOfWorkflows[workflowIndex]
);
},
async handleWorkflowSearch() {
this.$bvModal.show("modal-lg");
handleWorkflowSearch() {
this.$bvModal?.show("modal-lg");
},
async handleWorkflowCreation() {
const self = this;
Expand Down

0 comments on commit 55c31f7

Please sign in to comment.