diff --git a/packages/app-shell/package.json b/packages/app-shell/package.json index 4fa54b0bbad0912052474ef47fce96af552074cb..4ef8ff5a461b7532e33a7be27e196f3734a2f2f2 100644 --- a/packages/app-shell/package.json +++ b/packages/app-shell/package.json @@ -33,7 +33,7 @@ "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", "rollup-plugin-emit-ejs": "^3.1.0", - "rollup-plugin-serve": "^1.0.1" + "rollup-plugin-serve": "^2.0.0" }, "dependencies": { "@dbp-toolkit/auth": "^0.3.1", diff --git a/packages/auth/package.json b/packages/auth/package.json index 9fa211ed14c98537cc590050b1138bc467e3a54a..4e2c78b7bf60c1674a4149af57694e69fcc71600 100644 --- a/packages/auth/package.json +++ b/packages/auth/package.json @@ -34,7 +34,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/common/package.json b/packages/common/package.json index 8aa0bab6d163eef6f86dd137998fee47b07bbdd5..c5480abca9fa56dfef7a2a3b21f1bcefe1d0d7a6 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -1,7 +1,7 @@ { "name": "@dbp-toolkit/common", "homepage": "https://gitlab.tugraz.at/dbp/web-components/toolkit/-/tree/master/packages/common", - "version": "0.3.3", + "version": "0.3.4", "module": "index.js", "license": "LGPL-2.1-or-later", "repository": { @@ -27,7 +27,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1" + "rollup-plugin-serve": "^2.0.0" }, "scripts": { "i18next": "i18next", diff --git a/packages/data-table-view/package.json b/packages/data-table-view/package.json index a9b9024bf5854abb09935b8e86136f1c21d1a61d..6284811fdb2dc2b4f3ab8f85411511de237df184 100644 --- a/packages/data-table-view/package.json +++ b/packages/data-table-view/package.json @@ -32,7 +32,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/file-handling/package.json b/packages/file-handling/package.json index 610fd9cd2df5025516e2171e2295b363e7acc46d..def98a56550f69daaa6b45bca0e4699c1f67ac65 100644 --- a/packages/file-handling/package.json +++ b/packages/file-handling/package.json @@ -1,7 +1,7 @@ { "name": "@dbp-toolkit/file-handling", "homepage": "https://gitlab.tugraz.at/dbp/web-components/toolkit/-/tree/master/packages/file-handling", - "version": "0.3.4", + "version": "0.3.5", "main": "src/index.js", "license": "LGPL-2.1-or-later", "repository": { @@ -31,7 +31,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/file-handling/src/clipboard.js b/packages/file-handling/src/clipboard.js index 250e0b011a15fb7acc0c08c91fa1d476b72b1d22..fedc4d8e2973eaa84e9025d762e4311876c52b5f 100644 --- a/packages/file-handling/src/clipboard.js +++ b/packages/file-handling/src/clipboard.js @@ -864,6 +864,8 @@ export class Clipboard extends ScopedElementsMixin(AdapterLitElement) { ${commonStyles.getRadioAndCheckboxCss()} ${commonStyles.getTabulatorStyles()} ${fileHandlingStyles.getFileHandlingCss()} + + a { border-bottom: var(--dbp-border); padding: 0; diff --git a/packages/file-handling/src/i18n/de/translation.json b/packages/file-handling/src/i18n/de/translation.json index 9014babc8ce6fdedd8d7f166e18cc0f936f55ad9..1279d9353d142cf550d7e0865fbac72d4e378d43 100644 --- a/packages/file-handling/src/i18n/de/translation.json +++ b/packages/file-handling/src/i18n/de/translation.json @@ -135,7 +135,10 @@ "size": "Größe", "something-went-wrong": "Etwas ist schief gelaufen. Bitte verbinden Sie sich erneut.", "upload-to": "Es wird nach {{- path}} hochgeladen ...", - "webdav-error": "Etwas ist schief gelaufen: {{error}}" + "webdav-error": "Etwas ist schief gelaufen: {{error}}", + "file-error": "Das Dateiformat wird nicht unterstützt oder die Datei ist fehlerhaft und konnte nicht hochgeladen werden.", + "forbidden": "Sie sind nicht berechtigt, diese Aktion in diesem Ordner auszuführen.", + "file-upload-error": "Entschuldigung, etwas ist schief gelaufen. Bitte versuchen Sie es später noch einmal." }, "upload-label": "Dateiauswahl" } diff --git a/packages/file-handling/src/i18n/en/translation.json b/packages/file-handling/src/i18n/en/translation.json index 23f8ce6c4a29e241701b6d8320fda6e95370b02c..3cea0b10959f51a24755a0efc74205d49c86bef0 100644 --- a/packages/file-handling/src/i18n/en/translation.json +++ b/packages/file-handling/src/i18n/en/translation.json @@ -135,7 +135,10 @@ "size": "Size", "something-went-wrong": "Something went wrong. Please reload.", "upload-to": "Uploading to {{- path}} ...", - "webdav-error": "Something went wrong" + "webdav-error": "Something went wrong", + "file-error": "The file format is not supported or the file is corrupt and could not be uploaded.", + "forbidden": "You don't have permissions to perform this action in this folder.", + "file-upload-error": "Sorry, something went wrong. Please try again later." }, "upload-label": "Select some files" } diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js index 4ed8e65e82e45fa20515e3c91605cf2b66885341..28aa479b9dffcbb96a3cc74083db857df08673ff 100644 --- a/packages/file-handling/src/nextcloud-file-picker.js +++ b/packages/file-handling/src/nextcloud-file-picker.js @@ -1637,7 +1637,32 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { } }) .catch((error) => { - throw error; + this.loading = false; + if(error.response && error.response.status) { + switch (error.response.status) { + case 403: + this.statusText = i18n.t('nextcloud-file-picker.forbidden'); + return; + case 415: + this.statusText = i18n.t('nextcloud-file-picker.file-error'); + this.sendSetPropertyEvent('analytics-event', { + category: 'FileHandlingNextcloud', + action: 'UploadFilesPutfilesError', + name: "415", + }); + return; + default: + break; + } + } + + this.statusText = i18n.t('nextcloud-file-picker.file-upload-error'); + this.sendSetPropertyEvent('analytics-event', { + category: 'FileHandlingNextcloud', + action: 'UploadFilesPutfilesError', + name: error, + }); + console.error(error); }); } else { this.loadDirectory(this.directoryPath); @@ -2959,8 +2984,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) { #replace-modal .checkmark { height: 20px; width: 20px; - left: 15px; - top: 5px; + left: 0px; + top: 1px; } .table-wrapper { diff --git a/packages/file-handling/src/styles.js b/packages/file-handling/src/styles.js index be3972ba22af93ee7389be2aedc6328808fd942f..eae14667e411a581684da0a2c1a63cdfc7b93051 100644 --- a/packages/file-handling/src/styles.js +++ b/packages/file-handling/src/styles.js @@ -168,7 +168,15 @@ export function getFileHandlingCss() { .select-all-icon { height: 40px; position: absolute; - top: -34px; + top: -18px; + } + + + .tabulator .tabulator-header .tabulator-col.tabulator-sortable .tabulator-col-title { + padding-top: 4px; + padding-bottom: 4px; + font-weight: normal; + font-size: 1rem; } @media only screen and (orientation: portrait) and (max-width: 768px) { diff --git a/packages/knowledge-base-web-page-element-view/package.json b/packages/knowledge-base-web-page-element-view/package.json index 53782211fd2c3261e350b978cafeb4c64b3c471b..9b1cbd7151f41a8fd82bded7fdcc280244bafaab 100644 --- a/packages/knowledge-base-web-page-element-view/package.json +++ b/packages/knowledge-base-web-page-element-view/package.json @@ -32,7 +32,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/language-select/package.json b/packages/language-select/package.json index 25751cb569a9f15d33efa29b95f3a7de51a2983b..7547ca71b57e5955a8d1eeae96e0c0d99dde94ba 100644 --- a/packages/language-select/package.json +++ b/packages/language-select/package.json @@ -30,7 +30,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/matomo/package.json b/packages/matomo/package.json index aeae7cc001a8b062f7712907fb3d54749f175439..294aeabb7b4f5a68a1adb16ccfed57da2a833c55 100644 --- a/packages/matomo/package.json +++ b/packages/matomo/package.json @@ -32,7 +32,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/notification/package.json b/packages/notification/package.json index 10a1712e6cb4a880be6110cf1a265e7da43d0e38..dc3e3dfc5f6d3a7cede1b344e39e85fe3b9f4977 100644 --- a/packages/notification/package.json +++ b/packages/notification/package.json @@ -32,7 +32,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/person-profile/package.json b/packages/person-profile/package.json index 73a7282ea77bc171758c83a4eb257d919b762b05..e7f12f1b8579159f799554b45eca336757fb0f98 100644 --- a/packages/person-profile/package.json +++ b/packages/person-profile/package.json @@ -32,7 +32,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/person-select/package.json b/packages/person-select/package.json index 47e44028503f8629b24a93ec57ecf84761ef2b07..4a9a8deabde8809ae6f7fc9d2b6bbb1b336ab559 100644 --- a/packages/person-select/package.json +++ b/packages/person-select/package.json @@ -33,7 +33,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/provider/package.json b/packages/provider/package.json index 5cf0c19d3997728aea151a81aa8a348f387e31d9..1126cfd05e2c6149e82121b6e0b8c6c5bed6626e 100644 --- a/packages/provider/package.json +++ b/packages/provider/package.json @@ -33,7 +33,7 @@ "rollup": "^2.19.0", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/qr-code-scanner/package.json b/packages/qr-code-scanner/package.json index c4acf99b505951403754ab4cca5a3558e36bf235..a9b5c0025921dc63a791981fb342322d0c936137 100644 --- a/packages/qr-code-scanner/package.json +++ b/packages/qr-code-scanner/package.json @@ -32,7 +32,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2", "selfsigned": "^2.0.0" }, diff --git a/packages/resource-select/package.json b/packages/resource-select/package.json index 3ba1b9d9667ccf4fd490a3ba6b7c4cd0a8974fa4..fdf81e3bdd22ca4d625dac6c0a62ef04460ce1d7 100644 --- a/packages/resource-select/package.json +++ b/packages/resource-select/package.json @@ -33,7 +33,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/theme-switcher/package.json b/packages/theme-switcher/package.json index a42cad108d8ba98eaee67136d65c3b0dd48ec541..c0ba1a9bf6a30fcb106f8937595085bc5973c0e0 100644 --- a/packages/theme-switcher/package.json +++ b/packages/theme-switcher/package.json @@ -31,7 +31,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/tooltip/package.json b/packages/tooltip/package.json index 1072d2ebab8ef77e02fdef44658e9613c1312cd6..a2fcd485752295ea7b662e8b32ca518dd35db126 100644 --- a/packages/tooltip/package.json +++ b/packages/tooltip/package.json @@ -33,7 +33,7 @@ "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", "rollup-plugin-replace": "^2.2.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2" }, "dependencies": { diff --git a/packages/typescript-example/package.json b/packages/typescript-example/package.json index 68d2e68b1c9e4c4b63efc32a87cc88ecdebd8a4c..200fe0165a7ef1cd6ad960b9903074b332c20693 100644 --- a/packages/typescript-example/package.json +++ b/packages/typescript-example/package.json @@ -31,7 +31,7 @@ "rollup": "^2.33.3", "rollup-plugin-copy": "^3.1.0", "rollup-plugin-delete": "^2.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2", "rollup-plugin-typescript2": "^0.32.0", "ts-lit-plugin": "^1.2.1", diff --git a/toolkit-showcase/package.json b/toolkit-showcase/package.json index 4fd3ab6ac7f0a881e52a52451b61092d295c8206..7a01d4678ba24cc0ade9df10277392de22eb3bc7 100644 --- a/toolkit-showcase/package.json +++ b/toolkit-showcase/package.json @@ -1,6 +1,6 @@ { "name": "dbp-toolkit-showcase", - "version": "0.2.5", + "version": "0.2.6", "main": "src/toolkit-showcase.js", "license": "LGPL-2.1-or-later", "private": true, @@ -35,15 +35,15 @@ "rollup-plugin-emit-ejs": "^3.1.0", "rollup-plugin-license": "^2.1.0", "rollup-plugin-md": "^1.0.0", - "rollup-plugin-serve": "^1.0.1", + "rollup-plugin-serve": "^2.0.0", "rollup-plugin-terser": "^7.0.2", "selfsigned": "^2.0.0" }, "dependencies": { "@dbp-toolkit/app-shell": "^0.3.3", "@dbp-toolkit/auth": "^0.3.1", - "@dbp-toolkit/common": "^0.3.3", - "@dbp-toolkit/file-handling": "^0.3.4", + "@dbp-toolkit/common": "^0.3.4", + "@dbp-toolkit/file-handling": "^0.3.5", "@dbp-toolkit/font-source-sans-pro": "^0.2.4", "@dbp-toolkit/language-select": "^0.3.1", "@dbp-toolkit/notification": "^0.3.1", diff --git a/yarn.lock b/yarn.lock index 3593c53ab2697fe2b28c003018660a9bb9a5bf90..a446031ea586f3d6f76ffd916c38504d78ce5317 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7405,10 +7405,10 @@ rollup-plugin-replace@^2.2.0: magic-string "^0.25.2" rollup-pluginutils "^2.6.0" -rollup-plugin-serve@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-serve/-/rollup-plugin-serve-1.1.0.tgz#0654a57021a21b903340c69940f7463706e8288d" - integrity sha512-pYkSsuA0/psKqhhictkJw1c2klya5b+LlCvipWqI9OE1aG2M97mRumZCbBlry5CMEOzYBBgSDgd1694sNbmyIw== +rollup-plugin-serve@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-serve/-/rollup-plugin-serve-2.0.0.tgz#f5ac0d9740f8c30e8be353a780303838fa1dac0e" + integrity sha512-adII2hdsHyNftFhg4bx55B6ogZWmySEGtdqcqxwZQi3BryAnfzQ+xRb1/BLe3DR1lX9QxnpwtHbBCSULyXbMwA== dependencies: mime ">=2.4.6" opener "1"