From eb7643641db023c589169b0a644ffd1b90118cc1 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Wed, 21 Dec 2022 14:22:07 +0100 Subject: [PATCH 001/120] add background to nested attribute template Signed-off-by: Vinzenz Rosenkranz --- CHANGELOG.md | 2 + .../js/components/modals/attribute/Add.vue | 39 ++++++++++--------- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 03c93f510..afbc0e9aa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ All notable changes to this project will be documented in this file. ## 0.9.10 +### Added +- Background to column section in _Add Attribute_ modal to better distinguish it from the main section ### Changed - Attributes in entity detail's link list are now grouped by linked entity diff --git a/resources/js/components/modals/attribute/Add.vue b/resources/js/components/modals/attribute/Add.vue index 67236e2c8..be6268b97 100644 --- a/resources/js/components/modals/attribute/Add.vue +++ b/resources/js/components/modals/attribute/Add.vue @@ -19,24 +19,27 @@ @updated="updateAttribute" @validation="checkValidation" />
-
-
- {{ t('global.column', 2) }} - - {{ state.columns.length }} - -
-
- -
-
- +
+
+
+
+ {{ t('global.column', 2) }} + + {{ state.columns.length }} + +
+
+ +
+
+ +
From d0cef28ee79d0e8ca14f3df356b037c03cf830bf Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Wed, 21 Dec 2022 14:34:29 +0100 Subject: [PATCH 002/120] reset search term Signed-off-by: Vinzenz Rosenkranz --- CHANGELOG.md | 2 ++ resources/js/components/AttributeTemplate.vue | 7 +++++++ resources/js/components/search/Simple.vue | 9 +++++++++ 3 files changed, 18 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index afbc0e9aa..8d5160c24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## 0.9.10 ### Added - Background to column section in _Add Attribute_ modal to better distinguish it from the main section +### Fixed +- Reset label search after column added to table datatype in _Add Attribute_ modal ### Changed - Attributes in entity detail's link list are now grouped by linked entity diff --git a/resources/js/components/AttributeTemplate.vue b/resources/js/components/AttributeTemplate.vue index 7fef34193..c403cb159 100644 --- a/resources/js/components/AttributeTemplate.vue +++ b/resources/js/components/AttributeTemplate.vue @@ -8,6 +8,7 @@
@@ -124,6 +125,7 @@ import { translateConcept, getConceptLabel, + getTs, } from '@/helpers/helpers.js'; export default { @@ -162,6 +164,10 @@ state.attribute.rootAttributeLabel = null; state.attribute.differRoot = false; state.attribute.textContent = ''; + state.searchResetValue = { + reset: true, + ts: getTs(), + }; }; const create = _ => { if(!state.attribute.differRoot) { @@ -223,6 +229,7 @@ differRoot: false, textContent: '', }, + searchResetValue: null, formId: external.value || 'create-attribute-form', attributeTypes: types, label: computed(_ => { diff --git a/resources/js/components/search/Simple.vue b/resources/js/components/search/Simple.vue index 55d43e591..aab4b9cc4 100644 --- a/resources/js/components/search/Simple.vue +++ b/resources/js/components/search/Simple.vue @@ -70,6 +70,7 @@ computed, reactive, toRefs, + watch, } from 'vue'; import { useI18n } from 'vue-i18n'; @@ -195,6 +196,14 @@ enableChain: computed(_ => chain.value && chain.value.length > 0), }); + watch(_ => defaultValue.value, (newValue, oldValue) => { + if(newValue.reset) { + state.entry = null; + } else { + state.entry = newValue; + } + }); + // RETURN return { t, From 7c1e7fd921f33e5db0a39357521634c551973edd Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Wed, 21 Dec 2022 14:34:50 +0100 Subject: [PATCH 003/120] update version Signed-off-by: Vinzenz Rosenkranz --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index de102daf9..b4fbfe8e7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "spacialist", - "version": "0.9.7", + "version": "0.10.0", "description": "A Virtual Research Environment for the Spatial Humanities", "repository": { "type": "git", From 5c010c3281fe14fb0795b14e7907c7cf4ee2e8f1 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Wed, 21 Dec 2022 14:41:08 +0100 Subject: [PATCH 004/120] fix resetting search to null value Signed-off-by: Vinzenz Rosenkranz --- resources/js/components/search/Simple.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/js/components/search/Simple.vue b/resources/js/components/search/Simple.vue index aab4b9cc4..3b586d050 100644 --- a/resources/js/components/search/Simple.vue +++ b/resources/js/components/search/Simple.vue @@ -197,7 +197,7 @@ }); watch(_ => defaultValue.value, (newValue, oldValue) => { - if(newValue.reset) { + if(!newValue || newValue.reset) { state.entry = null; } else { state.entry = newValue; From bb7c9ebdb7e9cb061e402203992b3dd29a6d84c0 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Wed, 21 Dec 2022 14:42:26 +0100 Subject: [PATCH 005/120] correctly reset all column values after table row added Signed-off-by: Vinzenz Rosenkranz --- CHANGELOG.md | 1 + resources/js/components/attribute/Tabular.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d5160c24..c0f85f9ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file. - Background to column section in _Add Attribute_ modal to better distinguish it from the main section ### Fixed - Reset label search after column added to table datatype in _Add Attribute_ modal +- Reset column values after new row is added in _Entity Detail_ form ### Changed - Attributes in entity detail's link list are now grouped by linked entity diff --git a/resources/js/components/attribute/Tabular.vue b/resources/js/components/attribute/Tabular.vue index b9644e0ea..987555a78 100644 --- a/resources/js/components/attribute/Tabular.vue +++ b/resources/js/components/attribute/Tabular.vue @@ -453,6 +453,7 @@ const reference = newRowRefs.value[k]; if(!!reference.v.value) { rowValue[k] = reference.v.value; + state.newRowColumns[k] = null; if(!!reference.resetFieldState) { reference.resetFieldState(); } From 423c4aea6f41219c25c4804a084401e14ace23e9 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Thu, 22 Dec 2022 11:13:53 +0100 Subject: [PATCH 006/120] fix tabular attribute preview Signed-off-by: Vinzenz Rosenkranz --- CHANGELOG.md | 1 + resources/js/components/AttributeList.vue | 20 +++++++++- resources/js/components/attribute/Tabular.vue | 11 +++++- .../js/components/modals/attribute/Add.vue | 37 +++++++++++++++++-- resources/js/helpers/helpers.js | 6 +++ 5 files changed, 69 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c0f85f9ae..5791af356 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file. ### Fixed - Reset label search after column added to table datatype in _Add Attribute_ modal - Reset column values after new row is added in _Entity Detail_ form +- Preview for Tabular attribute ### Changed - Attributes in entity detail's link list are now grouped by linked entity diff --git a/resources/js/components/AttributeList.vue b/resources/js/components/AttributeList.vue index 1af3da4f9..48bd395c0 100644 --- a/resources/js/components/AttributeList.vue +++ b/resources/js/components/AttributeList.vue @@ -3,7 +3,7 @@ class="h-100 pe-1" v-model="state.attributeList" item-key="id" - :disabled="disableDrag" + :disabled="disableDrag || preview" :group="group" :move="handleMove" @change="handleUpdate"> @@ -135,6 +135,7 @@ :value="state.attributeValues[element.id].value" :attribute="element" :selections="selections" + :preview-columns="preview ? previewData[element.id] : null" @expanded="e => onAttributeExpand(e, index)" @change="e => updateDirtyState(e, element.id)" /> @@ -305,6 +306,16 @@ type: Boolean, default: false, }, + preview: { + required: false, + type: Boolean, + default: false, + }, + previewData: { + required: false, + type: Object, + default: {}, + }, }, components: { 'string-attribute': StringAttr, @@ -341,6 +352,8 @@ selections, values, nolabels, + preview, + previewData, } = toRefs(props); // FETCH @@ -372,6 +385,9 @@ state.hoverStates[i] = false; }; const handleMove = (e, orgE) => { + // Preview does not allow dragging + if(preview.value) return false; + const draggedAid = e.draggedContext.element.id; return !(showHidden.value && Object.keys(state.hiddenAttributeList).some(aid => aid == draggedAid)) && !disableDrag.value; }; @@ -570,6 +586,8 @@ metadataAddon, nolabels, selections, + preview, + previewData, // STATE attrRefs, state, diff --git a/resources/js/components/attribute/Tabular.vue b/resources/js/components/attribute/Tabular.vue index 987555a78..d4e0902fa 100644 --- a/resources/js/components/attribute/Tabular.vue +++ b/resources/js/components/attribute/Tabular.vue @@ -180,7 +180,7 @@ - +
@@ -292,6 +292,11 @@ attribute: { type: Object, }, + previewColumns: { + required: false, + type: Object, + default: null, + }, }, components: { 'string-attribute': StringAttr, @@ -316,6 +321,7 @@ value, selections, attribute, + previewColumns, } = toRefs(props); // FETCH @@ -506,7 +512,8 @@ initialValue: value.value, }); const state = reactive({ - columns: computed(_ => getAttribute(attribute.value.id).columns), + isPreview: computed(_ => previewColumns.value && Object.keys(previewColumns.value).length > 0), + columns: computed(_ => state.isPreview ? previewColumns.value : getAttribute(attribute.value.id).columns), selections: computed(_ => { const list = {}; if(!state.columns) return list; diff --git a/resources/js/components/modals/attribute/Add.vue b/resources/js/components/modals/attribute/Add.vue index be6268b97..36cbce596 100644 --- a/resources/js/components/modals/attribute/Add.vue +++ b/resources/js/components/modals/attribute/Add.vue @@ -48,9 +48,13 @@ + :selections="{}" + :preview="true" + :preview-data="state.previewData" />
@@ -72,6 +76,10 @@ } from 'vue'; import { useI18n } from 'vue-i18n'; + import { + randomId, + } from '@/helpers/helpers.js'; + import AttributeTemplate from '@/components/AttributeTemplate.vue'; export default { @@ -166,6 +174,7 @@ }; // DATA + const fakeId = randomId(); const state = reactive({ attribute: {}, columns: [], @@ -179,8 +188,6 @@ previewAttribute: computed(_ => { if(!state.attribute.type) return null; - const fakeId = Number.MAX_VALUE; - return { attribute: [{ ...state.attribute, @@ -195,6 +202,30 @@ }, }; }), + previewData: computed(_ => { + if(!state.attribute.type) return null; + // Currently only table type supports additional data + if(state.attribute.type != 'table') return null; + + const columns = {}; + if(state.columns.length == 0) { + columns.is_preview = true; + } else { + state.columns.forEach((c, i) => { + const colId = fakeId + (i+1); + columns[colId] = { + id: colId, + parent_id: fakeId, + recursive: c.recursive, + datatype: c.type, + thesaurus_url: c.label.concept_url + }; + }); + } + return { + [fakeId]: columns, + }; + }), }); // RETURN diff --git a/resources/js/helpers/helpers.js b/resources/js/helpers/helpers.js index fb12748ad..7697bbaab 100644 --- a/resources/js/helpers/helpers.js +++ b/resources/js/helpers/helpers.js @@ -135,6 +135,12 @@ export function getOrderedDate(short = false, withTime = false) { } } +export function randomId(min = 0, max = 100) { + min = Math.ceil(min); + max = Math.floor(max); + return Math.floor(Math.random() * (max - min) + min); +} + export function getConcept(url) { if(!url || !hasConcept(url)) { return {}; From 9d9920cd5100303f81aed56186a4ca3d0ce7df05 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Fri, 23 Dec 2022 10:45:16 +0100 Subject: [PATCH 007/120] fix dropdown selections for new table attributes Signed-off-by: Vinzenz Rosenkranz --- CHANGELOG.md | 3 ++- resources/js/bootstrap/store.js | 9 ++++++++- resources/js/components/attribute/Tabular.vue | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5791af356..e6c591b2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,8 @@ All notable changes to this project will be documented in this file. ### Fixed - Reset label search after column added to table datatype in _Add Attribute_ modal - Reset column values after new row is added in _Entity Detail_ form -- Preview for Tabular attribute +- Preview for _table_ datatype +- Dropdowns for columns of newly added _table_ attribute only visible after page reload ### Changed - Attributes in entity detail's link list are now grouped by linked entity diff --git a/resources/js/bootstrap/store.js b/resources/js/bootstrap/store.js index 8f75c9fa3..081b66f25 100644 --- a/resources/js/bootstrap/store.js +++ b/resources/js/bootstrap/store.js @@ -71,7 +71,13 @@ export const store = createStore({ state.attributeTypes = data; }, setAttributeSelection(state, data) { - state.attributeSelections[data.id] = data.selection; + if(data.nested) { + for(let k in data.selection) { + state.attributeSelections[k] = data.selection[k]; + } + } else { + state.attributeSelections[data.id] = data.selection; + } }, setAttributeSelections(state, data) { state.attributeSelections = data; @@ -696,6 +702,7 @@ export const store = createStore({ if(data.selection) { commit('setAttributeSelection', { id: data.attribute.id, + nested: data.attribute.datatype == 'table', selection: data.selection, }); } diff --git a/resources/js/components/attribute/Tabular.vue b/resources/js/components/attribute/Tabular.vue index d4e0902fa..e9009365e 100644 --- a/resources/js/components/attribute/Tabular.vue +++ b/resources/js/components/attribute/Tabular.vue @@ -516,7 +516,7 @@ columns: computed(_ => state.isPreview ? previewColumns.value : getAttribute(attribute.value.id).columns), selections: computed(_ => { const list = {}; - if(!state.columns) return list; + if(!state.columns || state.isPreview) return list; for(let k in state.columns) { const curr = state.columns[k]; From d49d7aa624c28ac50a771f0c1ecbd5764136218e Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 9 Oct 2023 13:45:18 +0200 Subject: [PATCH 008/120] update dependencies Signed-off-by: Vinzenz Rosenkranz --- package-lock.json | 982 ++++++++++++++++++--------- package.json | 42 +- resources/js/components/mde/Main.vue | 2 - 3 files changed, 672 insertions(+), 354 deletions(-) diff --git a/package-lock.json b/package-lock.json index ac4bc10b2..58d334d6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,35 +1,35 @@ { "name": "spacialist", - "version": "0.9.14", + "version": "0.10.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "spacialist", - "version": "0.9.14", + "version": "0.10.0", "license": "MIT", "dependencies": { "@fontsource/raleway": "^5.0.2", "@fontsource/source-code-pro": "^5.0.2", - "@milkdown/core": "^7.2.0", - "@milkdown/plugin-clipboard": "^7.2.0", - "@milkdown/plugin-diagram": "^7.2.0", - "@milkdown/plugin-emoji": "^7.2.0", - "@milkdown/plugin-history": "^7.2.0", - "@milkdown/plugin-indent": "^7.2.0", - "@milkdown/plugin-listener": "^7.2.0", - "@milkdown/plugin-math": "^7.2.0", - "@milkdown/plugin-prism": "^7.2.0", - "@milkdown/plugin-tooltip": "^7.2.0", - "@milkdown/plugin-upload": "^7.2.0", - "@milkdown/preset-commonmark": "^7.2.0", - "@milkdown/preset-gfm": "^7.2.0", - "@milkdown/prose": "^7.2.0", - "@milkdown/theme-nord": "^7.2.0", - "@milkdown/vue": "^7.2.0", + "@milkdown/core": "^7.3.0", + "@milkdown/plugin-clipboard": "^7.3.0", + "@milkdown/plugin-diagram": "^7.3.0", + "@milkdown/plugin-emoji": "^7.3.0", + "@milkdown/plugin-history": "^7.3.0", + "@milkdown/plugin-indent": "^7.3.0", + "@milkdown/plugin-listener": "^7.3.0", + "@milkdown/plugin-math": "^7.3.0", + "@milkdown/plugin-prism": "^7.3.0", + "@milkdown/plugin-tooltip": "^7.3.0", + "@milkdown/plugin-upload": "^7.3.0", + "@milkdown/preset-commonmark": "^7.3.0", + "@milkdown/preset-gfm": "^7.3.0", + "@milkdown/prose": "^7.3.0", + "@milkdown/theme-nord": "^7.3.0", + "@milkdown/vue": "^7.3.0", "@picmo/popup-picker": "^5.8.2", "@popperjs/core": "^2.11.7", - "@retorquere/bibtex-parser": "^6.4.12", + "@retorquere/bibtex-parser": "^7.0.5", "@vueform/multiselect": "^2.6.2", "bootstrap": "^5.3.0", "buffer": "^6.0.3", @@ -37,12 +37,12 @@ "circular-dependency-plugin": "^5.2.2", "d3-dsv": "^3.0.1", "dayjs": "^1.11.7", - "emojibase-data": "^7.0.1", + "emojibase-data": "^15.0.0", "highlight.js": "^11.8.0", "lodash": "^4.17.21", "markdown-vue": "^1.0.1", - "ol": "^7.4.0", - "ol-ext": "^4.0.8", + "ol": "^8.1.0", + "ol-ext": "^4.0.10", "p-queue": "^7.3.4", "picmo": "^5.8.2", "process": "^0.11.10", @@ -51,7 +51,7 @@ "remark-gfm": "^3.0.1", "tree-vue-component": "^6.0.2", "vee-validate": "^4.9.6", - "video.js": "^7.21.4", + "video.js": "^8.5.0", "videojs-record": "^4.6.0", "vue-datepicker-next": "^1.0.3", "vue-final-modal": "v4.4.2", @@ -2029,51 +2029,12 @@ "integrity": "sha512-Hcv+nVC0kZnQ3tD9GVu5xSMR4VVYOteQIr/hwFPVEvPdlXqgGEuRjiheChHgdM+JyqdgNcmzZOX/tnl0JOiI7A==", "dev": true }, - "node_modules/@mapbox/jsonlint-lines-primitives": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", - "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/@mapbox/mapbox-gl-style-spec": { - "version": "13.28.0", - "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.28.0.tgz", - "integrity": "sha512-B8xM7Fp1nh5kejfIl4SWeY0gtIeewbuRencqO3cJDrCHZpaPg7uY+V8abuR+esMeuOjRl5cLhVTP40v+1ywxbg==", - "dependencies": { - "@mapbox/jsonlint-lines-primitives": "~2.0.2", - "@mapbox/point-geometry": "^0.1.0", - "@mapbox/unitbezier": "^0.0.0", - "csscolorparser": "~1.0.2", - "json-stringify-pretty-compact": "^2.0.0", - "minimist": "^1.2.6", - "rw": "^1.3.3", - "sort-object": "^0.3.2" - }, - "bin": { - "gl-style-composite": "bin/gl-style-composite.js", - "gl-style-format": "bin/gl-style-format.js", - "gl-style-migrate": "bin/gl-style-migrate.js", - "gl-style-validate": "bin/gl-style-validate.js" - } - }, - "node_modules/@mapbox/point-geometry": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", - "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==" - }, - "node_modules/@mapbox/unitbezier": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.0.tgz", - "integrity": "sha512-HPnRdYO0WjFjRTSwO3frz1wKaU649OBFPX3Zo/2WZvuRi6zMiRGui8SnPQiQABgqCf8YikDe5t3HViTVw1WUzA==" - }, "node_modules/@milkdown/core": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/core/-/core-7.2.0.tgz", - "integrity": "sha512-rdh7VdML91O/NvEksE6druT4r9QRtYkk2ocH7mic99QLRhKxTuecOuZnRKPeBmPlxbG/o7bwCyPKeqWUlLEkDg==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/core/-/core-7.3.0.tgz", + "integrity": "sha512-spB2mti5glP/ZJROgNZuaVgDC0djhMEnd9eu5iEmm4qqUj4RabKDZkVox9kZE0ngn6msWtDW/qQwnIFd4iFGdQ==", "dependencies": { - "@milkdown/exception": "7.2.0", + "@milkdown/exception": "7.3.0", "remark-parse": "^10.0.1", "remark-stringify": "^10.0.2", "tslib": "^2.5.0", @@ -2085,6 +2046,14 @@ "@milkdown/transformer": "^7.2.0" } }, + "node_modules/@milkdown/core/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, "node_modules/@milkdown/ctx": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/@milkdown/ctx/-/ctx-7.2.0.tgz", @@ -2099,16 +2068,17 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.2.0.tgz", "integrity": "sha512-7v7rwK9ReBJeSMbICyhvt4VrYJfU4fLfZS1LJrL4bkrMCRW+urmOC2d3C4zaxB2WuTR6EVkA920LQjDDwD8fdA==", + "peer": true, "dependencies": { "tslib": "^2.5.0" } }, "node_modules/@milkdown/plugin-clipboard": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-clipboard/-/plugin-clipboard-7.2.0.tgz", - "integrity": "sha512-TiHzNSq2F1+GISyMnKtux4hwHuZgvFiMbwnrgOqU0SqI8862g86U7TR+hldNZfJ8UKRrWXw1T0lq3A476dJrUQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-clipboard/-/plugin-clipboard-7.3.0.tgz", + "integrity": "sha512-KTvoOC8bJyOLqejpKWK1PAqoNH6WKdS7dGByy92rI3zQeJn9QPdzR2w2mi3d4j3AJHVxEimApGJRHrAOcb+i1w==", "dependencies": { - "@milkdown/utils": "7.2.0", + "@milkdown/utils": "7.3.0", "tslib": "^2.5.0" }, "peerDependencies": { @@ -2117,38 +2087,91 @@ } }, "node_modules/@milkdown/plugin-diagram": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-diagram/-/plugin-diagram-7.2.0.tgz", - "integrity": "sha512-Z+qsVf06Z1+b/vGyvaQwE4hwhsw1JBVTiUBO/gxYrnmHI1EbbS08zK3ovMj8zVmy9G1P6NSvqJ9uIDvv5zOjuw==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-diagram/-/plugin-diagram-7.3.0.tgz", + "integrity": "sha512-qeZwX+Qft1Q5/Miu+0RHAbJyDA1JH0oBJWikDa9QiDLiMm4tjX69X4r8a2JfAfvR0AxWzwz8bllh1bn+ktgYiA==", "dependencies": { - "@milkdown/exception": "7.2.0", - "@milkdown/utils": "7.2.0", + "@milkdown/exception": "7.3.0", + "@milkdown/utils": "7.3.0", "@types/dompurify": "^3.0.0", "mermaid": "^10.0.0", "nanoid": "^4.0.0", "tslib": "^2.5.0", - "unist-util-visit": "^4.0.0" + "unist-util-visit": "^5.0.0" }, "peerDependencies": { "@milkdown/core": "^7.2.0", "@milkdown/ctx": "^7.2.0", - "@milkdown/prose": "^7.2.0" + "@milkdown/prose": "^7.2.0", + "@milkdown/transformer": "^7.2.0" + } + }, + "node_modules/@milkdown/plugin-diagram/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, + "node_modules/@milkdown/plugin-diagram/node_modules/@types/unist": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz", + "integrity": "sha512-MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w==" + }, + "node_modules/@milkdown/plugin-diagram/node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/@milkdown/plugin-diagram/node_modules/unist-util-visit": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz", + "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/@milkdown/plugin-diagram/node_modules/unist-util-visit-parents": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", + "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" } }, "node_modules/@milkdown/plugin-emoji": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-emoji/-/plugin-emoji-7.2.0.tgz", - "integrity": "sha512-4chB+grfhA0IKi4XK8GEmX4CKonNZ7OFf1HznmAzrC+Ank7Y/38x+rbfwHc0yRn2au8MNXfN5EOHLB7k7JCCFQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-emoji/-/plugin-emoji-7.3.0.tgz", + "integrity": "sha512-KqdrjTlH7kjc3xwYAgM6nYVhV7v0k6OUdosGMIH7jm8PiOn7EGaOqkiSyi8Cbfu/3Veb1gwWyKk+Lla0kbBS8Q==", "dependencies": { - "@milkdown/exception": "7.2.0", - "@milkdown/utils": "7.2.0", + "@milkdown/exception": "7.3.0", + "@milkdown/utils": "7.3.0", "@types/node-emoji": "^1.8.1", "emoji-regex": "^10.0.0", - "node-emoji": "^1.10.0", - "remark-emoji": "^3.0.1", + "node-emoji": "^2.0.0", + "remark-emoji": "^4.0.0", "tslib": "^2.5.0", "twemoji": "^14.0.1", - "unist-util-visit": "^4.0.0" + "unist-util-visit": "^5.0.0" }, "peerDependencies": { "@milkdown/core": "^7.2.0", @@ -2157,12 +2180,64 @@ "@milkdown/transformer": "^7.2.0" } }, + "node_modules/@milkdown/plugin-emoji/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, + "node_modules/@milkdown/plugin-emoji/node_modules/@types/unist": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz", + "integrity": "sha512-MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w==" + }, + "node_modules/@milkdown/plugin-emoji/node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/@milkdown/plugin-emoji/node_modules/unist-util-visit": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz", + "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/@milkdown/plugin-emoji/node_modules/unist-util-visit-parents": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", + "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/@milkdown/plugin-history": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-history/-/plugin-history-7.2.0.tgz", - "integrity": "sha512-1B4jAQAW5pRe0M0gtwUTTepcg4RMPbHCx9/Y2W727PpU83oohKAt6Zp5fY67ZJaS4jkjwG4BgochOJrGsq/EHA==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-history/-/plugin-history-7.3.0.tgz", + "integrity": "sha512-iKevzmS0+uhCssk8J+Z40ZgoRIzvSLAS3t3s5LWJ5tzgIP3UxYQLxUeQw5UOLga7v48FUDQfoEPmBs6n6Da2Cw==", "dependencies": { - "@milkdown/utils": "7.2.0", + "@milkdown/utils": "7.3.0", "tslib": "^2.5.0" }, "peerDependencies": { @@ -2172,11 +2247,11 @@ } }, "node_modules/@milkdown/plugin-indent": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-indent/-/plugin-indent-7.2.0.tgz", - "integrity": "sha512-JuWFLxmHeEHF6bmKOhQRtAUrBekjBoX3Wq83WesgFP+PjjyQoVq4xyh402vk6HxStKcoRlYNEU8Bch2XJoMzKQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-indent/-/plugin-indent-7.3.0.tgz", + "integrity": "sha512-KLyNh/6iKGlP3rO7cTua7OuveWsWVfA2fq4x+kYIqD31ImTUpJZnePRtI86OVirxwa1ua/rZcH59BpOX6mSQXg==", "dependencies": { - "@milkdown/utils": "7.2.0", + "@milkdown/utils": "7.3.0", "tslib": "^2.5.0" }, "peerDependencies": { @@ -2186,11 +2261,11 @@ } }, "node_modules/@milkdown/plugin-listener": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-listener/-/plugin-listener-7.2.0.tgz", - "integrity": "sha512-nN6/G1xYLXZ6n4nVpKRiHeaQKFCcgpHifyF/oixvIZZ1SvXlmp5m/rffSEGKXrL8FGs6sMgeqPVL/czVxQqH1A==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-listener/-/plugin-listener-7.3.0.tgz", + "integrity": "sha512-W/52MQ0occGD7MLXz7pDaeUA5NClz9bPuU7ZypOMY8x3CmbVXQMNMfOoEC0udgeRRbroZ+Vj4SEcedZ/CU6gPA==", "dependencies": { - "@milkdown/utils": "7.2.0", + "@milkdown/utils": "7.3.0", "@types/lodash.debounce": "^4.0.7", "lodash.debounce": "^4.0.8", "tslib": "^2.5.0" @@ -2202,12 +2277,12 @@ } }, "node_modules/@milkdown/plugin-math": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-math/-/plugin-math-7.2.0.tgz", - "integrity": "sha512-Y4YQJ7bfAByFyOY/n1QWl7DN5kTe7glm6JU0XGFpkNOPnvZNQKaE2CdV9BZU60esYB1FjfFFN4XPlRBvIzvTUQ==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-math/-/plugin-math-7.3.0.tgz", + "integrity": "sha512-CsoVx9+zGl/YnnIuCrgvkdm19+qlKt1vylUxNpym/H/pwgCx95lwoPjxPjUta0wr5jYJReTEW/UVKKs6zUlPIg==", "dependencies": { - "@milkdown/exception": "7.2.0", - "@milkdown/utils": "7.2.0", + "@milkdown/exception": "7.3.0", + "@milkdown/utils": "7.3.0", "@types/katex": "^0.16.0", "katex": "^0.16.0", "remark-math": "^5.1.0", @@ -2219,12 +2294,20 @@ "@milkdown/prose": "^7.2.0" } }, + "node_modules/@milkdown/plugin-math/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, "node_modules/@milkdown/plugin-prism": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-prism/-/plugin-prism-7.2.0.tgz", - "integrity": "sha512-0FUaNebyZGpvtOkK/wH3OIVcrDmaVejwQsfcAEjadaRlSvEtmOWZlOSMCEJ4u6k33nvSnaCVU0bZi+cFMF4FnA==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-prism/-/plugin-prism-7.3.0.tgz", + "integrity": "sha512-X39eBtUzB45ITE6Snxj7KXyuWe2SOAyocqRlhes7xff17aAr+57GSdtN4VLl3aqdGFlcBds839B5jkAEsp3RJQ==", "dependencies": { - "@milkdown/utils": "7.2.0", + "@milkdown/utils": "7.3.0", "refractor": "^4.0.0", "tslib": "^2.5.0" }, @@ -2235,12 +2318,12 @@ } }, "node_modules/@milkdown/plugin-tooltip": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-tooltip/-/plugin-tooltip-7.2.0.tgz", - "integrity": "sha512-OmtxxQwxfT+wH4qKJZz7A3CAVxQ82zUrim+dy7Cg51yZeZQUwiZn0GMLop47kPsmBZV0Cuz95HVobY4NY4Zkyg==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-tooltip/-/plugin-tooltip-7.3.0.tgz", + "integrity": "sha512-8wknnq1wtM4II8R7T5wy1Ak/QtycxhCCnxa568cCyMRhPVKwdXjDaDgIR/NZeIvHi3UIEeXWlQj8b4KuwiiPnA==", "dependencies": { - "@milkdown/exception": "7.2.0", - "@milkdown/utils": "7.2.0", + "@milkdown/exception": "7.3.0", + "@milkdown/utils": "7.3.0", "@types/lodash.debounce": "^4.0.7", "lodash.debounce": "^4.0.8", "tippy.js": "^6.3.7", @@ -2252,13 +2335,21 @@ "@milkdown/prose": "^7.2.0" } }, + "node_modules/@milkdown/plugin-tooltip/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, "node_modules/@milkdown/plugin-upload": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/plugin-upload/-/plugin-upload-7.2.0.tgz", - "integrity": "sha512-fJGRcPySlvRxEZsVq2dDC1NACjEJfx2VqhMOxmoqu6y8nzoMLIrFsKYxbB7upwmIi/8QkjCsxU8gt+Nva8SoQw==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/plugin-upload/-/plugin-upload-7.3.0.tgz", + "integrity": "sha512-SMjyIUXCH3g6Y3PYmPg0Tzy2bas+aT9lut0kHRKekszyZu9g6ZAudJhNoGWS2ff6KWSjBWlrvkLpozu+hu3EQQ==", "dependencies": { - "@milkdown/exception": "7.2.0", - "@milkdown/utils": "7.2.0", + "@milkdown/exception": "7.3.0", + "@milkdown/utils": "7.3.0", "tslib": "^2.5.0" }, "peerDependencies": { @@ -2267,17 +2358,25 @@ "@milkdown/prose": "^7.2.0" } }, + "node_modules/@milkdown/plugin-upload/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, "node_modules/@milkdown/preset-commonmark": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/preset-commonmark/-/preset-commonmark-7.2.0.tgz", - "integrity": "sha512-nY8S8F0Pdesk0b9zgixSgH2294vjfVDWU948RxE7KUhHjjH7l5/b5kS+002TQluCgNKcODTc0hhja69C9yz3Jg==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/preset-commonmark/-/preset-commonmark-7.3.0.tgz", + "integrity": "sha512-9ehBLkiLomp2av6E7YiRwihx/YsZ+LR80Y21e+Qzs5d6eq+payhblKQSaYYlVECA7gwLIOy67Lu8jxkOnO++rw==", "dependencies": { - "@milkdown/exception": "7.2.0", - "@milkdown/utils": "7.2.0", + "@milkdown/exception": "7.3.0", + "@milkdown/utils": "7.3.0", "@sindresorhus/slugify": "^2.2.0", "remark-inline-links": "^6.0.0", "tslib": "^2.5.0", - "unist-util-visit": "^4.0.0" + "unist-util-visit": "^5.0.0" }, "peerDependencies": { "@milkdown/core": "^7.2.0", @@ -2286,13 +2385,65 @@ "@milkdown/transformer": "^7.2.0" } }, + "node_modules/@milkdown/preset-commonmark/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, + "node_modules/@milkdown/preset-commonmark/node_modules/@types/unist": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz", + "integrity": "sha512-MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w==" + }, + "node_modules/@milkdown/preset-commonmark/node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/@milkdown/preset-commonmark/node_modules/unist-util-visit": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz", + "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/@milkdown/preset-commonmark/node_modules/unist-util-visit-parents": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", + "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/@milkdown/preset-gfm": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/preset-gfm/-/preset-gfm-7.2.0.tgz", - "integrity": "sha512-8VyDmfjXtcDuvzuXhGbLPojomsOdCBWb5dO5jOfeSHxvDcYFUIeRsHW0NT1eWW5Dw0Cc9xKKSSEfTC+dumIsvg==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/preset-gfm/-/preset-gfm-7.3.0.tgz", + "integrity": "sha512-ulaJ1Ck90SflxIe+tjq092ntu8PNbIM/pF0oYUuuUFHcKVkwqMmYevjRmFYo2MZiBvUv8eYOLbJ1xnGauB0aAg==", "dependencies": { - "@milkdown/exception": "7.2.0", - "@milkdown/utils": "7.2.0", + "@milkdown/exception": "7.3.0", + "@milkdown/utils": "7.3.0", "remark-gfm": "^3.0.0", "tslib": "^2.5.0" }, @@ -2304,34 +2455,50 @@ "@milkdown/transformer": "^7.2.0" } }, + "node_modules/@milkdown/preset-gfm/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, "node_modules/@milkdown/prose": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/prose/-/prose-7.2.0.tgz", - "integrity": "sha512-pIhQ+FCszvogPYSBWp9Av1cHivuc+35Rlm1kUEiM5PuVdWOMEjnpBxGsxlgC9oJGa/+5waArKI6q65h8R8vMhw==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/prose/-/prose-7.3.0.tgz", + "integrity": "sha512-YUx30G++v9RYw6mM5ybvvezaJBdSyhrDsVeuAzYkBRfV2fwEV1airBt96BqY+FeICYqE1eTCUty/gaPzpcwbPg==", + "dependencies": { + "@milkdown/exception": "7.3.0", + "prosemirror-changeset": "^2.2.1", + "prosemirror-commands": "^1.5.2", + "prosemirror-dropcursor": "^1.8.1", + "prosemirror-gapcursor": "^1.3.2", + "prosemirror-history": "^1.3.2", + "prosemirror-inputrules": "^1.2.1", + "prosemirror-keymap": "^1.2.2", + "prosemirror-model": "^1.19.2", + "prosemirror-schema-list": "^1.3.0", + "prosemirror-state": "^1.4.3", + "prosemirror-tables": "^1.3.4", + "prosemirror-transform": "^1.7.3", + "prosemirror-view": "^1.31.5", + "tslib": "^2.5.0" + } + }, + "node_modules/@milkdown/prose/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", "dependencies": { - "@milkdown/exception": "7.2.0", - "prosemirror-changeset": "^2.2.0", - "prosemirror-commands": "^1.5.0", - "prosemirror-dropcursor": "^1.7.0", - "prosemirror-gapcursor": "^1.3.1", - "prosemirror-history": "^1.3.0", - "prosemirror-inputrules": "^1.2.0", - "prosemirror-keymap": "^1.2.1", - "prosemirror-model": "^1.19.0", - "prosemirror-schema-list": "^1.2.2", - "prosemirror-state": "^1.4.2", - "prosemirror-tables": "^1.3.2", - "prosemirror-transform": "^1.7.1", - "prosemirror-view": "^1.30.1", "tslib": "^2.5.0" } }, "node_modules/@milkdown/theme-nord": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/theme-nord/-/theme-nord-7.2.0.tgz", - "integrity": "sha512-2K4rmQYshRav5FP8/GcFDq1W2pQuSXmWAmtGtv3eRrg1hZdY+MpuSYAx6dk2fTVa7uDW0KzWR6G61ocHl03X2A==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/theme-nord/-/theme-nord-7.3.0.tgz", + "integrity": "sha512-sXFY8wxn/38BbQJyrJQvj8/h0kKvrVr3q8U/lSzNoCywH1hQ/qapSFDs3HvXLSWOZm/V0CaIP7H/MwHKF8N6MA==", "dependencies": { - "clsx": "^1.2.1", + "clsx": "^2.0.0", "tslib": "^2.5.0" }, "peerDependencies": { @@ -2360,11 +2527,11 @@ } }, "node_modules/@milkdown/utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/utils/-/utils-7.2.0.tgz", - "integrity": "sha512-gjELvC1RC36XPjlJXiyhgPpvlhfxZyYk2uLRECAcgzglm8642pEeHa5sCnqBvCyddAkKiSCizRdMSgYcmUG89Q==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/utils/-/utils-7.3.0.tgz", + "integrity": "sha512-hOb6UwRIX2e7lpAn3sjAtsF2idzQN/wQ9MLbjoIevQXjO1EgNYiBTFIfTDnI4ka+VrVScvZtZ2D8cAA+3+ndxw==", "dependencies": { - "@milkdown/exception": "7.2.0", + "@milkdown/exception": "7.3.0", "nanoid": "^4.0.0", "tslib": "^2.5.0" }, @@ -2375,12 +2542,20 @@ "@milkdown/transformer": "^7.2.0" } }, + "node_modules/@milkdown/utils/node_modules/@milkdown/exception": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/exception/-/exception-7.3.0.tgz", + "integrity": "sha512-ZqN+3dOfTQ8OafkJz6WqNrNWxg3D6hACMa2XyPul+uVU0MLZXURfijCO26eByNlhG05w0Uo/FJfaapPZO3aE6g==", + "dependencies": { + "tslib": "^2.5.0" + } + }, "node_modules/@milkdown/vue": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@milkdown/vue/-/vue-7.2.0.tgz", - "integrity": "sha512-QTOetx4D9rBgUSPfrmX3pinh2nlj9FuzME0J7l2loqknEzolwufH8+Rd8h7BjECE5y491sv/vqH8Kr00MqNPPg==", + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/@milkdown/vue/-/vue-7.3.0.tgz", + "integrity": "sha512-eNHlYPcisSZ4p8JjGemPPox5h4px/h6Ln9yf6Oo25wBMRyTtyuBZ7mWk2OfSxk6A9Ay5Qm6rOnR6ok7OI1x3bw==", "dependencies": { - "@milkdown/utils": "7.2.0", + "@milkdown/utils": "7.3.0", "tslib": "^2.5.0" }, "peerDependencies": { @@ -2472,9 +2647,9 @@ } }, "node_modules/@retorquere/bibtex-parser": { - "version": "6.4.12", - "resolved": "https://registry.npmjs.org/@retorquere/bibtex-parser/-/bibtex-parser-6.4.12.tgz", - "integrity": "sha512-8UKB20AoBKaOHhj+2LaiMgf4aXDcHL1QcZStu2BoaC+JR8OpVE1w0aW4FE8hlAIzRIMLzqKhzb9Tov9+Ue3YgQ==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/@retorquere/bibtex-parser/-/bibtex-parser-7.0.5.tgz", + "integrity": "sha512-iwWETkP9j5a6OfjZAgm18NtECai9SzXzqWLzVGV0lipV9OO7ZtaKTtr+76jKsxZ/oOiTvOT2PJxf2f+GRVx7oQ==", "dependencies": { "unicode2latex": "^3.0.3", "xregexp": "^5.1.1" @@ -2501,6 +2676,17 @@ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==", "dev": true }, + "node_modules/@sindresorhus/is": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.2.tgz", + "integrity": "sha512-JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ==", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sindresorhus/is?sponsor=1" + } + }, "node_modules/@sindresorhus/slugify": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-2.2.0.tgz", @@ -3064,28 +3250,38 @@ } }, "node_modules/@videojs/http-streaming": { - "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-2.16.2.tgz", - "integrity": "sha512-etPTUdCFu7gUWc+1XcbiPr+lrhOcBu3rV5OL1M+3PDW89zskScAkkcdqYzP4pFodBPye/ydamQoTDScOnElw5A==", + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/@videojs/http-streaming/-/http-streaming-3.5.3.tgz", + "integrity": "sha512-dty8lsZk9QPc0i4It79tjWsmPiaC3FpgARFM0vJGko4k3yKNZIYkAk8kjiDRfkAQH/HZ3rYi5dDTriFNzwSsIg==", "dependencies": { "@babel/runtime": "^7.12.5", - "@videojs/vhs-utils": "3.0.5", - "aes-decrypter": "3.1.3", + "@videojs/vhs-utils": "4.0.0", + "aes-decrypter": "4.0.1", "global": "^4.4.0", - "m3u8-parser": "4.8.0", - "mpd-parser": "^0.22.1", - "mux.js": "6.0.1", - "video.js": "^6 || ^7" + "m3u8-parser": "^7.1.0", + "mpd-parser": "^1.1.1", + "mux.js": "7.0.0", + "video.js": "^7 || ^8" }, "engines": { "node": ">=8", "npm": ">=5" }, "peerDependencies": { - "video.js": "^6 || ^7" + "video.js": "^7 || ^8" } }, - "node_modules/@videojs/vhs-utils": { + "node_modules/@videojs/http-streaming/node_modules/m3u8-parser": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-7.1.0.tgz", + "integrity": "sha512-7N+pk79EH4oLKPEYdgRXgAsKDyA/VCo0qCHlUwacttQA0WqsjZQYmNfywMvjlY9MpEBVZEt0jKFd73Kv15EBYQ==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "@videojs/vhs-utils": "^3.0.5", + "global": "^4.4.0" + } + }, + "node_modules/@videojs/http-streaming/node_modules/m3u8-parser/node_modules/@videojs/vhs-utils": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz", "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==", @@ -3099,6 +3295,36 @@ "npm": ">=5" } }, + "node_modules/@videojs/http-streaming/node_modules/mux.js": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-7.0.0.tgz", + "integrity": "sha512-DeZmr+3NDrO02k4SREtl4VB5GyGPCz2fzMjDxBIlamkxffSTLge97rtNMoonnmFHTp96QggDucUtKv3fmyObrA==", + "dependencies": { + "@babel/runtime": "^7.11.2", + "global": "^4.4.0" + }, + "bin": { + "muxjs-transmux": "bin/transmux.js" + }, + "engines": { + "node": ">=8", + "npm": ">=5" + } + }, + "node_modules/@videojs/vhs-utils": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-4.0.0.tgz", + "integrity": "sha512-xJp7Yd4jMLwje2vHCUmi8MOUU76nxiwII3z4Eg3Ucb+6rrkFVGosrXlMgGnaLjq724j3wzNElRZ71D/CKrTtxg==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "global": "^4.4.0", + "url-toolkit": "^2.2.1" + }, + "engines": { + "node": ">=8", + "npm": ">=5" + } + }, "node_modules/@videojs/xhr": { "version": "2.6.0", "resolved": "https://registry.npmjs.org/@videojs/xhr/-/xhr-2.6.0.tgz", @@ -4195,9 +4421,9 @@ "dev": true }, "node_modules/@xmldom/xmldom": { - "version": "0.8.7", - "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.7.tgz", - "integrity": "sha512-sI1Ly2cODlWStkINzqGrZ8K6n+MTSbAeQnAipGyL+KZCXuHaRlj2gyyy8B/9MvsFFqN7XHryQnB2QwhzvJXovg==", + "version": "0.8.10", + "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz", + "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==", "engines": { "node": ">=10.0.0" } @@ -4292,9 +4518,9 @@ } }, "node_modules/aes-decrypter": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-3.1.3.tgz", - "integrity": "sha512-VkG9g4BbhMBy+N5/XodDeV6F02chEk9IpgRTq/0bS80y4dzy79VH2Gtms02VXomf3HmyRe3yyJYkJ990ns+d6A==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/aes-decrypter/-/aes-decrypter-4.0.1.tgz", + "integrity": "sha512-H1nh/P9VZXUf17AA5NQfJML88CFjVBDuGkp5zDHa7oEhYN9TTpNLJknRY1ie0iSKWlDf6JRnJKaZVDSQdPy6Cg==", "dependencies": { "@babel/runtime": "^7.12.5", "@videojs/vhs-utils": "^3.0.5", @@ -4302,6 +4528,20 @@ "pkcs7": "^1.0.4" } }, + "node_modules/aes-decrypter/node_modules/@videojs/vhs-utils": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz", + "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "global": "^4.4.0", + "url-toolkit": "^2.2.1" + }, + "engines": { + "node": ">=8", + "npm": ">=5" + } + }, "node_modules/ajv": { "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", @@ -5181,6 +5421,14 @@ "node": ">=0.8.0" } }, + "node_modules/char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", + "engines": { + "node": ">=10" + } + }, "node_modules/character-entities": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/character-entities/-/character-entities-2.0.2.tgz", @@ -5513,9 +5761,9 @@ } }, "node_modules/clsx": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz", - "integrity": "sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.0.0.tgz", + "integrity": "sha512-rQ1+kcj+ttHG0MKVGBUXwayCCF1oh39BF5COIpRzuCEv8Mwjv0XucrI2ExNTOn9IlLifGClWQcU9BrZORvtw6Q==", "engines": { "node": ">=6" } @@ -6182,11 +6430,6 @@ "url": "https://github.com/sponsors/fb55" } }, - "node_modules/csscolorparser": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/csscolorparser/-/csscolorparser-1.0.3.tgz", - "integrity": "sha512-umPSgYwZkdFoUrH5hIq5kf0wPSXiro51nPw0j2K/c83KflkPSTBGMz6NJvMB+07VlL0y7VPo6QJcDjcgKTTm3w==" - }, "node_modules/cssesc": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", @@ -7261,9 +7504,9 @@ } }, "node_modules/emojibase-data": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/emojibase-data/-/emojibase-data-7.0.1.tgz", - "integrity": "sha512-BLZpOdwyFpZ7lzBWyDtnxmKVm/SJMYgAfp1if3o6n1TVUMSXAf0nikONXl90LZuJ/m3XWPBkkubgCet2BsCGGQ==", + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/emojibase-data/-/emojibase-data-15.0.0.tgz", + "integrity": "sha512-hqrLNhEeBejKOQp5ArJcofkzV3qZBcp8czXj8nIKUGpBVc50NddNGwir4yAYxn3oNgrSj/lYdB9XxIVAKTkong==", "funding": { "type": "ko-fi", "url": "https://ko-fi.com/milesjohnson" @@ -7272,6 +7515,11 @@ "emojibase": "*" } }, + "node_modules/emojilib": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/emojilib/-/emojilib-2.4.0.tgz", + "integrity": "sha512-5U0rVMU5Y2n2+ykNLQqMoqklN9ICBT/KsvC1Gz6vqHbz2AXXGkG+Pm5rMWk/8Vjrr/mY9985Hi8DYzn1F09Nyw==" + }, "node_modules/emojis-list": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", @@ -9090,11 +9338,6 @@ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, - "node_modules/json-stringify-pretty-compact": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz", - "integrity": "sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==" - }, "node_modules/json5": { "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", @@ -9152,9 +9395,9 @@ } }, "node_modules/keycode": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.1.tgz", - "integrity": "sha512-Rdgz9Hl9Iv4QKi8b0OlCRQEzp4AgVxyCtz5S/+VIHezDmrDhkp2N2TqBWOLz0/gbeREXOOiI9/4b8BY9uw2vFg==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.2.0.tgz", + "integrity": "sha512-ps3I9jAdNtRpJrbBvQjpzyFbss/skHqzS+eu4RxKLaEAtFqkjZaB6TZMSivPbLxf4K7VI4SjR0P5mRCX5+Q25A==" }, "node_modules/khroma": { "version": "2.0.0", @@ -9901,15 +10144,29 @@ } }, "node_modules/m3u8-parser": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-4.8.0.tgz", - "integrity": "sha512-UqA2a/Pw3liR6Df3gwxrqghCP17OpPlQj6RBPLYygf/ZSQ4MoSgvdvhvt35qV+3NaaA0FSZx93Ix+2brT1U7cA==", + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/m3u8-parser/-/m3u8-parser-6.2.0.tgz", + "integrity": "sha512-qlC00JTxYOxawcqg+RB8jbyNwL3foY/nCY61kyWP+RCuJE9APLeqB/nSlTjb4Mg0yRmyERgjswpdQxMvkeoDrg==", "dependencies": { "@babel/runtime": "^7.12.5", "@videojs/vhs-utils": "^3.0.5", "global": "^4.4.0" } }, + "node_modules/m3u8-parser/node_modules/@videojs/vhs-utils": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz", + "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "global": "^4.4.0", + "url-toolkit": "^2.2.1" + }, + "engines": { + "node": ">=8", + "npm": ">=5" + } + }, "node_modules/magic-string": { "version": "0.30.0", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.0.tgz", @@ -9936,11 +10193,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/mapbox-to-css-font": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.2.tgz", - "integrity": "sha512-f+NBjJJY4T3dHtlEz1wCG7YFlkODEjFIYlxDdLIDMNpkSksqTt+l/d4rjuwItxuzkuMFvPyrjzV2lxRM4ePcIA==" - }, "node_modules/markdown-table": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/markdown-table/-/markdown-table-3.0.3.tgz", @@ -11046,6 +11298,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -11091,9 +11344,9 @@ "peer": true }, "node_modules/mpd-parser": { - "version": "0.22.1", - "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-0.22.1.tgz", - "integrity": "sha512-fwBebvpyPUU8bOzvhX0VQZgSohncbgYwUyJJoTSNpmy7ccD2ryiCvM7oRkn/xQH5cv73/xU7rJSNCLjdGFor0Q==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/mpd-parser/-/mpd-parser-1.2.2.tgz", + "integrity": "sha512-QCfB1koOoZw6E5La1cx+W/Yd0EZlRhHMqMr4TAJez0eRTuPDzPM5FWoiOqjyo37W+ISPLzmfJACSbJFEBjbL4Q==", "dependencies": { "@babel/runtime": "^7.12.5", "@videojs/vhs-utils": "^3.0.5", @@ -11104,6 +11357,20 @@ "mpd-to-m3u8-json": "bin/parse.js" } }, + "node_modules/mpd-parser/node_modules/@videojs/vhs-utils": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@videojs/vhs-utils/-/vhs-utils-3.0.5.tgz", + "integrity": "sha512-PKVgdo8/GReqdx512F+ombhS+Bzogiofy1LgAj4tN8PfdBx3HSS7V5WfJotKTqtOWGwVfSWsrYN/t09/DSryrw==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "global": "^4.4.0", + "url-toolkit": "^2.2.1" + }, + "engines": { + "node": ">=8", + "npm": ">=5" + } + }, "node_modules/mri": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", @@ -11141,9 +11408,9 @@ } }, "node_modules/mux.js": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.0.1.tgz", - "integrity": "sha512-22CHb59rH8pWGcPGW5Og7JngJ9s+z4XuSlYvnxhLuc58cA1WqGDQPzuG8I+sPm1/p0CdgpzVTaKW408k5DNn8w==", + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-6.3.0.tgz", + "integrity": "sha512-/QTkbSAP2+w1nxV+qTcumSDN5PA98P0tjrADijIzQHe85oBK3Akhy9AHlH0ne/GombLMz1rLyvVsmrgRxoPDrQ==", "dependencies": { "@babel/runtime": "^7.11.2", "global": "^4.4.0" @@ -11216,11 +11483,14 @@ } }, "node_modules/node-emoji": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.11.0.tgz", - "integrity": "sha512-wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.0.tgz", + "integrity": "sha512-tcsBm9C6FmPN5Wo7OjFi9lgMyJjvkAeirmjR/ax8Ttfqy4N8PoFic26uqFTIgayHPNI5FH4ltUvfh9kHzwcK9A==", "dependencies": { - "lodash": "^4.17.21" + "@sindresorhus/is": "^3.1.2", + "char-regex": "^1.0.2", + "emojilib": "^2.4.0", + "skin-tone": "^2.0.0" } }, "node_modules/node-fetch": { @@ -11501,13 +11771,12 @@ "dev": true }, "node_modules/ol": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/ol/-/ol-7.4.0.tgz", - "integrity": "sha512-bgBbiah694HhC0jt8ptEFNRXwgO8d6xWH3G97PCg4bmn9Li5nLLbi59oSrvqUI6VPVwonPQF1YcqJymxxyMC6A==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/ol/-/ol-8.1.0.tgz", + "integrity": "sha512-cx3SH2plpFS9fM8pp1nCypgQXGJD7Mcb1E3mEySmy5XEw1DUEo+kkNzgtAZz5qupekqi7aU9iBJEjCoMfqvO2Q==", "dependencies": { "earcut": "^2.2.3", "geotiff": "^2.0.7", - "ol-mapbox-style": "^10.1.0", "pbf": "3.2.1", "rbush": "^3.0.1" }, @@ -11517,23 +11786,13 @@ } }, "node_modules/ol-ext": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/ol-ext/-/ol-ext-4.0.8.tgz", - "integrity": "sha512-O0q4HmvrB+r0VOC3SAp9jEYSFN6Z3j1kSxRZxPK3VadArWjF27PXF+TGHj7HidzBy84jEre5/vDSv8oJbECbyA==", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/ol-ext/-/ol-ext-4.0.11.tgz", + "integrity": "sha512-zorUn71RsahiA/kbf+tRDbv19wqdLCclxd3gkjsFMnqCbdgl+P59CSJCqMO4O7b2bvaHrw5FEmep7FNFnGGQXg==", "peerDependencies": { "ol": ">= 5.3.0" } }, - "node_modules/ol-mapbox-style": { - "version": "10.6.0", - "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-10.6.0.tgz", - "integrity": "sha512-s86QhCoyyKVRsYkvPzzdWd///bhYh3onWrBq4lNXnCd9G/hS6AoK023kn4zlDESVlTBDTWLz8vhOistp0M3TXA==", - "dependencies": { - "@mapbox/mapbox-gl-style-spec": "^13.23.1", - "mapbox-to-css-font": "^2.4.1", - "ol": "^7.3.0" - } - }, "node_modules/on-finished": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", @@ -11700,9 +11959,9 @@ } }, "node_modules/orderedmap": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.0.tgz", - "integrity": "sha512-/pIFexOm6S70EPdznemIz3BQZoJ4VTFrhqzu0ACBqBgeLsLxq8e6Jim63ImIfwW/zAD1AlXpRMlOv3aghmo4dA==" + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/orderedmap/-/orderedmap-2.1.1.tgz", + "integrity": "sha512-TvAWxi0nDe1j/rtMcWcIj94+Ffe6n7zhow33h40SKxmsmozs6dz/e+EajymfoFcHd7sxNn8yHM8839uixMOV6g==" }, "node_modules/os-browserify": { "version": "0.3.0", @@ -12820,17 +13079,17 @@ } }, "node_modules/prosemirror-changeset": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.2.0.tgz", - "integrity": "sha512-QM7ohGtkpVpwVGmFb8wqVhaz9+6IUXcIQBGZ81YNAKYuHiFJ1ShvSzab4pKqTinJhwciZbrtBEk/2WsqSt2PYg==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/prosemirror-changeset/-/prosemirror-changeset-2.2.1.tgz", + "integrity": "sha512-J7msc6wbxB4ekDFj+n9gTW/jav/p53kdlivvuppHsrZXCaQdVgRghoZbSS3kwrRyAstRVQ4/+u5k7YfLgkkQvQ==", "dependencies": { "prosemirror-transform": "^1.0.0" } }, "node_modules/prosemirror-commands": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.5.1.tgz", - "integrity": "sha512-ga1ga/RkbzxfAvb6iEXYmrEpekn5NCwTb8w1dr/gmhSoaGcQ0VPuCzOn5qDEpC45ql2oDkKoKQbRxLJwKLpMTQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/prosemirror-commands/-/prosemirror-commands-1.5.2.tgz", + "integrity": "sha512-hgLcPaakxH8tu6YvVAaILV2tXYsW3rAdDR8WNkeKGcgeMVQg3/TMhPdVoh7iAmfgVjZGtcOSjKiQaoeKjzd2mQ==", "dependencies": { "prosemirror-model": "^1.0.0", "prosemirror-state": "^1.0.0", @@ -12838,9 +13097,9 @@ } }, "node_modules/prosemirror-dropcursor": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.0.tgz", - "integrity": "sha512-TZMitR8nlp9Xh42pDYGcWopCoFPmJduoyGJ7FjYM2/7gZKnfD41TIaZN5Q1cQjm6Fm/P5vk/DpVYFhS8kDdigw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/prosemirror-dropcursor/-/prosemirror-dropcursor-1.8.1.tgz", + "integrity": "sha512-M30WJdJZLyXHi3N8vxN6Zh5O8ZBbQCz0gURTfPmTIBNQ5pxrdU7A58QkNqfa98YEjSAL1HUyyU34f6Pm5xBSGw==", "dependencies": { "prosemirror-state": "^1.0.0", "prosemirror-transform": "^1.1.0", @@ -12848,9 +13107,9 @@ } }, "node_modules/prosemirror-gapcursor": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.1.tgz", - "integrity": "sha512-GKTeE7ZoMsx5uVfc51/ouwMFPq0o8YrZ7Hx4jTF4EeGbXxBveUV8CGv46mSHuBBeXGmvu50guoV2kSnOeZZnUA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/prosemirror-gapcursor/-/prosemirror-gapcursor-1.3.2.tgz", + "integrity": "sha512-wtjswVBd2vaQRrnYZaBCbyDqr232Ed4p2QPtRIUK5FuqHYKGWkEwl08oQM4Tw7DOR0FsasARV5uJFvMZWxdNxQ==", "dependencies": { "prosemirror-keymap": "^1.0.0", "prosemirror-model": "^1.0.0", @@ -12859,55 +13118,56 @@ } }, "node_modules/prosemirror-history": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.3.0.tgz", - "integrity": "sha512-qo/9Wn4B/Bq89/YD+eNWFbAytu6dmIM85EhID+fz9Jcl9+DfGEo8TTSrRhP15+fFEoaPqpHSxlvSzSEbmlxlUA==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/prosemirror-history/-/prosemirror-history-1.3.2.tgz", + "integrity": "sha512-/zm0XoU/N/+u7i5zepjmZAEnpvjDtzoPWW6VmKptcAnPadN/SStsBjMImdCEbb3seiNTpveziPTIrXQbHLtU1g==", "dependencies": { "prosemirror-state": "^1.2.2", "prosemirror-transform": "^1.0.0", + "prosemirror-view": "^1.31.0", "rope-sequence": "^1.3.0" } }, "node_modules/prosemirror-inputrules": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.2.0.tgz", - "integrity": "sha512-eAW/M/NTSSzpCOxfR8Abw6OagdG0MiDAiWHQMQveIsZtoKVYzm0AflSPq/ymqJd56/Su1YPbwy9lM13wgHOFmQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prosemirror-inputrules/-/prosemirror-inputrules-1.2.1.tgz", + "integrity": "sha512-3LrWJX1+ULRh5SZvbIQlwZafOXqp1XuV21MGBu/i5xsztd+9VD15x6OtN6mdqSFI7/8Y77gYUbQ6vwwJ4mr6QQ==", "dependencies": { "prosemirror-state": "^1.0.0", "prosemirror-transform": "^1.0.0" } }, "node_modules/prosemirror-keymap": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.2.1.tgz", - "integrity": "sha512-kVK6WGC+83LZwuSJnuCb9PsADQnFZllt94qPP3Rx/vLcOUV65+IbBeH2nS5cFggPyEVJhGkGrgYFRrG250WhHQ==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/prosemirror-keymap/-/prosemirror-keymap-1.2.2.tgz", + "integrity": "sha512-EAlXoksqC6Vbocqc0GtzCruZEzYgrn+iiGnNjsJsH4mrnIGex4qbLdWWNza3AW5W36ZRrlBID0eM6bdKH4OStQ==", "dependencies": { "prosemirror-state": "^1.0.0", "w3c-keyname": "^2.2.0" } }, "node_modules/prosemirror-model": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.19.0.tgz", - "integrity": "sha512-/CvFGJnwc41EJSfDkQLly1cAJJJmBpZwwUJtwZPTjY2RqZJfM8HVbCreOY/jti8wTRbVyjagcylyGoeJH/g/3w==", + "version": "1.19.3", + "resolved": "https://registry.npmjs.org/prosemirror-model/-/prosemirror-model-1.19.3.tgz", + "integrity": "sha512-tgSnwN7BS7/UM0sSARcW+IQryx2vODKX4MI7xpqY2X+iaepJdKBPc7I4aACIsDV/LTaTjt12Z56MhDr9LsyuZQ==", "dependencies": { "orderedmap": "^2.0.0" } }, "node_modules/prosemirror-schema-list": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.2.2.tgz", - "integrity": "sha512-rd0pqSDp86p0MUMKG903g3I9VmElFkQpkZ2iOd3EOVg1vo5Cst51rAsoE+5IPy0LPXq64eGcCYlW1+JPNxOj2w==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/prosemirror-schema-list/-/prosemirror-schema-list-1.3.0.tgz", + "integrity": "sha512-Hz/7gM4skaaYfRPNgr421CU4GSwotmEwBVvJh5ltGiffUJwm7C8GfN/Bc6DR1EKEp5pDKhODmdXXyi9uIsZl5A==", "dependencies": { "prosemirror-model": "^1.0.0", "prosemirror-state": "^1.0.0", - "prosemirror-transform": "^1.0.0" + "prosemirror-transform": "^1.7.3" } }, "node_modules/prosemirror-state": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.2.tgz", - "integrity": "sha512-puuzLD2mz/oTdfgd8msFbe0A42j5eNudKAAPDB0+QJRw8cO1ygjLmhLrg9RvDpf87Dkd6D4t93qdef00KKNacQ==", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/prosemirror-state/-/prosemirror-state-1.4.3.tgz", + "integrity": "sha512-goFKORVbvPuAQaXhpbemJFRKJ2aixr+AZMGiquiqKxaucC6hlpHNZHWgz5R7dS4roHiwq9vDctE//CZ++o0W1Q==", "dependencies": { "prosemirror-model": "^1.0.0", "prosemirror-transform": "^1.0.0", @@ -12915,9 +13175,9 @@ } }, "node_modules/prosemirror-tables": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.3.2.tgz", - "integrity": "sha512-/9JTeN6s58Zq66HXaxP6uf8PAmc7XXKZFPlOGVtLvxEd6xBP6WtzaJB9wBjiGUzwbdhdMEy7V62yuHqk/3VrnQ==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/prosemirror-tables/-/prosemirror-tables-1.3.4.tgz", + "integrity": "sha512-z6uLSQ1BLC3rgbGwZmpfb+xkdvD7W/UOsURDfognZFYaTtc0gsk7u/t71Yijp2eLflVpffMk6X0u0+u+MMDvIw==", "dependencies": { "prosemirror-keymap": "^1.1.2", "prosemirror-model": "^1.8.1", @@ -12927,17 +13187,17 @@ } }, "node_modules/prosemirror-transform": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.7.1.tgz", - "integrity": "sha512-VteoifAfpt46z0yEt6Fc73A5OID9t/y2QIeR5MgxEwTuitadEunD/V0c9jQW8ziT8pbFM54uTzRLJ/nLuQjMxg==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/prosemirror-transform/-/prosemirror-transform-1.7.5.tgz", + "integrity": "sha512-U/fWB6frEzY7dzwJUo+ir8dU1JEanaI/RwL12Imy9js/527N0v/IRUKewocP1kTq998JNT18IGtThaDLwLOBxQ==", "dependencies": { "prosemirror-model": "^1.0.0" } }, "node_modules/prosemirror-view": { - "version": "1.30.2", - "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.30.2.tgz", - "integrity": "sha512-nTNzZvalQf9kHeEyO407LiV6DoOs/pXsid88UqW9Vvybo4ozJW2PJhkfZUxCUF1hR/9vJLdhxX84wuw9P9HsXA==", + "version": "1.31.8", + "resolved": "https://registry.npmjs.org/prosemirror-view/-/prosemirror-view-1.31.8.tgz", + "integrity": "sha512-VQrEIdiPJ4YV65Ifj2kWISwaiqocMHy7cpUKVQYt19C/87FepoqnwVW3kMKRpeY/nQzED8L+vyOaYDBn0WqT7w==", "dependencies": { "prosemirror-model": "^1.16.0", "prosemirror-state": "^1.0.0", @@ -13415,18 +13675,71 @@ } }, "node_modules/remark-emoji": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-3.1.1.tgz", - "integrity": "sha512-kVCTaHzX+/ls67mE8JsGd3ZX511p2FlAPmKhdGpRCb5z6GSwp+3sAIB5oTySIetPh7CtqfGf7JBUt5fyMjgOHw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/remark-emoji/-/remark-emoji-4.0.0.tgz", + "integrity": "sha512-lQP1lFaYOz6zyJTBfOwYChM1YkgJEVcxSnUBkjo9qujqWwpY36MRFzDjYDk9YNdHqkw5yExB8MnVVHb6wX9QNA==", "dependencies": { "emoticon": "^4.0.1", - "mdast-util-find-and-replace": "^2.2.2", - "node-emoji": "^1.11.0" + "mdast-util-find-and-replace": "^3.0.0", + "node-emoji": "^2.1.0" }, "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, + "node_modules/remark-emoji/node_modules/@types/mdast": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.0.tgz", + "integrity": "sha512-YLeG8CujC9adtj/kuDzq1N4tCDYKoZ5l/bnjq8d74+t/3q/tHquJOJKUQXJrLCflOHpKjXgcI/a929gpmLOEng==", + "dependencies": { + "@types/unist": "*" + } + }, + "node_modules/remark-emoji/node_modules/@types/unist": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.0.tgz", + "integrity": "sha512-MFETx3tbTjE7Uk6vvnWINA/1iJ7LuMdO4fcq8UfF0pRbj01aGLduVvQcRyswuACJdpnHgg8E3rQLhaRdNEJS0w==" + }, + "node_modules/remark-emoji/node_modules/mdast-util-find-and-replace": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mdast-util-find-and-replace/-/mdast-util-find-and-replace-3.0.0.tgz", + "integrity": "sha512-8wLPIKAvGdA5jgkI8AYKfSorV3og3vE6HA+gKeKEZydbi1EtUu2g4XCxIBj3R+AsFqY/uRtoYbH30tiWsFKkBQ==", + "dependencies": { + "@types/mdast": "^4.0.0", + "escape-string-regexp": "^5.0.0", + "unist-util-is": "^6.0.0", + "unist-util-visit-parents": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-emoji/node_modules/unist-util-is": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.0.tgz", + "integrity": "sha512-2qCTHimwdxLfz+YzdGfkqNlH0tLi9xjTnHddPmJwtIG9MGsdbutfTc4P+haPD7l7Cjxf/WZj+we5qfVPvvxfYw==", + "dependencies": { + "@types/unist": "^3.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, + "node_modules/remark-emoji/node_modules/unist-util-visit-parents": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.1.tgz", + "integrity": "sha512-L/PqWzfTP9lzzEa6CKs0k2nARxTdZduw3zyh8d2NVBnsyvHjSX4TWse388YrrQKbvI8w20fGjGlhgT96WwKykw==", + "dependencies": { + "@types/unist": "^3.0.0", + "unist-util-is": "^6.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/unified" + } + }, "node_modules/remark-gemoji": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/remark-gemoji/-/remark-gemoji-7.0.1.tgz", @@ -13761,9 +14074,9 @@ "integrity": "sha512-ndEIpszUHiG4HtDsQLeIuMvRsDnn8c8rYStabochtUeCvfuvNptb5TUbVD68LRAILPX7p9nqQGh4xJgn3EHS/g==" }, "node_modules/rope-sequence": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.3.tgz", - "integrity": "sha512-85aZYCxweiD5J8yTEbw+E6A27zSnLPNDL0WfPdw3YYodq7WjnTKo0q4dtyQ2gz23iPT8Q9CUyJtAaUNcTxRf5Q==" + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/rope-sequence/-/rope-sequence-1.3.4.tgz", + "integrity": "sha512-UT5EDe2cu2E/6O4igUr5PSFs23nvvukicWHx6GnOPlHAiiYbzNuCRQCuiUdHJQcqKalLKlrYJnjY0ySGsXNQXQ==" }, "node_modules/run-parallel": { "version": "1.2.0", @@ -14213,6 +14526,17 @@ "node": ">= 10" } }, + "node_modules/skin-tone": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/skin-tone/-/skin-tone-2.0.0.tgz", + "integrity": "sha512-kUMbT1oBJCpgrnKoSr0o6wPtvRWT9W9UKvGLwfJYO2WuahZRHOpEyL1ckyMGgMWh0UdpmaoFqKKD29WTomNEGA==", + "dependencies": { + "unicode-emoji-modifier-base": "^1.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/slash": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", @@ -14242,34 +14566,6 @@ "uuid": "dist/bin/uuid" } }, - "node_modules/sort-asc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.1.0.tgz", - "integrity": "sha512-jBgdDd+rQ+HkZF2/OHCmace5dvpos/aWQpcxuyRs9QUbPRnkEJmYVo81PIGpjIdpOcsnJ4rGjStfDHsbn+UVyw==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sort-desc": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.1.1.tgz", - "integrity": "sha512-jfZacW5SKOP97BF5rX5kQfJmRVZP5/adDUTY8fCSPvNcXDVpUEe2pr/iKGlcyZzchRJZrswnp68fgk3qBXgkJw==", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/sort-object": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-0.3.2.tgz", - "integrity": "sha512-aAQiEdqFTTdsvUFxXm3umdo04J7MRljoVGbBlkH7BgNsMvVNAJyGj7C/wV1A8wHWAJj/YikeZbfuCKqhggNWGA==", - "dependencies": { - "sort-asc": "^0.1.0", - "sort-desc": "^0.1.1" - }, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/sortablejs": { "version": "1.14.0", "resolved": "https://registry.npmjs.org/sortablejs/-/sortablejs-1.14.0.tgz", @@ -15039,6 +15335,14 @@ "node": ">=4" } }, + "node_modules/unicode-emoji-modifier-base": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unicode-emoji-modifier-base/-/unicode-emoji-modifier-base-1.0.0.tgz", + "integrity": "sha512-yLSH4py7oFH3oG/9K+XWrz1pSi3dfUrWEnInbxMfArOfc1+33BlGPQtLsOYwvdMy11AwUBetYuaRxSPqgkq+8g==", + "engines": { + "node": ">=4" + } + }, "node_modules/unicode-match-property-ecmascript": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", @@ -15426,29 +15730,45 @@ } }, "node_modules/video.js": { - "version": "7.21.4", - "resolved": "https://registry.npmjs.org/video.js/-/video.js-7.21.4.tgz", - "integrity": "sha512-R5e57M/5uqxQMQpFpybNbd8GtiRwFJPqkHjrhv0QTJ2tqnesbjETbck5kU5dhFr1FevsJRFhjBG4hAnvRGnXbw==", + "version": "8.5.2", + "resolved": "https://registry.npmjs.org/video.js/-/video.js-8.5.2.tgz", + "integrity": "sha512-6/uNXQV3xSaKLpaPf/bVvr7omd+82sKUp0RMBgIt4PxHIe28GtX+O+GcNfI2fuwBvcDRDqk5Ei5AG9bJJOpulA==", "dependencies": { "@babel/runtime": "^7.12.5", - "@videojs/http-streaming": "2.16.2", - "@videojs/vhs-utils": "^3.0.4", + "@videojs/http-streaming": "3.5.3", + "@videojs/vhs-utils": "^4.0.0", "@videojs/xhr": "2.6.0", - "aes-decrypter": "3.1.3", - "global": "^4.4.0", - "keycode": "^2.2.0", - "m3u8-parser": "4.8.0", - "mpd-parser": "0.22.1", - "mux.js": "6.0.1", + "aes-decrypter": "^4.0.1", + "global": "4.4.0", + "keycode": "2.2.0", + "m3u8-parser": "^6.0.0", + "mpd-parser": "^1.0.1", + "mux.js": "^6.2.0", "safe-json-parse": "4.0.0", - "videojs-font": "3.2.0", - "videojs-vtt.js": "^0.15.4" + "videojs-contrib-quality-levels": "4.0.0", + "videojs-font": "4.1.0", + "videojs-vtt.js": "0.15.5" + } + }, + "node_modules/videojs-contrib-quality-levels": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/videojs-contrib-quality-levels/-/videojs-contrib-quality-levels-4.0.0.tgz", + "integrity": "sha512-u5rmd8BjLwANp7XwuQ0Q/me34bMe6zg9PQdHfTS7aXgiVRbNTb4djcmfG7aeSrkpZjg+XCLezFNenlJaCjBHKw==", + "dependencies": { + "global": "^4.4.0" + }, + "engines": { + "node": ">=14", + "npm": ">=6" + }, + "peerDependencies": { + "video.js": "^8" } }, "node_modules/videojs-font": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-3.2.0.tgz", - "integrity": "sha512-g8vHMKK2/JGorSfqAZQUmYYNnXmfec4MLhwtEFS+mMs2IDY398GLysy6BH6K+aS1KMNu/xWZ8Sue/X/mdQPliA==" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/videojs-font/-/videojs-font-4.1.0.tgz", + "integrity": "sha512-X1LuPfLZPisPLrANIAKCknZbZu5obVM/ylfd1CN+SsCmPZQ3UMDPcvLTpPBJxcBuTpHQq2MO1QCFt7p8spnZ/w==" }, "node_modules/videojs-record": { "version": "4.6.0", @@ -15462,9 +15782,9 @@ } }, "node_modules/videojs-vtt.js": { - "version": "0.15.4", - "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.4.tgz", - "integrity": "sha512-r6IhM325fcLb1D6pgsMkTQT1PpFdUdYZa1iqk7wJEu+QlibBwATPfPc9Bg8Jiym0GE5yP1AG2rMLu+QMVWkYtA==", + "version": "0.15.5", + "resolved": "https://registry.npmjs.org/videojs-vtt.js/-/videojs-vtt.js-0.15.5.tgz", + "integrity": "sha512-yZbBxvA7QMYn15Lr/ZfhhLPrNpI/RmCSCqgIff57GC2gIrV5YfyzLfLyZMj0NnZSAz8syB4N0nHXpZg9MyrMOQ==", "dependencies": { "global": "^4.3.1" } @@ -15708,9 +16028,9 @@ } }, "node_modules/w3c-keyname": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.6.tgz", - "integrity": "sha512-f+fciywl1SJEniZHD6H+kUO8gOnwIr7f4ijKA6+ZvJFjeGi1r4PDLl53Ayud9O/rk64RqgoQine0feoeOU0kXg==" + "version": "2.2.8", + "resolved": "https://registry.npmjs.org/w3c-keyname/-/w3c-keyname-2.2.8.tgz", + "integrity": "sha512-dpojBhNsCNN7T82Tm7k26A6G9ML3NkhDsnw9n/eoxSRlVBB4CEtIQ/KTCLI2Fwf3ataSXRhYFkQi3SlnFwPvPQ==" }, "node_modules/watchpack": { "version": "2.4.0", diff --git a/package.json b/package.json index 3480dca57..44e454a34 100644 --- a/package.json +++ b/package.json @@ -44,25 +44,25 @@ "dependencies": { "@fontsource/raleway": "^5.0.2", "@fontsource/source-code-pro": "^5.0.2", - "@milkdown/core": "^7.2.0", - "@milkdown/plugin-clipboard": "^7.2.0", - "@milkdown/plugin-diagram": "^7.2.0", - "@milkdown/plugin-emoji": "^7.2.0", - "@milkdown/plugin-history": "^7.2.0", - "@milkdown/plugin-indent": "^7.2.0", - "@milkdown/plugin-listener": "^7.2.0", - "@milkdown/plugin-math": "^7.2.0", - "@milkdown/plugin-prism": "^7.2.0", - "@milkdown/plugin-tooltip": "^7.2.0", - "@milkdown/plugin-upload": "^7.2.0", - "@milkdown/preset-commonmark": "^7.2.0", - "@milkdown/preset-gfm": "^7.2.0", - "@milkdown/prose": "^7.2.0", - "@milkdown/theme-nord": "^7.2.0", - "@milkdown/vue": "^7.2.0", + "@milkdown/core": "^7.3.0", + "@milkdown/plugin-clipboard": "^7.3.0", + "@milkdown/plugin-diagram": "^7.3.0", + "@milkdown/plugin-emoji": "^7.3.0", + "@milkdown/plugin-history": "^7.3.0", + "@milkdown/plugin-indent": "^7.3.0", + "@milkdown/plugin-listener": "^7.3.0", + "@milkdown/plugin-math": "^7.3.0", + "@milkdown/plugin-prism": "^7.3.0", + "@milkdown/plugin-tooltip": "^7.3.0", + "@milkdown/plugin-upload": "^7.3.0", + "@milkdown/preset-commonmark": "^7.3.0", + "@milkdown/preset-gfm": "^7.3.0", + "@milkdown/prose": "^7.3.0", + "@milkdown/theme-nord": "^7.3.0", + "@milkdown/vue": "^7.3.0", "@picmo/popup-picker": "^5.8.2", "@popperjs/core": "^2.11.7", - "@retorquere/bibtex-parser": "^6.4.12", + "@retorquere/bibtex-parser": "^7.0.5", "@vueform/multiselect": "^2.6.2", "bootstrap": "^5.3.0", "buffer": "^6.0.3", @@ -70,12 +70,12 @@ "circular-dependency-plugin": "^5.2.2", "d3-dsv": "^3.0.1", "dayjs": "^1.11.7", - "emojibase-data": "^7.0.1", + "emojibase-data": "^15.0.0", "highlight.js": "^11.8.0", "lodash": "^4.17.21", "markdown-vue": "^1.0.1", - "ol": "^7.4.0", - "ol-ext": "^4.0.8", + "ol": "^8.1.0", + "ol-ext": "^4.0.10", "p-queue": "^7.3.4", "picmo": "^5.8.2", "process": "^0.11.10", @@ -84,7 +84,7 @@ "remark-gfm": "^3.0.1", "tree-vue-component": "^6.0.2", "vee-validate": "^4.9.6", - "video.js": "^7.21.4", + "video.js": "^8.5.0", "videojs-record": "^4.6.0", "vue-datepicker-next": "^1.0.3", "vue-final-modal": "v4.4.2", diff --git a/resources/js/components/mde/Main.vue b/resources/js/components/mde/Main.vue index 153c02f48..aea4ee60c 100644 --- a/resources/js/components/mde/Main.vue +++ b/resources/js/components/mde/Main.vue @@ -28,7 +28,6 @@ import { math } from '@milkdown/plugin-math'; import { emojiAttr, - emojiConfig, remarkEmojiPlugin, emojiSchema, } from '@milkdown/plugin-emoji'; @@ -61,7 +60,6 @@ // DATA const emojiPlugin = [ emojiAttr, - emojiConfig, remarkEmojiPlugin, emojiSchema, ].flat() From 55eb9c8f4113d26bb9fddcc2c78fbb54c1e2e4f7 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 9 Oct 2023 13:45:35 +0200 Subject: [PATCH 009/120] fix style in dark mode Signed-off-by: Vinzenz Rosenkranz --- resources/sass/app-dark_unrounded.scss | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/sass/app-dark_unrounded.scss b/resources/sass/app-dark_unrounded.scss index 3be68ff65..fae7d2636 100644 --- a/resources/sass/app-dark_unrounded.scss +++ b/resources/sass/app-dark_unrounded.scss @@ -2,4 +2,8 @@ @import "variables-override-dark_unrounded"; @import "variables"; -@import "app-base"; \ No newline at end of file +@import "app-base"; + +.milkdown-wrapper { + background: #313335; +} \ No newline at end of file From 22d8cff61ed8dca47c474c4ca3dd4909bdf6003e Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 9 Oct 2023 13:48:36 +0200 Subject: [PATCH 010/120] rework password reset workflow (#419) --- app/Http/Controllers/UserController.php | 93 ++++++++- ...2_11_28_131210_password_reset_attempts.php | 32 +++ resources/js/api.js | 13 +- resources/js/bootstrap/store.js | 2 +- resources/js/components/Login.vue | 11 +- resources/js/components/Users.vue | 15 +- .../modals/user/ConfirmPassword.vue | 197 ++++++++++++++++++ .../components/modals/user/ResetPassword.vue | 181 ++++++++++++++++ resources/js/helpers/modal.js | 63 ++++++ resources/js/i18n/de.json | 13 +- resources/js/i18n/en.json | 13 +- routes/api.php | 3 +- 12 files changed, 611 insertions(+), 25 deletions(-) create mode 100644 database/migrations/2022_11_28_131210_password_reset_attempts.php create mode 100644 resources/js/components/modals/user/ConfirmPassword.vue create mode 100644 resources/js/components/modals/user/ResetPassword.vue diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 05c3b6972..992c27f10 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -159,18 +159,20 @@ public function login(Request $request) { $creds = ['password']; if($request->has('nickname')) { $creds[] = 'nickname'; - if(!User::where('nickname', $request->get('nickname'))->withoutTrashed()->exists()) { - return response()->json([ - 'error' => __('Invalid Credentials') - ], 400); - } + $user = User::where('nickname', $request->get('nickname'))->withoutTrashed()->first(); } else { $creds[] = 'email'; - if(!User::where('email', $request->get('email'))->withoutTrashed()->exists()) { - return response()->json([ - 'error' => __('Invalid Credentials') - ], 400); - } + $user = User::where('email', $request->get('email'))->withoutTrashed()->first(); + } + if(!isset($user)) { + return response()->json([ + 'error' => __('Invalid Credentials') + ], 400); + } + if($user->login_attempts === 0) { + return response()->json([ + 'error' => __('Password confirmation expired') + ], 400); } $credentials = request($creds); @@ -178,6 +180,11 @@ public function login(Request $request) { return response()->json(['error' => __('Invalid Credentials')], 400); } + if($user->login_attempts > 0) { + $user->login_attempts--; + $user->save(); + } + return response() ->json(null, 200) ->header('Authorization', $token); @@ -194,7 +201,7 @@ public function addUser(Request $request) { 'email' => 'required_without:nickname|email|max:255|unique:users,email', 'nickname' => 'required_without:email|alpha_dash|max:255|unique:users,nickname', 'name' => 'required|string|max:255', - 'password' => 'required', + 'password' => 'required|min:6', ]); $name = $request->get('name'); @@ -412,6 +419,70 @@ public function patchRole(Request $request, $id) { return response()->json($role); } + public function resetPassword(Request $request, $id) { + $user = auth()->user(); + if($user->id != $id && !$user->can('users_roles_write')) { + return response()->json([ + 'error' => __('You do not have the permission to reset user password') + ], 403); + } + + $this->validate($request, [ + 'password' => 'required|min:6', + ]); + + try { + $pUser = User::withoutTrashed()->findOrFail($id); + } catch(ModelNotFoundException $e) { + return response()->json([ + 'error' => __('This user does not exist') + ], 400); + } + + $password = Hash::make($request->get('password')); + + $pUser->password = $password; + + if($user->id != $id) { + $pUser->login_attempts = 3; + } + + $pUser->save(); + + return response()->json(null, 204); + } + + public function confirmPassword(Request $request, $id) { + $user = auth()->user(); + if($user->id != $id) { + return response()->json([ + 'error' => __('You do not have the permission to confirm an other user\'s password') + ], 403); + } + + $this->validate($request, [ + 'password' => 'min:6', + ]); + + try { + $pUser = User::withoutTrashed()->findOrFail($id); + } catch(ModelNotFoundException $e) { + return response()->json([ + 'error' => __('This user does not exist') + ], 400); + } + + if($request->has('password')) { + $password = Hash::make($request->get('password')); + $pUser->password = $password; + } + + $pUser->login_attempts = null; + $pUser->save(); + + return response()->json(null, 204); + } + // PUT // DELETE diff --git a/database/migrations/2022_11_28_131210_password_reset_attempts.php b/database/migrations/2022_11_28_131210_password_reset_attempts.php new file mode 100644 index 000000000..8526acc7b --- /dev/null +++ b/database/migrations/2022_11_28_131210_password_reset_attempts.php @@ -0,0 +1,32 @@ +integer('login_attempts')->nullable(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('users', function (Blueprint $table) { + $table->dropColumn('login_attempts'); + }); + } +}; diff --git a/resources/js/api.js b/resources/js/api.js index c1aa31399..7b37460a3 100644 --- a/resources/js/api.js +++ b/resources/js/api.js @@ -336,12 +336,19 @@ export async function addRole(role) { ); }; -export async function sendResetPasswordMail(email) { +export async function resetUserPassword(uid, password) { const data = { - email: email, + password: password, }; return $httpQueue.add( - () => http.post(`user/reset/password`, data).then(response => response.data) + () => http.patch(`user/${uid}/password/reset`, data).then(response => response.data) + ); +}; + +export async function confirmUserPassword(uid, password = null) { + const data = !!password ? {password: password} : {}; + return $httpQueue.add( + () => http.patch(`user/${uid}/password/confirm`, data).then(response => response.data) ); }; diff --git a/resources/js/bootstrap/store.js b/resources/js/bootstrap/store.js index cc16b068d..5cf5f6c39 100644 --- a/resources/js/bootstrap/store.js +++ b/resources/js/bootstrap/store.js @@ -295,7 +295,7 @@ export const store = createStore({ updateUser(state, data) { const index = state.users.findIndex(u => u.id == data.id); if(index > -1) { - const cleanData = only(data, ['email', 'roles', 'updated_at', 'deleted_at',]); + const cleanData = only(data, ['email', 'roles', 'updated_at', 'deleted_at', 'login_attempts',]); const currentData = state.users[index]; state.users[index] = { ...currentData, diff --git a/resources/js/components/Login.vue b/resources/js/components/Login.vue index 1dab978f8..7d9e14409 100644 --- a/resources/js/components/Login.vue +++ b/resources/js/components/Login.vue @@ -81,9 +81,14 @@ import { initApp, getErrorMessages, - getValidClass + getValidClass, + getUser, } from '@/helpers/helpers.js'; + import { + showConfirmPassword, + } from '@/helpers/modal.js'; + export default { setup() { const { t, locale } = useI18n(); @@ -121,6 +126,10 @@ }) .then(_ => { state.error = {}; + const currUser = getUser(); + if(currUser.login_attempts > 0 || currUser.login_attempts === 0) { + showConfirmPassword(currUser.id); + } }); }; diff --git a/resources/js/components/Users.vue b/resources/js/components/Users.vue index e71769d93..01c87249c 100644 --- a/resources/js/components/Users.vue +++ b/resources/js/components/Users.vue @@ -87,8 +87,8 @@ {{ t('global.reset') }} - - {{ t('global.send_reset_mail') }} + + {{ t('global.reset_password') }} {{ t('global.deactivate') }} @@ -197,13 +197,13 @@ import { reactivateUser as reactivateUserApi, - sendResetPasswordMail, patchUserData, } from '@/api.js'; import { showDiscard, showAddUser, + showResetPassword, showDeactivateUser, showUserInfo, } from '@/helpers/modal.js'; @@ -214,6 +214,7 @@ getErrorMessages, getUserBy, hasPreference, + userId, } from '@/helpers/helpers.js'; import { @@ -365,9 +366,10 @@ store.dispatch('reactivateUser', id); }); }; - const updatePassword = email => { - if(!can('users_roles_write')) return; - sendResetPasswordMail(email); + const updatePassword = uid => { + if(state.currentUserId != uid && !can('users_roles_write')) return; + + showResetPassword(uid); }; const anyUserDirty = _ => { let isDirty = false; @@ -414,6 +416,7 @@ // DATA const state = reactive({ setupFinished: false, + currentUserId: userId(), userList: computed(_ => store.getters.users), validatedUserList: computed(_ => { return state.userList.filter(u => { diff --git a/resources/js/components/modals/user/ConfirmPassword.vue b/resources/js/components/modals/user/ConfirmPassword.vue new file mode 100644 index 000000000..572aa5697 --- /dev/null +++ b/resources/js/components/modals/user/ConfirmPassword.vue @@ -0,0 +1,197 @@ + + + diff --git a/resources/js/components/modals/user/ResetPassword.vue b/resources/js/components/modals/user/ResetPassword.vue new file mode 100644 index 000000000..7830d60b8 --- /dev/null +++ b/resources/js/components/modals/user/ResetPassword.vue @@ -0,0 +1,181 @@ + + + diff --git a/resources/js/helpers/modal.js b/resources/js/helpers/modal.js index 13e5cf69d..bc1ddb77e 100644 --- a/resources/js/helpers/modal.js +++ b/resources/js/helpers/modal.js @@ -9,6 +9,8 @@ import { import { addUser, + resetUserPassword, + confirmUserPassword, deactivateUser, addOrUpdateBibliographyItem, deleteBibliographyItem, @@ -30,6 +32,8 @@ import { import { can, + userId, + getUserBy, getEntityTypeAttributes, getTs, getRoleBy, @@ -48,6 +52,8 @@ import MarkdownEditor from '@/components/modals/system/MarkdownEditor.vue'; import Changelog from '@/components/modals/system/Changelog.vue'; import UserInfo from '@/components/modals/user/UserInfo.vue'; import AddUser from '@/components/modals/user/Add.vue'; +import ResetPassword from '@/components/modals/user/ResetPassword.vue'; +import ConfirmPassword from '@/components/modals/user/ConfirmPassword.vue'; import DeactiveUser from '@/components/modals/user/Deactivate.vue'; import AccessControl from '@/components/modals/role/AccessControl.vue'; import AddRole from '@/components/modals/role/Add.vue'; @@ -314,6 +320,63 @@ export function showAddUser(onAdded) { modal.open(); } +export function showResetPassword(id) { + const uid = `ResetPassword-${getTs()}`; + const modal = useModal({ + component: ResetPassword, + attrs: { + name: uid, + modalId: uid, + userId: id, + onReset(e) { + if(userId() != id && !can('users_roles_write')) return; + + resetUserPassword(id, e.password).then(_ => { + modal.destroy(); + const user = getUserBy(id); + const msg = t('main.user.toasts.reset_password.message', { + name: user.name, + nickname: user.nickname, + }); + const title = t('main.user.toasts.reset_password.title'); + addToast(msg, title, { + channel: 'success', + }); + }) + }, + onCancel(e) { + modal.destroy(); + } + }, + }); + modal.open(); +} + +export function showConfirmPassword(id) { + const uid = `ConfirmPassword-${getTs()}`; + const modal = useModal({ + component: ConfirmPassword, + attrs: { + name: uid, + modalId: uid, + userId: id, + onConfirm(e) { + confirmUserPassword(id, e.password).then(_ => { + store.dispatch('updateUser', { + id: id, + login_attempts: null, + }); + modal.destroy(); + }) + }, + onCancel(e) { + modal.destroy(); + } + }, + }); + modal.open(); +} + export function showDeactivateUser(user, onDeactivated) { const uid = `DeactiveUser-${getTs()}`; const modal = useModal({ diff --git a/resources/js/i18n/de.json b/resources/js/i18n/de.json index c187bdad3..bf8b50147 100644 --- a/resources/js/i18n/de.json +++ b/resources/js/i18n/de.json @@ -7,7 +7,7 @@ "reactivate": "Reaktivieren", "remove": "Entfernen", "reset": "Zurücksetzen", - "send_reset_mail": "E-Mail zum Zurücksetzen des Passworts senden", + "reset_password": "Passwort zurücksetzen", "cancel": "Abbrechen", "close": "Schließen", "add": "Hinzufügen", @@ -409,11 +409,22 @@ "updated": { "title": "Benutzer aktualisiert", "msg": "{name} wurde erfolgreich aktualisiert." + }, + "reset_password": { + "title": "Passwort aktualisiert", + "message": "Passwort für Benutzer {name} ({nickname}) wurde erfolgreich aktualisiert." } }, "modal": { "new": { "title": "Neuer Benutzer" + }, + "reset_password": { + "title": "Passwort zurücksetzen" + }, + "confirm_password": { + "title": "Passwort bestätigen", + "message": "Dein Passwort wurde geändert. Du musst entweder dieses neue Passwort akzeptieren oder selbst ein neues vergeben. Dafür hast du nur noch einen weiteren Login übrig! | Dein Passwort wurde geändert. Du musst entweder dieses neue Passwort akzeptieren oder selbst ein neues vergeben. Dafür hast du noch {attempts} weitere Logins übrig." } }, "add_role_placeholder": "Rollen hinzufügen" diff --git a/resources/js/i18n/en.json b/resources/js/i18n/en.json index 31a5b936e..845748041 100644 --- a/resources/js/i18n/en.json +++ b/resources/js/i18n/en.json @@ -7,7 +7,7 @@ "reactivate": "Reactivate", "remove": "Remove", "reset": "Reset", - "send_reset_mail": "Send mail to reset password", + "reset_password": "Reset Password", "cancel": "Cancel", "close": "Close", "add": "Add", @@ -409,11 +409,22 @@ "updated": { "title": "User updated", "msg": "{name} successfully updated." + }, + "reset_password": { + "title": "Password updated", + "message": "Password for User {name} ({nickname}) successfully updated." } }, "modal": { "new": { "title": "New User" + }, + "reset_password": { + "title": "Reset Password" + }, + "confirm_password": { + "title": "Confirm Password", + "message": "Your password has been changed recently. You either have to accept that new password or set one yourself. To do so you have only one additional login left! | Your password has been changed recently. You either have to accept that new password or set one yourself. To do so you have {attempts} additional logins left." } }, "add_role_placeholder": "Add roles" diff --git a/routes/api.php b/routes/api.php index 95fb8ea8b..f34c9fe3c 100644 --- a/routes/api.php +++ b/routes/api.php @@ -117,13 +117,14 @@ Route::post('/user', 'UserController@addUser'); Route::post('/user/avatar', 'UserController@addAvatar')->where('id', '[0-9]+'); - Route::post('/user/reset/password', 'Auth\\ForgotPasswordController@sendResetLinkEmail'); Route::post('/role', 'UserController@addRole'); Route::post('/auth/logout', 'UserController@logout'); Route::patch('/user/{id}', 'UserController@patchUser'); Route::patch('/user/restore/{id}', 'UserController@restoreUser'); Route::patch('/role/{id}', 'UserController@patchRole'); + Route::patch('/user/{id}/password/reset', 'UserController@resetPassword')->where('id', '[0-9]+'); + Route::patch('/user/{id}/password/confirm', 'UserController@confirmPassword')->where('id', '[0-9]+'); Route::delete('/user/{id}', 'UserController@deleteUser')->where('id', '[0-9]+'); Route::delete('/role/{id}', 'UserController@deleteRole')->where('id', '[0-9]+'); From 24a806db0f03f30d652fe02c4a5c5804184281c1 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 9 Oct 2023 13:57:31 +0200 Subject: [PATCH 011/120] Add multiedit support for entity attributes (#401) * add multiedit support for entity attributes * update modal function --------- Signed-off-by: Vinzenz Rosenkranz --- CHANGELOG.md | 6 + app/AttributeValue.php | 96 ++++++++++- app/Http/Controllers/EntityController.php | 136 +++++++--------- resources/js/api.js | 14 ++ resources/js/bootstrap/font.js | 2 + resources/js/bootstrap/store.js | 67 ++++++++ .../js/components/DataModelDetailView.vue | 6 +- .../js/components/modals/attribute/Add.vue | 61 +------ .../components/modals/attribute/MultiEdit.vue | 135 ++++++++++++++++ resources/js/components/tree/Entity.vue | 152 +++++++++++------- resources/js/components/tree/Node.vue | 39 ++++- resources/js/helpers/helpers.js | 116 ++++++++++--- resources/js/helpers/modal.js | 46 +++++- resources/js/i18n/de.json | 14 ++ resources/js/i18n/en.json | 14 ++ resources/js/i18n/ja.json | 1 + routes/api.php | 1 + 17 files changed, 687 insertions(+), 219 deletions(-) create mode 100644 resources/js/components/modals/attribute/MultiEdit.vue diff --git a/CHANGELOG.md b/CHANGELOG.md index 0647491b3..50c249dcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Changelog All notable changes to this project will be documented in this file. +## 0.10 - Jelling +### Added +- Support Multiediting attributes across multiple entities (through ...-menu in entity tree) +### Changed +- Entity tree sorting is now accessible through ...-menu + ## 0.9.14 ### Added - Changelog Viewer diff --git a/app/AttributeValue.php b/app/AttributeValue.php index f5822115d..19bdd39c0 100644 --- a/app/AttributeValue.php +++ b/app/AttributeValue.php @@ -3,6 +3,7 @@ namespace App; use App\Exceptions\InvalidDataException; +use App\Plugins\Map\App\Geodata; use Illuminate\Database\Eloquent\Model; use MStaack\LaravelPostgis\Eloquent\PostgisTrait; use App\Traits\CommentTrait; @@ -10,6 +11,7 @@ use Spatie\Activitylog\LogOptions; use Spatie\Searchable\Searchable; use Spatie\Searchable\SearchResult; +use stdClass; class AttributeValue extends Model implements Searchable { @@ -102,10 +104,102 @@ public function patch($values) { $this->save(); } + public static function getFormattedKeyValue($datatype, $rawValue) : stdClass { + $keyValue = new stdClass(); + + switch($datatype) { + // for primitive types: just save them to the db + case 'stringf': + case 'string': + case 'iconclass': + case 'rism': + $key = 'str_val'; + $val = $rawValue; + break; + case 'double': + $key = 'dbl_val'; + $val = $rawValue; + break; + case 'boolean': + case 'percentage': + case 'integer': + $key = 'int_val'; + $val = $rawValue; + break; + case 'date': + $key = 'dt_val'; + $val = $rawValue; + break; + case 'string-sc': + $key = 'thesaurus_val'; + $val = $rawValue['concept_url']; + break; + case 'string-mc': + $key = 'json_val'; + $thesaurus_urls = []; + foreach($rawValue as $val) { + $thesaurus_urls[] = [ + "concept_url" => $val['concept_url'], + "id" => $val['id'] + ]; + } + $val = json_encode($thesaurus_urls); + break; + case 'epoch': + case 'timeperiod': + case 'dimension': + case 'list': + case 'table': + $key = 'json_val'; + // check for invalid time spans + if($datatype == 'epoch' || $datatype == 'timeperiod') { + $sl = isset($rawValue['startLabel']) ? strtoupper($rawValue['startLabel']) : null; + $el = isset($rawValue['endLabel']) ? strtoupper($rawValue['endLabel']) : null; + $s = $rawValue['start']; + $e = $rawValue['end']; + if( + (isset($s) && !isset($sl)) + || + (isset($e) && !isset($el)) + ) { + throw new InvalidDataException(__('You have to specify if your date is BC or AD.')); + } + if( + ($sl == 'AD' && $el == 'BC') + || + ($sl == 'BC' && $el == 'BC' && $s < $e) + || + ($sl == 'AD' && $el == 'AD' && $s > $e) + ) { + throw new InvalidDataException(__('Start date of a time period must not be after it\'s end date')); + } + } + $val = json_encode($rawValue); + break; + case 'entity': + $key = 'entity_val'; + $val = $rawValue; + break; + case 'entity-mc': + $key = 'json_val'; + $val = json_encode($rawValue); + break; + case 'geography': + $key = 'geography_val'; + $val = Geodata::parseWkt($rawValue); + break; + } + + $keyValue->key = $key; + $keyValue->val = $val; + + return $keyValue; + } + // Does not handle InvalidDataException and AmbiguousValueException in stringToValue method here! // Throws InvalidDataException // Throws AmbiguousValueException - public function setValue($strValue, $type = null, $save = false) { + public function setValueFromRaw($strValue, $type = null, $save = false) { if(!isset($type)) { $type = Attribute::first($this->attribute_id)->datatype; } diff --git a/app/Http/Controllers/EntityController.php b/app/Http/Controllers/EntityController.php index 43c4eff5a..8979dd66c 100644 --- a/app/Http/Controllers/EntityController.php +++ b/app/Http/Controllers/EntityController.php @@ -474,7 +474,7 @@ public function importData(Request $request) { $attrVal->certainty = 100; $attrVal->user_id = $user->id; try { - $setValue = $attrVal->setValue($row[$val], $type); + $setValue = $attrVal->setValueFromRaw($row[$val], $type); if($setValue === null) { continue; } @@ -565,83 +565,14 @@ public function patchAttributes($id, Request $request) { if($op == 'remove') continue; $attr = Attribute::find($aid); - switch($attr->datatype) { - // for primitive types: just save them to the db - case 'stringf': - case 'string': - case 'iconclass': - case 'rism': - $attrval->str_val = $value; - break; - case 'double': - $attrval->dbl_val = $value; - break; - case 'boolean': - case 'percentage': - case 'integer': - $attrval->int_val = $value; - break; - case 'date': - $attrval->dt_val = $value; - break; - case 'string-sc': - $thesaurus_url = $value['concept_url']; - $attrval->thesaurus_val = $thesaurus_url; - break; - case 'string-mc': - $thesaurus_urls = []; - foreach($value as $val) { - $thesaurus_urls[] = [ - "concept_url" => $val['concept_url'], - "id" => $val['id'] - ]; - } - $attrval->json_val = json_encode($thesaurus_urls); - break; - case 'epoch': - case 'timeperiod': - case 'dimension': - case 'list': - case 'table': - // check for invalid time spans - if($attr->datatype == 'epoch' || $attr->datatype == 'timeperiod') { - $sl = isset($value['startLabel']) ? strtoupper($value['startLabel']) : null; - $el = isset($value['endLabel']) ? strtoupper($value['endLabel']) : null; - $s = $value['start']; - $e = $value['end']; - if( - (isset($s) && !isset($sl)) - || - (isset($e) && !isset($el)) - ) { - return response()->json([ - 'error' => __('You have to specify if your date is BC or AD.') - ], 422); - } - if( - ($sl == 'AD' && $el == 'BC') - || - ($sl == 'BC' && $el == 'BC' && $s < $e) - || - ($sl == 'AD' && $el == 'AD' && $s > $e) - ) { - return response()->json([ - 'error' => __('Start date of a time period must not be after it\'s end date') - ], 422); - } - } - $attrval->json_val = json_encode($value); - break; - case 'entity': - $attrval->entity_val = $value; - break; - case 'entity-mc': - $attrval->json_val = json_encode($value); - break; - case 'geography': - $attrval->geography_val = Geodata::parseWkt($value); - break; + try { + $formKeyValue = AttributeValue::getFormattedKeyValue($attr->datatype, $value); + } catch(InvalidDataException $ide) { + return response()->json([ + 'error' => $ide->getMessage(), + ], 422); } + $attrval->{$formKeyValue->col} = $formKeyValue->val; $attrval->user_id = $user->id; $attrval->save(); } @@ -706,6 +637,57 @@ public function patchAttribute($id, $aid, Request $request) { return response()->json($attrValue, 201); } + public function multieditAttributes(Request $request) { + $user = auth()->user(); + if(!$user->can('entity_data_write')) { + return response()->json([ + 'error' => __('You do not have the permission to modify an entity\'s data') + ], 403); + } + + $this->validate($request, [ + 'entity_ids' => 'required|array', + 'entries' => 'required|array', + ]); + + $entities = $request->get('entity_ids'); + $attrValues = $request->get('entries'); + + DB::beginTransaction(); + + foreach($attrValues as $av) { + try { + $attr = Attribute::findOrFail($av['attribute_id']); + } catch(ModelNotFoundException $e) { + DB::rollBack(); + return response()->json([ + 'error' => __('This attribute does not exist'), + ], 400); + } + try { + $formKeyValue = AttributeValue::getFormattedKeyValue($attr->datatype, $av['value']); + } catch(InvalidDataException $ide) { + DB::rollBack(); + return response()->json([ + 'error' => $ide->getMessage(), + ], 422); + } + foreach($entities as $eid) { + AttributeValue::updateOrCreate( + ['entity_id' => $eid, 'attribute_id' => $av['attribute_id']], + [ + $formKeyValue->key => $formKeyValue->val, + 'user_id' => $user->id, + ] + ); + } + } + + DB::commit(); + + return response()->json(null, 204); + } + public function patchName($id, Request $request) { $user = auth()->user(); if(!$user->can('entity_write')) { diff --git a/resources/js/api.js b/resources/js/api.js index 7b37460a3..baeb3b2b5 100644 --- a/resources/js/api.js +++ b/resources/js/api.js @@ -614,6 +614,20 @@ export async function patchAttributes(entityId, data) { ); }; +export async function multieditAttributes(entityIds, entries) { + const data = { + entity_ids: entityIds, + entries: entries, + }; + return $httpQueue.add( + () => http.patch(`/entity/multiedit`, data).then(response => { + return response.data; + }).catch(error => { + throw error; + }) + ); +}; + export async function moveEntity(entityId, parentId = null, rank = null) { const data = { parent_id: parentId, diff --git a/resources/js/bootstrap/font.js b/resources/js/bootstrap/font.js index b4d303315..6ffd63e7d 100644 --- a/resources/js/bootstrap/font.js +++ b/resources/js/bootstrap/font.js @@ -117,6 +117,7 @@ import { faLightbulb, faLink, faList, + faListCheck, faListOl, faListUl, faLongArrowAltDown, @@ -300,6 +301,7 @@ library.add( faLightbulb, faLink, faList, + faListCheck, faListOl, faListUl, faLongArrowAltDown, diff --git a/resources/js/bootstrap/store.js b/resources/js/bootstrap/store.js index 5cf5f6c39..39ec7110b 100644 --- a/resources/js/bootstrap/store.js +++ b/resources/js/bootstrap/store.js @@ -10,6 +10,8 @@ import { fillEntityData, only, slugify, + getIntersectedEntityAttributes, + hasIntersectionWithEntityAttributes, } from '@/helpers/helpers.js'; import { getEntityData, @@ -17,6 +19,17 @@ import { getEntityReferences, } from '@/api.js'; +function updateSelectionTypeIdList(selection) { + const tmpDict = {}; + for(let k in selection) { + const curr = selection[k]; + if(!tmpDict[curr.entity_type_id]) { + tmpDict[curr.entity_type_id] = 1; + } + } + return Object.keys(tmpDict).map(tdk => parseInt(tdk)); +} + export const store = createStore({ modules: { core: { @@ -47,6 +60,9 @@ export const store = createStore({ roles: [], rolePresets: [], tree: [], + treeSelectionMode: false, + treeSelection: {}, + treeSelectionTypeIds: [], user: {}, users: [], version: {}, @@ -402,6 +418,37 @@ export const store = createStore({ sortTree(state, sort) { sortTree(sort.by, sort.dir, state.tree); }, + addToTreeSelection(state, data) { + const addPossible = hasIntersectionWithEntityAttributes(data.value.entity_type_id, state.treeSelectionTypeIds); + if(addPossible || state.treeSelectionTypeIds.length == 0) { + state.treeSelection[data.id] = data.value; + + state.treeSelectionTypeIds = []; + state.treeSelectionTypeIds = updateSelectionTypeIdList(state.treeSelection); + } + }, + removeFromTreeSelection(state, data) { + delete state.treeSelection[data.id]; + + state.treeSelectionTypeIds = []; + state.treeSelectionTypeIds = updateSelectionTypeIdList(state.treeSelection); + }, + toggleTreeSelectionMode(state) { + state.treeSelectionMode = !state.treeSelectionMode; + + if(!state.treeSelectionMode) { + state.treeSelection = {}; + state.treeSelectionTypeIds = []; + } + }, + setTreeSelectionMode(state, data) { + state.treeSelectionMode = data; + + if(!state.treeSelectionMode) { + state.treeSelection = {}; + state.treeSelectionTypeIds = []; + } + }, setPreferences(state, data) { state.preferences = data; }, @@ -544,6 +591,21 @@ export const store = createStore({ sortTree({commit}, sort) { commit('sortTree', sort) }, + addToTreeSelection({commit}, data) { + commit('addToTreeSelection', data); + }, + removeFromTreeSelection({commit}, data) { + commit('removeFromTreeSelection', data); + }, + toggleTreeSelectionMode({commit}) { + commit('toggleTreeSelectionMode'); + }, + setTreeSelectionMode({commit}) { + commit('setTreeSelectionMode', true); + }, + unsetTreeSelectionMode({commit}) { + commit('setTreeSelectionMode', false); + }, setMainViewTab({commit}, data) { commit('setMainViewTab', data); }, @@ -756,6 +818,11 @@ export const store = createStore({ geometryTypes: state => state.geometryTypes, mainView: state => state.mainView, tree: state => state.tree, + treeSelectionMode: state => state.treeSelectionMode, + treeSelection: state => state.treeSelection, + treeSelectionCount: state => Object.keys(state.treeSelection).length, + treeSelectionTypeIds: state => state.treeSelectionTypeIds, + treeSelectionIntersection: state => getIntersectedEntityAttributes(state.treeSelectionTypeIds), preferenceByKey: state => key => state.preferences[key], preferences: state => state.preferences, systemPreferences: state => state.systemPreferences, diff --git a/resources/js/components/DataModelDetailView.vue b/resources/js/components/DataModelDetailView.vue index 0c404100e..3de30f698 100644 --- a/resources/js/components/DataModelDetailView.vue +++ b/resources/js/components/DataModelDetailView.vue @@ -108,7 +108,7 @@ import { useToast } from '@/plugins/toast.js'; import { - defaultAttributeValue, + getInitialAttributeValue, getEntityType, getEntityTypeAttributes, translateConcept, @@ -216,7 +216,9 @@ for(let i=0; i { state.tableColumnValidated = e; }; - const getInitialValue = attribute => { - switch(attribute.type) { - case 'string': - case 'stringf': - case 'iconclass': - case 'rism': - case 'geography': - return ''; - case 'integer': - case 'double': - return 0; - case 'boolean': - return 0; - case 'percentage': - return 50; - case 'serial': - let str = attribute.textContent; - let toRepl = '%d'; - let ctr = "1954"; - if(!str) { - str = 'Find_%05d_Placeholder'; - } - let hasIdentifier = false; - let isSimple = true; - let matches = str.match(/.*(%d).*/); - if(matches && matches[1]) { - hasIdentifier = true; - isSimple = true; - } else { - matches = str.match(/.*(%\d*d).*/); - if(matches && matches[1]) { - hasIdentifier = true; - isSimple = false; - } - } - if(hasIdentifier && !isSimple) { - toRepl = matches[1]; - let pad = parseInt(toRepl.substring(1, toRepl.length-1)); - ctr = ctr.padStart(pad, '0'); - } - return str.replaceAll(toRepl, ctr); - case 'list': - case 'string-mc': - case 'entity-mc': - return []; - case 'date': - return new Date(); - case 'sql': - return t('global.preview_not_available'); - case 'epoch': - case 'dimension': - case 'entity': - case 'string-sc': - case 'table': - return {}; - } - }; // DATA const fakeId = randomId(); @@ -197,7 +142,7 @@ }], values: { [fakeId]: { - value: getInitialValue(state.attribute), + value: getInitialAttributeValue(state.attribute), }, }, }; diff --git a/resources/js/components/modals/attribute/MultiEdit.vue b/resources/js/components/modals/attribute/MultiEdit.vue new file mode 100644 index 000000000..346109767 --- /dev/null +++ b/resources/js/components/modals/attribute/MultiEdit.vue @@ -0,0 +1,135 @@ + + + \ No newline at end of file diff --git a/resources/js/components/tree/Entity.vue b/resources/js/components/tree/Entity.vue index 4b0c253e6..1aeb4ce27 100644 --- a/resources/js/components/tree/Entity.vue +++ b/resources/js/components/tree/Entity.vue @@ -8,65 +8,86 @@
-
- - - - {{ t('main.entity.tree.sorts.asc.rank') }} - - - - - - {{ t('main.entity.tree.sorts.desc.rank') }} - - - - - - {{ t('main.entity.tree.sorts.asc.name') }} - + + + {{ t('global.sort') }} +
+ + + + {{ t('main.entity.tree.sorts.asc.rank') }} + + + + + + {{ t('main.entity.tree.sorts.desc.rank') }} + + + + + + {{ t('main.entity.tree.sorts.asc.name') }} + + + + + + {{ t('main.entity.tree.sorts.desc.name') }} + + + + + + {{ t('main.entity.tree.sorts.asc.children') }} + + + + + + {{ t('main.entity.tree.sorts.desc.children') }} + + + + + + + + + {{ t('main.entity.tree.sorts.asc.type') }} + + + + + + + + + {{ t('main.entity.tree.sorts.desc.type') }} + + +
- - - - {{ t('main.entity.tree.sorts.desc.name') }} +
+ + + + + + + + + {{ t('main.entity.tree.multiedit.title') }} - - - - {{ t('main.entity.tree.sorts.asc.children') }} - - - - - - {{ t('main.entity.tree.sorts.desc.children') }} - - - - - - - - - {{ t('main.entity.tree.sorts.asc.type') }} - - - - - - - - - {{ t('main.entity.tree.sorts.desc.type') }} + + + + {{ t('main.entity.tree.multiedit.open') }}
@@ -130,7 +151,10 @@ openPath, } from '@/helpers/tree.js'; - import { ShowAddEntity } from '@/helpers/modal.js'; + import { + showAddEntity, + showMultiEditAttribute, + } from '@/helpers/modal.js'; export default { components: { @@ -144,6 +168,10 @@ // FUNCTIONS const itemClick = (item) => { + // if treeSelectionMode is active, itemClick is (wrongly) triggered, but has no data. + // Preventing itemClick to trigger would result in not checked checkboxes in node component + if(!item.data) return; + if(state.entity.id == item.data.id) { router.push({ append: true, @@ -172,6 +200,14 @@ } item.state.opened = !item.state.opened; }; + const toggleSelectMode = _ => { + store.dispatch('toggleTreeSelectionMode'); + }; + const openMultieditModal = _ => { + const entityIds = Object.keys(store.getters.treeSelection).map(id => parseInt(id)); + const attributes = store.getters.treeSelectionIntersection; + showMultiEditAttribute(entityIds, attributes); + }; const getSortingStateClass = (attr, dir) => { if(state.sort.by == attr && state.sort.dir == dir) { return [ @@ -190,7 +226,7 @@ }); }; const openAddEntityDialog = _ => { - ShowAddEntity(null); + showAddEntity(null); }; const resetHighlighting = _ => { state.highlightedItems.forEach(i => i.state.highlighted = false); @@ -223,6 +259,8 @@ // DATA const state = reactive({ + selectMode: computed(_ => store.getters.treeSelectionMode), + canOpenMultiEditModal: computed(_ => store.getters.treeSelectionCount >= 2), highlightedItems: [], tree: computed(_ => store.getters.tree), entity: computed(_ => store.getters.entity), @@ -248,6 +286,8 @@ // LOCAL itemClick, itemToggle, + toggleSelectMode, + openMultieditModal, getSortingStateClass, setSort, openAddEntityDialog, diff --git a/resources/js/components/tree/Node.vue b/resources/js/components/tree/Node.vue index 8457bbd23..5565c4f35 100644 --- a/resources/js/components/tree/Node.vue +++ b/resources/js/components/tree/Node.vue @@ -1,5 +1,6 @@ diff --git a/resources/js/open.js b/resources/js/open.js index c2f5280b5..9f63578a9 100644 --- a/resources/js/open.js +++ b/resources/js/open.js @@ -20,7 +20,6 @@ window.$httpQueue = queue; import Multiselect from "@vueform/multiselect"; import DatePicker from "vue-datepicker-next"; import draggable from "vuedraggable"; -import Markdown from "vue3-markdown-it"; // Components import App from '@/components/openaccess/App.vue'; From f296e0c83fa36f38bc334b8dd6c4c936436db98c Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 16 Oct 2023 14:15:13 +0200 Subject: [PATCH 020/120] add appname env to open webpack script Signed-off-by: Vinzenz Rosenkranz --- webpack.mix.open.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/webpack.mix.open.js b/webpack.mix.open.js index 5cc4ee989..f52f4671b 100644 --- a/webpack.mix.open.js +++ b/webpack.mix.open.js @@ -21,6 +21,7 @@ const path = require('path'); */ const appPath = process.env.MIX_APP_PATH; +const appName = process.env.APP_NAME; /* |-------------------------------------------------------------------------- @@ -34,8 +35,17 @@ const appPath = process.env.MIX_APP_PATH; */ mix.js('resources/js/open.js', 'public/js/open').vue() .options({ runtimeChunkPath: 'js/open' }) - .sourceMaps() - .extract(); + .sourceMaps() + .webpackConfig(webpack => { + return { + plugins: [ + new webpack.DefinePlugin({ + __APPNAME__: `'${appName}'`, + }), + ], + } + }) + .extract(); mix.alias({ '@': path.join(__dirname, 'resources/js'), vue$: path.join(__dirname, 'node_modules/vue/dist/vue.esm-bundler.js') From 65dd478cf4efcbb8c5906d9b2124a1763dd25795 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 16 Oct 2023 14:18:04 +0200 Subject: [PATCH 021/120] remove old md lib reference Signed-off-by: Vinzenz Rosenkranz --- resources/js/open.js | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/js/open.js b/resources/js/open.js index 9f63578a9..f45cb6018 100644 --- a/resources/js/open.js +++ b/resources/js/open.js @@ -40,7 +40,6 @@ const app = createApp(App); app.use(i18n); app.use(router); app.use(store); -app.use(Markdown); app.component("attribute-list", AttributeList); app.component('result-card', ResultCard); From 1fac8ef8e2d713b5914c1bdc2a6f66d5d9f75494 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 16 Oct 2023 14:21:56 +0200 Subject: [PATCH 022/120] add font handling to open webpack config Signed-off-by: Vinzenz Rosenkranz --- webpack.mix.open.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/webpack.mix.open.js b/webpack.mix.open.js index f52f4671b..4db90c8d5 100644 --- a/webpack.mix.open.js +++ b/webpack.mix.open.js @@ -34,10 +34,18 @@ const appName = process.env.APP_NAME; | */ mix.js('resources/js/open.js', 'public/js/open').vue() - .options({ runtimeChunkPath: 'js/open' }) + .options({ + runtimeChunkPath: 'js/open', + fileLoaderDirs: { + fonts: appPath + 'fonts' + }, + }) .sourceMaps() .webpackConfig(webpack => { return { + output: { + publicPath: '/' + appPath + }, plugins: [ new webpack.DefinePlugin({ __APPNAME__: `'${appName}'`, @@ -46,6 +54,10 @@ mix.js('resources/js/open.js', 'public/js/open').vue() } }) .extract(); + +if(`public/${appPath}fonts` !== 'public/fonts') { + mix.copyDirectory(`public/${appPath}fonts`, 'public/fonts'); +} mix.alias({ '@': path.join(__dirname, 'resources/js'), vue$: path.join(__dirname, 'node_modules/vue/dist/vue.esm-bundler.js') From 27d19948f86a74d86b9c4b7f00648c67343c21f3 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 16 Oct 2023 16:00:36 +0200 Subject: [PATCH 023/120] fix empty value in entity-mc attribute Signed-off-by: Vinzenz Rosenkranz --- CHANGELOG.md | 2 ++ resources/js/components/AttributeList.vue | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e7c15333..0fd4802c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. ### Added - Support Multiediting attributes across multiple entities (through ...-menu in entity tree) - Support moderated roles/users that require a privileged user to accept/deny their changes in entity forms +### Fixed +- Error in _Attribute List_ caused by _Entity (Multiple Choice)_ attribute ### Changed - Entity tree sorting is now accessible through ...-menu - Reset Password Workflow diff --git a/resources/js/components/AttributeList.vue b/resources/js/components/AttributeList.vue index bfa956840..8fd06c3cf 100644 --- a/resources/js/components/AttributeList.vue +++ b/resources/js/components/AttributeList.vue @@ -612,7 +612,7 @@ }; const convertEntityValue = (value, isMultiple) => { let actValue = null; - if(value == '') { + if(value == '' || !value.value) { if(isMultiple) { actValue = { value: [], From 8b4d66bd3e5526049f9a90a504844ec23f4047c7 Mon Sep 17 00:00:00 2001 From: Vinzenz Rosenkranz Date: Mon, 16 Oct 2023 16:41:57 +0200 Subject: [PATCH 024/120] fix multi-edit modal Signed-off-by: Vinzenz Rosenkranz --- .../components/modals/attribute/MultiEdit.vue | 71 +++++++++---------- 1 file changed, 32 insertions(+), 39 deletions(-) diff --git a/resources/js/components/modals/attribute/MultiEdit.vue b/resources/js/components/modals/attribute/MultiEdit.vue index 346109767..c2c422a2c 100644 --- a/resources/js/components/modals/attribute/MultiEdit.vue +++ b/resources/js/components/modals/attribute/MultiEdit.vue @@ -1,45 +1,44 @@ diff --git a/resources/js/api.js b/resources/js/api.js index 29f68cb89..6570e20e6 100644 --- a/resources/js/api.js +++ b/resources/js/api.js @@ -15,7 +15,7 @@ export async function fetchVersion() { await $httpQueue.add(() => http.get('/version').then(response => { store.dispatch('setVersion', response.data); })); -}; +} export async function fetchPlugins() { await $httpQueue.add( @@ -23,7 +23,7 @@ export async function fetchPlugins() { store.dispatch('setPlugins', response.data); }) ); -}; +} export async function uploadPlugin(file) { const formData = new FormData(); @@ -34,7 +34,7 @@ export async function uploadPlugin(file) { store.dispatch('addPlugin', response.data); }) ); -}; +} export async function installPlugin(id) { return $httpQueue.add( @@ -50,7 +50,7 @@ export async function installPlugin(id) { return response.data; }) ); -}; +} export async function updatePlugin(id) { return $httpQueue.add( @@ -66,7 +66,7 @@ export async function updatePlugin(id) { }); }) ); -}; +} export async function uninstallPlugin(id) { return $httpQueue.add( @@ -82,7 +82,7 @@ export async function uninstallPlugin(id) { return response.data; }) ); -}; +} export async function removePlugin(id) { return $httpQueue.add( @@ -94,7 +94,7 @@ export async function removePlugin(id) { return response.data; }) ); -}; +} export async function fetchUsers() { store.commit('setUser', auth.user()); @@ -111,31 +111,31 @@ export async function fetchUsers() { presets: response.data.presets, }); })); -}; +} export async function fetchTopEntities() { await $httpQueue.add(() => http.get('/entity/top').then(response => { store.dispatch('setInitialEntities', response.data); })); -}; +} export async function fetchAttributes() { return await $httpQueue.add(() => http.get('editor/dm/attribute').then(response => { store.dispatch('setAttributes', response.data); })); -}; +} export async function fetchBibliography() { await $httpQueue.add(() => http.get('bibliography').then(response => { store.dispatch('setBibliography', response.data); })); -}; +} export async function fetchTags() { await $httpQueue.add(() => http.get('tag').then(response => { store.dispatch('setTags', response.data); })); -}; +} export async function fetchPreData(locale) { return $httpQueue.add(() => http.get('pre').then(response => { @@ -154,7 +154,7 @@ export async function fetchPreData(locale) { locale.value = store.getters.preferenceByKey('prefs.gui-language'); } })); -}; +} export async function fetchGeometryTypes() { return $httpQueue.add( @@ -174,7 +174,7 @@ export async function fetchGeometryTypes() { store.dispatch('setGeometryTypes', geom); }) ); -}; +} export async function fetchAttributeTypes() { return $httpQueue.add( @@ -182,16 +182,16 @@ export async function fetchAttributeTypes() { store.dispatch('setAttributeTypes', response.data); }) ); -}; +} // GET export async function getEntityComments(id) { return fetchComments(id, 'entity'); -}; +} export async function getAttributeValueComments(eid, aid) { return fetchComments(eid, 'attribute_value', aid); -}; +} export async function getCommentReplies(cid, endpoint = '/comment/{cid}/reply') { endpoint = endpoint.replaceAll('{cid}', cid); @@ -199,7 +199,7 @@ export async function getCommentReplies(cid, endpoint = '/comment/{cid}/reply') return $httpQueue.add( () => http.get(endpoint).then(response => response.data) ); -}; +} export async function getEntityParentIds(id) { return await $httpQueue.add( @@ -208,7 +208,7 @@ export async function getEntityParentIds(id) { return response.data; }) ); -}; +} export async function getEntityData(id) { return await $httpQueue.add( @@ -221,7 +221,7 @@ export async function getEntityData(id) { return response.data; }) ); -}; +} export async function getEntityReferences(id) { return await $httpQueue.add( @@ -234,19 +234,19 @@ export async function getEntityReferences(id) { return response.data; }) ); -}; +} export async function getEntityTypeAttributes(id) { return await $httpQueue.add( () => http.get(`/editor/entity_type/${id}/attribute`) ) -}; +} export async function getEntityTypeOccurrenceCount(id) { return $httpQueue.add( () => http.get(`/editor/dm/entity_type/occurrence_count/${id}`).then(response => response.data) ); -}; +} export async function getAttributeOccurrenceCount(aid, etid) { let endpoint = `/editor/dm/attribute/occurrence_count/${aid}`; @@ -256,7 +256,7 @@ export async function getAttributeOccurrenceCount(aid, etid) { return $httpQueue.add( () => http.get(endpoint).then(response => response.data) ); -}; +} async function fetchComments(id, type, aid = null) { let endpoint = `/comment/resource/${id}?r=${type}`; @@ -264,31 +264,31 @@ async function fetchComments(id, type, aid = null) { endpoint = `${endpoint}&aid=${aid}`; } return $httpQueue.add(() => http.get(endpoint).then(response => response.data).catch(error => { throw error; })); -}; +} export async function getBibtexFile() { return await $httpQueue.add( () => http.get('bibliography/export').then(response => response.data) ); -}; +} export async function getIconClassInfo(iconClass) { return external.get(`http://iconclass.org/${iconClass}.json`, { crossdomain: true }).then(response => response.data).catch(e => e); -}; +} export async function getRismInfo(rismId) { return external.get(`https://muscat.rism.info/sru/sources?operation=searchRetrieve&version=1.1&query=id=${rismId}&maximumRecords=1`, { crossdomain: true }).then(response => response.data).catch(e => e); -}; +} export async function fetchChildren(id) { return $httpQueue.add( () => http.get(`/entity/byParent/${id}`).then(response => response.data) ); -}; +} export async function getMapLayers(includeEntityLayers) { let url = `map/layer`; @@ -298,7 +298,7 @@ export async function getMapLayers(includeEntityLayers) { return $httpQueue.add( () => http.get(url).then(response => response.data) ); -}; +} export async function moveMapLayer(id, neighborId) { const data = { @@ -307,19 +307,19 @@ export async function moveMapLayer(id, neighborId) { return $httpQueue.add( () => http.patch(`/map/layer/${id}/switch`, data).then(response => response.data) ); -}; +} export async function changeMapLayerClass(id) { return $httpQueue.add( () => http.patch(`/map/layer/${id}/move`).then(response => response.data) ); -}; +} export async function getMapProjection(srid) { return $httpQueue.add( () => http.get(`map/epsg/${srid}`).then(response => response.data) ); -}; +} // POST export async function addUser(user) { @@ -327,14 +327,14 @@ export async function addUser(user) { return $httpQueue.add( () => http.post('user', data).then(response => response.data) ); -}; +} export async function addRole(role) { const data = only(role, ['name', 'display_name', 'description', 'derived_from']); return $httpQueue.add( () => http.post('role', data).then(response => response.data) ); -}; +} export async function resetUserPassword(uid, password) { const data = { @@ -350,7 +350,7 @@ export async function confirmUserPassword(uid, password = null) { return $httpQueue.add( () => http.patch(`user/${uid}/password/confirm`, data).then(response => response.data) ); -}; +} export async function updateEntityTypeRelation(entityType) { const id = entityType.id; @@ -361,7 +361,7 @@ export async function updateEntityTypeRelation(entityType) { return await $httpQueue.add( () => http.post(`/editor/dm/${id}/relation`, data).then(response => response.data) ); -}; +} export async function postComment(content, resource, replyTo = null, metadata = null, endpoint = '/comment') { let data = { @@ -385,7 +385,7 @@ export async function postComment(content, resource, replyTo = null, metadata = return $httpQueue.add( () => http.post(endpoint, data).then(response => response.data) ); -}; +} export async function editComment(cid, content, endpoint = '/comment/{cid}') { endpoint = endpoint.replaceAll('{cid}', cid); @@ -397,7 +397,7 @@ export async function editComment(cid, content, endpoint = '/comment/{cid}') { return $httpQueue.add( () => http.patch(endpoint, data).then(response => response.data) ); -}; +} export async function addOrUpdateBibliographyItem(item, file) { const data = new FormData(); @@ -422,7 +422,7 @@ export async function addOrUpdateBibliographyItem(item, file) { () => http.post('bibliography', data).then(response => response.data) ); } -}; +} export async function updateBibliography(file) { let formData = new FormData(); @@ -430,7 +430,7 @@ export async function updateBibliography(file) { return await $httpQueue.add( () => http.post('bibliography/import', formData).then(response => response.data) ); -}; +} export async function setUserAvatar(file) { let formData = new FormData(); @@ -438,7 +438,7 @@ export async function setUserAvatar(file) { return await $httpQueue.add( () => http.post(`user/avatar`, formData).then(response => response.data) ); -}; +} export async function addEntity(entity) { const data = { @@ -451,20 +451,20 @@ export async function addEntity(entity) { return $httpQueue.add( () => http.post(`/entity`, data).then(response => response.data) ); -}; +} export async function duplicateEntity(entity) { const data = {}; return $httpQueue.add( () => http.post(`/entity/${entity.id}/duplicate`, data).then(response => response.data) ); -}; +} export async function importEntityData(data) { return $httpQueue.add( () => http.post(`/entity/import`, data).then(response => response.data).catch(e => {throw e}) ); -}; +} export async function addEntityType(et) { const data = { @@ -475,13 +475,13 @@ export async function addEntityType(et) { return $httpQueue.add( () => http.post(`/editor/dm/entity_type`, data).then(response => response.data) ); -}; +} export async function duplicateEntityType(id) { return $httpQueue.add( () => http.post(`/editor/dm/entity_type/${id}/duplicate`).then(response => response.data) ); -}; +} export async function addAttribute(attribute) { const data = { @@ -518,7 +518,7 @@ export async function addAttribute(attribute) { return $httpQueue.add( () => http.post(`/editor/dm/attribute`, data).then(response => response.data) ); -}; +} export async function addEntityTypeAttribute(etid, aid, to) { const attrs = storedEntityTypeAttributes(etid); @@ -563,7 +563,7 @@ export async function addEntityTypeAttribute(etid, aid, to) { return new Promise(r => r(data)); }) ); -}; +} export async function addReference(eid, aid, url, data) { $httpQueue.add( @@ -575,7 +575,7 @@ export async function addReference(eid, aid, url, data) { return response.data; }) ); -}; +} export async function getFilteredActivity(pageUrl, payload) { pageUrl = pageUrl || 'activity'; @@ -590,7 +590,7 @@ export async function getFilteredActivity(pageUrl, payload) { }; }) ); -}; +} // PATCH export async function patchEntityName(eid, name) { @@ -600,19 +600,19 @@ export async function patchEntityName(eid, name) { return $httpQueue.add( () => http.patch(`entity/${eid}/name`, data).then(response => response.data) ); -}; +} export async function patchAttribute(entityId, attributeId, data) { return $httpQueue.add( () => http.patch(`/entity/${entityId}/attribute/${attributeId}`, data).then(response => response.data) ); -}; +} export async function patchAttributes(entityId, data) { return $httpQueue.add( () => http.patch(`/entity/${entityId}/attributes`, data).then(response => response.data).catch(error => { throw error; }) ); -}; +} export async function handleModeration(modAction, entity_id, attribute_id, overwrite_value = null) { const data = { @@ -679,7 +679,7 @@ export async function moveEntity(entityId, parentId = null, rank = null) { return response.data; }) ); -}; +} export async function patchEntityType(etid, updatedProps) { // If no props updated, do nothing @@ -702,7 +702,7 @@ export async function patchEntityType(etid, updatedProps) { return response.data; }) ); -}; +} export async function reorderEntityAttributes(etid, aid, from, to) { if(from == to) { @@ -731,7 +731,7 @@ export async function reorderEntityAttributes(etid, aid, from, to) { return response.data; }) ); -}; +} export async function updateAttributeDependency(etid, aid, dependency) { const data = {}; @@ -752,7 +752,7 @@ export async function updateAttributeDependency(etid, aid, dependency) { return data; }) ); -}; +} export async function updateAttributeMetadata(etid, aid, pivid, data) { return $httpQueue.add( @@ -766,30 +766,30 @@ export async function updateAttributeMetadata(etid, aid, pivid, data) { return response.data; }) ); -}; +} export async function patchPreferences(data, uid) { const endpoint = !!uid ? `preference/${uid}` : 'preference'; return await http.patch(endpoint, data).then(response => response.data); -}; +} export async function reactivateUser(uid) { return $httpQueue.add( () => http.patch(`user/restore/${uid}`).then(response => response.data) ); -}; +} export async function patchUserData(uid, data) { return $httpQueue.add( () => http.patch(`user/${uid}`, data).then(response => response.data) ); -}; +} export async function patchRoleData(rid, data) { return $httpQueue.add( () => http.patch(`role/${rid}`, data).then(response => response.data) ); -}; +} export async function updateReference(id, eid, url, data) { $httpQueue.add( @@ -807,69 +807,69 @@ export async function updateReference(id, eid, url, data) { return response.data; }) ); -}; +} // DELETE export async function deactivateUser(id) { return $httpQueue.add( () => http.delete(`user/${id}`).then(response => response.data) ); -}; +} export async function deleteRole(id) { return $httpQueue.add( () => http.delete(`role/${id}`).then(response => response.data) ); -}; +} export async function deleteUserAvatar() { return await $httpQueue.add( () => http.delete(`user/avatar`).then(response => response.data) ); -}; +} export async function deleteComment(cid, endpoint = '/comment/{cid}') { endpoint = endpoint.replaceAll('{cid}', cid); return $httpQueue.add( () => http.delete(endpoint).then(response => response.data) ); -}; +} export async function deleteEntity(eid) { return $httpQueue.add( () => http.delete(`entity/${eid}`).then(response => response.data) ); -}; +} export async function deleteEntityType(etid) { return $httpQueue.add( () => http.delete(`editor/dm/entity_type/${etid}`).then(response => response.data) ); -}; +} export async function removeEntityTypeAttribute(id) { return $httpQueue.add( () => http.delete(`/editor/dm/entity_type/attribute/${id}`).then(response => response.data) ); -}; +} export async function deleteAttribute(aid) { return $httpQueue.add( () => http.delete(`editor/dm/attribute/${aid}`).then(response => response.data) ); -}; +} export async function deleteBibliographyItemFile(id) { return await $httpQueue.add( () => http.delete(`bibliography/${id}/file`).then(response => response.data) ); -}; +} export async function deleteBibliographyItem(id) { return $httpQueue.add( () => http.delete(`bibliography/${id}`).then(response => response.data) ); -}; +} export async function deleteReferenceFromEntity(id, eid, url) { return $httpQueue.add( @@ -882,29 +882,29 @@ export async function deleteReferenceFromEntity(id, eid, url) { return response.data; }) ); -}; +} // SEARCH export async function searchGlobal(query = '') { return $httpQueue.add( () => http.get(`search?q=${query}`).then(response => response.data) ) -}; +} export async function searchAttribute(query = '') { return $httpQueue.add( () => http.get(`search/attribute?q=${query}`).then(response => response.data) ) -}; +} export async function searchLabel(query = '') { return $httpQueue.add( () => http.get(`search/label?q=${query}`).then(response => response.data) ) -}; +} export async function searchEntity(query = '') { return $httpQueue.add( () => http.get(`search/entity?q=${query}`).then(response => response.data) ) -}; \ No newline at end of file +} \ No newline at end of file diff --git a/resources/js/app.js b/resources/js/app.js index e4342bae5..caf5be29c 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -214,31 +214,31 @@ app.directive('infinite-scroll', { }); // Components -app.component('attribute-list', AttributeList); -app.component('entity-type-list', EntityTypeList); -app.component('entity-tree', EntityTree); -app.component('entity-breadcrumbs', EntityBreadcrumbs); -app.component('user-avatar', UserAvatar); -app.component('activity-log', ActivityLog); -app.component('comment-list', CommentList); -app.component('emoji-picker', EmojiPicker); -app.component('global-search', GlobalSearch); -app.component('simple-search', SimpleSearch); -app.component('sp-map', InteractiveMap); -app.component('alert', Alert); -app.component('notification-body', NotificationBody); -app.component('csv-table', CsvTable); -app.component('color-gradient', Gradient); -app.component('md-viewer', MarkdownViewer); -app.component('md-editor', MarkdownEditor); -app.component("bibtex-code", BibtexCode); +app.component('AttributeList', AttributeList); +app.component('EntityTypeList', EntityTypeList); +app.component('EntityTree', EntityTree); +app.component('EntityBreadcrumbs', EntityBreadcrumbs); +app.component('UserAvatar', UserAvatar); +app.component('ActivityLog', ActivityLog); +app.component('CommentList', CommentList); +app.component('EmojiPicker', EmojiPicker); +app.component('GlobalSearch', GlobalSearch); +app.component('SimpleSearch', SimpleSearch); +app.component('SpMap', InteractiveMap); +app.component('Alert', Alert); +app.component('NotificationBody', NotificationBody); +app.component('CsvTable', CsvTable); +app.component('ColorGradient', Gradient); +app.component('MdViewer', MarkdownViewer); +app.component('MdEditor', MarkdownEditor); +app.component('BibtexCode', BibtexCode); // Third-Party components -app.component('multiselect', Multiselect); -app.component('file-upload', VueUploadComponent); -app.component('date-picker', DatePicker); -app.component('draggable', draggable); -app.component('node', Node); -app.component('tree', Tree); +app.component('Multiselect', Multiselect); +app.component('FileUpload', VueUploadComponent); +app.component('DatePicker', DatePicker); +app.component('Draggable', draggable); +app.component('Node', Node); +app.component('Tree', Tree); SpPS.initialize(app, i18n.global.t); diff --git a/resources/js/bootstrap/font.js b/resources/js/bootstrap/font.js index 9b1366f6d..895c5d0cc 100644 --- a/resources/js/bootstrap/font.js +++ b/resources/js/bootstrap/font.js @@ -1,12 +1,12 @@ // Sans serif -import "@fontsource/raleway/300.css"; -import "@fontsource/raleway/400.css"; -import "@fontsource/raleway/600.css"; -import "@fontsource/raleway/700.css"; +import '@fontsource/raleway/300.css'; +import '@fontsource/raleway/400.css'; +import '@fontsource/raleway/600.css'; +import '@fontsource/raleway/700.css'; // Monospace -import "@fontsource/source-code-pro/400.css"; -import "@fontsource/source-code-pro/500.css"; +import '@fontsource/source-code-pro/400.css'; +import '@fontsource/source-code-pro/500.css'; // Font Awesome import { library, dom, findIconDefinition } from '@fortawesome/fontawesome-svg-core'; @@ -416,7 +416,7 @@ export const iconList = fw => { list.push({ class: str, key: def.iconName, - unicode: def.icon[3].padStart(4, "0"), + unicode: def.icon[3].padStart(4, '0'), label: def.iconName, }); } diff --git a/resources/js/bootstrap/http.js b/resources/js/bootstrap/http.js index 555eb8754..a8a0cb4ad 100644 --- a/resources/js/bootstrap/http.js +++ b/resources/js/bootstrap/http.js @@ -48,7 +48,7 @@ instance.interceptors.response.use(response => { export function useHttp() { return instance; -}; +} export const open = axios.create(); diff --git a/resources/js/bootstrap/plugins.js b/resources/js/bootstrap/plugins.js index 5292189f5..b70be5ea5 100644 --- a/resources/js/bootstrap/plugins.js +++ b/resources/js/bootstrap/plugins.js @@ -1,11 +1,11 @@ -import { only } from "@/helpers/helpers"; -import store from "./store.js"; -import i18n from "./i18n.js"; +import { only } from '@/helpers/helpers'; +import store from './store.js'; +import i18n from './i18n.js'; import { router, onBeforeRouteLeave, onBeforeRouteUpdate, -} from "./router.js"; +} from './router.js'; import { global_api, api_base, diff --git a/resources/js/bootstrap/store.js b/resources/js/bootstrap/store.js index 8635c9912..911e835e5 100644 --- a/resources/js/bootstrap/store.js +++ b/resources/js/bootstrap/store.js @@ -566,9 +566,9 @@ export const store = createStore({ updateBibliography({commit}, data) { data.forEach(itemWrap => { if(itemWrap.added) { - commit("addBibliographyItem", itemWrap.entry); + commit('addBibliographyItem', itemWrap.entry); } else { - commit("updateBibliographyItem", itemWrap.entry); + commit('updateBibliographyItem', itemWrap.entry); } }); }, diff --git a/resources/js/components/ActivityLog.vue b/resources/js/components/ActivityLog.vue index 336fc8add..86a16c2e9 100644 --- a/resources/js/components/ActivityLog.vue +++ b/resources/js/components/ActivityLog.vue @@ -1,13 +1,20 @@ diff --git a/resources/js/components/ActivityLogFilter.vue b/resources/js/components/ActivityLogFilter.vue index b2f74a9f6..0a414ab26 100644 --- a/resources/js/components/ActivityLogFilter.vue +++ b/resources/js/components/ActivityLogFilter.vue @@ -1,89 +1,135 @@