From 5027935ee2feaae7fbe1e0493fb79641cfb06719 Mon Sep 17 00:00:00 2001 From: yingfeng Date: Mon, 28 Oct 2024 11:49:07 -0400 Subject: [PATCH 1/4] AMP-3426: experiments not working - global registration of BSVN components - manaul import of BSVN components in EntityList --- babel.config.js | 1 + components.d.ts | 74 ++++++ package-lock.json | 214 +++++++++++++----- package.json | 3 +- src/components/entity/EntityList.vue | 31 +-- .../evaluation/GroundTruthModal.vue | 2 +- src/main.js | 2 +- vue.config.js | 32 ++- 8 files changed, 279 insertions(+), 80 deletions(-) create mode 100644 components.d.ts diff --git a/babel.config.js b/babel.config.js index cb40e0f..c7545c1 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,4 +1,5 @@ module.exports = { presets: ["@vue/cli-plugin-babel/preset"], + // plugins: [require('unplugin-vue-components/webpack').default({ /* options */ })] // plugins: ["vuera/babel"] }; diff --git a/components.d.ts b/components.d.ts new file mode 100644 index 0000000..e7665c1 --- /dev/null +++ b/components.d.ts @@ -0,0 +1,74 @@ +/* eslint-disable */ +// @ts-nocheck +// Generated by unplugin-vue-components +// Read more: https://github.com/vuejs/core/pull/3399 +export {} + +/* prettier-ignore */ +declare module 'vue' { + export interface GlobalComponents { + AccessDenied: typeof import('./src/components/shared/AccessDenied.vue')['default'] + AmpHeader: typeof import('./src/components/shared/AmpHeader.vue')['default'] + ApproveUser: typeof import('./src/components/account/ApproveUser.vue')['default'] + BarChart: typeof import('./src/components/evaluation/BarChart.vue')['default'] + BatchIngest: typeof import('./src/components/batch/BatchIngest.vue')['default'] + BreadCrumbs: typeof import('./src/components/shared/BreadCrumbs.vue')['default'] + CollectionDetails: typeof import('./src/components/unused/CollectionDetails.vue')['default'] + CollectionDetailsItemCard: typeof import('./src/components/unused/CollectionDetailsItemCard.vue')['default'] + CollectionFilter: typeof import('./src/components/unused/CollectionFilter.vue')['default'] + Collections: typeof import('./src/components/unused/Collections.vue')['default'] + Dashboard: typeof import('./src/components/dashboard/Dashboard.vue')['default'] + DashboardTable: typeof import('./src/components/dashboard/DashboardTable.vue')['default'] + DateFilter: typeof import('./src/components/dashboard/DashboardFilters/DateFilter.vue')['default'] + Deliverables: typeof import('./src/components/deliverables/Deliverables.vue')['default'] + EntityList: typeof import('./src/components/entity/EntityList.vue')['default'] + FileFilter: typeof import('./src/components/unused/FileFilter.vue')['default'] + ForgotPassword: typeof import('./src/components/account/ForgotPassword.vue')['default'] + GroundTruthModal: typeof import('./src/components/evaluation/GroundTruthModal.vue')['default'] + Home: typeof import('./src/components/home/index.vue')['default'] + ItemFiles: typeof import('./src/components/entity/ItemFiles.vue')['default'] + ItemFilter: typeof import('./src/components/unused/ItemFilter.vue')['default'] + ItemSearch: typeof import('./src/components/entity/ItemSearch.vue')['default'] + Jobs: typeof import('./src/components/unused/Jobs.vue')['default'] + Loader: typeof import('./src/components/shared/Loader.vue')['default'] + Login: typeof import('./src/components/account/Login.vue')['default'] + Logout: typeof import('./src/components/shared/Logout.vue')['default'] + Mediaelement: typeof import('./src/components/entity/Mediaelement.vue')['default'] + MGMevaluation: typeof import('./src/components/evaluation/MGMevaluation.vue')['default'] + Modal: typeof import('./src/components/shared/Modal.vue')['default'] + NerEditor: typeof import('./src/components/hmgm/NerEditor.vue')['default'] + NewTest: typeof import('./src/components/evaluation/NewTest.vue')['default'] + OutputFile: typeof import('./src/components/entity/OutputFile.vue')['default'] + Pagination: typeof import('./src/components/shared/Pagination.vue')['default'] + Register: typeof import('./src/components/account/Register.vue')['default'] + ResetPassword: typeof import('./src/components/account/ResetPassword.vue')['default'] + RouterLink: typeof import('vue-router')['RouterLink'] + RouterView: typeof import('vue-router')['RouterView'] + SaveBundle: typeof import('./src/components/workflow/SaveBundle.vue')['default'] + Search: typeof import('./src/components/shared/Search.vue')['default'] + SearchFilter: typeof import('./src/components/dashboard/DashboardFilters/SearchFilter.vue')['default'] + SelectBundle: typeof import('./src/components/workflow/SelectBundle.vue')['default'] + SelectFiles: typeof import('./src/components/workflow/SelectFiles.vue')['default'] + SelectWorkflow: typeof import('./src/components/workflow/SelectWorkflow.vue')['default'] + Sidebar: typeof import('./src/components/navigation/Sidebar.vue')['default'] + SortableHeader: typeof import('./src/components/shared/SortableHeader.vue')['default'] + StatusFilter: typeof import('./src/components/unused/StatusFilter.vue')['default'] + StepFilter: typeof import('./src/components/unused/StepFilter.vue')['default'] + SubmitterFilter: typeof import('./src/components/unused/SubmitterFilter.vue')['default'] + SupplementFile: typeof import('./src/components/supplement/SupplementFile.vue')['default'] + SupplementList: typeof import('./src/components/supplement/SupplementList.vue')['default'] + TestResults: typeof import('./src/components/evaluation/TestResults.vue')['default'] + TestResultsVisualiz: typeof import('./src/components/evaluation/TestResultsVisualiz.vue')['default'] + TextFilter: typeof import('./src/components/unused/TextFilter.vue')['default'] + TokenValidator: typeof import('./src/components/hmgm/TokenValidator.vue')['default'] + TranscriptEditor: typeof import('./src/components/hmgm/TranscriptEditor.vue')['default'] + TypeAhead: typeof import('./src/components/shared/TypeAhead.vue')['default'] + Welcome: typeof import('./src/components/shared/Welcome.vue')['default'] + WorkflowEditor: typeof import('./src/components/workflow/WorkflowEditor.vue')['default'] + WorkflowFiles: typeof import('./src/components/unused/WorkflowFiles.vue')['default'] + WorkflowFilter: typeof import('./src/components/unused/WorkflowFilter.vue')['default'] + WorkflowList: typeof import('./src/components/workflow/WorkflowList.vue')['default'] + WorkflowSelection: typeof import('./src/components/unused/WorkflowSelection.vue')['default'] + WorkflowSubmission: typeof import('./src/components/workflow/WorkflowSubmission.vue')['default'] + } +} diff --git a/package-lock.json b/package-lock.json index cdaf282..4aaee7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,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" @@ -37,7 +36,8 @@ "eslint": "^9.7.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-vue": "^9.27.0", - "prettier": "^3.3.3" + "prettier": "^3.3.3", + "unplugin-vue-components": "^0.27.4" } }, "node_modules/@achrinza/node-ipc": { @@ -76,6 +76,15 @@ "node": ">=6.0.0" } }, + "node_modules/@antfu/utils": { + "version": "0.7.10", + "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.10.tgz", + "integrity": "sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==", + "dev": true, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/@apollo/protobufjs": { "version": "1.2.7", "resolved": "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.2.7.tgz", @@ -7312,6 +7321,12 @@ "node": ">=0.10.0" } }, + "node_modules/confbox": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz", + "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==", + "dev": true + }, "node_modules/config-chain": { "version": "1.1.13", "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", @@ -14289,6 +14304,22 @@ "json5": "lib/cli.js" } }, + "node_modules/local-pkg": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", + "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", + "dev": true, + "dependencies": { + "mlly": "^1.4.2", + "pkg-types": "^1.0.3" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -14587,18 +14618,6 @@ "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==" }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "peer": true, - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, "node_modules/lowdb": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lowdb/-/lowdb-1.0.0.tgz", @@ -14984,6 +15003,18 @@ "mkdirp": "bin/cmd.js" } }, + "node_modules/mlly": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.2.tgz", + "integrity": "sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==", + "dev": true, + "dependencies": { + "acorn": "^8.12.1", + "pathe": "^1.1.2", + "pkg-types": "^1.2.0", + "ufo": "^1.5.4" + } + }, "node_modules/module-alias": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/module-alias/-/module-alias-2.2.3.tgz", @@ -15937,6 +15968,12 @@ "node": ">=8" } }, + "node_modules/pathe": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true + }, "node_modules/pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", @@ -16130,6 +16167,17 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/pkg-types": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.2.1.tgz", + "integrity": "sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==", + "dev": true, + "dependencies": { + "confbox": "^0.1.8", + "mlly": "^1.7.2", + "pathe": "^1.1.2" + } + }, "node_modules/portfinder": { "version": "1.0.32", "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz", @@ -17055,31 +17103,6 @@ "node": ">= 0.8" } }, - "node_modules/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", - "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - }, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-dom": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", - "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0", - "scheduler": "^0.23.2" - }, - "peerDependencies": { - "react": "^18.3.1" - } - }, "node_modules/react-is": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", @@ -17555,15 +17578,6 @@ "node": ">=10" } }, - "node_modules/scheduler": { - "version": "0.23.2", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", - "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", - "peer": true, - "dependencies": { - "loose-envify": "^1.1.0" - } - }, "node_modules/schema-utils": { "version": "2.7.1", "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", @@ -19232,6 +19246,12 @@ "node": ">=4.2.0" } }, + "node_modules/ufo": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.4.tgz", + "integrity": "sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==", + "dev": true + }, "node_modules/unbzip2-stream": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz", @@ -19317,6 +19337,94 @@ "node": ">= 0.8" } }, + "node_modules/unplugin": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.14.1.tgz", + "integrity": "sha512-lBlHbfSFPToDYp9pjXlUEFVxYLaue9f9T1HC+4OHlmj+HnMDdz9oZY+erXfoCe/5V/7gKUSY2jpXPb9S7f0f/w==", + "dev": true, + "dependencies": { + "acorn": "^8.12.1", + "webpack-virtual-modules": "^0.6.2" + }, + "engines": { + "node": ">=14.0.0" + }, + "peerDependencies": { + "webpack-sources": "^3" + }, + "peerDependenciesMeta": { + "webpack-sources": { + "optional": true + } + } + }, + "node_modules/unplugin-vue-components": { + "version": "0.27.4", + "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.27.4.tgz", + "integrity": "sha512-1XVl5iXG7P1UrOMnaj2ogYa5YTq8aoh5jwDPQhemwO/OrXW+lPQKDXd1hMz15qxQPxgb/XXlbgo3HQ2rLEbmXQ==", + "dev": true, + "dependencies": { + "@antfu/utils": "^0.7.10", + "@rollup/pluginutils": "^5.1.0", + "chokidar": "^3.6.0", + "debug": "^4.3.6", + "fast-glob": "^3.3.2", + "local-pkg": "^0.5.0", + "magic-string": "^0.30.11", + "minimatch": "^9.0.5", + "mlly": "^1.7.1", + "unplugin": "^1.12.1" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + }, + "peerDependencies": { + "@babel/parser": "^7.15.8", + "@nuxt/kit": "^3.2.2", + "vue": "2 || 3" + }, + "peerDependenciesMeta": { + "@babel/parser": { + "optional": true + }, + "@nuxt/kit": { + "optional": true + } + } + }, + "node_modules/unplugin-vue-components/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/unplugin-vue-components/node_modules/minimatch": { + "version": "9.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", + "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/unplugin/node_modules/webpack-virtual-modules": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz", + "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==", + "dev": true + }, "node_modules/unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", @@ -20006,16 +20114,6 @@ "vue": "^3.0.0" } }, - "node_modules/vuera": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/vuera/-/vuera-0.2.7.tgz", - "integrity": "sha512-MZErNEK+xXjxBzIDFL9cdEtX3TDZk4pMJGB+WLrlFOVro9okS/FeOSpdPFkpdyZUImZN/or4CrmztA932ChGEQ==", - "peerDependencies": { - "react": ">= 15.2.0", - "react-dom": ">= 15.2.0", - "vue": ">= 2.2" - } - }, "node_modules/vuex": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/vuex/-/vuex-4.1.0.tgz", diff --git a/package.json b/package.json index 83ae5f9..766ae9e 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,8 @@ "eslint": "^9.7.0", "eslint-plugin-prettier": "^5.2.1", "eslint-plugin-vue": "^9.27.0", - "prettier": "^3.3.3" + "prettier": "^3.3.3", + "unplugin-vue-components": "^0.27.4" }, "eslintConfig": { "root": true, diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue index cbd72eb..f5dd134 100644 --- a/src/components/entity/EntityList.vue +++ b/src/components/entity/EntityList.vue @@ -10,7 +10,7 @@
- - Media Information - + - - +
- +
-
+
@@ -703,7 +703,7 @@
- + @@ -753,8 +753,8 @@
- @@ -870,12 +870,12 @@
- +

-No records found-

- +
@@ -912,6 +912,9 @@ import ConfigPropertiesService from "@/service/config-properties-service"; import EvaluationService from "@/service/evaluation-service"; import AccessControlService from "@/service/access-control-service"; +import { BCard, BCollapse, BButton } from "bootstrap-vue-next"; + + export default { name: "EntityList", components: { @@ -1596,11 +1599,11 @@ video { margin-bottom: 33px; padding-right: 0px; } -.b-card-spl { +.BCard-spl { background-color: #fafafa; margin: 0px 0px 8px 0px !important; } -.b-card-spl > div:first-child { +.BCard-spl > div:first-child { padding: 8px !important; } .row-spl { diff --git a/src/components/evaluation/GroundTruthModal.vue b/src/components/evaluation/GroundTruthModal.vue index 0b6c952..7c6b349 100644 --- a/src/components/evaluation/GroundTruthModal.vue +++ b/src/components/evaluation/GroundTruthModal.vue @@ -251,7 +251,7 @@ export default { } catch (error) { self.loading = false; self.$bvToast.toast( - "Something went wrong.Please try again!", + "Something went wrong. Please try again!", self.sharedService.erorrToastConfig ); } diff --git a/src/main.js b/src/main.js index a2873e1..0b5d638 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import router from "./router"; import { store } from "./store/amp-store"; // import { VuePlugin } from "vuera"; import VueFilterDateFormat from "@vuejs-community/vue-filter-date-format"; -import {createBootstrap} from "bootstrap-vue-next"; +import {createBootstrap, BootstrapVueNextResolver} from "bootstrap-vue-next"; import moment from "moment"; import "bootstrap/dist/css/bootstrap.css"; import "bootstrap-vue-next/dist/bootstrap-vue-next.css"; diff --git a/vue.config.js b/vue.config.js index 64c4317..3d96aed 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,7 +1,29 @@ +// const { BootstrapVueNextResolver} = require("bootstrap-vue-next"); +// const { defineConfig } = require('@vue/cli-service') +// const { Components } = require('unplugin-vue-components/webpack') + +// module.exports = defineConfig({ +// chainWebpack: (config) => { +// config.module +// .rule('vue') +// .use('vue-loader') +// }, +// configureWebpack: { +// plugins: [ +// Components({ resolvers: [BootstrapVueNextResolver()], }), +// ] +// } +// }) + module.exports = { - chainWebpack: (config) => { - config.module - .rule('vue') - .use('vue-loader') - } + chainWebpack: (config) => { + config.module + .rule('vue') + .use('vue-loader') + }, + configureWebpack: { + plugins: [ + require('unplugin-vue-components/webpack').default({ /* options */ }), + ], + } } \ No newline at end of file From a5b8c1c464ccf59d941a6106e3d7e99d12724084 Mon Sep 17 00:00:00 2001 From: Issayah Date: Mon, 28 Oct 2024 11:46:17 -0500 Subject: [PATCH 2/4] fix: bootstrap-vue-next --- components.d.ts | 27 +++++++++++++++++++++++++++ src/main.js | 2 +- vue.config.js | 6 ++++-- 3 files changed, 32 insertions(+), 3 deletions(-) diff --git a/components.d.ts b/components.d.ts index e7665c1..0334791 100644 --- a/components.d.ts +++ b/components.d.ts @@ -10,8 +10,31 @@ declare module 'vue' { AccessDenied: typeof import('./src/components/shared/AccessDenied.vue')['default'] AmpHeader: typeof import('./src/components/shared/AmpHeader.vue')['default'] ApproveUser: typeof import('./src/components/account/ApproveUser.vue')['default'] + BAlert: typeof import('bootstrap-vue-next/components/BAlert')['BAlert'] BarChart: typeof import('./src/components/evaluation/BarChart.vue')['default'] BatchIngest: typeof import('./src/components/batch/BatchIngest.vue')['default'] + BBreadcrumb: typeof import('bootstrap-vue-next/components/BBreadcrumb')['BBreadcrumb'] + BButton: typeof import('bootstrap-vue-next/components/BButton')['BButton'] + BCard: typeof import('bootstrap-vue-next/components/BCard')['BCard'] + BCollapse: typeof import('bootstrap-vue-next/components/BCollapse')['BCollapse'] + BDropdown: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdown'] + BDropdownForm: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownForm'] + BDropdownItem: typeof import('bootstrap-vue-next/components/BDropdown')['BDropdownItem'] + BFormCheckbox: typeof import('bootstrap-vue-next/components/BFormCheckbox')['BFormCheckbox'] + BFormCheckboxGroup: typeof import('bootstrap-vue-next/components/BFormCheckbox')['BFormCheckboxGroup'] + BFormGroup: typeof import('bootstrap-vue-next/components/BFormGroup')['BFormGroup'] + BFormRadio: typeof import('bootstrap-vue-next/components/BFormRadio')['BFormRadio'] + BFormRadioGroup: typeof import('bootstrap-vue-next/components/BFormRadio')['BFormRadioGroup'] + BLink: typeof import('bootstrap-vue-next/components/BLink')['BLink'] + BModal: typeof import('bootstrap-vue-next/components/BModal')['BModal'] + BNavbar: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbar'] + BNavbarBrand: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarBrand'] + BNavbarNav: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarNav'] + BNavbarToggle: typeof import('bootstrap-vue-next/components/BNavbar')['BNavbarToggle'] + BNavItem: typeof import('bootstrap-vue-next/components/BNav')['BNavItem'] + BNavItemDropdown: typeof import('bootstrap-vue-next/components/BNav')['BNavItemDropdown'] + BOverlay: typeof import('bootstrap-vue-next/components/BOverlay')['BOverlay'] + BPagination: typeof import('bootstrap-vue-next/components/BPagination')['BPagination'] BreadCrumbs: typeof import('./src/components/shared/BreadCrumbs.vue')['default'] CollectionDetails: typeof import('./src/components/unused/CollectionDetails.vue')['default'] CollectionDetailsItemCard: typeof import('./src/components/unused/CollectionDetailsItemCard.vue')['default'] @@ -71,4 +94,8 @@ declare module 'vue' { WorkflowSelection: typeof import('./src/components/unused/WorkflowSelection.vue')['default'] WorkflowSubmission: typeof import('./src/components/workflow/WorkflowSubmission.vue')['default'] } + export interface ComponentCustomProperties { + vBModal: typeof import('bootstrap-vue-next/directives/BModal')['vBModal'] + vBToggle: typeof import('bootstrap-vue-next/directives/BToggle')['vBToggle'] + } } diff --git a/src/main.js b/src/main.js index 0b5d638..3760c44 100644 --- a/src/main.js +++ b/src/main.js @@ -4,7 +4,7 @@ import router from "./router"; import { store } from "./store/amp-store"; // import { VuePlugin } from "vuera"; import VueFilterDateFormat from "@vuejs-community/vue-filter-date-format"; -import {createBootstrap, BootstrapVueNextResolver} from "bootstrap-vue-next"; +import {createBootstrap} from "bootstrap-vue-next/plugins"; import moment from "moment"; import "bootstrap/dist/css/bootstrap.css"; import "bootstrap-vue-next/dist/bootstrap-vue-next.css"; diff --git a/vue.config.js b/vue.config.js index 3d96aed..4fa8502 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,4 +1,4 @@ -// const { BootstrapVueNextResolver} = require("bootstrap-vue-next"); +const { BootstrapVueNextResolver } = require("bootstrap-vue-next/resolvers"); // const { defineConfig } = require('@vue/cli-service') // const { Components } = require('unplugin-vue-components/webpack') @@ -23,7 +23,9 @@ module.exports = { }, configureWebpack: { plugins: [ - require('unplugin-vue-components/webpack').default({ /* options */ }), + require('unplugin-vue-components/webpack').default({ + resolvers: [BootstrapVueNextResolver()] + }), ], } } \ No newline at end of file From 22ed65d5cf8d805082f8ee823f8cbf8616a03c78 Mon Sep 17 00:00:00 2001 From: yingfeng Date: Tue, 29 Oct 2024 14:33:18 -0400 Subject: [PATCH 3/4] AMP-3426: remove commented code --- src/components/entity/EntityList.vue | 31 +++++++++++++--------------- vue.config.js | 15 -------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue index f5dd134..cbd72eb 100644 --- a/src/components/entity/EntityList.vue +++ b/src/components/entity/EntityList.vue @@ -10,7 +10,7 @@
- - Media Information - + - - +
- +
-
+
@@ -703,7 +703,7 @@
- + @@ -753,8 +753,8 @@
- @@ -870,12 +870,12 @@
- +

-No records found-

- +
@@ -912,9 +912,6 @@ import ConfigPropertiesService from "@/service/config-properties-service"; import EvaluationService from "@/service/evaluation-service"; import AccessControlService from "@/service/access-control-service"; -import { BCard, BCollapse, BButton } from "bootstrap-vue-next"; - - export default { name: "EntityList", components: { @@ -1599,11 +1596,11 @@ video { margin-bottom: 33px; padding-right: 0px; } -.BCard-spl { +.b-card-spl { background-color: #fafafa; margin: 0px 0px 8px 0px !important; } -.BCard-spl > div:first-child { +.b-card-spl > div:first-child { padding: 8px !important; } .row-spl { diff --git a/vue.config.js b/vue.config.js index 4fa8502..4475f96 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,19 +1,4 @@ const { BootstrapVueNextResolver } = require("bootstrap-vue-next/resolvers"); -// const { defineConfig } = require('@vue/cli-service') -// const { Components } = require('unplugin-vue-components/webpack') - -// module.exports = defineConfig({ -// chainWebpack: (config) => { -// config.module -// .rule('vue') -// .use('vue-loader') -// }, -// configureWebpack: { -// plugins: [ -// Components({ resolvers: [BootstrapVueNextResolver()], }), -// ] -// } -// }) module.exports = { chainWebpack: (config) => { From 626700638a1876c2bbefe74fd5671b9855c9302e Mon Sep 17 00:00:00 2001 From: yingfeng Date: Tue, 29 Oct 2024 18:03:53 -0400 Subject: [PATCH 4/4] AMP-3426: remove commented code --- babel.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/babel.config.js b/babel.config.js index c7545c1..cb40e0f 100644 --- a/babel.config.js +++ b/babel.config.js @@ -1,5 +1,4 @@ module.exports = { presets: ["@vue/cli-plugin-babel/preset"], - // plugins: [require('unplugin-vue-components/webpack').default({ /* options */ })] // plugins: ["vuera/babel"] };