@social-mail/social-mail-client 1.0.1 → 1.0.3

package/node_modules/@web-atoms/entity/src/services/BaseEntityService.ts

@@ -7,6 +7,7 @@ import HttpSession, { IHttpRequest } from "./HttpSession";
 import mergeProperties from "./mergeProperties";
 import Query, { IDateRange, IEntityWithDateRange, stepTypes } from "./Query";
 import resolve from "./resolve";
+import { QueryProcessor } from "./QueryProcessor";
 
 export interface IGeometry {
     latitude: number;
@@ -223,19 +224,37 @@ export interface IModel<T> {
 }
 
 export class Model<T> implements IModel<T> {
-    constructor(public name: string) {
-
+    private defaults: [string, any][];
+    constructor(public name: string, defaults: any = null) {
+        if (defaults) {
+            this.defaults = [];
+            for (const key in defaults) {
+                if (Object.prototype.hasOwnProperty.call(defaults, key)) {
+                    const element = defaults[key];
+                    this.defaults.push([key, element]);
+                }
+            }
+        }
     }
     public create(properties: Omit<T, "$type"> = {} as any): T {
         (properties as any).$type = this.name;
+        if (this.defaults) {
+            for (const [key, value] of this.defaults) {
+                if (properties[key] === void 0) {
+                    properties[key] = value;
+                }
+            }
+        }
         return properties as T;
     }
 }
 
-export default class BaseEntityService extends HttpSession {
+export default abstract class BaseEntityService extends HttpSession {
 
     public url: string = "/api/entity/";
 
+    public abstract queryProcessor: QueryProcessor;
+
     protected resultConverter = resolve;
 
     private entityModel: EntityContext;
@@ -266,6 +285,7 @@ export default class BaseEntityService extends HttpSession {
         return new Query({
             service: this,
             name: m.name,
+            queryProcessor: this.queryProcessor,
             queryFunction,
             args
         });

package/node_modules/@web-atoms/entity/src/services/MockBaseEntityService.ts

@@ -4,6 +4,7 @@ import { EntityContext } from "../models/IEntityModel";
 import IPagedList from "../models/IPagedList";
 import BaseEntityService, { IBulkDeleteModel, IBulkUpdateModel, IModel, IQueryMethod } from "./BaseEntityService";
 import Query from "./Query";
+import { QueryProcessor } from "./QueryProcessor";
 
 const replacer = /(\.[a-z0-9\_])|([a-z0-9\_]\())/ig;
 
@@ -190,6 +191,8 @@ class MockEntityRestService {
 
 export default class MockBaseEntityService extends BaseEntityService {
 
+    public queryProcessor: QueryProcessor = "DotNet";
+
     public entityContext: EntityContext;
 
     private local: { [key: string]: any } = {};

package/node_modules/@web-atoms/entity/src/services/Query.ts

@@ -122,11 +122,12 @@ export class QueryComposer<Q> {
 }
 
 interface IQueryContext {
-    service: BaseEntityService;
+    service: BaseEntityService;    
     name: string;
     traceQuery?: boolean;
     queryFunction?: string;
     args?: any[];
+    queryProcessor?: "DotNet" | "JavaScript"
 }
 
 export default class Query<T> {
@@ -218,12 +219,12 @@ export default class Query<T> {
 
     public join<TInner, TKey>(model: IModel<TInner>, left: (x: T) => TKey, right: (x: TInner) => TKey)
         : Query<{ entity: T, inner: TInner }> {
-        return this.append(["join" as any, model.name, convertToLinq(left.toString()), convertToLinq(right.toString())] ) as any;
+        return this.append(["join" as any, model.name, this.convertToLinq(left.toString()), this.convertToLinq(right.toString())] ) as any;
     }
 
     public leftJoin<TInner, TKey>(model: IModel<TInner>, left: (x: T) => TKey, right: (x: TInner) => TKey)
     : Query<{ entity: T, inner: TInner }> {
-    return this.append(["leftJoin" as any, model.name, convertToLinq(left.toString()), convertToLinq(right.toString())] ) as any;
+    return this.append(["leftJoin" as any, model.name, this.convertToLinq(left.toString()), this.convertToLinq(right.toString())] ) as any;
 }
 
     public include<TR>(q: (x: T) => TR[]): IIncludedArrayQuery<T, TR, TR[]>;
@@ -235,7 +236,7 @@ export default class Query<T> {
                 ["include", tOrP],
                 ... q.map((s) => ["include", s] as IQueryMethod)) as any;
         }
-        const select = convertToLinq(tOrP.toString());
+        const select = this.convertToLinq(tOrP.toString());
         return this.append(["include", select] ) as any;
     }
 
@@ -377,7 +378,7 @@ export default class Query<T> {
     }
 
     protected thenInclude(a): any {
-        const select = convertToLinq(a.toString());
+        const select = this.convertToLinq(a.toString());
         return this.append(["thenInclude", select]);
     }
 
@@ -388,7 +389,7 @@ export default class Query<T> {
     private process<TP, TR>(name: any, tOrP: TP | T, q?: (p: TP) => (x: T) => TR): Query<T> {
 
         if (!q) {
-            const select = convertToLinq(tOrP.toString());
+            const select = this.convertToLinq(tOrP.toString());
             return this.append<T>([name , select]);
         }
 
@@ -405,8 +406,12 @@ export default class Query<T> {
                 pl.push(element);
             }
         }
-        text = convertToLinq(text);
+        text = this.convertToLinq(text);
         return this.append([name , text, ...pl]);
     }
 
+    private convertToLinq(text: string) {
+        return this.context.queryProcessor === "DotNet" ? convertToLinq(text) : text;
+    }
+
 }

package/node_modules/@web-atoms/entity/src/services/QueryProcessor.ts

@@ -0,0 +1 @@
+export type QueryProcessor = "DotNet" | "JavaScript";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
     "@web-atoms/data-styles": "^1.0.101",
     "@web-atoms/date-time": "^1.1.0",
     "@web-atoms/email-dom": "^1.0.29",
-    "@web-atoms/entity": "^2.4.19",
+    "@web-atoms/entity": "^2.4.26",
     "@web-atoms/font-awesome": "^1.0.37",
     "@web-atoms/hybrid-clr": "^1.0.21",
     "@web-atoms/module-loader": "^2.1.32",

package/src/admin/Admin.tsx

@@ -2,9 +2,48 @@ import Pack from "@web-atoms/core/dist/Pack";
 import MobileDesktopApp from "@web-atoms/web-controls/dist/desktop-app/MobileDesktopApp";
 
 import "../style/GlobalStyle";
+import UserService from "../services/UserService";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import AdminCommands from "./commands/AdminCommands";
+import PageNavigator from "@web-atoms/web-controls/dist/PageNavigator";
+import LoginPage from "../common/pages/user/LoginPage";
+import AdminDrawer from "./drawer/AdminDrawer";
+import Command from "@web-atoms/core/dist/core/Command";
+import Route from "@web-atoms/core/dist/core/Route";
 
 @Pack
 export default class AppIndex extends MobileDesktopApp {
+
+    @InjectProperty
+    private userService: UserService;
+
     async init() {
+        AdminCommands.install(this);
+
+        // check if we are logged in...
+        const user = await this.userService.getUser();
+        if (!user || !user.roles?.some((r) => r.roleName === "Administrator")) {
+            PageNavigator.openPage(LoginPage);
+            return;
+        }
+
+        this.drawerMenu = AdminDrawer;
+
+        if(!Command.invokeRoute()) {
+
+            // check if we are configured...
+
+            AdminCommands.openHome.dispatch();
+        }
+    }
+}
+
+Route.encodeUrl = (url) => {
+    if (url.startsWith("#")) {
+        return url;
+    }
+    if (/\d+\./.test(location.hostname)) {
+        return "#!" + url;
     }
-}
+    return url;
+};

package/src/admin/commands/AdminCommands.ts

@@ -0,0 +1,33 @@
+import Command, { Commands } from "@web-atoms/core/dist/core/Command";
+
+export default class AdminCommands extends Commands {
+
+    static openHome = Command.create({
+        route: "/admin",
+        routeOrder: 1000,
+        openPage: () => import("../pages/home/AdminHome")
+    });
+
+    static openDomainList = Command.create({
+        route: "/admin/domains",
+        routeOrder: 100,
+        openPage: () => import("../pages/domains/DomainListPage")
+    });
+
+    static openDomain = Command.create({
+        route: "/admin/domains/{domainID}",
+        openPage: () => import("../pages/domains/edit/EditDomainPage")
+    });
+
+    static openUserList = Command.create({
+        route: "/admin/users",
+        routeOrder: 100,
+        openPage: () => import("../pages/users/UserListPage")
+    });
+
+    static openMailboxList = Command.create({
+        route: "/admin/mailboxes",
+        routeOrder: 100,
+        openPage: () => import("../../common/pages/mailboxes/MailboxListPage")
+    });
+}

package/src/admin/drawer/AdminDrawer.tsx

@@ -1,5 +1,75 @@
+import XNode from "@web-atoms/core/dist/core/XNode";
+import styled from "@web-atoms/core/dist/style/styled";
 import { Drawer } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IUser } from "../../model/model";
+import SocialMailApp from "../../common/SocialMailApp";
+import AdminCommands from "../commands/AdminCommands";
+
+const css = styled.css `
+    min-width: 200px;
+`.installLocal();
+
+const MenuItem = ({
+    label,
+    icon,
+    click = undefined,
+    href = "",
+    commandLink = "",
+    target = undefined as string
+}) => href || commandLink
+    ? <a data-layout="menu-item"
+        data-click-event={ commandLink ? "route" : void 0}
+        href={href || commandLink}
+        target={target}
+        event-click={click}>
+        <i class={icon}/>
+        <span text={label}/></a>
+    : <div
+        data-layout="menu-item"
+        event-click={click}>
+        <i class={icon}/>
+        <span text={label}/>
+    </div>;
 
 export default class AdminDrawer extends Drawer {
 
+    user: IUser;
+
+    protected async init() {
+        this.element.className = css;
+
+        this.user = SocialMailApp.user;
+
+        this.renderer = <div>
+            <div data-background-color="accent">
+                <div
+                    data-padding="large"
+                    data-font-size="large"
+                    data-color="white"
+                    text="Social Mail Admin"/>
+            </div>
+            <MenuItem
+                icon="fas fa-home"
+                label="Home"
+                commandLink={AdminCommands.openHome.displayRoute({})}
+                />
+            <MenuItem
+                icon="fas fa-home"
+                label="Domains"
+                commandLink={AdminCommands.openDomainList.displayRoute({})}
+                />
+            <MenuItem
+                icon="fas fa-home"
+                label="Users"
+                commandLink={AdminCommands.openUserList.displayRoute({})}
+                />
+            <MenuItem
+                icon="fas fa-home"
+                label="Mailboxes"
+                commandLink={AdminCommands.openMailboxList.displayRoute({})}
+                />
+        </div>;
+
+    }
+
 }

package/src/admin/pages/config/ConfigPage.tsx

@@ -0,0 +1,5 @@
+import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+
+export default class ConfigPage extends ContentPage {
+    
+}

package/src/admin/pages/domains/DomainListPage.tsx

@@ -0,0 +1,43 @@
+import XNode from "@web-atoms/core/dist/core/XNode";
+import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import AdminDomainService from "./services/AdminDomainService";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import PageNavigator from "@web-atoms/web-controls/dist/PageNavigator";
+import EditDomainPage from "./edit/EditDomainPage";
+import { IDomain, IHostedDomain } from "../../../model/model";
+import AdminCommands from "../../commands/AdminCommands";
+
+export default class DomainListPage extends ContentPage {
+
+    @InjectProperty
+    private adminDomainService: AdminDomainService;
+
+    private domains: IHostedDomain[];
+
+    async init() {
+
+        this.title = "Domains";
+        this.domains = await this.adminDomainService.list();
+
+        this.actionRenderer = () => <i data-click-event="add-domain" class="fas fa-plus"/>;
+
+        this.renderer = <div>
+            <AtomRepeater
+                items={this.domains}
+                itemRenderer={(domain) => <div>
+                    <a
+                        data-click-event="route"
+                        href={AdminCommands.openDomain.displayRoute(domain)}>{domain.domain.name}</a>
+                </div> }
+                />
+        </div>;
+    }
+
+    @Action({ onEvent: "add-domain"})
+    async addDomain() {
+        const domain = await PageNavigator.pushPageForResult(EditDomainPage, {});
+        this.domains.add(domain);
+    }
+}

package/src/admin/pages/domains/choose/ChooseDomainPage.tsx

@@ -0,0 +1,57 @@
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import PageNavigator from "@web-atoms/web-controls/dist/PageNavigator";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import { PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IHostedDomain } from "../../../../model/model";
+import EditDomainPage from "../edit/EditDomainPage";
+import AdminDomainService from "../services/AdminDomainService";
+import Bind from "@web-atoms/core/dist/core/Bind";
+
+export default class ChooseDomainPage extends PopupWindowPage<any, IHostedDomain> {
+
+    @InjectProperty
+    private adminDomainService: AdminDomainService;
+
+    private domains: IHostedDomain[];
+
+    private domain: IHostedDomain = null;
+
+    async init() {
+
+        this.title = "Domains";
+        this.domains = await this.adminDomainService.list();
+
+        this.actionRenderer = () => <i data-click-event="add-domain" class="fas fa-plus"/>;
+
+        this.renderer = <div>
+            <AtomRepeater
+                data-list-selection="default"
+                for="table"
+                items={this.domains}
+                data-selection-updated-event="domain-selected"
+                selectedItem={Bind.twoWaysImmediate(() => this.domain)}
+                itemRenderer={(domain) => <tr data-click-event="item-select">
+                    <td>
+                        {domain.domain.name}
+                    </td>
+                </tr> }
+                />
+        </div>;
+    }
+
+    @Action({ onEvent: "add-domain"})
+    async addDomain() {
+        const domain = await PageNavigator.pushPageForResult(EditDomainPage, {});
+        this.domains.add(domain);
+    }
+
+    @Action({ onEvent: "domain-selected"})
+    domainSelected() {
+        if(this.domain) {
+            this.close(this.domain);
+        }
+    }
+
+}

package/src/admin/pages/domains/edit/EditDomainPage.tsx

@@ -0,0 +1,102 @@
+import { ContentPage, PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { Domain, HostedDomain, IDomain, IHostedDomain } from "../../../../model/model";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import Form from "@web-atoms/web-controls/dist/basic/Form";
+import FormField from "@web-atoms/web-controls/dist/basic/FormField";
+import RequiredFormField, { TextFormField } from "../../../../common/controls/form/RequiredFormField";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import AdminDomainService from "../services/AdminDomainService";
+import Checkbox from "@web-atoms/web-controls/dist/basic/Checkbox";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import Expander from "@web-atoms/web-controls/dist/basic/Expander";
+import { AddIconTextButton } from "../../../../common/controls/buttons/IconButton";
+
+
+export default class EditDomainPage extends ContentPage {
+
+    public parameters: { model?: IHostedDomain, domainID?: number };
+
+    public model: IHostedDomain;
+
+    @InjectProperty
+    private domainService: AdminDomainService;
+
+    async init() {
+
+        this.model = this.parameters.model
+            ?? ( this.parameters.domainID
+                ? await this.domainService.get(this.parameters.domainID)
+                : HostedDomain.create({
+            enableReceive: true,
+            enableSend: true,
+            useRelay: true,
+            domain: Domain.create({ name: ""})
+        }));
+
+        this.renderer = <div data-layout="center-page-900px">
+            <Form>
+                { this.model.domainID
+                    ? <span text={this.model.domain.name}/>
+                    : <TextFormField
+                    required={true}
+                    label="Domain"
+                    value={() => this.model.domain.name}/>}
+                <Checkbox
+                    checked={Bind.twoWaysImmediate(() => this.model.enableReceive)}
+                    text="Receive Mails"
+                    />
+                <Checkbox
+                    checked={Bind.twoWaysImmediate(() => this.model.enableSend)}
+                    text="Send Mails"
+                    />
+                <Checkbox
+                    checked={Bind.twoWaysImmediate(() => this.model.useRelay)}
+                    text="Use Domain Relay"
+                    />
+
+            <Expander isExpanded={false}>
+                <label text="Relays"/>
+                <AtomRepeater
+                    items={this.model.relays}
+                    footer={true}
+                    footerRenderer={() => <div data-layout="row">
+                        <AddIconTextButton
+                            text="New Relay"
+                            />
+                    </div>}
+                    />
+            </Expander>
+
+            <Expander isExpanded={false}>
+                <label text="Domain Keys"/>
+                <AtomRepeater
+                    items={this.model.domainKeys}
+                    footer={true}
+                    footerRenderer={() => <div data-layout="row">
+                        <AddIconTextButton
+                            text="New Domain Key"
+                            />
+                    </div>}
+                    />
+            </Expander>
+
+                <div data-layout="command-row">
+                    <button
+                        data-layout="accent-button"
+                        data-submit-event="save-domain"
+                        text="Save"
+                        />
+                </div>
+            </Form>
+        </div>;
+    }
+
+    @Action({ onEvent: "save-domain", close: true})
+    async saveDomain() {
+        await this.domainService.save(this.model);
+        return this.model;
+    }
+
+}

package/src/admin/pages/domains/services/AdminDomainService.ts

@@ -0,0 +1,34 @@
+import DITransient from "@web-atoms/core/dist/di/DITransient";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import EntityService from "../../../../services/EntityService";
+import { Domain, HostedDomain, IDomain, IHostedDomain } from "../../../../model/model";
+
+@DITransient()
+export default class AdminDomainService {
+
+    @Inject
+    private entityService: EntityService;
+
+    public list() {
+        return this.entityService
+            .query(HostedDomain)
+            .include((x) => x.domain)
+            .toArray();
+    }
+
+    public save(domain: IHostedDomain) {
+        const clone = this.entityService.cloner(domain)
+            .include((x) => x.domainUsers)
+            .include((x) => x.domain);
+        return this.entityService.save(clone.copy);
+    }
+
+    public get(domainID: number) {
+        return this.entityService.query(HostedDomain)
+            .where({ domainID }, (p) => (x) => x.domainID === p.domainID)
+            .include((x) => x.domain)
+            .include((x) => x.relays)
+            .include((x) => x.domainKeys).firstOrDefault();
+    }
+
+}

package/src/admin/pages/home/AdminHome.tsx

@@ -0,0 +1,6 @@
+import Command from "@web-atoms/core/dist/core/Command";
+import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+
+export default class AdminHome extends ContentPage {
+
+}

package/src/admin/pages/users/EditUserPage.tsx

@@ -0,0 +1,85 @@
+import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { DomainUser, IUser, User } from "../../../model/model";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import Form from "@web-atoms/web-controls/dist/basic/Form";
+import FormField from "@web-atoms/web-controls/dist/basic/FormField";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import RequiredFormField, { PasswordFormField, TextFormField } from "../../../common/controls/form/RequiredFormField";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import PageNavigator from "@web-atoms/web-controls/dist/PageNavigator";
+import ChooseDomainPage from "../domains/choose/ChooseDomainPage";
+import AdminUserService from "./services/AdminUserService";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+
+export default class EditUserPage extends ContentPage {
+
+    public parameters: { model?: IUser};
+
+    public model: IUser & { password?: string };
+
+    @InjectProperty
+    private adminUserService: AdminUserService;
+
+    async init() {
+
+        this.model = this.parameters.model ?? {
+            ... User.create({
+                domainUsers: []
+            }),
+            password: ""
+        };
+
+        this.renderer = <div data-layout="center-page-900px">
+            <Form>
+                <TextFormField label="Display Name" autofocus={true} required={true} value={() => this.model.displayName}/>
+                <TextFormField label="Username" required={true} value={() => this.model.userName}/>
+                { this.model.userID
+                    ? <PasswordFormField
+                        label="Password"
+                        required={true}
+                        value={() => this.model.password}/>
+                    : <PasswordFormField
+                        label="Password"
+                        placeholder="Leave empty..."
+                        value={() => this.model.password}/>
+                }
+
+                <div>
+                    <h5>Domains <i data-click-event="add-domain" class="fas fa-plus"/></h5>
+                    <AtomRepeater
+                        for="table"
+                        items={this.model.domainUsers}
+                        itemRenderer={(item) => <tr>
+                            <td>{item.hostedDomain.domain.name}</td>
+                        </tr>}
+                        />
+                </div>
+
+                <div data-layout="command-row">
+                    <button
+                        data-submit-event="save-user"
+                        data-layout="accept-button"
+                        text="Save"
+                        />
+                </div>
+            </Form>
+        </div>;
+    }
+
+    @Action({ onEvent: "add-domain"})
+    async addDomain() {
+        const hostedDomain = await PageNavigator.pushPageForResult(ChooseDomainPage);
+        this.model.domainUsers.add(DomainUser.create({
+            domainID: hostedDomain.domainID,
+            hostedDomain
+        }));
+    }
+
+    @Action({ onEvent: "save-user", close: true })
+    async saveUser() {
+        await this.adminUserService.save(this.model);
+        return this.model;
+    }
+
+}