From 5e1180611092df54a5f75237534fd7fe5dd67c65 Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 13 Sep 2020 21:59:31 +0200 Subject: [PATCH] sidebar widgets can be now disabled with labels --- package-lock.json | 37 ++++++++----------- package.json | 2 +- .../widgets/collapsible_widgets/link_map.js | 6 ++- .../widgets/collapsible_widgets/note_info.js | 4 ++ .../collapsible_widgets/note_revisions.js | 4 ++ .../collapsible_widgets/what_links_here.js | 4 ++ 6 files changed, 33 insertions(+), 24 deletions(-) diff --git a/package-lock.json b/package-lock.json index 68403ffff..2279075a9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3800,12 +3800,12 @@ } }, "eslint-scope": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.0.tgz", - "integrity": "sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", "dev": true, "requires": { - "esrecurse": "^4.1.0", + "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, @@ -7542,9 +7542,9 @@ }, "dependencies": { "ajv": { - "version": "6.12.4", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz", - "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==", + "version": "6.12.5", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz", + "integrity": "sha512-lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag==", "dev": true, "requires": { "fast-deep-equal": "^3.1.1", @@ -8422,19 +8422,19 @@ } }, "terser-webpack-plugin": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.1.0.tgz", - "integrity": "sha512-0ZWDPIP8BtEDZdChbufcXUigOYk6dOX/P/X0hWxqDDcVAQLb8Yy/0FAaemSfax3PAA67+DJR778oz8qVbmy4hA==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.0.tgz", + "integrity": "sha512-Wi0YFbWKG8gBXhbJmrMusRcoXl/C9U5BzIPC2Tn3Si0hejGhhIh0gPf9rEfOCxwigzRPLC8PXv42qDiRTocMXg==", "dev": true, "requires": { "cacache": "^15.0.5", "find-cache-dir": "^3.3.1", "jest-worker": "^26.3.0", "p-limit": "^3.0.2", - "schema-utils": "^2.6.6", + "schema-utils": "^2.7.1", "serialize-javascript": "^4.0.0", "source-map": "^0.6.1", - "terser": "^5.0.0", + "terser": "^5.3.0", "webpack-sources": "^1.4.3" }, "dependencies": { @@ -9048,9 +9048,9 @@ "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==" }, "webpack": { - "version": "5.0.0-beta.29", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.0.0-beta.29.tgz", - "integrity": "sha512-uBVX3gDHTN3FnIqlrGmav5FRW7CujSN4aybLbAd8Uc1hTk+zXDmZAFJFa0pCzzWv7FkKyhdv0+q8BRL2OK7+xg==", + "version": "5.0.0-beta.30", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.0.0-beta.30.tgz", + "integrity": "sha512-pOAAo71m6icygRrOPn/lQM4Ky8MN+9dDBwEU9Get285VBbmuZE6AFqizEEV692mYgUit/0+7vnjsnUr8xX2puA==", "dev": true, "requires": { "@types/eslint-scope": "^3.7.0", @@ -9061,7 +9061,6 @@ "@webassemblyjs/wasm-parser": "1.9.0", "acorn": "^7.4.0", "chrome-trace-event": "^1.0.2", - "core-js": "^3.6.5", "enhanced-resolve": "5.0.0-beta.10", "eslint-scope": "^5.1.0", "events": "^3.2.0", @@ -9085,12 +9084,6 @@ "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w==", "dev": true }, - "core-js": { - "version": "3.6.5", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz", - "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA==", - "dev": true - }, "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", diff --git a/package.json b/package.json index 1b111a734..6c6f9651c 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "jsdoc": "3.6.5", "lorem-ipsum": "2.0.3", "rcedit": "2.2.0", - "webpack": "5.0.0-beta.29", + "webpack": "5.0.0-beta.30", "webpack-cli": "4.0.0-beta.8" }, "optionalDependencies": { diff --git a/src/public/app/widgets/collapsible_widgets/link_map.js b/src/public/app/widgets/collapsible_widgets/link_map.js index 7d04d5279..758f2d1f7 100644 --- a/src/public/app/widgets/collapsible_widgets/link_map.js +++ b/src/public/app/widgets/collapsible_widgets/link_map.js @@ -10,6 +10,10 @@ const TPL = ` `; export default class LinkMapWidget extends CollapsibleWidget { + isEnabled() { + return super.isEnabled() && !this.note.hasLabel('linkMapWidgetDisabled'); + } + get widgetTitle() { return "Link map"; } get help() { @@ -105,4 +109,4 @@ export default class LinkMapWidget extends CollapsibleWidget { } } } -} \ No newline at end of file +} diff --git a/src/public/app/widgets/collapsible_widgets/note_info.js b/src/public/app/widgets/collapsible_widgets/note_info.js index 04ed1cdb1..b7ed845cd 100644 --- a/src/public/app/widgets/collapsible_widgets/note_info.js +++ b/src/public/app/widgets/collapsible_widgets/note_info.js @@ -42,6 +42,10 @@ const TPL = ` `; export default class NoteInfoWidget extends CollapsibleWidget { + isEnabled() { + return super.isEnabled() && !this.note.hasLabel('noteInfoWidgetDisabled'); + } + get widgetTitle() { return "Note info"; } async doRenderBody() { diff --git a/src/public/app/widgets/collapsible_widgets/note_revisions.js b/src/public/app/widgets/collapsible_widgets/note_revisions.js index 636c0fd97..f97f1aa98 100644 --- a/src/public/app/widgets/collapsible_widgets/note_revisions.js +++ b/src/public/app/widgets/collapsible_widgets/note_revisions.js @@ -7,6 +7,10 @@ const TPL = ` `; class NoteRevisionsWidget extends CollapsibleWidget { + isEnabled() { + return super.isEnabled() && !this.note.hasLabel('noteRevisionsWidgetDisabled'); + } + get widgetTitle() { return "Note revisions"; } get help() { diff --git a/src/public/app/widgets/collapsible_widgets/what_links_here.js b/src/public/app/widgets/collapsible_widgets/what_links_here.js index 1b8f27920..2124efd3b 100644 --- a/src/public/app/widgets/collapsible_widgets/what_links_here.js +++ b/src/public/app/widgets/collapsible_widgets/what_links_here.js @@ -2,6 +2,10 @@ import CollapsibleWidget from "../collapsible_widget.js"; import linkService from "../../services/link.js"; export default class WhatLinksHereWidget extends CollapsibleWidget { + isEnabled() { + return super.isEnabled() && !this.note.hasLabel('whatLinksHereWidgetDisabled'); + } + get widgetTitle() { return "What links here"; } get help() {