Skip to content

armgit / dashy

Public Imported from GitHub
0

πŸš€ A self-hostable personal dashboard built for you. Includes status-checking, widgets, themes, icon packs, a UI editor and tons more!

✨ Schema-driven UI config editors

Alicia Sykes052ff83408f0
diff --git a/package.json b/package.json
index d293c4a9..bf67ffa2 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,9 @@
},
"dependencies": {
"@febe95/vue-js-modal": "^3.2.0",
+ "@jsonforms/core": "^3.7.0",
+ "@jsonforms/vue": "^3.7.0",
+ "@jsonforms/vue-vanilla": "^3.7.0",
"@sentry/tracing": "^7.102.1",
"@sentry/vue": "^7.102.1",
"ajv": "^8.10.0",
diff --git a/src/components/FormElements/SchemaForm.vue b/src/components/FormElements/SchemaForm.vue
new file mode 100644
index 00000000..ad79101a
--- /dev/null
+++ b/src/components/FormElements/SchemaForm.vue
@@ -0,0 +1,323 @@
+<template>
+ <div class="dashy-schema-form">
+ <div v-if="fatalError" class="form-error">
+ <p>Unable to render this form. {{ fatalError }}</p>
+ <p class="form-error-hint">See browser console or Config / Logs for details.</p>
+ </div>
+ <template v-else>
+ <JsonForms
+ :data="formData"
+ :schema="schema"
+ :uischema="uischema"
+ :renderers="renderers"
+ :validation-mode="validationMode"
+ :ajv="ajv"
+ :config="jfConfig"
+ @change="onChange"
+ />
+ <p v-if="errorCount" class="validation-summary">
+ {{ errorCount }} validation issue{{ errorCount === 1 ? '' : 's' }}. Review highlighted fields.
+ </p>
+ </template>
+ </div>
+</template>
+
+<script>
+import { JsonForms } from '@jsonforms/vue';
+import { vanillaRenderers, defaultStyles } from '@jsonforms/vue-vanilla';
+import Ajv from 'ajv';
+import addFormats from 'ajv-formats';
+import ErrorHandler from '@/utils/ErrorHandler';
+import safeClone from '@/utils/safeClone';
+
+const ajv = new Ajv({
+ allErrors: true,
+ strict: false,
+ addUsedSchema: false,
+ useDefaults: true,
+ validateSchema: false,
+});
+addFormats(ajv);
+
+/* Global config for every control: keep field descriptions always visible,
+ * not gated behind focus (the vue-vanilla default). */
+const jfConfig = Object.freeze({ showUnfocusedDescription: true });
+
+const dashyStyles = Object.fromEntries(
+ Object.entries(defaultStyles).map(([group, map]) => [
+ group,
+ Object.fromEntries(Object.entries(map).map(([k, v]) => [
+ k,
+ typeof v === 'string' ? v.split(/\s+/).filter(Boolean).map(c => `dashy-jf-${c}`).join(' ') : v,
+ ])),
+ ]),
+);
+
+export default {
+ name: 'SchemaForm',
+ components: { JsonForms },
+ props: {
+ modelValue: { type: [Object, Array], default: null },
+ schema: { type: Object, required: true },
+ uischema: { type: Object, default: undefined },
+ validationMode: { type: String, default: 'ValidateAndShow' },
+ },
+ emits: ['update:modelValue'],
+ provide() {
+ return { styles: dashyStyles };
+ },
+ data() {
+ const empty = this.schema.type === 'array' ? [] : {};
+ return {
+ renderers: Object.freeze(vanillaRenderers),
+ formData: safeClone(this.modelValue, empty),
+ ajv,
+ jfConfig,
+ errorCount: 0,
+ fatalError: null,
+ };
+ },
+ errorCaptured(err, _vm, info) {
+ /* Return false to stop Vue's default handler from also logging. */
+ this.fatalError = err?.message || 'unknown error';
+ ErrorHandler(`SchemaForm runtime error (${info})`, err);
+ return false;
+ },
+ methods: {
+ onChange({ data, errors }) {
+ this.formData = data;
+ this.errorCount = (errors || []).length;
+ this.$emit('update:modelValue', data);
+ },
+ },
+};
+</script>
+
+<style lang="scss">
+/* Themed vue-vanilla styles, scoped to .dashy-schema-form. Class names match
+ * the `dashy-jf-*` map provided to JsonForms above. */
+
+$jf-gap: 0.75rem;
+$jf-field-radius: var(--curve-factor, 4px);
+
+.dashy-schema-form {
+ color: var(--interactive-editor-color);
+
+ > p.validation-summary {
+ color: var(--warning);
+ font-size: 0.9rem;
+ text-align: right;
+ margin: 0.25rem 0 0.5rem;
+ }
+
+ > .form-error {
+ padding: 1rem;
+ border: 1px solid var(--warning);
+ border-radius: var(--curve-factor, 4px);
+ color: var(--warning);
+ background: var(--interactive-editor-background-darker, transparent);
+ p { margin: 0.25rem 0; }
+ .form-error-hint {
+ opacity: var(--dimming-factor, 0.75);
+ font-size: 0.85rem;
+ }
+ }
+
+ /* Layouts */
+ .dashy-jf-vertical-layout {
+ display: flex;
+ flex-direction: column;
+ gap: $jf-gap;
+ }
+ .dashy-jf-horizontal-layout {
+ display: flex;
+ flex-direction: row;
+ gap: $jf-gap;
+ flex-wrap: wrap;
+ .dashy-jf-horizontal-layout-item {
+ flex: 1 1 auto;
+ min-width: 0;
+ }
+ }
+
+ /* Groups */
+ .dashy-jf-group {
+ border: 1px solid var(--interactive-editor-color);
+ border-radius: $jf-field-radius;
+ padding: 0.75rem 1rem;
+ margin: 0.25rem 0;
+ .dashy-jf-group-label {
+ font-weight: bold;
+ font-size: 1.05rem;
+ margin: 0 0 0.5rem 0;
+ color: var(--interactive-editor-color);
+ }
+ .dashy-jf-group-item + .dashy-jf-group-item {
+ margin-top: $jf-gap;
+ }
+ }
+
+ /* Controls (field wrapper + label + input + description + error) */
+ .dashy-jf-control {
+ display: flex;
+ flex-direction: column;
+ .dashy-jf-wrapper {
+ display: flex;
+ flex-direction: column;
+ }
+ .dashy-jf-label {
+ font-size: 0.9rem;
+ margin-bottom: 0.25rem;
+ color: var(--interactive-editor-color);
+ .dashy-jf-asterisk {
+ color: var(--warning, #ef5350);
+ margin-left: 0.2rem;
+ }
+ }
+ .dashy-jf-description {
+ font-size: 0.8rem;
+ opacity: var(--dimming-factor, 0.75);
+ margin: 0.5rem 0;
+ color: var(--interactive-editor-color);
+ }
+ .dashy-jf-error {
+ color: var(--warning, #ef5350);
+ font-size: 0.8rem;
+ margin-top: 0.2rem;
+ }
+ }
+
+ /* Inputs (text / number / select / textarea / checkbox) */
+ .dashy-jf-input,
+ .dashy-jf-select,
+ .dashy-jf-text-area {
+ width: 100%;
+ padding: 0.4rem 0.6rem;
+ font-size: 1rem;
+ font-family: inherit;
+ color: var(--interactive-editor-color);
+ background: var(--interactive-editor-background);
+ border: 1px solid var(--interactive-editor-color);
+ border-radius: $jf-field-radius;
+ box-sizing: border-box;
+ &:focus {
+ outline: none;
+ box-shadow: 0 0 0 2px var(--interactive-editor-color);
+ }
+ &:disabled {
+ opacity: var(--dimming-factor, 0.6);
+ cursor: not-allowed;
+ }
+ }
+ .dashy-jf-text-area {
+ min-height: 5rem;
+ resize: vertical;
+ font-family: monospace;
+ }
+ /* Boolean rows: label + description on the left, checkbox on the right */
+ .dashy-jf-control:has(input[type='checkbox']) {
+ display: grid;
+ grid-template-columns: 1fr auto;
+ grid-template-areas: "label box" "desc box";
+ column-gap: 1rem;
+ align-items: center;
+ padding: 0.25rem 0;
+ > .dashy-jf-label { grid-area: label; margin: 0; }
+ > .dashy-jf-wrapper { grid-area: box; display: flex; }
+ > .dashy-jf-description,
+ > .dashy-jf-error { grid-area: desc; margin: 0.15rem 0 0; }
+ }
+ input[type='checkbox'].dashy-jf-input {
+ width: 1.25rem;
+ height: 1.25rem;
+ margin: 0;
+ cursor: pointer;
+ accent-color: var(--interactive-editor-color);
+ }
+
+ /* Arrays of objects */
+ .dashy-jf-array-list {
+ border: 1px solid var(--interactive-editor-color);
+ border-radius: $jf-field-radius;
+ padding: 0.5rem 0.75rem;
+ margin: 0.25rem 0;
+ .dashy-jf-array-list-legend {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 0.5rem;
+ margin-bottom: 0.5rem;
+ }
+ .dashy-jf-array-list-label {
+ font-weight: bold;
+ font-size: 1rem;
+ color: var(--interactive-editor-color);
+ }
+ .dashy-jf-array-list-no-data {
+ opacity: var(--dimming-factor, 0.6);
+ font-style: italic;
+ padding: 0.5rem 0;
+ }
+ .dashy-jf-array-list-item-wrapper {
+ border: 1px dashed var(--interactive-editor-color);
+ border-radius: $jf-field-radius;
+ margin: 0.5rem 0;
+ padding: 0.25rem 0.5rem;
+ background: var(--interactive-editor-background-darker, transparent);
+ }
+ .dashy-jf-array-list-item-toolbar {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ gap: 0.25rem;
+ padding: 0.25rem 0;
+ .dashy-jf-array-list-item-label {
+ flex: 1;
+ font-weight: 500;
+ cursor: pointer;
+ }
+ }
+ .dashy-jf-array-list-item-content {
+ display: none;
+ padding: 0.5rem 0.25rem 0.25rem;
+ border-top: 1px dashed var(--interactive-editor-color);
+ margin-top: 0.25rem;
+ &.dashy-jf-expanded {
+ display: block;
+ }
+ }
+ }
+
+ /* Buttons inside JSON Forms (add / remove / move) */
+ .dashy-jf-array-list-add,
+ .dashy-jf-array-list-item-move-up,
+ .dashy-jf-array-list-item-move-down,
+ .dashy-jf-array-list-item-delete {
+ cursor: pointer;
+ font-size: 0.85rem;
+ padding: 0.2rem 0.5rem;
+ color: var(--interactive-editor-color);
+ background: var(--interactive-editor-background);
+ border: 1px solid var(--interactive-editor-color);
+ border-radius: $jf-field-radius;
+ &:hover:not(:disabled) {
+ color: var(--interactive-editor-background);
+ background: var(--interactive-editor-color);
+ }
+ &:disabled {
+ opacity: var(--dimming-factor, 0.4);
+ cursor: not-allowed;
+ }
+ }
+ .dashy-jf-array-list-item-delete:hover:not(:disabled) {
+ background: var(--warning, #ef5350);
+ border-color: var(--warning, #ef5350);
+ }
+
+ /* Standalone labels / categorization (rarely used here) */
+ .dashy-jf-label-element {
+ font-weight: bold;
+ margin: 0.5rem 0;
+ }
+}
+</style>
diff --git a/src/components/InteractiveEditor/EditAppConfig.vue b/src/components/InteractiveEditor/EditAppConfig.vue
index 8b68bc08..bb0376e5 100644
--- a/src/components/InteractiveEditor/EditAppConfig.vue
+++ b/src/components/InteractiveEditor/EditAppConfig.vue
@@ -1,145 +1,92 @@
<template>
<modal
- :name="modalName"
- :resizable="true"
- width="50%"
- height="80%"
+ :name="modalName" @closed="modalClosed"
+ :resizable="true" width="50%" height="80%"
classes="dashy-modal edit-app-config"
- @closed="modalClosed"
>
- <div class="edit-app-config-inner" v-if="allowViewConfig">
- <h3>{{ $t('interactive-editor.menu.edit-app-config-btn') }}</h3>
- <div class="app-config-intro">
- <p class="use-caution">
- {{ $t('interactive-editor.edit-app-config.warning-msg-title') }}
- </p>
- {{ $t('interactive-editor.edit-app-config.warning-msg-l1') }}
- {{ $t('interactive-editor.edit-app-config.warning-msg-l2') }}
- <a href="https://dashy.to/docs/configuring#appconfig-optional">
- {{ $t('interactive-editor.edit-app-config.warning-msg-docs') }}
- </a>
- {{ $t('interactive-editor.edit-app-config.warning-msg-l3') }}
- </div>
- <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
- <div class="json-editor-wrap">
- <textarea
- v-model="jsonString"
- class="app-config-editor"
- spellcheck="false"
- />
- <p v-if="jsonError" class="json-error">{{ jsonError }}</p>
- </div>
- <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
- </div>
- <AccessError v-else />
+ <div class="interactive-editor-inner" v-if="allowViewConfig">
+ <h3>{{ $t('interactive-editor.menu.edit-app-config-btn') }}</h3>
+ <div class="app-config-intro">
+ <p class="use-caution">
+ {{ $t('interactive-editor.edit-app-config.warning-msg-title') }}
+ </p>
+ {{ $t('interactive-editor.edit-app-config.warning-msg-l1') }}
+ {{ $t('interactive-editor.edit-app-config.warning-msg-l2') }}
+ <a href="https://dashy.to/docs/configuring#appconfig-optional">
+ {{ $t('interactive-editor.edit-app-config.warning-msg-docs') }}
+ </a>
+ {{ $t('interactive-editor.edit-app-config.warning-msg-l3') }}
+ </div>
+ <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
+ <SchemaForm v-model="formData" :schema="schema" class="app-config-form" />
+ <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
+ </div>
+ <AccessError v-else />
</modal>
</template>
<script>
+import DashySchema from '@/utils/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
import { modalNames } from '@/utils/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import safeClone from '@/utils/safeClone';
import AccessError from '@/components/Configuration/AccessError';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
+import SchemaForm from '@/components/FormElements/SchemaForm';
export default {
name: 'EditAppConfig',
+ components: { AccessError, SaveCancelButtons, SchemaForm },
data() {
return {
- jsonString: '',
- jsonError: '',
+ formData: {},
+ schema: DashySchema.properties.appConfig,
modalName: modalNames.EDIT_APP_CONFIG,
};
},
- components: {
- SaveCancelButtons,
- AccessError,
+ computed: {
+ appConfig() { return this.$store.getters.appConfig; },
+ allowViewConfig() { return this.$store.getters.permissions.allowViewConfig; },
},
mounted() {
- this.jsonString = JSON.stringify(this.appConfig, null, 2);
- },
- computed: {
- appConfig() {
- return this.$store.getters.appConfig;
- },
- allowViewConfig() {
- return this.$store.getters.permissions.allowViewConfig;
- },
+ this.formData = safeClone(this.appConfig, {});
},
methods: {
saveToState() {
- this.jsonError = '';
- let parsed;
try {
- parsed = JSON.parse(this.jsonString);
+ this.$store.commit(StoreKeys.SET_APP_CONFIG, this.formData);
+ this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
+ InfoHandler('App config updated', InfoKeys.EDITOR);
+ this.cancelEditing();
} catch (e) {
- this.jsonError = `Invalid JSON: ${e.message}`;
- return;
+ ErrorHandler('Failed to save app config', e);
+ this.$toasted.show('Error saving changes, check the logs', { className: 'toast-error' });
}
- this.$store.commit(StoreKeys.SET_APP_CONFIG, parsed);
- this.$modal.hide(this.modalName);
- this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
- this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
- },
- cancelEditing() {
- this.$modal.hide(this.modalName);
- },
- modalClosed() {
- this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
},
+ cancelEditing() { this.$modal.hide(this.modalName); },
+ modalClosed() { this.$store.commit(StoreKeys.SET_MODAL_OPEN, false); },
},
};
</script>
<style lang="scss">
@import '@/styles/style-helpers.scss';
-@import '@/styles/media-queries.scss';
-.edit-app-config-inner {
- padding: 1rem;
- background: var(--interactive-editor-background);
+.edit-app-config .app-config-intro {
+ padding: 0.5rem;
+ font-size: 0.9rem;
color: var(--interactive-editor-color);
- height: 100%;
- overflow-y: auto;
- @extend .scroll-bar;
- h3 {
- font-size: 1.4rem;
- margin: 0.5rem;
- }
- .json-editor-wrap {
- margin: 0.5rem 0;
- .app-config-editor {
- width: 100%;
- min-height: 20rem;
- padding: 0.5rem;
- font-family: monospace;
- font-size: 0.9rem;
- color: var(--interactive-editor-color);
- background: var(--interactive-editor-background);
- border: 1px solid var(--interactive-editor-color);
- border-radius: var(--curve-factor);
- resize: vertical;
- tab-size: 2;
- }
- .json-error {
- color: var(--warning);
- margin: 0.25rem 0;
- font-size: 0.85rem;
- }
- }
- .app-config-intro {
- padding: 0.5rem;
- font-size: 0.9rem;
- color: var(--interactive-editor-color);
- background: var(--interactive-editor-background-darker);
- border-radius: var(--interactive-editor-color);
- p.use-caution {
- color: var(--warning);
- margin: 0;
- font-weight: bold;
- }
- a {
- color: var(--interactive-editor-color);
- }
+ background: var(--interactive-editor-background-darker);
+ border-radius: var(--curve-factor);
+ p.use-caution {
+ margin: 0;
+ color: var(--warning);
+ font-weight: bold;
}
+ a { color: var(--interactive-editor-color); }
+}
+.edit-app-config .app-config-form {
+ margin: 1rem 0;
}
</style>
diff --git a/src/components/InteractiveEditor/EditItem.vue b/src/components/InteractiveEditor/EditItem.vue
index d8c0be0a..a03fa972 100644
--- a/src/components/InteractiveEditor/EditItem.vue
+++ b/src/components/InteractiveEditor/EditItem.vue
@@ -65,7 +65,7 @@
</div>
</div>
<!-- Save to state button -->
- <SaveCancelButtons :saveClick="saveItem" :cancelClick="modalClosed" />
+ <SaveCancelButtons :saveClick="saveItem" :cancelClick="closeModal" />
</div>
<AccessError v-else />
</modal>
@@ -82,6 +82,7 @@ import Select from '@/components/FormElements/Select';
import StoreKeys from '@/utils/StoreMutations';
import DashySchema from '@/utils/ConfigSchema';
import { modalNames } from '@/utils/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
export default {
name: 'EditItem',
@@ -210,20 +211,24 @@ export default {
this.$t('interactive-editor.edit-item.missing-title-err'),
{ className: 'toast-error' },
);
- } else {
+ return;
+ }
+ try {
// Some attributes need a little extra formatting
const newItem = this.formatBeforeSave(structured);
if (this.isNew) { // Insert new item into data store
newItem.id = `temp_${newItem.title}`;
- const payload = { newItem, targetSection: this.parentSectionTitle };
- this.$store.commit(StoreKeys.INSERT_ITEM, payload);
+ this.$store.commit(StoreKeys.INSERT_ITEM, { newItem, targetSection: this.parentSectionTitle });
} else { // Update existing item from form data, in the store
this.$store.commit(StoreKeys.UPDATE_ITEM, { newItem, itemId: this.itemId });
}
// If we're not already in edit mode, enable it now
this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
- // Close edit menu
- this.$emit('closeEditMenu');
+ InfoHandler(`Item ${this.isNew ? 'added' : 'updated'}: ${newItem.title}`, InfoKeys.EDITOR);
+ this.closeModal();
+ } catch (e) {
+ ErrorHandler('Failed to save item', e);
+ this.$toasted.show('Error saving item. See Logs.', { className: 'toast-error' });
}
},
/* Some fields require a bit of extra processing before they're saved */
@@ -247,7 +252,11 @@ export default {
// if (newItem.hotkey) newItem.hotkey = parseInt(newItem.hotkey, 10);
return newItem;
},
- /* Clean up work, triggered when modal closed */
+ /* Cleanup work for modal, triggered by save, cancel or click-outside */
+ closeModal() {
+ this.$modal.hide(this.modalName);
+ },
+ /* Runs after the modal has finished closing. */
modalClosed() {
this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
this.$emit('closeEditMenu');
diff --git a/src/components/InteractiveEditor/EditMultiPages.vue b/src/components/InteractiveEditor/EditMultiPages.vue
index fe8dc785..a00c7819 100644
--- a/src/components/InteractiveEditor/EditMultiPages.vue
+++ b/src/components/InteractiveEditor/EditMultiPages.vue
@@ -4,187 +4,87 @@
:resizable="true" width="50%" height="80%"
classes="dashy-modal edit-multi-pages"
>
- <div class="edit-multi-pages-inner" v-if="allowViewConfig">
- <h3>{{ $t('interactive-editor.menu.edit-pages-btn') }}</h3>
- <div class="pages-list">
- <div v-for="(page, index) in formData" :key="index" class="page-entry">
- <div class="page-fields">
- <Input v-model="page.name" label="Name" layout="horizontal" />
- <Input v-model="page.path" label="Path" layout="horizontal" />
- <Radio
- :options="boolOptions"
- :initialOption="String(!!getHideForGuests(page))"
- label="Hide for Guests"
- @update:modelValue="(val) => setHideForGuests(page, val === 'true')"
- />
- </div>
- <div class="page-actions">
- <button @click="movePage(index, -1)" :disabled="index === 0" class="action-btn">β–²</button>
- <button @click="movePage(index, 1)" :disabled="index === formData.length - 1" class="action-btn">β–Ό</button>
- <button @click="removePage(index)" class="action-btn delete-btn">βœ•</button>
- </div>
+ <div class="interactive-editor-inner" v-if="allowViewConfig">
+ <h3>{{ $t('interactive-editor.menu.edit-pages-btn') }}</h3>
+ <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
+ <SchemaForm v-model="formData" :schema="customSchema" />
+ <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
</div>
- </div>
- <button @click="addPage" class="add-page-btn">+ Add Page</button>
- <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
- </div>
- <AccessError v-else />
+ <AccessError v-else />
</modal>
</template>
<script>
+import DashySchema from '@/utils/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
import { modalNames } from '@/utils/defaults';
-import Input from '@/components/FormElements/Input';
-import Radio from '@/components/FormElements/Radio';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import safeClone from '@/utils/safeClone';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
import AccessError from '@/components/Configuration/AccessError';
+import SchemaForm from '@/components/FormElements/SchemaForm';
+
+/* Curated subset of the pages schema (name, path, and the most commonly
+ * toggled displayData flag). Full option list is in the docs. */
+const pagesSchema = DashySchema.properties.pages;
+const itemProps = pagesSchema.items.properties;
+const PAGES_SCHEMA = {
+ type: 'array',
+ title: pagesSchema.title,
+ description: pagesSchema.description,
+ items: {
+ type: 'object',
+ title: pagesSchema.items.title,
+ required: pagesSchema.items.required,
+ properties: {
+ name: itemProps.name,
+ path: itemProps.path,
+ displayData: {
+ type: 'object',
+ title: 'Display (see docs for more options)',
+ properties: {
+ hideForGuests: itemProps.displayData.properties.hideForGuests,
+ },
+ },
+ },
+ },
+};
export default {
name: 'EditMultiPages',
+ components: { SaveCancelButtons, AccessError, SchemaForm },
data() {
return {
formData: [],
+ customSchema: PAGES_SCHEMA,
modalName: modalNames.EDIT_MULTI_PAGES,
- boolOptions: [
- { label: 'Yes', value: 'true' },
- { label: 'No', value: 'false' },
- ],
};
},
- components: {
- Input,
- Radio,
- SaveCancelButtons,
- AccessError,
+ computed: {
+ pages() { return this.$store.getters.pages; },
+ allowViewConfig() { return this.$store.getters.permissions.allowViewConfig; },
},
mounted() {
- const pages = this.$store.getters.pages;
- this.formData = pages ? pages.map(p => ({
- ...p,
- displayData: { ...(p.displayData || {}) },
- })) : [];
- },
- computed: {
- allowViewConfig() {
- return this.$store.getters.permissions.allowViewConfig;
- },
+ this.formData = safeClone(Array.isArray(this.pages) ? this.pages : [], []);
},
methods: {
- getHideForGuests(page) {
- return page.displayData && page.displayData.hideForGuests;
- },
- setHideForGuests(page, value) {
- if (!page.displayData) page.displayData = {};
- page.displayData.hideForGuests = value;
- },
- addPage() {
- this.formData.push({ name: '', path: '', displayData: {} });
- },
- removePage(index) {
- this.formData.splice(index, 1);
- },
- movePage(index, direction) {
- const target = index + direction;
- const item = this.formData.splice(index, 1)[0];
- this.formData.splice(target, 0, item);
- },
saveToState() {
- this.$store.commit(StoreKeys.SET_PAGES, this.formData);
- this.$modal.hide(this.modalName);
- this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
- this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
- },
- cancelEditing() {
- this.$modal.hide(this.modalName);
- },
- modalClosed() {
- this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
+ try {
+ this.$store.commit(StoreKeys.SET_PAGES, this.formData);
+ this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
+ InfoHandler(`Pages list updated (${this.formData.length} page${this.formData.length === 1 ? '' : 's'})`, InfoKeys.EDITOR);
+ this.cancelEditing();
+ } catch (e) {
+ ErrorHandler('Failed to save pages list', e);
+ this.$toasted.show('Error saving changes. See Logs.', { className: 'toast-error' });
+ }
},
+ cancelEditing() { this.$modal.hide(this.modalName); },
+ modalClosed() { this.$store.commit(StoreKeys.SET_MODAL_OPEN, false); },
},
};
</script>
<style lang="scss">
@import '@/styles/style-helpers.scss';
-@import '@/styles/media-queries.scss';
-
-.edit-multi-pages-inner {
- padding: 1rem;
- background: var(--interactive-editor-background);
- color: var(--interactive-editor-color);
- height: 100%;
- overflow-y: auto;
- @extend .scroll-bar;
- h3 {
- font-size: 1.4rem;
- margin: 0.5rem;
- }
- .pages-list {
- margin-bottom: 1rem;
- .page-entry {
- display: flex;
- align-items: flex-start;
- padding: 0.75rem;
- margin: 0.5rem 0;
- border: 1px solid var(--interactive-editor-color);
- border-radius: var(--curve-factor);
- .page-fields {
- flex: 1;
- .input-container {
- margin: 0.25rem 0;
- input.input-field {
- color: var(--interactive-editor-color);
- border-color: var(--interactive-editor-color);
- background: var(--interactive-editor-background);
- }
- }
- .radio-container {
- color: var(--interactive-editor-color);
- }
- }
- .page-actions {
- display: flex;
- flex-direction: column;
- margin-left: 0.5rem;
- gap: 0.25rem;
- .action-btn {
- padding: 0.25rem 0.5rem;
- cursor: pointer;
- color: var(--interactive-editor-color);
- background: var(--interactive-editor-background);
- border: 1px solid var(--interactive-editor-color);
- border-radius: var(--curve-factor);
- &:hover:not(:disabled) {
- color: var(--interactive-editor-background);
- background: var(--interactive-editor-color);
- }
- &:disabled {
- opacity: 0.4;
- cursor: not-allowed;
- }
- &.delete-btn:hover:not(:disabled) {
- background: var(--danger);
- border-color: var(--danger);
- }
- }
- }
- }
- }
- .add-page-btn {
- min-width: 15rem;
- padding: 0.5rem 0.75rem;
- margin: 0.5rem 0;
- font-size: 1rem;
- cursor: pointer;
- color: var(--interactive-editor-color);
- background: var(--interactive-editor-background);
- border: 1px solid var(--interactive-editor-color);
- border-radius: var(--curve-factor);
- &:hover {
- color: var(--interactive-editor-background);
- background: var(--interactive-editor-color);
- }
- }
-}
</style>
diff --git a/src/components/InteractiveEditor/EditPageInfo.vue b/src/components/InteractiveEditor/EditPageInfo.vue
index a145df65..72b26884 100644
--- a/src/components/InteractiveEditor/EditPageInfo.vue
+++ b/src/components/InteractiveEditor/EditPageInfo.vue
@@ -4,100 +4,61 @@
:resizable="true" width="50%" height="80%"
classes="dashy-modal edit-page-info"
>
- <div class="edit-page-info-inner" v-if="allowViewConfig">
- <h3>{{ $t('interactive-editor.menu.edit-page-info-btn') }}</h3>
- <form @submit.prevent="saveToState" class="page-info-form">
- <Input v-model="formData.title" label="Title" layout="horizontal" />
- <Input v-model="formData.description" label="Description" layout="horizontal" />
- <Input v-model="formData.footerText" label="Footer Text" layout="horizontal" />
- <Input v-model="formData.logo" label="Logo" layout="horizontal" />
- <Button type="submit">
- {{ $t('interactive-editor.menu.save-stage-btn') }}
- <SaveIcon />
- </Button>
- </form>
- </div>
- <AccessError v-else />
+ <div class="interactive-editor-inner" v-if="allowViewConfig">
+ <h3>{{ $t('interactive-editor.menu.edit-page-info-btn') }}</h3>
+ <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
+ <SchemaForm v-model="formData" :schema="schema" />
+ <SaveCancelButtons :saveClick="saveToState" :cancelClick="cancelEditing" />
+ </div>
+ <AccessError v-else />
</modal>
</template>
<script>
+import DashySchema from '@/utils/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
import { modalNames } from '@/utils/defaults';
-import Button from '@/components/FormElements/Button';
-import Input from '@/components/FormElements/Input';
-import SaveIcon from '@/assets/interface-icons/save-config.svg';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import safeClone from '@/utils/safeClone';
import AccessError from '@/components/Configuration/AccessError';
+import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
+import SchemaForm from '@/components/FormElements/SchemaForm';
export default {
name: 'EditPageInfo',
+ components: { AccessError, SaveCancelButtons, SchemaForm },
data() {
return {
formData: {},
+ schema: DashySchema.properties.pageInfo,
modalName: modalNames.EDIT_PAGE_INFO,
};
},
- components: {
- Button,
- Input,
- SaveIcon,
- AccessError,
+ computed: {
+ pageInfo() { return this.$store.getters.pageInfo; },
+ allowViewConfig() { return this.$store.getters.permissions.allowViewConfig; },
},
mounted() {
- this.formData = { ...this.pageInfo };
- },
- computed: {
- pageInfo() {
- return this.$store.getters.pageInfo;
- },
- allowViewConfig() {
- return this.$store.getters.permissions.allowViewConfig;
- },
+ this.formData = safeClone(this.pageInfo, {});
},
methods: {
saveToState() {
- this.$store.commit(StoreKeys.SET_PAGE_INFO, this.formData);
- this.$modal.hide(this.modalName);
- this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
- this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
- },
- modalClosed() {
- this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
+ try {
+ this.$store.commit(StoreKeys.SET_PAGE_INFO, this.formData);
+ this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
+ InfoHandler('Page info updated', InfoKeys.EDITOR);
+ this.cancelEditing();
+ } catch (e) {
+ ErrorHandler('Failed to save page info', e);
+ this.$toasted.show('Error saving changes. See Logs.', { className: 'toast-error' });
+ }
},
+ cancelEditing() { this.$modal.hide(this.modalName); },
+ modalClosed() { this.$store.commit(StoreKeys.SET_MODAL_OPEN, false); },
},
};
</script>
<style lang="scss">
@import '@/styles/style-helpers.scss';
-@import '@/styles/media-queries.scss';
-
-.edit-page-info-inner {
- padding: 1rem;
- background: var(--interactive-editor-background);
- color: var(--interactive-editor-color);
- height: 100%;
- overflow-y: auto;
- @extend .scroll-bar;
- h3 {
- font-size: 1.4rem;
- margin: 0.5rem;
- }
- .page-info-form {
- margin-bottom: 2.5rem;
- .input-container {
- margin: 0.5rem 0;
- input.input-field {
- color: var(--interactive-editor-color);
- border-color: var(--interactive-editor-color);
- background: var(--interactive-editor-background);
- }
- }
- button {
- margin: 1rem auto;
- display: flex;
- svg { width: 1rem; height: 1rem; margin-left: 0.25rem; }
- }
- }
-}
</style>
diff --git a/src/components/InteractiveEditor/EditSection.vue b/src/components/InteractiveEditor/EditSection.vue
index bad84c09..cfd0272d 100644
--- a/src/components/InteractiveEditor/EditSection.vue
+++ b/src/components/InteractiveEditor/EditSection.vue
@@ -4,120 +4,98 @@
:resizable="true" width="50%" height="80%"
classes="dashy-modal edit-section"
>
- <div class="edit-section-inner" v-if="allowViewConfig">
- <h3>
- {{ $t(`interactive-editor.edit-section.${isAddNew ? 'add' : 'edit'}-section-title`) }}
- </h3>
- <form @submit.prevent="saveSection" class="edit-section-form">
- <Input v-model="sectionData.name" label="Section Name" layout="horizontal" />
- <Input v-model="sectionData.icon" label="Section Icon" layout="horizontal" />
- <Select
- :options="sortByOptions"
- :initialOption="displayData.sortBy"
- label="Sort By"
- @update:modelValue="(val) => setDisplayData('sortBy', val)"
- />
- <Input
- :modelValue="displayData.rows"
- @update:modelValue="(val) => setDisplayData('rows', Number(val))"
- label="Rows" type="number" layout="horizontal"
- />
- <Input
- :modelValue="displayData.cols"
- @update:modelValue="(val) => setDisplayData('cols', Number(val))"
- label="Cols" type="number" layout="horizontal"
- />
- <Radio
- :options="boolOptions"
- :initialOption="String(!!displayData.collapsed)"
- label="Collapsed"
- @update:modelValue="(val) => setDisplayData('collapsed', val === 'true')"
- />
- <Radio
- :options="boolOptions"
- :initialOption="String(!!displayData.hideForGuests)"
- label="Hide for Guests"
- @update:modelValue="(val) => setDisplayData('hideForGuests', val === 'true')"
- />
- </form>
- <SaveCancelButtons
- :saveClick="saveSection"
- :cancelClick="modalClosed"
- />
+ <div class="interactive-editor-inner" v-if="allowViewConfig">
+ <h3>
+ {{ $t(`interactive-editor.edit-section.${isAddNew ? 'add' : 'edit'}-section-title`) }}
+ </h3>
+ <SchemaForm v-model="sectionData" :schema="customSchema" />
+ <SaveCancelButtons :saveClick="saveSection" :cancelClick="modalClosed" />
</div>
<AccessError v-else />
</modal>
</template>
<script>
+import DashySchema from '@/utils/ConfigSchema.json';
import StoreKeys from '@/utils/StoreMutations';
import { modalNames } from '@/utils/defaults';
-import Input from '@/components/FormElements/Input';
-import Select from '@/components/FormElements/Select';
-import Radio from '@/components/FormElements/Radio';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
+import safeClone from '@/utils/safeClone';
import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons';
import AccessError from '@/components/Configuration/AccessError';
+import SchemaForm from '@/components/FormElements/SchemaForm';
+
+/* Curated subset of the section schema: omits `items` (edited per-item elsewhere)
+ * and trims displayData to the commonly-tweaked attributes. */
+const sectionProps = DashySchema.properties.sections.items.properties;
+const displayProps = sectionProps.displayData.properties;
+const SECTION_SCHEMA = {
+ type: 'object',
+ required: DashySchema.properties.sections.items.required,
+ properties: {
+ name: sectionProps.name,
+ icon: sectionProps.icon,
+ displayData: {
+ type: 'object',
+ title: sectionProps.displayData.title,
+ description: sectionProps.displayData.description,
+ properties: {
+ sortBy: displayProps.sortBy,
+ rows: displayProps.rows,
+ cols: displayProps.cols,
+ collapsed: displayProps.collapsed,
+ hideForGuests: displayProps.hideForGuests,
+ },
+ },
+ },
+};
export default {
name: 'EditSection',
+ components: { SaveCancelButtons, AccessError, SchemaForm },
props: {
sectionIndex: Number,
isAddNew: Boolean,
},
- components: {
- Input,
- Select,
- Radio,
- SaveCancelButtons,
- AccessError,
- },
data() {
return {
modalName: modalNames.EDIT_SECTION,
+ customSchema: SECTION_SCHEMA,
sectionData: {},
- sortByOptions: [
- 'default', 'most-used', 'last-used',
- 'alphabetical', 'reverse-alphabetical', 'random',
- ],
- boolOptions: [
- { label: 'Yes', value: 'true' },
- { label: 'No', value: 'false' },
- ],
};
},
computed: {
- displayData() {
- return this.sectionData.displayData || {};
- },
- allowViewConfig() {
- return this.$store.getters.permissions.allowViewConfig;
- },
+ allowViewConfig() { return this.$store.getters.permissions.allowViewConfig; },
},
mounted() {
- const section = this.$store.getters.getSectionByIndex(this.sectionIndex);
- this.sectionData = section ? { ...section, displayData: { ...(section.displayData || {}) } } : {};
- this.$modal.show(modalNames.EDIT_SECTION);
+ const live = this.isAddNew ? null : this.$store.getters.getSectionByIndex(this.sectionIndex);
+ this.sectionData = safeClone(live, {});
+ this.$modal.show(this.modalName);
},
methods: {
- setDisplayData(key, value) {
- if (!this.sectionData.displayData) {
- this.sectionData.displayData = {};
- }
- this.sectionData.displayData[key] = value;
- },
modalClosed() {
this.$store.commit(StoreKeys.SET_MODAL_OPEN, false);
this.$emit('closeEditSection');
},
saveSection() {
- const { sectionIndex, sectionData } = this;
- if (this.isAddNew) {
- this.$store.commit(StoreKeys.INSERT_SECTION, sectionData);
- } else {
- this.$store.commit(StoreKeys.UPDATE_SECTION, { sectionIndex, sectionData });
+ try {
+ /* Form only edits metadata, so preserve the live section's items array. */
+ const payload = { ...this.sectionData };
+ if (!this.isAddNew) {
+ const live = this.$store.getters.getSectionByIndex(this.sectionIndex);
+ if (live?.items) payload.items = live.items;
+ this.$store.commit(StoreKeys.UPDATE_SECTION, { sectionIndex: this.sectionIndex, sectionData: payload });
+ } else {
+ this.$store.commit(StoreKeys.INSERT_SECTION, payload);
+ }
+ this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
+ const label = payload.name || '(unnamed)';
+ InfoHandler(`Section ${this.isAddNew ? 'added' : 'updated'}: ${label}`, InfoKeys.EDITOR);
+ this.$emit('closeEditSection');
+ } catch (e) {
+ ErrorHandler('Failed to save section', e);
+ this.$toasted.show('Error saving changes. See Logs.', { className: 'toast-error' });
}
- this.$store.commit(StoreKeys.SET_EDIT_MODE, true);
- this.$emit('closeEditSection');
},
},
};
@@ -125,33 +103,4 @@ export default {
<style lang="scss">
@import '@/styles/style-helpers.scss';
-@import '@/styles/media-queries.scss';
-
-.edit-section-inner {
- padding: 1rem;
- background: var(--interactive-editor-background);
- color: var(--interactive-editor-color);
- height: 100%;
- overflow-y: auto;
- @extend .scroll-bar;
- h3 {
- font-size: 1.4rem;
- margin: 0.5rem;
- }
- .edit-section-form {
- margin-bottom: 2.5rem;
- .input-container {
- margin: 0.5rem 0;
- input.input-field {
- color: var(--interactive-editor-color);
- border-color: var(--interactive-editor-color);
- background: var(--interactive-editor-background);
- }
- }
- .select-container, .radio-container {
- margin: 0.5rem 0;
- color: var(--interactive-editor-color);
- }
- }
-}
</style>
diff --git a/src/components/InteractiveEditor/MoveItemTo.vue b/src/components/InteractiveEditor/MoveItemTo.vue
index 4633d2a2..ab9bca0a 100644
--- a/src/components/InteractiveEditor/MoveItemTo.vue
+++ b/src/components/InteractiveEditor/MoveItemTo.vue
@@ -41,6 +41,7 @@ import SaveCancelButtons from '@/components/InteractiveEditor/SaveCancelButtons'
import AccessError from '@/components/Configuration/AccessError';
import StoreKeys from '@/utils/StoreMutations';
import { modalNames } from '@/utils/defaults';
+import ErrorHandler, { InfoHandler, InfoKeys } from '@/utils/ErrorHandler';
export default {
name: 'MoveItemTo',
@@ -95,16 +96,29 @@ export default {
},
methods: {
save() {
- const item = this.$store.getters.getItemById(this.itemId);
- // Copy item to new section
- const copyPayload = { item, toSection: this.selectedSection, appendTo: this.appendTo };
- this.$store.commit(StoreKeys.COPY_ITEM, copyPayload);
- // Remove item from previous section
- if (this.operation === 'move') {
- const payload = { itemId: this.itemId, sectionName: this.currentSection };
- this.$store.commit(StoreKeys.REMOVE_ITEM, payload);
+ try {
+ const item = this.$store.getters.getItemById(this.itemId);
+ if (!item) throw new Error(`Item '${this.itemId}' not found`);
+ // Copy item to new section
+ this.$store.commit(StoreKeys.COPY_ITEM, {
+ item, toSection: this.selectedSection, appendTo: this.appendTo,
+ });
+ // Remove item from previous section if moving
+ if (this.operation === 'move') {
+ this.$store.commit(StoreKeys.REMOVE_ITEM, {
+ itemId: this.itemId, sectionName: this.currentSection,
+ });
+ }
+ InfoHandler(
+ `${this.operation === 'move' ? 'Moved' : 'Copied'} '${item.title}' `
+ + `from '${this.currentSection}' to '${this.selectedSection}'`,
+ InfoKeys.EDITOR,
+ );
+ this.close();
+ } catch (e) {
+ ErrorHandler(`Failed to ${this.operation} item`, e);
+ this.$toasted.show('Error. See Logs.', { className: 'toast-error' });
}
- this.close();
},
close() {
this.$modal.hide(this.modalName);
diff --git a/src/styles/style-helpers.scss b/src/styles/style-helpers.scss
index 80dba337..bc5fd969 100644
--- a/src/styles/style-helpers.scss
+++ b/src/styles/style-helpers.scss
@@ -57,6 +57,20 @@
}
}
+/* Modal container shared by the interactive-editor modals */
+.interactive-editor-inner {
+ padding: 1rem;
+ height: 100%;
+ overflow-y: auto;
+ background: var(--interactive-editor-background);
+ color: var(--interactive-editor-color);
+ @extend .scroll-bar;
+ h3 {
+ font-size: 1.4rem;
+ margin: 0.5rem;
+ }
+}
+
/* Single-style helpers */
.bold { font-weight: bold; }
.light { font-weight: lighter; }
diff --git a/src/utils/ConfigSchema.json b/src/utils/ConfigSchema.json
index 7cd08c52..5fac9a5f 100644
--- a/src/utils/ConfigSchema.json
+++ b/src/utils/ConfigSchema.json
@@ -536,8 +536,7 @@
"title": "Hashed Pass",
"type": "string",
"description": "A SHA-256 hashed password for that user",
- "minLength": 64,
- "maxLength": 64
+ "pattern": "^[a-fA-F0-9]{64}$"
},
"password": {
"title": "Password",
diff --git a/yarn.lock b/yarn.lock
index faf49d09..4c9e7bde 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1066,6 +1066,30 @@
"@jridgewell/resolve-uri" "^3.1.0"
"@jridgewell/sourcemap-codec" "^1.4.14"
+"@jsonforms/core@^3.7.0":
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/@jsonforms/core/-/core-3.7.0.tgz#444fff8860342d097443e6c33374d90fc076a8cc"
+ integrity sha512-CE9viWtwi9QWLqlWLeOul1/R1GRAyOA9y6OoUpsCc0FhyR+g5p29F3k0fUExHWxL0Sf4KHcXYkfhtqfRBPS8ww==
+ dependencies:
+ "@types/json-schema" "^7.0.3"
+ ajv "^8.6.1"
+ ajv-formats "^2.1.0"
+ lodash "^4.17.21"
+
+"@jsonforms/vue-vanilla@^3.7.0":
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/@jsonforms/vue-vanilla/-/vue-vanilla-3.7.0.tgz#f5a0e654090c023a3f7424fa5d330e1e45532d69"
+ integrity sha512-+wCnot4j0dXHx4cZg1bC7GunVhNCn0bYYCzsy+zJGJwQmdjQ/pdaDcF6CaS7crL/rO1lrEfW+03oJNBi50YDyw==
+ dependencies:
+ lodash "^4.17.21"
+
+"@jsonforms/vue@^3.7.0":
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/@jsonforms/vue/-/vue-3.7.0.tgz#2d51e912e4b0252951f42bb6380ad005c5a709ab"
+ integrity sha512-S5NXYeu6lTh2yfNmPz17TRo32dSYqAhOe8Co2mp0lmeq1ODJNBQs8SesXqBRdVMEmMK20ZW/1i7i/38J0TGjdw==
+ dependencies:
+ lodash "^4.17.21"
+
"@noble/hashes@^1.1.5":
version "1.8.0"
resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.8.0.tgz#cee43d801fcef9644b11b8194857695acd5f815a"
@@ -1519,6 +1543,11 @@
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.8.tgz#958b91c991b1867ced318bedea0e215ee050726e"
integrity sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==
+"@types/json-schema@^7.0.3":
+ version "7.0.15"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+ integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
"@types/node@*", "@types/node@>=20.0.0":
version "25.6.0"
resolved "https://registry.yarnpkg.com/@types/node/-/node-25.6.0.tgz#4e09bad9b469871f2d0f68140198cbd714f4edca"
@@ -1747,6 +1776,13 @@ acorn@^8.15.0, acorn@^8.9.0:
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.16.0.tgz#4ce79c89be40afe7afe8f3adb902a1f1ce9ac08a"
integrity sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==
+ajv-formats@^2.1.0:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+ integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
+ dependencies:
+ ajv "^8.0.0"
+
ajv@^6.12.4:
version "6.14.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.14.0.tgz#fd067713e228210636ebb08c60bd3765d6dbe73a"
@@ -1757,7 +1793,7 @@ ajv@^6.12.4:
json-schema-traverse "^0.4.1"
uri-js "^4.2.2"
-ajv@^8.10.0, ajv@^8.6.0:
+ajv@^8.0.0, ajv@^8.10.0, ajv@^8.6.0, ajv@^8.6.1:
version "8.18.0"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.18.0.tgz#8864186b6738d003eb3a933172bb3833e10cefbc"
integrity sha512-PlXPeEWMXMZ7sPYOHqmDyCJzcfNrUr3fGNKtezX14ykXOEIvyK81d+qydx89KY5O71FKMPaQ2vBfBFI5NHR63A==
@@ -1858,12 +1894,12 @@ at-least-node@^1.0.0:
integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
autoprefixer@^10.4.27:
- version "10.4.27"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.27.tgz#51ea301a5c3c5f8642f8e564759c4f573be486f2"
- integrity sha512-NP9APE+tO+LuJGn7/9+cohklunJsXWiaWEfV3si4Gi/XHDwVNgkwr1J3RQYFIvPy76GmJ9/bW8vyoU1LcxwKHA==
+ version "10.5.0"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.5.0.tgz#33d87e443430f020a0f85319d6ff1593cb291be9"
+ integrity sha512-FMhOoZV4+qR6aTUALKX2rEqGG+oyATvwBt9IIzVR5rMa2HRWPkxf+P+PAJLD1I/H5/II+HuZcBJYEFBpq39ong==
dependencies:
- browserslist "^4.28.1"
- caniuse-lite "^1.0.30001774"
+ browserslist "^4.28.2"
+ caniuse-lite "^1.0.30001787"
fraction.js "^5.3.4"
picocolors "^1.1.1"
postcss-value-parser "^4.2.0"
@@ -1915,9 +1951,9 @@ base64-js@^1.5.1:
integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
baseline-browser-mapping@^2.10.12:
- version "2.10.18"
- resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.18.tgz#565745085ba7743af7d4072707ad132db3a5a42f"
- integrity sha512-VSnGQAOLtP5mib/DPyg2/t+Tlv65NTBz83BJBJvmLVHHuKJVaDOBvJJykiT5TR++em5nfAySPccDZDa4oSrn8A==
+ version "2.10.19"
+ resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.10.19.tgz#7697721c22f94f66195d0c34299b1a91e3299493"
+ integrity sha512-qCkNLi2sfBOn8XhZQ0FXsT1Ki/Yo5P90hrkRamVFRS7/KV9hpfA4HkoWNU152+8w0zPjnxo5psx5NL3PSGgv5g==
basic-auth@^2.0.1:
version "2.0.1"
@@ -1978,7 +2014,7 @@ braces@^3.0.3:
dependencies:
fill-range "^7.1.1"
-browserslist@^4.24.0, browserslist@^4.28.1:
+browserslist@^4.24.0, browserslist@^4.28.1, browserslist@^4.28.2:
version "4.28.2"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.28.2.tgz#f50b65362ef48974ca9f50b3680566d786b811d2"
integrity sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==
@@ -2030,10 +2066,10 @@ callsites@^3.0.0:
resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
-caniuse-lite@^1.0.30001774, caniuse-lite@^1.0.30001782:
- version "1.0.30001787"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001787.tgz#fd25c5e42e2d35df5c75eddda00d15d9c0c68f81"
- integrity sha512-mNcrMN9KeI68u7muanUpEejSLghOKlVhRqS/Za2IeyGllJ9I9otGpR9g3nsw7n4W378TE/LyIteA0+/FOZm4Kg==
+caniuse-lite@^1.0.30001782, caniuse-lite@^1.0.30001787:
+ version "1.0.30001788"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001788.tgz#31e97d1bfec332b3f2d7eea7781460c97629b3bf"
+ integrity sha512-6q8HFp+lOQtcf7wBK+uEenxymVWkGKkjFpCvw5W25cmMwEDU45p1xQFBQv8JDlMMry7eNxyBaR+qxgmTUZkIRQ==
chai@^6.2.2:
version "6.2.2"
@@ -2401,9 +2437,9 @@ domhandler@^5.0.2, domhandler@^5.0.3:
domelementtype "^2.3.0"
dompurify@^3.0.8:
- version "3.3.3"
- resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.3.3.tgz#680cae8af3e61320ddf3666a3bc843f7b291b2b6"
- integrity sha512-Oj6pzI2+RqBfFG+qOaOLbFXLQ90ARpcGG6UePL82bJLtdsa6CYJD7nmiU8MW9nQNOtCHV3lZ/Bzq1X0QYbBZCA==
+ version "3.4.0"
+ resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.4.0.tgz#b1fc33ebdadb373241621e0a30e4ad81573dfd0b"
+ integrity sha512-nolgK9JcaUXMSmW+j1yaSvaEaoXYHwWyGJlkoCTghc97KgGDDSnpoU/PlEnw63Ah+TGKFOyY+X5LnxaWbCSfXg==
optionalDependencies:
"@types/trusted-types" "^2.0.7"
@@ -2453,9 +2489,9 @@ ejs@^3.1.6:
jake "^10.8.5"
electron-to-chromium@^1.5.328:
- version "1.5.335"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.335.tgz#0b957cea44ef86795c227c616d16b4803d119daa"
- integrity sha512-q9n5T4BR4Xwa2cwbrwcsDJtHD/enpQ5S1xF1IAtdqf5AAgqDFmR/aakqH3ChFdqd/QXJhS3rnnXFtexU7rax6Q==
+ version "1.5.340"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.340.tgz#fe3f76e8d9b9541c123fb7edbc3381688272f79a"
+ integrity sha512-908qahOGocRMinT2nM3ajCEM99H4iPdv84eagPP3FfZy/1ZGeOy2CZYzjhms81ckOPCXPlW7LkY4XpxD8r1DrA==
emoji-regex@^8.0.0:
version "8.0.0"
@@ -3146,9 +3182,9 @@ graphemer@^1.4.0:
integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==
happy-dom@^20.8.9:
- version "20.8.9"
- resolved "https://registry.yarnpkg.com/happy-dom/-/happy-dom-20.8.9.tgz#aeacc9ab9aacada379bce0ba37b2f02dabbba286"
- integrity sha512-Tz23LR9T9jOGVZm2x1EPdXqwA37G/owYMxRwU0E4miurAtFsPMQ1d2Jc2okUaSjZqAFz2oEn3FLXC5a0a+siyA==
+ version "20.9.0"
+ resolved "https://registry.yarnpkg.com/happy-dom/-/happy-dom-20.9.0.tgz#22fa4f2b8a34d2fbd0fb43eb48227e4bf8e206e8"
+ integrity sha512-GZZ9mKe8r646NUAf/zemnGbjYh4Bt8/MqASJY+pSm5ZDtc3YQox+4gsLI7yi1hba6o+eCsGxpHn5+iEVn31/FQ==
dependencies:
"@types/node" ">=20.0.0"
"@types/whatwg-mimetype" "^3.0.2"
@@ -3199,9 +3235,9 @@ has-tostringtag@^1.0.2:
has-symbols "^1.0.3"
hasown@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
- integrity sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.3.tgz#5e5c2b15b60370a4c7930c383dfb76bf17bc403c"
+ integrity sha512-ej4AhfhfL2Q2zpMmLo7U1Uv9+PyhIZpgQLGT1F9miIGmiCJIoCgSmczFdrc97mWT4kVY72KA+WnnhJ5pghSvSg==
dependencies:
function-bind "^1.1.2"
@@ -4135,9 +4171,9 @@ postcss-value-parser@^4.2.0:
integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
postcss@^8.4.31, postcss@^8.5.3, postcss@^8.5.8:
- version "8.5.9"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.9.tgz#f6ee9e0b94f0f19c97d2f172bfbd7fc71fe1cca4"
- integrity sha512-7a70Nsot+EMX9fFU3064K/kdHWZqGVY+BADLyXc8Dfv+mTLLVl6JzJpPaCZ2kQL9gIJvKXSLMHhqdRRjwQeFtw==
+ version "8.5.10"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.10.tgz#8992d8c30acf3f12169e7c09514a12fed7e48356"
+ integrity sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==
dependencies:
nanoid "^3.3.11"
picocolors "^1.1.1"
@@ -4708,9 +4744,9 @@ statuses@~2.0.1, statuses@~2.0.2:
integrity sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==
std-env@^4.0.0-rc.1:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/std-env/-/std-env-4.0.0.tgz#ba3dc31c3a46bc5ba21138aa20a6a4ceb5bb9b7e"
- integrity sha512-zUMPtQ/HBY3/50VbpkupYHbRroTRZJPRLvreamgErJVys0ceuzMkD44J/QjqhHjOzK42GQ3QZIeFG1OYfOtKqQ==
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/std-env/-/std-env-4.1.0.tgz#45899abc590d86d682e87f0acd1033a75084cd3f"
+ integrity sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==
stop-iteration-iterator@^1.1.0:
version "1.1.0"