Merge branch 'main' into beta

Author: Yelinz

addon/components/single-document-details.hbs

@@ -100,7 +100,7 @@
         id="date"
         name="date"
         class="uk-input"
-        @locale={{this.locale}}
+        @locale={{this.flatpickrLocale}}
         @date={{or @document.date null}}
         @altFormat={{this.dateFormat}}
         @altInput={{true}}
@@ -164,7 +164,20 @@
     </ul>
   </div>
 
-  <div class="uk-grid uk-grid-small {{if this.displayConvertButton 'uk-child-width-1-3' 'uk-child-width-1-2'}}" uk-grid>
+  <div class="uk-grid uk-grid-small uk-child-width-1-2" uk-grid>
+    {{#if this.displayWebDAVButton}}
+      <div>
+        <UkButton
+          @size="small"
+          class="uk-width-1"
+          @onClick={{this.openWebDAV.perform}}
+          data-test-web-dav-button
+        >
+          {{t "alexandria.document-details.web-dav"}}
+        </UkButton>
+      </div>
+    {{/if}}
+
     {{#if this.displayConvertButton}}
       <div>
         <UkButton
@@ -269,4 +282,4 @@
   </ul>
 
   <TagManager @documents={{array @document}} />
-</div>
+</div>

addon/components/single-document-details.js

@@ -1,7 +1,8 @@
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
 import { tracked } from "@glimmer/tracking";
-import { restartableTask, dropTask } from "ember-concurrency";
+import { task } from "ember-concurrency";
+import lang from "flatpickr/dist/l10n";
 import { DateTime } from "luxon";
 
 import DocumentCard from "./document-card";
@@ -24,22 +25,34 @@ export default class SingleDocumentDetailsComponent extends DocumentCard {
   @tracked editDate = false;
   @tracked validTitle = true;
 
+  get locale() {
+    return this.intl.primaryLocale.split("-")[0];
+  }
+
+  get flatpickrLocale() {
+    return lang[this.locale];
+  }
+
   get dateFormat() {
-    const language = this.intl.primaryLocale.split("-")[0];
     const defaultFormat = "m/d/Y";
     const formats = { de: "d.m.Y", fr: "d.m.Y", en: defaultFormat };
 
-    return formats[language] ?? defaultFormat;
+    return formats[this.locale] ?? defaultFormat;
+  }
+
+  get isWordProcessingFormat() {
+    return [
+      "application/vnd.oasis.opendocument.text",
+      "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+    ].includes(this.args.document.latestFile?.value?.mimeType);
+  }
+
+  get displayWebDAVButton() {
+    return this.config.enableWebDAV && this.isWordProcessingFormat;
   }
 
   get displayConvertButton() {
-    return (
-      this.config.enablePDFConversion &&
-      [
-        "application/vnd.oasis.opendocument.text",
-        "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-      ].includes(this.args.document.latestFile?.value?.mimeType)
-    );
+    return this.config.enablePDFConversion && this.isWordProcessingFormat;
   }
 
   @action updateDocumentTitle({ target: { value: title } }) {
@@ -75,38 +88,37 @@ export default class SingleDocumentDetailsComponent extends DocumentCard {
     this.documents.enableShortcuts();
   }
 
-  @restartableTask *saveDocument(event) {
+  saveDocument = task({ restartable: true }, async (event) => {
     event?.preventDefault();
 
     try {
-      yield this.args.document.save();
+      await this.args.document.save();
       this.resetState();
       this.notification.success(this.intl.t("alexandria.success.update"));
     } catch (error) {
       this.args.document.rollbackAttributes();
       new ErrorHandler(this, error).notify("alexandria.errors.update");
     }
-  }
+  });
 
-  @dropTask *uploadReplacement(event) {
+  uploadReplacement = task({ drop: true }, async (event) => {
     try {
       const [file] = event.target.files;
-      yield this.documents.replace(this.args.document, file);
+      await this.documents.replace(this.args.document, file);
     } catch (error) {
       new ErrorHandler(this, error).notify(
         "alexandria.errors.replace-document",
       );
     }
-  }
+  });
 
-  @dropTask
-  *convertDocument(event) {
+  convertDocument = task({ drop: true }, async (event) => {
     event?.preventDefault();
     try {
       const modelName = "document";
       const adapter = this.store.adapterFor(modelName);
       const url = adapter.buildURL(modelName, this.args.document.id);
-      yield this.fetch.fetch(`${url}/convert`, {
+      await this.fetch.fetch(`${url}/convert`, {
         method: "POST",
       });
 
@@ -116,5 +128,18 @@ export default class SingleDocumentDetailsComponent extends DocumentCard {
     } catch (error) {
       new ErrorHandler(this, error).notify("alexandria.errors.convert-pdf");
     }
-  }
+  });
+
+  openWebDAV = task({ drop: true }, async (event) => {
+    event?.preventDefault();
+    try {
+      const fileId = this.args.document.latestFile.value.id;
+
+      const file = await this.store.findRecord("file", fileId);
+
+      window.open(file.webdavUrl, "_blank");
+    } catch (error) {
+      new ErrorHandler(this, error).notify("alexandria.errors.open-webdav");
+    }
+  });
 }

addon/models/file.js

@@ -4,6 +4,7 @@ export default class FileModel extends Model {
   @attr variant;
   @attr name;
   @attr downloadUrl;
+  @attr webdavUrl;
   @attr metainfo;
   @attr content; // needed for upload
   @attr mimeType;

addon/services/alexandria-config.js

@@ -7,6 +7,7 @@ export default class AlexandriaConfigService extends Service {
   zipDownloadNamespace = undefined;
 
   enablePDFConversion = false;
+  enableWebDAV = false;
 
   markIcons = {};
 

app/styles/ember-alexandria.scss

@@ -2,6 +2,8 @@
 @import "custom-uikit-rules";
 @import "ember-uikit";
 @import "skeleton-loading";
+@import "flatpickr/dist/flatpickr";
+@import "flatpickr/dist/themes/airbnb";
 
 $tag-hover-shadow: 0 2px 8px rgba(0 0 0 / 20%);
 

package.json

@@ -33,11 +33,11 @@
     "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "@babel/core": "^7.23.9",
+    "@babel/core": "^7.24.0",
     "@ember/legacy-built-in-components": "^0.5.0",
     "@ember/optional-features": "^2.1.0",
     "@ember/render-modifiers": "^2.1.0",
-    "@embroider/macros": "^1.13.5",
+    "@embroider/macros": "^1.14.0",
     "@fortawesome/ember-fontawesome": "^2.0.0",
     "@fortawesome/free-regular-svg-icons": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
@@ -53,8 +53,8 @@
     "ember-data-resources": "^5.2.1",
     "ember-engines-router-service": "^0.5.1",
     "ember-fetch": "^8.1.2",
-    "ember-flatpickr": "^4.0.0",
-    "ember-intl": "^6.4.1",
+    "ember-flatpickr": "^7.1.0",
+    "ember-intl": "^6.5.1",
     "ember-localized-model": "^3.2.2",
     "ember-modifier": "^4.1.0",
     "ember-promise-helpers": "^2.0.0",
@@ -63,13 +63,14 @@
     "ember-truth-helpers": "^4.0.3",
     "ember-uikit": "^9.0.0",
     "file-saver": "^2.0.5",
+    "flatpickr": "^4.6.13",
     "luxon": "^3.4.4"
   },
   "devDependencies": {
     "@adfinis/eslint-config": "2.1.0",
     "@adfinis/semantic-release-config": "4.1.0",
     "@babel/eslint-parser": "7.23.10",
-    "@babel/plugin-proposal-decorators": "7.23.9",
+    "@babel/plugin-proposal-decorators": "7.24.0",
     "@ember/test-helpers": "3.3.0",
     "@embroider/test-setup": "3.0.3",
     "@faker-js/faker": "8.4.1",
@@ -80,7 +81,7 @@
     "ember-cli-clean-css": "3.0.0",
     "ember-cli-dependency-checker": "3.3.2",
     "ember-cli-inject-live-reload": "2.1.0",
-    "ember-cli-mirage": "3.0.2",
+    "ember-cli-mirage": "3.0.3",
     "ember-cli-sass": "11.0.1",
     "ember-cli-sri": "2.1.1",
     "ember-cli-terser": "4.0.2",
@@ -96,27 +97,27 @@
     "ember-template-lint-plugin-prettier": "5.0.0",
     "ember-test-selectors": "6.0.0",
     "ember-try": "3.0.0",
-    "eslint": "8.56.0",
+    "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-ember": "11.12.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-n": "16.6.2",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-qunit": "8.0.1",
+    "eslint-plugin-qunit": "8.1.1",
     "graphql": "16.8.1",
     "loader.js": "4.7.0",
     "miragejs": "0.1.48",
     "prettier": "3.2.5",
     "qunit": "2.20.1",
     "qunit-dom": "3.0.0",
     "sass": "1.71.1",
-    "semantic-release": "23.0.0",
+    "semantic-release": "23.0.2",
     "sinon": "17.0.1",
     "stylelint": "16.2.1",
     "stylelint-config-standard-scss": "13.0.0",
     "stylelint-prettier": "5.0.0",
     "stylelint-scss": "6.1.0",
-    "uikit": "3.18.1",
+    "uikit": "3.19.1",
     "webpack": "5.90.3"
   },
   "//": [