Merge pull request #27 from LCOGT/feature/move-compose-to-lib

Feature/move compose to lib
LCOGT · Jun 10, 2021 · ba83fe7 · ba83fe7
2 parents 656dcb7 + 20086ab
commit ba83fe7
Show file tree

Hide file tree

Showing 29 changed files with 2,589 additions and 22,820 deletions.
diff --git a/babel.config.js b/babel.config.js
@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['@vue/cli-plugin-babel/preset']
+  presets: [['@vue/cli-plugin-babel/preset', { useBuiltIns: 'entry' }]]
 };
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,6 +11,7 @@
     "test:unit": "vue-cli-service test:unit"
   },
   "dependencies": {
+    "@vue/composition-api": "^1.0.0-rc.7",
     "bootstrap": "^4.5.3",
     "bootstrap-table": "^1.14.2",
     "bootstrap-vue": "^2.20.1",
@@ -22,7 +23,7 @@
     "jquery-file-download": "^1.4.6",
     "lodash": "^4.17.13",
     "moment": "^2.22.1",
-    "ocs-component-lib": "^0.6.0",
+    "ocs-component-lib": "^0.7.0",
     "pdf-lib": "^1.12.0",
     "popper.js": "^1.16.1",
     "vis": "4.19.1",

diff --git a/src/components/Cadence.vue b/src/components/Cadence.vue
diff --git a/src/components/CoInvestigatorTable.vue b/src/components/CoInvestigatorTable.vue
@@ -117,7 +117,7 @@
 import $ from 'jquery';
 import { OCSMixin, OCSUtil } from 'ocs-component-lib';
 
-import { confirmMixin, clearAndSetErrorsMixin } from '@/components/util/utilMixins.js';
+import { clearAndSetErrorsMixin } from '@/components/util/utilMixins.js';
 
 export default {
   name: 'CoInvestigatorTable',
@@ -126,7 +126,7 @@ export default {
       return OCSUtil.formatFloat(value, precision);
     }
   },
-  mixins: [OCSMixin.paginationAndFilteringMixin, confirmMixin, clearAndSetErrorsMixin],
+  mixins: [OCSMixin.paginationAndFilteringMixin, OCSMixin.confirmMixin, clearAndSetErrorsMixin],
   props: {
     proposalId: {
       type: String,