From b06803b2ebdf4f2e10dc157e6e1299fece6632c4 Mon Sep 17 00:00:00 2001 From: Alexander Zaslonov Date: Tue, 11 Apr 2023 14:46:37 -0700 Subject: [PATCH 1/3] Revert "Remove heading block that contains popup (#2126)" This reverts commit 8ce94654d0950c34b819d14cff8bdf1331b88559. --- src/libraries/block-snippets.json | 153 ++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/src/libraries/block-snippets.json b/src/libraries/block-snippets.json index 2fe57346a..f6ba8ba40 100644 --- a/src/libraries/block-snippets.json +++ b/src/libraries/block-snippets.json @@ -48,6 +48,19 @@ "key": "blocks/new-popup-template", "title": "New popup template", "type": "popup" + }, + "heading-block-1": { + "type": "layout-section", + "key": "blocks/heading-block-1", + "title": "Feature block 5", + "description": "", + "contentKey": "files/heading-block-1", + "imports": [ + "styles/colors/semi-trsp-lt-bg", + "styles/components/button/no-border", + "popups/main-menu-popup", + "files/main-menu-popup" + ] } }, "popups": { @@ -1581,6 +1594,146 @@ } ] }, + "heading-block-1": { + "type": "layout-section", + "styles": { + "instance": { + "key": "awgovjdnwn" + } + }, + "nodes": [ + { + "type": "grid", + "nodes": [ + { + "type": "grid-cell", + "nodes": [ + { + "type": "picture", + "width": 80, + "height": 80, + "caption": "Logo", + "styles": { + "appearance": "components/picture/default" + }, + "hyperlink": { + "target": "_self", + "targetKey": "pages/e0987ca1-f458-b546-7697-7be594b35583" + } + }, + { + "type": "menu", + "navigationItemKey": "main", + "layout": "horizontal", + "styles": { + "appearance": "components/menu/default", + "instance": { + "display": { + "md": "inline-block", + "xs": "none" + } + } + }, + "roles": null + }, + { + "type": "button", + "label": "☰", + "styles": { + "appearance": "components/button/no-border", + "instance": { + "display": { + "xs": "inline-block", + "md": "none" + } + } + }, + "roles": null, + "hyperlink": { + "target": "_popup", + "targetKey": "popups/main-menu-popup" + } + } + ], + "role": "article", + "styles": { + "instance": { + "grid-cell": { + "xs": { + "position": { + "col": 1, + "row": 1 + }, + "span": { + "cols": 1, + "rows": 1 + }, + "alignment": { + "vertical": "center", + "horizontal": "between" + } + }, + "xl": { + "alignment": { + "vertical": "center", + "horizontal": "between" + } + }, + "md": { + "alignment": { + "vertical": "center", + "horizontal": "between" + } + }, + "lg": { + "alignment": { + "vertical": "center", + "horizontal": "between" + } + } + }, + "padding": { + "xs": { + "top": 10, + "bottom": 10, + "left": 10, + "right": 10 + } + } + } + } + } + ], + "styles": { + "instance": { + "margin": { + "xs": { + "top": 20, + "left": "auto", + "right": "auto", + "bottom": 20 + } + }, + "size": { + "lg": { + "maxWidth": 1140 + } + }, + "grid": { + "xs": { + "rows": [ + "auto" + ], + "cols": [ + "1fr" + ] + } + } + } + } + } + ] + }, "main-menu-popup": { "type": "popup", "backdrop": false, From 2fe45d51bd13c57ff6c605e0cc9f5f687db9c318 Mon Sep 17 00:00:00 2001 From: Alexander Zaslonov Date: Sat, 15 Apr 2023 12:23:54 -0700 Subject: [PATCH 2/3] Re-enabling popup controls and snippets. --- package-lock.json | 194 +++++++++++++++------------ package.json | 12 +- src/persistence/mapiObjectStorage.ts | 2 +- src/startup.design.ts | 2 - 4 files changed, 116 insertions(+), 94 deletions(-) diff --git a/package-lock.json b/package-lock.json index 482719d7e..13edf99d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,12 +15,12 @@ "@braintree/sanitize-url": "6.0.2", "@microsoft/applicationinsights-web": "^2.8.11", "@monaco-editor/loader": "^1.3.2", - "@paperbits/azure": "0.1.576", - "@paperbits/common": "0.1.576", - "@paperbits/core": "0.1.576", - "@paperbits/forms": "0.1.576", - "@paperbits/prosemirror": "0.1.576", - "@paperbits/styles": "0.1.576", + "@paperbits/azure": "0.1.580", + "@paperbits/common": "0.1.580", + "@paperbits/core": "0.1.580", + "@paperbits/forms": "0.1.580", + "@paperbits/prosemirror": "0.1.580", + "@paperbits/styles": "0.1.580", "@webcomponents/custom-elements": "1.5.1", "@webcomponents/shadydom": "^1.10.0", "client-oauth2": "4.3.3", @@ -266,9 +266,9 @@ } }, "node_modules/@azure/core-http": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz", - "integrity": "sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz", + "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==", "dependencies": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", @@ -283,12 +283,24 @@ "tslib": "^2.2.0", "tunnel": "^0.0.6", "uuid": "^8.3.0", - "xml2js": "^0.4.19" + "xml2js": "^0.5.0" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@azure/core-http/node_modules/xml2js": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", + "dependencies": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/@azure/core-lro": { "version": "2.2.1", "license": "MIT", @@ -1095,12 +1107,12 @@ } }, "node_modules/@paperbits/azure": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/azure/-/azure-0.1.576.tgz", - "integrity": "sha512-Q5114q/z2n+YiUn+34xJ3elNmcanuDuMxrNpHJKTrfBIJ0AaoSbY3mWE9K4aN25BpvTpdIFwF06TZDKCXFxvIw==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/azure/-/azure-0.1.580.tgz", + "integrity": "sha512-2GOl/73c7WzHoR71omPZiHOv7RKTdePhdt/fNc0poO8io27+re4xmwAsBEEsGRbgb1l50nCZPcG4rmx1nHoSlQ==", "dependencies": { "@azure/storage-blob": "12.5.0", - "@paperbits/common": "0.1.576", + "@paperbits/common": "0.1.580", "applicationinsights-js": "1.0.21", "mime": "3.0.0" } @@ -1241,9 +1253,9 @@ } }, "node_modules/@paperbits/common": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/common/-/common-0.1.576.tgz", - "integrity": "sha512-WswHaUNbLK5rhpZ+0tCxDMt5IvgLxr9emT4YhQVPp/4RBcTL0DJj/F+vkEbebmerUoZLKqZ8yHCVk9wc41XXlg==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/common/-/common-0.1.580.tgz", + "integrity": "sha512-x+Yx2lv2xHAg2hcUf4UsNKy0/IrAU4JhQp9S9LnVhXzJFPM1GhkU+N37y12UON7zgHV+CX4TA5narexMxNTrwg==", "dependencies": { "@googlemaps/js-api-loader": "^1.13.2", "html-minifier-terser": "^5.1.1", @@ -1260,13 +1272,13 @@ } }, "node_modules/@paperbits/core": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/core/-/core-0.1.576.tgz", - "integrity": "sha512-WeoHilw3KXJE8aVb0BMaoTJNBezTQt09YxrvfySUnTtIRJtWWZZc30mfKMQ9d06fGW4BVC44rRmN1+XS3CgWUQ==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/core/-/core-0.1.580.tgz", + "integrity": "sha512-lckEV0eXx8hHN/B/6/av8IVd52XlYQ4LiCVJeP5m3qKkQImizCTBNHRI31R51ypCRZ/beHN5fH3lazSP7gboig==", "dependencies": { "@googlemaps/js-api-loader": "^1.12.9", - "@paperbits/common": "0.1.576", - "@paperbits/styles": "0.1.576", + "@paperbits/common": "0.1.580", + "@paperbits/styles": "0.1.580", "await-parallel-limit": "^2.1.0", "basiclightbox": "^5.0.4", "cropperjs": "^1.5.11", @@ -1289,23 +1301,23 @@ } }, "node_modules/@paperbits/forms": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/forms/-/forms-0.1.576.tgz", - "integrity": "sha512-5h1iBQPmm4pF9RuY4qEXz2H8pRn2E83Qdv1QhgFpA0a2XuD4iAJ5v59NBR7hEtb9e5nZ/XpcsZpJWvd6IN6jiw==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/forms/-/forms-0.1.580.tgz", + "integrity": "sha512-3ythwhJyAmLhuHR/sze5JHsOxtcTy2tnKHoL6XSw5+lbX+EQyXM02iUrYB9akPduh2vTQIsbcRaKAdFGh7adLw==", "dependencies": { - "@paperbits/common": "0.1.576", - "@paperbits/core": "0.1.576", - "@paperbits/styles": "0.1.576", + "@paperbits/common": "0.1.580", + "@paperbits/core": "0.1.580", + "@paperbits/styles": "0.1.580", "knockout": "^3.5.1", "knockout.validation": "^2.0.4" } }, "node_modules/@paperbits/prosemirror": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/prosemirror/-/prosemirror-0.1.576.tgz", - "integrity": "sha512-0KMfeSMDo5y8kmiFF1g0oEYkRF4mgW0gYb1ssWLJJSog2G1l0I3JGofqSAp9F//pbVcRh5ry831bWBeWbntTHw==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/prosemirror/-/prosemirror-0.1.580.tgz", + "integrity": "sha512-mrDOQwLWmyjjhpg67/rqVvg3FvKo2Vp25m4Dly5VCjZ5RjS75p3egzt/L891W1eZcphmXPEH4IsjFczORdfNWA==", "dependencies": { - "@paperbits/common": "0.1.576", + "@paperbits/common": "0.1.580", "prosemirror-commands": "^1.5.0", "prosemirror-history": "^1.3.0", "prosemirror-inputrules": "^1.2.0", @@ -1318,11 +1330,11 @@ } }, "node_modules/@paperbits/styles": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/styles/-/styles-0.1.576.tgz", - "integrity": "sha512-oXW14f9PQBTNIxxFRYBtcVSzEIiMLjXiIWR7iByuLhcVjTICnxnob9vm4ElVXWXxj/xOCHdYYROkOygN84XXsg==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/styles/-/styles-0.1.580.tgz", + "integrity": "sha512-MuZLFtvCjJN3oA+Vcv6XqftZJWoYjkzqpFArEmMTzss3+VJgwJIzQ9KfdFAlJ3FrjGJ9j00D8gp4roOXVo6KEg==", "dependencies": { - "@paperbits/common": "0.1.576", + "@paperbits/common": "0.1.580", "@simonwep/pickr": "^1.7.4", "jss": "^10.4.0", "jss-preset-default": "^10.4.0", @@ -3639,9 +3651,9 @@ "license": "MIT" }, "node_modules/csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", + "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "node_modules/d3": { "version": "7.8.2", @@ -8016,9 +8028,9 @@ } }, "node_modules/nanopop": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.2.0.tgz", - "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.3.0.tgz", + "integrity": "sha512-fzN+T2K7/Ah25XU02MJkPZ5q4Tj5FpjmIYq4rvoHX4yb16HzFdCO6JxFFn5Y/oBhQ8no8fUZavnyIv9/+xkBBw==" }, "node_modules/natural-compare": { "version": "1.4.0", @@ -11460,9 +11472,10 @@ "node": ">=4.0.0" } }, - "node_modules/xml2js/node_modules/xmlbuilder": { + "node_modules/xmlbuilder": { "version": "11.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "engines": { "node": ">=4.0" } @@ -11684,9 +11697,9 @@ } }, "@azure/core-http": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.0.tgz", - "integrity": "sha512-BxI2SlGFPPz6J1XyZNIVUf0QZLBKFX+ViFjKOkzqD18J1zOINIQ8JSBKKr+i+v8+MB6LacL6Nn/sP/TE13+s2Q==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@azure/core-http/-/core-http-3.0.1.tgz", + "integrity": "sha512-A3x+um3cAPgQe42Lu7Iv/x8/fNjhL/nIoEfqFxfn30EyxK6zC13n+OUxzZBRC0IzQqssqIbt4INf5YG7lYYFtw==", "requires": { "@azure/abort-controller": "^1.0.0", "@azure/core-auth": "^1.3.0", @@ -11701,7 +11714,18 @@ "tslib": "^2.2.0", "tunnel": "^0.0.6", "uuid": "^8.3.0", - "xml2js": "^0.4.19" + "xml2js": "^0.5.0" + }, + "dependencies": { + "xml2js": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz", + "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==", + "requires": { + "sax": ">=0.6.0", + "xmlbuilder": "~11.0.0" + } + } } }, "@azure/core-lro": { @@ -12283,12 +12307,12 @@ "version": "0.10.2" }, "@paperbits/azure": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/azure/-/azure-0.1.576.tgz", - "integrity": "sha512-Q5114q/z2n+YiUn+34xJ3elNmcanuDuMxrNpHJKTrfBIJ0AaoSbY3mWE9K4aN25BpvTpdIFwF06TZDKCXFxvIw==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/azure/-/azure-0.1.580.tgz", + "integrity": "sha512-2GOl/73c7WzHoR71omPZiHOv7RKTdePhdt/fNc0poO8io27+re4xmwAsBEEsGRbgb1l50nCZPcG4rmx1nHoSlQ==", "requires": { "@azure/storage-blob": "12.5.0", - "@paperbits/common": "0.1.576", + "@paperbits/common": "0.1.580", "applicationinsights-js": "1.0.21", "mime": "3.0.0" }, @@ -12394,9 +12418,9 @@ } }, "@paperbits/common": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/common/-/common-0.1.576.tgz", - "integrity": "sha512-WswHaUNbLK5rhpZ+0tCxDMt5IvgLxr9emT4YhQVPp/4RBcTL0DJj/F+vkEbebmerUoZLKqZ8yHCVk9wc41XXlg==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/common/-/common-0.1.580.tgz", + "integrity": "sha512-x+Yx2lv2xHAg2hcUf4UsNKy0/IrAU4JhQp9S9LnVhXzJFPM1GhkU+N37y12UON7zgHV+CX4TA5narexMxNTrwg==", "requires": { "@googlemaps/js-api-loader": "^1.13.2", "html-minifier-terser": "^5.1.1", @@ -12413,13 +12437,13 @@ } }, "@paperbits/core": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/core/-/core-0.1.576.tgz", - "integrity": "sha512-WeoHilw3KXJE8aVb0BMaoTJNBezTQt09YxrvfySUnTtIRJtWWZZc30mfKMQ9d06fGW4BVC44rRmN1+XS3CgWUQ==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/core/-/core-0.1.580.tgz", + "integrity": "sha512-lckEV0eXx8hHN/B/6/av8IVd52XlYQ4LiCVJeP5m3qKkQImizCTBNHRI31R51ypCRZ/beHN5fH3lazSP7gboig==", "requires": { "@googlemaps/js-api-loader": "^1.12.9", - "@paperbits/common": "0.1.576", - "@paperbits/styles": "0.1.576", + "@paperbits/common": "0.1.580", + "@paperbits/styles": "0.1.580", "await-parallel-limit": "^2.1.0", "basiclightbox": "^5.0.4", "cropperjs": "^1.5.11", @@ -12442,23 +12466,23 @@ } }, "@paperbits/forms": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/forms/-/forms-0.1.576.tgz", - "integrity": "sha512-5h1iBQPmm4pF9RuY4qEXz2H8pRn2E83Qdv1QhgFpA0a2XuD4iAJ5v59NBR7hEtb9e5nZ/XpcsZpJWvd6IN6jiw==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/forms/-/forms-0.1.580.tgz", + "integrity": "sha512-3ythwhJyAmLhuHR/sze5JHsOxtcTy2tnKHoL6XSw5+lbX+EQyXM02iUrYB9akPduh2vTQIsbcRaKAdFGh7adLw==", "requires": { - "@paperbits/common": "0.1.576", - "@paperbits/core": "0.1.576", - "@paperbits/styles": "0.1.576", + "@paperbits/common": "0.1.580", + "@paperbits/core": "0.1.580", + "@paperbits/styles": "0.1.580", "knockout": "^3.5.1", "knockout.validation": "^2.0.4" } }, "@paperbits/prosemirror": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/prosemirror/-/prosemirror-0.1.576.tgz", - "integrity": "sha512-0KMfeSMDo5y8kmiFF1g0oEYkRF4mgW0gYb1ssWLJJSog2G1l0I3JGofqSAp9F//pbVcRh5ry831bWBeWbntTHw==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/prosemirror/-/prosemirror-0.1.580.tgz", + "integrity": "sha512-mrDOQwLWmyjjhpg67/rqVvg3FvKo2Vp25m4Dly5VCjZ5RjS75p3egzt/L891W1eZcphmXPEH4IsjFczORdfNWA==", "requires": { - "@paperbits/common": "0.1.576", + "@paperbits/common": "0.1.580", "prosemirror-commands": "^1.5.0", "prosemirror-history": "^1.3.0", "prosemirror-inputrules": "^1.2.0", @@ -12471,11 +12495,11 @@ } }, "@paperbits/styles": { - "version": "0.1.576", - "resolved": "https://registry.npmjs.org/@paperbits/styles/-/styles-0.1.576.tgz", - "integrity": "sha512-oXW14f9PQBTNIxxFRYBtcVSzEIiMLjXiIWR7iByuLhcVjTICnxnob9vm4ElVXWXxj/xOCHdYYROkOygN84XXsg==", + "version": "0.1.580", + "resolved": "https://registry.npmjs.org/@paperbits/styles/-/styles-0.1.580.tgz", + "integrity": "sha512-MuZLFtvCjJN3oA+Vcv6XqftZJWoYjkzqpFArEmMTzss3+VJgwJIzQ9KfdFAlJ3FrjGJ9j00D8gp4roOXVo6KEg==", "requires": { - "@paperbits/common": "0.1.576", + "@paperbits/common": "0.1.580", "@simonwep/pickr": "^1.7.4", "jss": "^10.4.0", "jss-preset-default": "^10.4.0", @@ -13993,9 +14017,9 @@ } }, "csstype": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.1.tgz", - "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==" + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", + "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" }, "d3": { "version": "7.8.2", @@ -16738,9 +16762,9 @@ "dev": true }, "nanopop": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.2.0.tgz", - "integrity": "sha512-E9JaHcxh3ere8/BEZHAcnuD10RluTSPyTToBvoFWS9/7DcCx6gyKjbn7M7Bx7E1veCxCuY1iO6h4+gdAf1j73Q==" + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-2.3.0.tgz", + "integrity": "sha512-fzN+T2K7/Ah25XU02MJkPZ5q4Tj5FpjmIYq4rvoHX4yb16HzFdCO6JxFFn5Y/oBhQ8no8fUZavnyIv9/+xkBBw==" }, "natural-compare": { "version": "1.4.0", @@ -18896,13 +18920,13 @@ "requires": { "sax": ">=0.6.0", "xmlbuilder": "~11.0.0" - }, - "dependencies": { - "xmlbuilder": { - "version": "11.0.1" - } } }, + "xmlbuilder": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", + "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==" + }, "xmlchars": { "version": "2.2.0" }, diff --git a/package.json b/package.json index a6d99e77e..78c8841b6 100644 --- a/package.json +++ b/package.json @@ -78,12 +78,12 @@ "@braintree/sanitize-url": "6.0.2", "@microsoft/applicationinsights-web": "^2.8.11", "@monaco-editor/loader": "^1.3.2", - "@paperbits/azure": "0.1.576", - "@paperbits/common": "0.1.576", - "@paperbits/core": "0.1.576", - "@paperbits/forms": "0.1.576", - "@paperbits/prosemirror": "0.1.576", - "@paperbits/styles": "0.1.576", + "@paperbits/azure": "0.1.580", + "@paperbits/common": "0.1.580", + "@paperbits/core": "0.1.580", + "@paperbits/forms": "0.1.580", + "@paperbits/prosemirror": "0.1.580", + "@paperbits/styles": "0.1.580", "@webcomponents/custom-elements": "1.5.1", "@webcomponents/shadydom": "^1.10.0", "client-oauth2": "4.3.3", diff --git a/src/persistence/mapiObjectStorage.ts b/src/persistence/mapiObjectStorage.ts index 5eaa3d790..f3b7c2fc8 100644 --- a/src/persistence/mapiObjectStorage.ts +++ b/src/persistence/mapiObjectStorage.ts @@ -393,7 +393,7 @@ export class MapiObjectStorage implements IObjectStorage { const isLocalized = localizedContentTypes.includes(contentType); const localeSearchPrefix = isLocalized ? `${selectedLocale}/` : ""; - if (key === "popups" || key === "locales") { + if (key === "locales") { return { value: [] }; diff --git a/src/startup.design.ts b/src/startup.design.ts index cc904e050..08e8b42b5 100644 --- a/src/startup.design.ts +++ b/src/startup.design.ts @@ -3,7 +3,6 @@ import * as ko from "knockout"; import { InversifyInjector } from "@paperbits/common/injection"; import { OfflineModule } from "@paperbits/common/persistence/offline.module"; import { CoreDesignModule } from "@paperbits/core/core.design.module"; -import { PopupDesignModule } from "@paperbits/core/popup"; import { FormsDesignModule } from "@paperbits/forms/forms.design.module"; import { ProseMirrorModule } from "@paperbits/prosemirror/prosemirror.module"; import { StylesDesignModule } from "@paperbits/styles/styles.design.module"; @@ -18,7 +17,6 @@ injector.bindToCollection("autostart", SessionExpirationErrorHandler); injector.bindModule(new CoreDesignModule()); injector.bindModule(new StylesDesignModule()); injector.bindModule(new ProseMirrorModule()); -injector.bindModule(new PopupDesignModule()); injector.bindModule(new FormsDesignModule()); injector.bindModule(new ApimDesignModule()); injector.bindModule(new OfflineModule({ autosave: false })); From abff1f2dd38532034e1d336376914cca3d8de596 Mon Sep 17 00:00:00 2001 From: Alexander Zaslonov Date: Wed, 19 Apr 2023 12:00:41 -0700 Subject: [PATCH 3/3] Added setting Google Fonts APi Key placeholder. --- src/components/staticSettingsProvider.ts | 10 ++++++---- src/config.design.json | 7 ++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/components/staticSettingsProvider.ts b/src/components/staticSettingsProvider.ts index f3c9c6d5a..90d3e643c 100644 --- a/src/components/staticSettingsProvider.ts +++ b/src/components/staticSettingsProvider.ts @@ -1,14 +1,16 @@ +import * as Objects from "@paperbits/common/objects"; import { ISettingsProvider } from "@paperbits/common/configuration"; export class StaticSettingsProvider implements ISettingsProvider { constructor(private readonly configuration: Object) { } - public getSetting(name: string): Promise { - return this.configuration[name]; + public getSetting(path: string): Promise { + return Objects.getObjectAt(path, this.configuration); } - public async setSetting(name: string, value: T): Promise { - this.configuration[name] = value; + public async setSetting(path: string, value: T): Promise { + Objects.setValue(path, this.configuration, value); + this.configuration[path] = value; } public async getSettings(): Promise { diff --git a/src/config.design.json b/src/config.design.json index d125ac42a..75c6b844a 100644 --- a/src/config.design.json +++ b/src/config.design.json @@ -3,5 +3,10 @@ "managementApiUrl": "https://.management.azure-api.net", "managementApiAccessToken": "SharedAccessSignature ...", "backendUrl": "https://.developer.azure-api.net", - "useHipCaptcha": false + "useHipCaptcha": false, + "integration": { + "googleFonts": { + "apiKey": "" + } + } } \ No newline at end of file