@fluid-topics/ft-reader-feedback 1.1.32 → 1.1.34

package/build/utils/events.d.ts

@@ -31,8 +31,10 @@ interface OpenMapFeedbackDrawerEventDetail {
 export declare class OpenMapFeedbackDrawerEvent extends CustomEvent<OpenMapFeedbackDrawerEventDetail> {
     constructor(detail: OpenMapFeedbackDrawerEventDetail);
 }
-export declare class SendMailerTopicFeedbackEvent extends CustomEvent<FtReaderTocNode | undefined> {
-    constructor(detail?: FtReaderTocNode);
+export declare class SendMailerTopicFeedbackEvent extends CustomEvent<{
+    topic: FtReaderTocNode | undefined;
+}> {
+    constructor(topic?: FtReaderTocNode);
 }
 export declare class SendMailerMapFeedbackEvent extends CustomEvent<any> {
     constructor();

package/build/utils/events.js

@@ -24,11 +24,11 @@ export class OpenMapFeedbackDrawerEvent extends CustomEvent {
     }
 }
 export class SendMailerTopicFeedbackEvent extends CustomEvent {
-    constructor(detail) {
+    constructor(topic) {
         super("ft-reader-mailer-topic-feedback", {
             composed: true,
             bubbles: true,
-            detail
+            detail: { topic }
         });
     }
 }

package/build/utils/mail.d.ts

@@ -8,5 +8,6 @@ export declare class FeedbackMailLinkBuilder {
     private isAuthenticated;
     update(subject: string, url: string, metadata: Array<FtMetadata>, configuration: FtReaderFeedbackConfiguration, isAuthenticated: boolean): void;
     private filterMetadata;
-    build(feedbackMessage: string): string | undefined;
+    shouldUseMailer(): boolean;
+    build(feedbackMessage?: string): string | undefined;
 }

package/build/utils/mail.js

@@ -24,9 +24,15 @@ export class FeedbackMailLinkBuilder {
         return metadataIds.map(key => metadata.find(m => m.key === key))
             .filter(m => m != null && m.values.length > 0);
     }
+    shouldUseMailer() {
+        var _a, _b;
+        const mailerIfAuthenticated = this.isAuthenticated && !((_a = this.configuration) === null || _a === void 0 ? void 0 : _a.mailsSentByFluidTopics);
+        const mailerIfUnauthenticated = !this.isAuthenticated && !((_b = this.configuration) === null || _b === void 0 ? void 0 : _b.mailsSentByFluidTopicsForUnauthenticatedUsers);
+        return mailerIfAuthenticated || mailerIfUnauthenticated;
+    }
     build(feedbackMessage) {
-        var _a, _b, _c;
-        if (feedbackMessage.length === 0 || this.isAuthenticated && (this.configuration == null || ((_a = this.configuration) === null || _a === void 0 ? void 0 : _a.mailsSentByFluidTopics)) || ((_b = this.configuration) === null || _b === void 0 ? void 0 : _b.mailsSentByFluidTopicsForUnauthenticatedUsers)) {
+        var _a;
+        if ((feedbackMessage != null && feedbackMessage.length === 0) || !this.shouldUseMailer()) {
             return undefined;
         }
         const subject = encodeURIComponent(this.subject + " " + this.subjectMetadata);
@@ -35,10 +41,10 @@ ${this.bodyMetadata}
 ${this.url}
 _________________________________________________________________
 
-${feedbackMessage}
+${feedbackMessage !== null && feedbackMessage !== void 0 ? feedbackMessage : ""}
 
 _________________________________________________________________
 ${server.messages["mail.feedback.disclaimer"]()}`);
-        return `mailto:${(_c = this.configuration) === null || _c === void 0 ? void 0 : _c.recipients.join(",")}?subject=${subject}&body=${body}`;
+        return `mailto:${(_a = this.configuration) === null || _a === void 0 ? void 0 : _a.recipients.join(",")}?subject=${subject}&body=${body}`;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-reader-feedback",
-  "version": "1.1.32",
+  "version": "1.1.34",
   "description": "Feedback forms for a map and its topics in an integrated reader",
   "keywords": [
     "Lit"
@@ -19,13 +19,13 @@
     "url": "ssh://git@scm.mrs.antidot.net:2222/fluidtopics/ft-web-components.git"
   },
   "dependencies": {
-    "@fluid-topics/ft-app-context": "1.1.32",
-    "@fluid-topics/ft-reader-context": "1.1.32",
-    "@fluid-topics/ft-wc-utils": "1.1.32",
+    "@fluid-topics/ft-app-context": "1.1.34",
+    "@fluid-topics/ft-reader-context": "1.1.34",
+    "@fluid-topics/ft-wc-utils": "1.1.34",
     "lit": "3.1.0"
   },
   "devDependencies": {
-    "@fluid-topics/public-api": "1.0.58"
+    "@fluid-topics/public-api": "1.0.59"
   },
-  "gitHead": "7aceb8fb7c61e391e77ab55affab94df9d3f91aa"
+  "gitHead": "1e947e93e937ded84f056955b14b760e9dea7058"
 }