Skip to content

Commit

Permalink
Merge branch '9053-cbyrd-create-future-publications' of https://githu…
Browse files Browse the repository at this point in the history
…b.com/archesproject/arches into 9271-cbyrd-manage-published-graphs
  • Loading branch information
chrabyrd committed Mar 18, 2024
2 parents 3a562ec + 586eb5e commit d614e60
Show file tree
Hide file tree
Showing 10 changed files with 46 additions and 19 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ module.exports = {
"files": [ "*.vue" ],
"rules": {
"vue/html-indent": [2, 4],
"vue/this-in-template": "off"
}
},
{
Expand Down
14 changes: 14 additions & 0 deletions arches/app/media/js/utils/create-vue-application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
import PrimeVue from 'primevue/config';
import AnimateOnScroll from 'primevue/animateonscroll';
import ConfirmationService from 'primevue/confirmationservice';
import DialogService from 'primevue/dialogservice';
import FocusTrap from 'primevue/focustrap';
import StyleClass from 'primevue/styleclass';
import ToastService from 'primevue/toastservice';
import Tooltip from 'primevue/tooltip';

import { createApp } from 'vue';
import { createGettext } from "vue3-gettext";
Expand Down Expand Up @@ -32,6 +39,13 @@ export default async function createVueApp(vueComponent){
const app = createApp(vueComponent);
app.use(PrimeVue);
app.use(gettext);
app.use(ConfirmationService);
app.use(DialogService);
app.use(ToastService);
app.directive('animateonscroll', AnimateOnScroll);
app.directive('focustrap', FocusTrap);
app.directive('styleclass', StyleClass);
app.directive('tooltip', Tooltip);

return app;
});
Expand Down
1 change: 1 addition & 0 deletions arches/app/src/declarations.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ declare module "moment-timezone";
declare module "nouislider";
declare module "numeral";
declare module "primevue";
declare module "primevue/*";
declare module "proj4";
declare module "regenerator-runtime";
declare module "requirejs";
Expand Down
2 changes: 2 additions & 0 deletions arches/app/templates/base.htm
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
<link rel="apple-touch-icon" sizes="180x180" href="{% webpack_static 'favicons/apple-touch-icon-180x180.png' %}" />

{% block css %}
<!-- POC rough out of PrimeVue theme switcher -->
<link rel="stylesheet" href="{% webpack_static 'node_modules/primevue/resources/themes/mdc-light-indigo/theme.css' %}" />
{% render_bundle 'css/arches' 'css' %}
{% render_bundle 'css/core' 'css' %}

Expand Down
1 change: 0 additions & 1 deletion arches/install/arches-app-templates/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ module.exports = {
"files": [ "*.vue" ],
"rules": {
"vue/html-indent": [2, 4],
"vue/this-in-template": "off"
}
},
{
Expand Down
13 changes: 8 additions & 5 deletions arches/install/arches-app-templates/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
"paths": {
"@/*": [
"*.ts",
"*.vue",
],
},
"*.vue"
]
}
},
"include": [
"**/*.ts",
"**/*.vue",
"**/*.vue"
],
}
"vueCompilerOptions": {
"skipTemplateCodegen": true
}
}
1 change: 0 additions & 1 deletion arches/install/arches-templates/project_name/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ module.exports = {
"files": [ "*.vue" ],
"rules": {
"vue/html-indent": [2, 4],
"vue/this-in-template": "off"
}
},
{
Expand Down
13 changes: 8 additions & 5 deletions arches/install/arches-templates/project_name/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
"paths": {
"@/*": [
"*.ts",
"*.vue",
],
},
"*.vue"
]
}
},
"include": [
"**/*.ts",
"**/*.vue",
"**/*.vue"
],
}
"vueCompilerOptions": {
"skipTemplateCodegen": true
}
}
6 changes: 5 additions & 1 deletion releases/7.6.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@ Arches 7.6.0 Release Notes

### Major enhancements

### Performance Improvments
An interface for contributing front-end features in Vue is now provided via the ``createVueApp()`` function. A minimal example is available in the [Arches Vue Integration Styleguide](https://github.com/archesproject/arches-docs/blob/master/docs/developing/vue/arches-vue-integration.md).

The ``createVueApp()`` function is experimental in 7.6. It currently registers all available ``PrimeVue`` services and directives, such as [toast (error messaging) plugins](https://primevue.org/toast/), [tooltip animations](https://primevue.org/tooltip/), and more. Over time, if some of these features do not see significant use in core Arches (or if registering them leads to a performance drag), they may be dropped from the ``createVueApp()`` wrapper. Implementers may always register any needed plugins/services in their own Vue applications. (Note: The vast majority of ``PrimeVue``'s functionality does not require these services or directives.)

### Performance Improvements

### Additional improvements and bug fixes
- 10490 Fixes an issue where webpack receives multiple build calls when running in a container
Expand Down
13 changes: 8 additions & 5 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,15 @@
"paths": {
"@/*": [
"*.ts",
"*.vue",
],
},
"*.vue"
]
}
},
"include": [
"**/*.ts",
"**/*.vue",
"**/*.vue"
],
}
"vueCompilerOptions": {
"skipTemplateCodegen": true
}
}

0 comments on commit d614e60

Please sign in to comment.