@social-mail/social-mail-client 1.2.356 → 1.2.358

package/package.json

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

package/src/common/pages/websites/edit/WebSiteFolderSettings.tsx

@@ -0,0 +1,49 @@
+import XNode from "@web-atoms/core/dist/core/XNode";
+import { PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IWebSiteFolder } from "../../../../model/model";
+import Form from "@web-atoms/web-controls/dist/basic/Form";
+import FormField from "@web-atoms/web-controls/dist/basic/FormField";
+import Checkbox from "@web-atoms/web-controls/dist/basic/Checkbox";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import { SaveIconTextButton } from "../../../controls/buttons/IconButton";
+import Action from "@web-atoms/core/dist/view-model/Action";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import EntityService from "../../../../services/EntityService";
+
+export default class WebSiteFolderSettings extends PopupWindowPage<IWebSiteFolder> {
+
+    model: IWebSiteFolder;
+
+    @Inject
+    entityService: EntityService;
+
+    async init() {
+        this.model = { ... this.parameters };
+        this.renderer = <div>
+            <Form>
+                <FormField label="From Email">
+                    <input value={Bind.twoWaysImmediate(() => this.model.fromEmail)}/>
+                </FormField>
+                <FormField label="Support Emmail">
+                    <input value={Bind.twoWaysImmediate(() => this.model.supportEmail)}/>
+                </FormField>
+                <FormField label="">
+                    <SaveIconTextButton
+                        data-submit-event="save-settings"
+                        text="Save"
+                        />
+                </FormField>
+            </Form>
+        </div>;
+    }
+
+    @Action({
+        onEvent: "save-settings",
+        close: true
+    })
+    async saveSettings() {
+        await this.entityService.save(this.model, (c) => c);
+        return this.model;
+    }
+
+}

package/src/common/pages/websites/list/WebSiteListPage.tsx

@@ -14,6 +14,7 @@ import { IWebSiteFolder } from "../../../../model/model";
 import Checkbox from "@web-atoms/web-controls/dist/basic/Checkbox";
 import InfiniteRepeater from "../../../controls/repeater/InfiniteRepeater";
 import { toFileSize } from "../../../NumberFormats";
+import WebSiteFolderSettings from "../edit/WebSiteFolderSettings";
 
 export default class WebSiteListPage extends ContentPage {
 
@@ -66,6 +67,9 @@ export default class WebSiteListPage extends ContentPage {
                         data-click-event="route"
                         href={AppCommands.openFiles.displayRoute({ id: item.folderID})}>
                         <i class="fas fa-folder"/></a>
+                    <i
+                        data-click-event="change-settings"
+                        class="fas fa-gears"/>
                 </div>}
                 />
         </div>;
@@ -80,4 +84,9 @@ export default class WebSiteListPage extends ContentPage {
         await PageNavigator.pushPageForResult(WebSiteFolderEditor);
         await this.init();
     }
+
+    @Action({ onEvent: "change-settings"})
+    async changeSettings(item: IWebSiteFolder) {
+        PageNavigator.pushPage(WebSiteFolderSettings, item);
+    }
 }

package/src/model/model.ts

