@social-mail/social-mail-client 1.9.35 → 1.9.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.9.35",
+  "version": "1.9.37",
   "description": "",
   "main": "index.js",
   "scripts": {

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

@@ -9,8 +9,14 @@ import EditDomainPage from "./edit/EditDomainPage";
 import { HostedDomain, IHostedDomain } from "../../../model/model";
 import AdminCommands from "../../commands/AdminCommands";
 import EntityService from "../../../services/EntityService";
+import InfiniteRepeater from "../../../common/controls/repeater/InfiniteRepeater";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import { Sql } from "../../../common/Sql";
+import MasterDetailPage from "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage";
 
-export default class DomainListPage extends ContentPage {
+export default class DomainListPage extends MasterDetailPage {
+
+    search = "";
 
     @InjectProperty
     private adminDomainService: AdminDomainService;
@@ -23,17 +29,24 @@ export default class DomainListPage extends ContentPage {
     async init() {
 
         this.title = "Domains";
-        this.domains = await this.adminDomainService.list();
 
         this.actionRenderer = () => <i data-click-event="add-domain" class="fas fa-plus"/>;
 
+        this.headerRenderer = () => <div>
+            <input type="search" value={Bind.twoWaysImmediate(() => this.search)}/>
+        </div>;
+
         this.renderer = <div>
             <AtomRepeater
+                data-layout="data-grid"
                 items={this.domains}
+                selectOnClick={true}
+                data-selection-updated-event="item-selected"
+                { ... InfiniteRepeater.pagedItems((start) => (c, e, cancelToken) =>
+                    this.loadItems({ search: this.search, start, cancelToken })
+                )}
                 itemRenderer={(domain) => <div>
-                    <a
-                        data-click-event="route"
-                        href={AdminCommands.openDomain.displayRoute(domain)}>{domain.domain.name}</a>
+                    <label>{domain.domain.name}</label>
 
                     <i
                         data-click-event="delete-item"
@@ -44,10 +57,35 @@ export default class DomainListPage extends ContentPage {
         </div>;
     }
 
+    async loadItems({ search, start, cancelToken }) {
+        let q = this.entityService.query(HostedDomain);
+        if (search) {
+            search = `${search}%`.toLowerCase();
+            q = q.where({ search }, (p) => (x) => Sql.text.like(x.domain.name, p.search));
+        }
+        return q
+            .include((x) => x.domain)
+            .orderBy((x) => x.domain.name)
+            .toPagedList({
+            start,
+            size: 10,
+            cancelToken
+        });
+    }
+
     @Action({ onEvent: "add-domain"})
     async addDomain() {
-        const domain = await PageNavigator.pushPageForResult(EditDomainPage, {});
+        const domain = HostedDomain.create({});
         this.domains.add(domain);
+        this.openDetail(EditDomainPage, { model: domain });
+    }
+
+    @Action({ onEvent: "item-selected" , defer: 10 })
+    itemSelected([domain]) {
+        if (!domain) {
+            return;
+        }
+        this.openDetail(EditDomainPage, { model: domain });
     }
 
     @Action({

package/src/common/pages/dns/DnsZoneListPage.tsx

@@ -9,8 +9,10 @@ import CommonCommands from "../../commands/CommonCommands";
 import DnsZoneService from "./DnsZoneService";
 import { HostedZone, IHostedZone } from "../../../model/model";
 import Bind from "@web-atoms/core/dist/core/Bind";
+import MasterDetailPage from "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage";
+import DnsZoneEditorPage from "./edit/DnsZoneEditorPage";
 
-export default class DnsZoneListPage extends ContentPage {
+export default class DnsZoneListPage extends MasterDetailPage {
 
     start = 0;
     size = 100;
@@ -32,6 +34,8 @@ export default class DnsZoneListPage extends ContentPage {
         this.renderer = <div>
             <AtomRepeater
                 data-layout="data-grid"
+                data-selection-updated-event="item-selected"
+                selectOnClick={true}
                 items={this.zones}
                 { ... InfiniteRepeater.pagedItems((start) =>
                     (c, e, cancelToken) =>
@@ -42,9 +46,7 @@ export default class DnsZoneListPage extends ContentPage {
                             version: this.version
                         }))}
                 itemRenderer={(item: IHostedZone) => <div>
-                    <a
-                        data-click-event="route"
-                        href={CommonCommands.editDnsZone.displayRoute({ zoneID: item.zoneID})}
+                    <label
                         text={item.domain.name}/>
                     {/* <i
                         title="View DS Records"
@@ -75,6 +77,14 @@ export default class DnsZoneListPage extends ContentPage {
         this.version++;
     }
 
+    @Action({ onEvent: "item-selected", defer: 10})
+    async itemSelected([domain]) {
+        if (!domain) {
+            return;
+        }
+        this.openDetail(DnsZoneEditorPage, domain);
+    }
+
     @Action({ onEvent: "view-zone"})
     async viewZone(zone: IHostedZone) {
         await PopupService.alert({