@social-mail/social-mail-client 1.2.394 → 1.2.396
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/admin/AdminAppIndex.pack.js +111 -14
- package/dist/admin/AdminAppIndex.pack.js.map +1 -1
- package/dist/admin/AdminAppIndex.pack.min.js +7 -7
- package/dist/admin/AdminAppIndex.pack.min.js.map +1 -1
- package/dist/admin/pages/repair/RepairPage.d.ts.map +1 -1
- package/dist/admin/pages/repair/RepairPage.js +4 -0
- package/dist/admin/pages/repair/RepairPage.js.map +1 -1
- package/dist/common/BaseApp.d.ts +10 -0
- package/dist/common/BaseApp.d.ts.map +1 -0
- package/dist/common/BaseApp.js +99 -0
- package/dist/common/BaseApp.js.map +1 -0
- package/dist/common/StringFormat.d.ts +2 -0
- package/dist/common/StringFormat.d.ts.map +1 -0
- package/dist/common/StringFormat.js +14 -0
- package/dist/common/StringFormat.js.map +1 -0
- package/dist/model/model.d.ts +13 -0
- package/dist/model/model.d.ts.map +1 -1
- package/dist/model/model.js +58 -1
- package/dist/model/model.js.map +1 -1
- package/dist/public/channel/ChannelView.pack.js +65 -2
- package/dist/public/channel/ChannelView.pack.js.map +1 -1
- package/dist/public/channel/ChannelView.pack.min.js +2 -2
- package/dist/public/channel/ChannelView.pack.min.js.map +1 -1
- package/dist/public/store/Store.pack.js +65 -2
- package/dist/public/store/Store.pack.js.map +1 -1
- package/dist/public/store/Store.pack.min.js +2 -2
- package/dist/public/store/Store.pack.min.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/web/AppIndex.pack.js +107 -14
- package/dist/web/AppIndex.pack.js.map +1 -1
- package/dist/web/AppIndex.pack.min.js +6 -6
- package/dist/web/AppIndex.pack.min.js.map +1 -1
- package/dist/web/apps/site-editor/SiteEditorApp.d.ts +8 -0
- package/dist/web/apps/site-editor/SiteEditorApp.d.ts.map +1 -0
- package/dist/web/apps/site-editor/SiteEditorApp.js +25 -0
- package/dist/web/apps/site-editor/SiteEditorApp.js.map +1 -0
- package/dist/web/apps/site-editor/commands/SiteEditorCommands.d.ts +4 -0
- package/dist/web/apps/site-editor/commands/SiteEditorCommands.d.ts.map +1 -0
- package/dist/web/apps/site-editor/commands/SiteEditorCommands.js +15 -0
- package/dist/web/apps/site-editor/commands/SiteEditorCommands.js.map +1 -0
- package/dist/web/apps/site-editor/drawer/SiteEditorDrawer.d.ts +5 -0
- package/dist/web/apps/site-editor/drawer/SiteEditorDrawer.d.ts.map +1 -0
- package/dist/web/apps/site-editor/drawer/SiteEditorDrawer.js +21 -0
- package/dist/web/apps/site-editor/drawer/SiteEditorDrawer.js.map +1 -0
- package/dist/web/apps/site-editor/pages/CodeEditorPage.d.ts +4 -0
- package/dist/web/apps/site-editor/pages/CodeEditorPage.d.ts.map +1 -0
- package/dist/web/apps/site-editor/pages/CodeEditorPage.js +15 -0
- package/dist/web/apps/site-editor/pages/CodeEditorPage.js.map +1 -0
- package/dist/web/apps/site-editor/pages/DesignEditorPage.d.ts +4 -0
- package/dist/web/apps/site-editor/pages/DesignEditorPage.d.ts.map +1 -0
- package/dist/web/apps/site-editor/pages/DesignEditorPage.js +15 -0
- package/dist/web/apps/site-editor/pages/DesignEditorPage.js.map +1 -0
- package/dist/web/apps/store-editor/StoreEditorApp.d.ts +8 -0
- package/dist/web/apps/store-editor/StoreEditorApp.d.ts.map +1 -0
- package/dist/web/apps/store-editor/StoreEditorApp.js +25 -0
- package/dist/web/apps/store-editor/StoreEditorApp.js.map +1 -0
- package/dist/web/apps/store-editor/commands/StoreEditorCommands.d.ts +4 -0
- package/dist/web/apps/store-editor/commands/StoreEditorCommands.d.ts.map +1 -0
- package/dist/web/apps/store-editor/commands/StoreEditorCommands.js +15 -0
- package/dist/web/apps/store-editor/commands/StoreEditorCommands.js.map +1 -0
- package/dist/web/apps/store-editor/drawer/StoreEditorDrawer.d.ts +5 -0
- package/dist/web/apps/store-editor/drawer/StoreEditorDrawer.d.ts.map +1 -0
- package/dist/web/apps/store-editor/drawer/StoreEditorDrawer.js +21 -0
- package/dist/web/apps/store-editor/drawer/StoreEditorDrawer.js.map +1 -0
- package/dist/web/page/mails/MailboxContacts.d.ts +2 -1
- package/dist/web/page/mails/MailboxContacts.d.ts.map +1 -1
- package/dist/web/page/mails/MailboxContacts.js +15 -6
- package/dist/web/page/mails/MailboxContacts.js.map +1 -1
- package/dist/web/page/mails/service/MailService.d.ts +2 -2
- package/dist/web/page/mails/service/MailService.d.ts.map +1 -1
- package/dist/web/page/mails/service/MailService.js +9 -5
- package/dist/web/page/mails/service/MailService.js.map +1 -1
- package/node_modules/@web-atoms/entity/dist/services/BaseEntityService.d.ts +1 -1
- package/node_modules/@web-atoms/entity/dist/services/BaseEntityService.d.ts.map +1 -1
- package/node_modules/@web-atoms/entity/dist/services/BaseEntityService.js +7 -1
- package/node_modules/@web-atoms/entity/dist/services/BaseEntityService.js.map +1 -1
- package/node_modules/@web-atoms/entity/dist/tsconfig.tsbuildinfo +1 -1
- package/node_modules/@web-atoms/entity/package.json +1 -1
- package/node_modules/@web-atoms/entity/src/services/BaseEntityService.ts +8 -1
- package/package.json +2 -2
- package/src/admin/pages/repair/RepairPage.tsx +1 -0
- package/src/common/BaseApp.tsx +84 -0
- package/src/common/StringFormat.ts +3 -0
- package/src/model/model.ts +25 -4
- package/src/web/apps/site-editor/SiteEditorApp.tsx +13 -0
- package/src/web/apps/site-editor/commands/SiteEditorCommands.ts +5 -0
- package/src/web/apps/site-editor/drawer/SiteEditorDrawer.tsx +9 -0
- package/src/web/apps/site-editor/pages/CodeEditorPage.tsx +6 -0
- package/src/web/apps/site-editor/pages/DesignEditorPage.tsx +5 -0
- package/src/web/apps/store-editor/StoreEditorApp.tsx +13 -0
- package/src/web/apps/store-editor/commands/StoreEditorCommands.ts +5 -0
- package/src/web/apps/store-editor/drawer/StoreEditorDrawer.tsx +9 -0
- package/src/web/page/mails/MailboxContacts.tsx +16 -5
- package/src/web/page/mails/service/MailService.ts +6 -3
|
@@ -27,6 +27,7 @@ import MailboxService from "../../../common/pages/mailboxes/services/MailboxServ
|
|
|
27
27
|
import { toKMBString } from "../../../common/NumberFormats";
|
|
28
28
|
import { MailAppEvents } from "../../commands/MailAppEvents";
|
|
29
29
|
import EntityService from "../../../services/EntityService";
|
|
30
|
+
import { toSentenceCase } from "../../../common/StringFormat";
|
|
30
31
|
|
|
31
32
|
const css = styled.css `
|
|
32
33
|
|
|
@@ -198,18 +199,25 @@ export default class MailsPage extends MasterDetailPage {
|
|
|
198
199
|
|
|
199
200
|
private previousThread: IMailboxContact = null;
|
|
200
201
|
|
|
201
|
-
private showBlocked = false;
|
|
202
|
-
|
|
203
202
|
private version = 1;
|
|
204
203
|
|
|
205
204
|
private conversationType = "all";
|
|
206
205
|
private threadsRepeater: AtomRepeater;
|
|
207
206
|
|
|
207
|
+
private folderID = null;
|
|
208
|
+
private nonContactFolderIDs: number[] = [];
|
|
209
|
+
|
|
208
210
|
async init() {
|
|
209
211
|
|
|
210
212
|
const mailboxID = this.parameters.id;
|
|
211
213
|
const mailbox = this.currentMailbox = await this.mailService.mailbox(mailboxID);
|
|
212
214
|
|
|
215
|
+
const contactFolderID = mailbox.folders.find((x) => /contacts/i.test(x.tag.name)).tagID;
|
|
216
|
+
|
|
217
|
+
this.folderID = contactFolderID;
|
|
218
|
+
|
|
219
|
+
this.nonContactFolderIDs = mailbox.folders.filter((x) => x.tagID !== contactFolderID).map((x) => x.tagID);
|
|
220
|
+
|
|
213
221
|
if (mailbox.isExternal) {
|
|
214
222
|
const es = this.resolve(EntityService);
|
|
215
223
|
es.invoke(Mailbox, "fetch", mailbox).catch(console.error);
|
|
@@ -242,9 +250,12 @@ export default class MailsPage extends MasterDetailPage {
|
|
|
242
250
|
<div
|
|
243
251
|
class="blocked-bar">
|
|
244
252
|
<ToggleButtonBar
|
|
245
|
-
items={
|
|
246
|
-
|
|
253
|
+
items={mailbox.folders}
|
|
254
|
+
labelPath={(x) => toSentenceCase(x.tag.name) }
|
|
255
|
+
valuePath={(x) => x.tagID}
|
|
256
|
+
value={Bind.sourceTwoWays(this, (x) => x.source.folderID)}/>
|
|
247
257
|
<ToggleButtonBar
|
|
258
|
+
style-display={Bind.oneWay(() => !this.nonContactFolderIDs.includes(this.folderID))}
|
|
248
259
|
items={conversationTypes}
|
|
249
260
|
itemRenderer={(item) => <div data-item-type="toggle-button" class="conversation-type">
|
|
250
261
|
<label text={item.label}/>
|
|
@@ -269,7 +280,7 @@ export default class MailsPage extends MasterDetailPage {
|
|
|
269
280
|
conversationType: this.conversationType,
|
|
270
281
|
mailboxID: this.currentMailbox.mailboxID,
|
|
271
282
|
version: this.version,
|
|
272
|
-
|
|
283
|
+
folderID: this.folderID,
|
|
273
284
|
cancelToken
|
|
274
285
|
}))}
|
|
275
286
|
itemRenderer={(item: IMailboxContact) => {
|
|
@@ -16,7 +16,7 @@ export default class MailService {
|
|
|
16
16
|
async mailbox(mailboxID: number) {
|
|
17
17
|
const mb = await this.entityService.query(Mailbox)
|
|
18
18
|
.where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID)
|
|
19
|
-
.include((x) => x.emailAddress)
|
|
19
|
+
.include((x) => [x.emailAddress, x.folders.forEach((t) => t.tag) ])
|
|
20
20
|
.firstOrDefault();
|
|
21
21
|
const notify = await this.entityService.query(UserPushSubscription)
|
|
22
22
|
.where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID && x.emailAddressID === null)
|
|
@@ -32,11 +32,14 @@ export default class MailService {
|
|
|
32
32
|
start = 0,
|
|
33
33
|
size = 20,
|
|
34
34
|
version = 1,
|
|
35
|
-
|
|
35
|
+
folderID = null,
|
|
36
36
|
cancelToken
|
|
37
37
|
}) {
|
|
38
38
|
let q = this.entityService.query(MailboxContact)
|
|
39
|
-
.where({ mailboxID
|
|
39
|
+
.where({ mailboxID }, (p) => (x) => x.mailboxID === p.mailboxID);
|
|
40
|
+
if (folderID) {
|
|
41
|
+
q = q.where({ folderID }, (p) => (x) => x.folderTagID === p.folderID);
|
|
42
|
+
}
|
|
40
43
|
switch(conversationType) {
|
|
41
44
|
case "open":
|
|
42
45
|
q = q.where((x) => x.openThreads !== 0);
|