@@ -1436,6 +1436,8 @@ export interface IWebSiteFolder extends IClrEntity {
 	isTemplate?: boolean;
 	isModified?: boolean;
 	snapshotStorage?: number;
+	supportEmail?: string | null;
+	fromEmail?: string | null;
 	folder?: IAppFile;
 	currentVersion?: IAppFile;
 	activities?: ICollection<IServerActivity>;
@@ -1449,7 +1451,7 @@ export const WebSiteFolder: IModel<IWebSiteFolder> = new Model<IWebSiteFolder>(
 "WebSiteFolder",
 ["folderID"],
 { isStatic: false,isTemplate: false,isModified: false,snapshotStorage: 0 },
-{"name":"web_site_folders","keys":[{"name":"folderID","type":"number"}],"properties":[{"name":"currentVersionID","type":"number"},{"name":"isStatic","type":"boolean","default":["isStatic","false"]},{"name":"isTemplate","type":"boolean","default":["isTemplate","false"]},{"name":"isModified","type":"boolean","default":["isModified","false"]},{"name":"snapshotStorage","type":"number","default":["snapshotStorage","0"]}],"relations":[{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"currentVersion","fkMap":[{"fk":"currentVersionID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"activities","isCollection":true,"isInverse":true,"relatedName":"ServerActivity"},{"name":"hosts","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderHost"},{"name":"versions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"},{"name":"channels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"},{"name":"websiteStores","isCollection":true,"isInverse":true,"relatedName":"WebSiteStore"}]}
+{"name":"web_site_folders","keys":[{"name":"folderID","type":"number"}],"properties":[{"name":"currentVersionID","type":"number"},{"name":"isStatic","type":"boolean","default":["isStatic","false"]},{"name":"isTemplate","type":"boolean","default":["isTemplate","false"]},{"name":"isModified","type":"boolean","default":["isModified","false"]},{"name":"snapshotStorage","type":"number","default":["snapshotStorage","0"]},{"name":"supportEmail","type":"string","default":["supportEmail","\"\""]},{"name":"fromEmail","type":"string","default":["fromEmail","\"\""]}],"relations":[{"name":"folder","fkMap":[{"fk":"folderID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"currentVersion","fkMap":[{"fk":"currentVersionID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"activities","isCollection":true,"isInverse":true,"relatedName":"ServerActivity"},{"name":"hosts","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderHost"},{"name":"versions","isCollection":true,"isInverse":true,"relatedName":"WebSiteFolderVersion"},{"name":"channels","isCollection":true,"isInverse":true,"relatedName":"WebSiteChannel"},{"name":"websiteStores","isCollection":true,"isInverse":true,"relatedName":"WebSiteStore"}]}
 );
 modelEntitySchemas["WebSiteFolder"] = WebSiteFolder;
 
@@ -1649,6 +1651,105 @@ export const Tag: IModel<ITag> = new Model<ITag>(
 );
 modelEntitySchemas["Tag"] = Tag;
 
+export interface IVirtualServer extends IClrEntity {
+	readonly serverID?: number;
+	serverName?: string;
+	ownerEmailAddress?: string | null;
+	ownerPhoneNumber?: string | null;
+	active?: boolean;
+	bucketName?: string | null;
+	database?: string | null;
+	host?: string;
+	forwardHost?: string | null;
+	forwardPublicKey?: string | null;
+	environmentVariables?: string | null;
+	maxStorageGB?: number;
+	dnsZones?: ICollection<IDnsZone>;
+}
+
+export const VirtualServer: IModel<IVirtualServer> = new Model<IVirtualServer>(
+"VirtualServer",
+["serverID"],
+{ serverName: "",active: false,host: "",maxStorageGB: 0 },
+{"name":"virtual_servers","keys":[{"name":"serverID","type":"number","generated":"identity"}],"properties":[{"name":"serverName","type":"string","default":["serverName","\"\""]},{"name":"ownerEmailAddress","type":"string","default":["ownerEmailAddress","\"\""]},{"name":"ownerPhoneNumber","type":"string","default":["ownerPhoneNumber","\"\""]},{"name":"active","type":"boolean","default":["active","false"]},{"name":"bucketName","type":"string","default":["bucketName","\"\""]},{"name":"database","type":"string","default":["database","\"\""]},{"name":"host","type":"string","default":["host","\"\""]},{"name":"forwardHost","type":"string","default":["forwardHost","\"\""]},{"name":"forwardPrivateKey","type":"string","default":["forwardPrivateKey","\"\""]},{"name":"forwardPublicKey","type":"string","default":["forwardPublicKey","\"\""]},{"name":"environmentVariables","type":"string","default":["environmentVariables","\"\""]},{"name":"maxStorageGB","type":"number","default":["maxStorageGB","0"]}],"relations":[{"name":"dnsZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"}]}
+);
+modelEntitySchemas["VirtualServer"] = VirtualServer;
+
+export interface IDnsZone extends IClrEntity {
+	readonly zoneID?: number;
+	serverID?: number;
+	zone?: string;
+	keySigningKeyID?: number;
+	zoneSigningKeyID?: number;
+	dateCreated?: DateTime;
+	dateUpdated?: DateTime;
+	signed?: string | null;
+	unsigned?: string | null;
+	virtualServer?: IVirtualServer;
+	ksk?: IDnsSigningKey;
+	zsk?: IDnsSigningKey;
+	records?: ICollection<IDnsZoneRecord>;
+}
+
+export const DnsZone: IModel<IDnsZone> = new Model<IDnsZone>(
+"DnsZone",
+["zoneID"],
+{ zone: "",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()) },
+{"name":"dns_zones","keys":[{"name":"zoneID","type":"number","generated":"identity"}],"properties":[{"name":"serverID","type":"number"},{"name":"zone","type":"string","default":["zone","\"\""]},{"name":"zoneLowerCase","type":"string","generated":"computed"},{"name":"keySigningKeyID","type":"number"},{"name":"zoneSigningKeyID","type":"number"},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"signed","type":"string","default":["signed","\"\""]},{"name":"unsigned","type":"string","default":["unsigned","\"\""]}],"relations":[{"name":"virtualServer","fkMap":[{"fk":"serverID","relatedKey":"serverID"}],"relatedName":"VirtualServer"},{"name":"ksk","fkMap":[{"fk":"keySigningKeyID","relatedKey":"keyID"}],"relatedName":"DnsSigningKey"},{"name":"zsk","fkMap":[{"fk":"zoneSigningKeyID","relatedKey":"keyID"}],"relatedName":"DnsSigningKey"},{"name":"records","isCollection":true,"isInverse":true,"relatedName":"DnsZoneRecord"}]}
+);
+modelEntitySchemas["DnsZone"] = DnsZone;
+
+export interface IDnsZoneRecord extends IClrEntity {
+	readonly recordID?: number;
+	zoneID?: number;
+	disabled?: boolean;
+	name?: string;
+	type?: "A" | "AAAA" | "CNAME" | "MX" | "TXT" | "PTR" | "SRV" | "CAA" | "NS" | "SOA";
+	isAlias?: boolean;
+	value?: string;
+	ttl?: number;
+	dateCreated?: DateTime;
+	dateUpdated?: DateTime;
+	notes?: string | null;
+	signature?: string | null;
+	expiryDate?: DateTime | null;
+	readonly fqdn?: string | null;
+	hosted?: boolean;
+	zone?: IDnsZone;
+}
+
+export const DnsZoneRecordTypeArray = [{"label":"A","value":"A"},{"label":"AAAA","value":"AAAA"},{"label":"CNAME","value":"CNAME"},{"label":"MX","value":"MX"},{"label":"TXT","value":"TXT"},{"label":"PTR","value":"PTR"},{"label":"SRV","value":"SRV"},{"label":"CAA","value":"CAA"},{"label":"NS","value":"NS"},{"label":"SOA","value":"SOA"}];
+
+export const DnsZoneRecord: IModel<IDnsZoneRecord> = new Model<IDnsZoneRecord>(
+"DnsZoneRecord",
+["recordID"],
+{ disabled: false,name: "",type: "A",isAlias: false,value: "",ttl: 0,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),hosted: false },
+{"name":"dns_zone_records","keys":[{"name":"recordID","type":"number","generated":"identity"}],"properties":[{"name":"zoneID","type":"number"},{"name":"disabled","type":"boolean","default":["disabled","false"]},{"name":"name","type":"string","default":["name","\"\""]},{"name":"type","type":"Object","default":["type","\"A\""]},{"name":"isAlias","type":"boolean","default":["isAlias","false"]},{"name":"value","type":"string","default":["value","\"\""]},{"name":"ttl","type":"number","default":["ttl","0"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"notes","type":"string","default":["notes","\"\""]},{"name":"signature","type":"string","default":["signature","\"\""]},{"name":"expiryDate","type":"DateTime","default":["expiryDate","new DefaultFactory(() => new DateTime())"]},{"name":"fqdn","type":"string","default":["fqdn","\"\""]},{"name":"hosted","type":"boolean","default":["hosted","false"]}],"relations":[{"name":"zone","fkMap":[{"fk":"zoneID","relatedKey":"zoneID"}],"relatedName":"DnsZone"}]}
+);
+modelEntitySchemas["DnsZoneRecord"] = DnsZoneRecord;
+
+export interface IDnsSigningKey extends IClrEntity {
+	readonly keyID?: number;
+	publicKey?: string;
+	digestAlgorithm?: number;
+	signingAlgorithm?: number;
+	digest?: string;
+	flags?: number;
+	dateCreated?: DateTime;
+	expiryDate?: DateTime;
+	fileName?: string;
+	kskZones?: ICollection<IDnsZone>;
+	zskZones?: ICollection<IDnsZone>;
+}
+
+export const DnsSigningKey: IModel<IDnsSigningKey> = new Model<IDnsSigningKey>(
+"DnsSigningKey",
+["keyID"],
+{ publicKey: "",digestAlgorithm: 0,signingAlgorithm: 0,digest: "",flags: 0,dateCreated: new DefaultFactory(() => new DateTime()),expiryDate: new DefaultFactory(() => new DateTime()),fileName: "" },
+{"name":"dns_signing_keys","keys":[{"name":"keyID","type":"number","generated":"identity"}],"properties":[{"name":"publicKey","type":"string","default":["publicKey","\"\""]},{"name":"privateKey","type":"string","default":["privateKey","\"\""]},{"name":"digestAlgorithm","type":"number","default":["digestAlgorithm","0"]},{"name":"signingAlgorithm","type":"number","default":["signingAlgorithm","0"]},{"name":"digest","type":"string","default":["digest","\"\""]},{"name":"flags","type":"number","default":["flags","0"]},{"name":"dateCreated","type":"DateTime","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"expiryDate","type":"DateTime","default":["expiryDate","new DefaultFactory(() => new DateTime())"]},{"name":"fileName","type":"string","default":["fileName","\"\""]}],"relations":[{"name":"kskZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"},{"name":"zskZones","isCollection":true,"isInverse":true,"relatedName":"DnsZone"}]}
+);
+modelEntitySchemas["DnsSigningKey"] = DnsSigningKey;
+
 const fixRelatedSchemas = (schema) => {
 for (const key in schema) {
 if (Object.prototype.hasOwnProperty.call(schema, key)) {

package/src/public/contact-us/ContactUsApp.tsx

@@ -64,7 +64,7 @@ export default class ContactUsApp extends AtomControl {
                 <FormField label="Questions">
                     <textarea
                         rows="8"
-                        value={Bind.twoWaysImmediate(() => this.model.subject)}/>
+                        value={Bind.twoWaysImmediate(() => this.model.description)}/>
                 </FormField>
                 <FormField
                     label="Verify Code"