@social-mail/social-mail-client 1.2.87 → 1.2.89

package/component.js

@@ -1,6 +1,9 @@
 (function () {
     let id = 1;
     const currentScript = document.currentScript;
+
+    
+
     setTimeout(() => {
         for(const e of Array.from(document.querySelectorAll(`[styler-layout="component"]`))) {
             e.id ||= `web_atoms_uid_${id++}`;
@@ -25,6 +28,9 @@
             if (v = e.getAttribute("data-replace")) {
                 script.setAttribute("data-replace", v);
             }
+            if (v = e.getAttribute("data-json-args")) {
+                script.setAttribute("data-json-args");
+            }
             e.setAttribute("data-ready", "yes");
             document.body.appendChild(script);
         }

package/dist/admin/AdminAppIndex.pack.js

@@ -1828,6 +1828,9 @@ class System {
                 setup = importsOrSetup;
             }
             const module = instance.get(name);
+            if (module.isLoaded) {
+                return;
+            }
             module.dependencies.push(...imports.map((x) => instance.get(module.require.resolve(x))));
             module.isLoaded = true;
             const postResolve = new Promise((resolve, reject) => {
@@ -1928,17 +1931,12 @@ class UMDClass {
                 AmdLoader.instance.get(path);
                 const m = yield this.load(this.defaultApp, designMode);
                 const app = ((_a = globalNS.webApp) !== null && _a !== void 0 ? _a : (globalNS.webApp = new (m.default)()));
-                app.onReady(() => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const viewClass = yield AmdLoader.instance.import(path);
-                        const view = new (viewClass.default)(app);
-                        const element = typeof id === "string" ? document.getElementById(id) : id;
-                        element.appendChild(view.element);
-                    }
-                    catch (e) {
-                        console.error(e);
-                    }
-                }));
+                yield app.initPromise;
+                const viewClass = yield AmdLoader.instance.import(path);
+                const view = new (viewClass.default)(app);
+                const element = typeof id === "string" ? document.getElementById(id) : id;
+                element.appendChild(view.element);
+                return view;
             }
             catch (e) {
                 console.error(e);
@@ -1947,26 +1945,18 @@ class UMDClass {
     }
     loadView(path, designMode, appPath) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             try {
                 this.mock = designMode;
                 appPath = appPath || this.defaultApp;
                 AmdLoader.instance.get(path);
                 const m = yield this.load(appPath, designMode);
-                const app = new (m.default)();
-                return yield new Promise((resolve, reject) => {
-                    app.onReady(() => __awaiter(this, void 0, void 0, function* () {
-                        try {
-                            const viewClass = yield AmdLoader.instance.import(path);
-                            const view = new (viewClass.default)(app);
-                            app.root = view;
-                            resolve(view);
-                        }
-                        catch (e) {
-                            console.error(e);
-                            reject(e);
-                        }
-                    }));
-                });
+                const app = ((_a = globalNS.webApp) !== null && _a !== void 0 ? _a : (globalNS.webApp = new (m.default)()));
+                yield app.initPromise;
+                const viewClass = yield AmdLoader.instance.import(path);
+                const view = new (viewClass.default)(app);
+                app.root = view;
+                return view;
             }
             catch (er) {
                 console.error(er);
@@ -18606,7 +18596,7 @@ System.register(["tslib", "@web-atoms/core/dist/App", "@web-atoms/core/dist/core
               extra = JSON.parse(extra);
             }
             const sha256 = yield this.sha256(file);
-            if (extra.parentID) {
+            if (extra === null || extra === void 0 ? void 0 : extra.parentID) {
               const existing = yield this.entityService.query(AppFile, "children", extra.parentID, folder ? folder + "/" + file.name : file.name, sha256).firstOrDefault();
               if (existing) {
                 const {
@@ -22411,11 +22401,19 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
         }
         msg.innerHTML = html;
         for (const iterator of descendentElementIterator(msg)) {
-          if (iterator.tagName === "IMG") {
+          let cid = iterator.getAttribute("data-content-id");
+          if (cid) {
+            const a = mail.attachments.find(x => x.contentID === cid);
+            if (a) {
+              iterator.setAttribute("src", a.url);
+              continue;
+            }
+          }
+          if (/^(IMG|VIDEO)$/.test(iterator.tagName)) {
             const src = iterator.getAttribute("src");
             if (src) {
               if (src.startsWith("cid:")) {
-                const cid = src.substring(4);
+                cid = src.substring(4);
                 const a = mail.attachments.find(x => x.contentID === cid);
                 if (a) {
                   iterator.setAttribute("src", `/api/files/${a.appFileID}/${a.fileContentID}/${a.name}`);
@@ -23075,11 +23073,9 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/di
         }
         onContentSet() {
           var _a;
-          const start = (_a = Array.from(this.editor.querySelectorAll(this.editableSelector))) !== null && _a !== void 0 ? _a : [this.editor.firstElementChild];
-          if (start.length) {
-            for (const iterator of start) {
-              iterator.contentEditable = "true";
-            }
+          const start = (_a = Array.from(this.editor.querySelectorAll(this.editableSelector))[0]) !== null && _a !== void 0 ? _a : this.editor.firstElementChild;
+          if (start) {
+            start.contentEditable = "true";
           }
           this.editor.dispatchEvent(new CustomEvent("contentReady", {
             detail: this.editor.innerHTML,
@@ -25571,8 +25567,22 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/web-con
       _export("MailHtmlEditor", MailHtmlEditor = class MailHtmlEditor extends InlineHtmlEditor {
         constructor() {
           super(...arguments);
+          this.files = [];
+          this.attachments = [];
           this.autofocus = false;
         }
+        onContentSet() {
+          super.onContentSet();
+          const files = this.attachments;
+          const items = Array.from(this.editor.querySelectorAll(`*[data-content-id]`));
+          for (const iterator of items) {
+            const file = files.find(x => x.contentID === iterator.getAttribute("data-content-id"));
+            if (!file) {
+              continue;
+            }
+            iterator.setAttribute("src", file.url);
+          }
+        }
         onPasteEvent(e) {
           if (e.clipboardData.files.length) {
             e.preventDefault();
@@ -25598,7 +25608,7 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/web-con
           super.preCreate();
           this.element.className = css;
           this.sanitizeHtml = node => {
-            const images = Array.from(node.querySelectorAll(`img[data-content-id]`));
+            const images = Array.from(node.querySelectorAll(`*[data-content-id]`));
             for (const image of images) {
               image.setAttribute("src", `cid:${image.getAttribute("data-content-id")}`);
             }
@@ -26874,7 +26884,8 @@ System.register(["tslib", "@web-atoms/web-controls/dist/mobile-app/MobileApp", "
 `.installGlobal("[data-html-editor=email-editor]");
       _export("default", ComposeMailPage = class ComposeMailPage extends PopupWindowPage {
         init() {
-          var _a, _b, _c;
+          var _a, _b, _c, _d;
+          var _e;
           return __awaiter(this, void 0, void 0, function* () {
             if (this.parameters.subject) {
               this.title = "Reply: " + this.parameters.subject;
@@ -26888,6 +26899,7 @@ System.register(["tslib", "@web-atoms/web-controls/dist/mobile-app/MobileApp", "
               recipients: [],
               attachments: []
             });
+            (_c = (_e = this.model).attachments) !== null && _c !== void 0 ? _c : _e.attachments = [];
             if (this.parameters.social) {
               const senderName = this.parameters.mailbox.emailAddress.name;
               const senderEmail = this.parameters.mailbox.emailAddress.emailAddress;
@@ -26899,7 +26911,7 @@ System.register(["tslib", "@web-atoms/web-controls/dist/mobile-app/MobileApp", "
             if (this.parameters.emailAddress) {
               this.model.recipients.add(EmailRecipient.create({
                 emailAddressText: this.parameters.emailAddress,
-                emailAddressID: (_c = this.parameters.emailAddressID) !== null && _c !== void 0 ? _c : void 0
+                emailAddressID: (_d = this.parameters.emailAddressID) !== null && _d !== void 0 ? _d : void 0
               }));
             }
             this.renderer = XNode.create("div", null, XNode.create(Form, null, XNode.create(HorizontalFormField, {
@@ -26917,6 +26929,7 @@ System.register(["tslib", "@web-atoms/web-controls/dist/mobile-app/MobileApp", "
               "data-html-editor": "email-editor",
               presenter: Bind.presenter(c => this.editor = c),
               content: this.model.htmlBody,
+              attachments: this.model.attachments,
               "style-min-height": "200px"
             }), XNode.create(AtomRepeater, {
               items: this.model.attachments,
@@ -33486,10 +33499,10 @@ System.register(["@web-atoms/core/dist/core/XNode", "@web-atoms/web-controls/dis
 
     AmdLoader.instance.setup("@social-mail/social-mail-client/dist/web/page/mails/mini-compose/Atttach");
 
-System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/dist/style/styled", "@web-atoms/core/dist/web/controls/AtomControl", "../../../../model/model", "@web-atoms/core/dist/core/Bind", "@web-atoms/core/dist/view-model/Action", "../../../../common/controls/audio/AudioRecorder", "../service/ConversationService", "@web-atoms/web-controls/dist/basic/AtomRepeater", "@web-atoms/core/dist/core/InjectProperty", "@web-atoms/core/dist/core/AtomBinder", "../../../../common/events/CommonEvents", "../service/MailService", "@web-atoms/date-time/dist/DateTime", "@web-atoms/core/dist/core/sleep", "../../../../common/controls/html/InlineHtmlEditorWithToolbar", "@web-atoms/web-controls/dist/html-editor/AtomHtmlEditor", "@web-atoms/web-controls/dist/html-editor/commands/Align", "@web-atoms/web-controls/dist/html-editor/commands/Bold", "@web-atoms/web-controls/dist/html-editor/commands/Italic", "@web-atoms/web-controls/dist/html-editor/commands/StrikeThrough", "@web-atoms/web-controls/dist/html-editor/commands/Underline", "@web-atoms/web-controls/dist/html-editor/commands/AddLink", "@web-atoms/web-controls/dist/html-editor/commands/Unlink", "@web-atoms/web-controls/dist/html-editor/commands/Separator", "./Insert", "@web-atoms/date-time/dist/TimeSpan", "./Atttach"], function (_export, _context) {
+System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/dist/style/styled", "@web-atoms/core/dist/web/controls/AtomControl", "../../../../model/model", "@web-atoms/core/dist/core/Bind", "@web-atoms/core/dist/view-model/Action", "../../../../common/controls/audio/AudioRecorder", "../service/ConversationService", "@web-atoms/web-controls/dist/basic/AtomRepeater", "@web-atoms/core/dist/core/InjectProperty", "../../../../common/events/CommonEvents", "../service/MailService", "@web-atoms/date-time/dist/DateTime", "@web-atoms/core/dist/core/sleep", "../../../../common/controls/html/InlineHtmlEditorWithToolbar", "@web-atoms/web-controls/dist/html-editor/AtomHtmlEditor", "@web-atoms/web-controls/dist/html-editor/commands/Align", "@web-atoms/web-controls/dist/html-editor/commands/Bold", "@web-atoms/web-controls/dist/html-editor/commands/Italic", "@web-atoms/web-controls/dist/html-editor/commands/StrikeThrough", "@web-atoms/web-controls/dist/html-editor/commands/Underline", "@web-atoms/web-controls/dist/html-editor/commands/AddLink", "@web-atoms/web-controls/dist/html-editor/commands/Unlink", "@web-atoms/web-controls/dist/html-editor/commands/Separator", "./Insert", "@web-atoms/date-time/dist/TimeSpan", "./Atttach"], function (_export, _context) {
   "use strict";
 
-  var __awaiter, __decorate, __metadata, XNode, styled, AtomControl, AppFile, Email, Bind, Action, AudioRecorder, ConversationService, AtomRepeater, InjectProperty, AtomBinder, CommonEvents, MailService, DateTime, sleep, MailHtmlEditor, Toolbar, Align, Bold, Italic, StrikeThrough, Underline, AddLink, Unlink, Separator, Insert, TimeSpan, Attach, MiniComposeBox, css;
+  var __awaiter, __decorate, __metadata, XNode, styled, AtomControl, AppFile, Email, Bind, Action, AudioRecorder, ConversationService, AtomRepeater, InjectProperty, CommonEvents, MailService, DateTime, sleep, MailHtmlEditor, Toolbar, Align, Bold, Italic, StrikeThrough, Underline, AddLink, Unlink, Separator, Insert, TimeSpan, Attach, MiniComposeBox, css;
   _export("default", void 0);
   return {
     setters: [function (_tslib) {
@@ -33517,8 +33530,6 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/di
       AtomRepeater = _webAtomsWebControlsDistBasicAtomRepeater.default;
     }, function (_webAtomsCoreDistCoreInjectProperty) {
       InjectProperty = _webAtomsCoreDistCoreInjectProperty.default;
-    }, function (_webAtomsCoreDistCoreAtomBinder) {
-      AtomBinder = _webAtomsCoreDistCoreAtomBinder.AtomBinder;
     }, function (_commonEventsCommonEvents) {
       CommonEvents = _commonEventsCommonEvents.CommonEvents;
     }, function (_serviceMailService) {
@@ -33632,7 +33643,8 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/di
               "data-html-editor": "email-editor",
               presenter: Bind.presenter(c => this.editor = c),
               content: this.typedMessage,
-              "style-min-height": "50px"
+              "style-min-height": "50px",
+              attachments: Bind.oneWay(() => this.draft.attachments)
             }), XNode.create("i", {
               "data-element": "send",
               class: "fa-solid fa-microphone-lines mic",
@@ -33669,10 +33681,59 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/di
           extra
         }) {
           return __awaiter(this, void 0, void 0, function* () {
-            if (extra.insert) {}
-            this.addFiles(...files);
+            if (extra.stream) {
+              yield this.streamFiles({
+                files,
+                extra
+              });
+              return;
+            }
+            const size = files.reduce((pv, cv) => pv + cv.file.size, 0);
+            if (size > 20 * 1024 * 1024) {
+              if (!extra.stream) {
+                throw new Error(`Total size of attachments cannot be more than 20MB.`);
+              }
+            }
+            if (extra.insert) {
+              this.ensureDraft();
+              const firstChild = this.editor.editor.firstElementChild;
+              for (const iterator of files) {
+                if (/^image\//.test(iterator.contentType)) {
+                  const af = this.createAppFile(iterator);
+                  const img = firstChild.ownerDocument.createElement("img");
+                  img.src = iterator.url;
+                  img.setAttribute("data-content-id", af.contentID);
+                  this.draft.attachments.add(af);
+                  firstChild.appendChild(img);
+                  const newLine = document.createElement("div");
+                  newLine.appendChild(document.createElement("br"));
+                  firstChild.appendChild(newLine);
+                  continue;
+                }
+                if (/^(video|audio)\//.test(iterator.contentType)) {
+                  const af = this.createAppFile(iterator);
+                  const img = firstChild.ownerDocument.createElement("video");
+                  img.src = iterator.url;
+                  img.setAttribute("data-content-id", af.contentID);
+                  this.draft.attachments.add(af);
+                  firstChild.appendChild(img);
+                  const newLine = document.createElement("div");
+                  newLine.appendChild(document.createElement("br"));
+                  firstChild.appendChild(newLine);
+                  continue;
+                }
+              }
+              return;
+            }
+            yield this.addFiles(...files);
           });
         }
+        streamFiles({
+          files,
+          extra
+        }) {
+          return __awaiter(this, void 0, void 0, function* () {});
+        }
         deleteAttachment(file) {
           var _a;
           return __awaiter(this, void 0, void 0, function* () {
@@ -33680,12 +33741,16 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/di
             (_a = this.draft) === null || _a === void 0 ? void 0 : _a.attachments.remove(file);
           });
         }
-        refreshDraft() {
-          var _a;
+        recreateDraft() {
+          var _a, _b;
+          var _c;
           return __awaiter(this, void 0, void 0, function* () {
+            this.draft = null;
             (_a = this.draft) !== null && _a !== void 0 ? _a : this.draft = Email.create({
+              subject: "",
               attachments: []
             });
+            (_b = (_c = this.draft).attachments) !== null && _b !== void 0 ? _b : _c.attachments = [];
           });
         }
         onChanged() {
@@ -33743,35 +33808,40 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/di
           });
         }
         sendAudioMessage() {
-          var _a;
           return __awaiter(this, void 0, void 0, function* () {
             const uploadedFile = yield AudioRecorder.show();
-            (_a = this.draft) !== null && _a !== void 0 ? _a : this.draft = Email.create({
-              attachments: []
-            });
+            this.ensureDraft();
             this.draft.mdBody = this.typedMessage;
-            this.addFiles(uploadedFile);
+            yield this.addFiles(uploadedFile);
             yield this.save();
           });
         }
         addFiles(...files) {
-          var _a;
-          var _b;
-          const attachments = (_a = (_b = this.draft).attachments) !== null && _a !== void 0 ? _a : _b.attachments = [];
-          AtomBinder.refreshValue(this, "draft");
-          for (const {
-            appFileID,
-            url,
-            file
-          } of files) {
-            attachments.add(AppFile.create({
-              appFileID,
-              contentType: file.type,
-              name: file.name,
-              contentID: appFileID.toString(36),
-              url
-            }));
-          }
+          return __awaiter(this, void 0, void 0, function* () {
+            this.ensureDraft();
+            const attachments = this.draft.attachments;
+            for (const file of files) {
+              attachments.add(this.createAppFile(file));
+            }
+          });
+        }
+        createAppFile(file) {
+          return AppFile.create({
+            appFileID: file.appFileID,
+            contentType: file.file.type,
+            name: file.file.name,
+            contentID: file.appFileID.toString(36),
+            url: file.url
+          });
+        }
+        ensureDraft() {
+          var _a, _b;
+          var _c;
+          (_a = this.draft) !== null && _a !== void 0 ? _a : this.draft = Email.create({
+            subject: "",
+            attachments: []
+          });
+          (_b = (_c = this.draft).attachments) !== null && _b !== void 0 ? _b : _c.attachments = [];
         }
         save() {
           return __awaiter(this, void 0, void 0, function* () {
@@ -33792,7 +33862,7 @@ System.register(["tslib", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/di
       }), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", Promise)], MiniComposeBox.prototype, "deleteAttachment", null);
       __decorate([Action({
         onEvent: CommonEvents.onDraftDeleted
-      }), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MiniComposeBox.prototype, "refreshDraft", null);
+      }), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MiniComposeBox.prototype, "recreateDraft", null);
       __decorate([Action({
         onEvent: "input",
         defer: 500,
@@ -35754,6 +35824,9 @@ System.register(["../App", "../core/AtomOnce", "../core/AtomUri", "../di/Service
               this.url = new AtomUri(location.href);
             });
           });
+          this.initPromise = new Promise((resolve, reject) => {
+            this.onReady(resolve);
+          });
         }
         updateDefaultStyle(textContent) {
           if (this.styleElement) {