@jd-data-limited/easy-fm 2.0.3 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jd-data-limited/easy-fm",
-  "version": "2.0.3",
+  "version": "3.0.0",
   "dependencies": {
     "@types/btoa": "^1.2.3",
     "@types/events": "^3.0.0",

package/src/index.js

@@ -1263,7 +1263,7 @@ export class Database extends EventEmitter {
 }
 export class Layout {
     constructor(database, name) {
-        this.records = new LayourRecordManager(this);
+        this.records = new LayoutRecordManager(this);
         this.database = database;
         this.name = name;
     }
@@ -1325,7 +1325,7 @@ export class Layout {
         });
     }
 }
-class LayourRecordManager {
+class LayoutRecordManager {
     constructor(layout) {
         this.layout = layout;
     }
@@ -1337,7 +1337,10 @@ class LayourRecordManager {
                 for (let _field of this.layout.metadata.fieldMetaData) {
                     fields[_field.name] = "";
                 }
-                resolve(new LayoutRecord(this.layout, -1, 0, fields));
+                let portals = {};
+                for (let _portal of Object.keys(this.layout.metadata.portalMetaData))
+                    portals[_portal] = [];
+                resolve(new LayoutRecord(this.layout, -1, 0, fields, portals));
             }).catch(e => {
                 reject(e);
             });
@@ -1463,7 +1466,8 @@ export class RecordBase extends EventEmitter {
             delete data.modId;
             if (this.recordId === -1) {
                 // This is a new LayoutRecord
-                extraBody.fieldData = data.fieldData;
+                for (let item of Object.keys(data))
+                    extraBody[item] = data[item];
                 this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
@@ -1489,6 +1493,7 @@ export class RecordBase extends EventEmitter {
             }
             for (let item of Object.keys(data))
                 extraBody[item] = data[item];
+            console.log(extraBody.portalData);
             this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
                 method: "PATCH",
@@ -1760,6 +1765,15 @@ export class Portal {
         this.record = record;
         this.name = name;
     }
+    create() {
+        let fields = {};
+        for (let _field of this.record.layout.metadata.portalMetaData[this.name]) {
+            fields[_field.name] = "";
+        }
+        let record = new PortalRecord(this.record, this, -1, -1, fields);
+        this.records.push(record);
+        return record;
+    }
 }
 export class PortalRecord extends RecordBase {
     constructor(record, portal, recordId, modId = recordId, fieldData = {}) {
@@ -1777,13 +1791,16 @@ export class PortalRecord extends RecordBase {
     toObject(fieldFilter) {
         super.toObject();
         let res = {
-            recordId: this.recordId, modId: this.modId
+            recordId: this.recordId === -1 ? undefined : this.recordId, modId: this.modId === -1 ? undefined : this.modId
         };
         for (let field of this.fields.filter(a => fieldFilter(a)))
             res[field.id] = field.value;
         // console.log(res)
         return res;
     }
+    getField(field) {
+        return this.fields.find(_field => _field.id === field) || this.fields.find(_field => _field.id === this.portal.name + "::" + field);
+    }
 }
 export class RecordGetOperation {
     constructor(layout) {

package/src/index.ts

@@ -67,18 +67,9 @@ interface limitPortalsInterface {
 
 interface extraBodyOptions {
     scripts?: {
-        prerequest?: {
-            name: string,
-            param?: string
-        },
-        presort?: {
-            name: string,
-            param?: string
-        },
-        after?: {
-            name: string,
-            param?: string
-        },
+        prerequest?: Script,
+        presort?: Script,
+        after?: Script,
     }
 }
 
@@ -1120,7 +1111,7 @@ interface portalDataObject {
     [key: string]: recordObject
 }
 
-interface fieldMetaData {
+interface FieldMetaData {
     name: string,
     type: string,
     displayType: string,
@@ -1137,6 +1128,13 @@ interface fieldMetaData {
     repetitionEnd: number
 }
 
+interface LayoutMetaData {
+    fieldMetaData: FieldMetaData[],
+    portalMetaData?: {
+        [key: string]: FieldMetaData[]
+    }
+}
+
 interface FMHostMetadata {
     productInfo: {
         buildDate: Date,
@@ -1360,7 +1358,7 @@ export class Database extends EventEmitter {
         })
     }
 
-    script(name, parameter): Script {
+    script(name, parameter = ""): Script {
         return ({name, parameter} as Script)
     }
 
@@ -1409,7 +1407,7 @@ export class Database extends EventEmitter {
 
 export class Layout {
     readonly database: Database;
-    readonly records = new LayourRecordManager(this)
+    readonly records = new LayoutRecordManager(this)
     protected name: string;
     metadata: any;
 
@@ -1482,7 +1480,7 @@ export class Layout {
     }
 }
 
-class LayourRecordManager {
+class LayoutRecordManager {
     readonly layout: Layout
 
     constructor(layout: Layout) {
@@ -1497,7 +1495,9 @@ class LayourRecordManager {
                 for (let _field of this.layout.metadata.fieldMetaData) {
                     fields[_field.name] = ""
                 }
-                resolve(new LayoutRecord(this.layout, -1, 0, fields))
+                let portals = {}
+                for (let _portal of Object.keys(this.layout.metadata.portalMetaData)) portals[_portal] = []
+                resolve(new LayoutRecord(this.layout, -1, 0, fields, portals))
             }).catch(e => {
                 reject(e)
             })
@@ -1630,22 +1630,32 @@ export class RecordBase extends EventEmitter {
         })
     }
 
-    commit(extraBody = {
-        fieldData: undefined
-    }): Promise<RecordBase | FMError> {
+    commit(extraBody: extraBodyOptions): Promise<RecordBase | FMError> {
         return new Promise(async (resolve, reject) => {
             let data = this.toObject()
             delete data.recordId
             delete data.modId
 
+            if (extraBody.scripts.after) {
+                data["script"] = extraBody.scripts.after.name
+                if (extraBody.scripts.after.parameter) data["param"] = extraBody.scripts.after.parameter
+            }
+            if (extraBody.scripts.prerequest) {
+                data["script"] = extraBody.scripts.after.name
+                if (extraBody.scripts.prerequest.parameter) data["param"] = extraBody.scripts.prerequest.parameter
+            }
+            if (extraBody.scripts.presort) {
+                data["script"] = extraBody.scripts.presort.name
+                if (extraBody.scripts.presort.parameter) data["param"] = extraBody.scripts.presort.parameter
+            }
+
             if (this.recordId === -1) {
                 // This is a new LayoutRecord
-                extraBody.fieldData = data.fieldData
 
                 this.layout.database.apiRequest(`${this.layout.endpoint}/records`, {
                     port: 443,
                     method: "POST",
-                    body: JSON.stringify(extraBody)
+                    body: JSON.stringify(data)
                 })
                     .then(res => {
                         if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
@@ -1667,11 +1677,12 @@ export class RecordBase extends EventEmitter {
                 return
             }
 
-            for (let item of Object.keys(data)) extraBody[item] = data[item]
+            // for (let item of Object.keys(data)) extraBody[item] = data[item]
+            console.log((extraBody as any).portalData)
             this.layout.database.apiRequest(this.endpoint, {
                 port: 443,
                 method: "PATCH",
-                body: JSON.stringify(extraBody)
+                body: JSON.stringify(data)
             })
                 .then(res => {
                     if (typeof res.response.scriptError !== "undefined" && res.response.scriptError !== '0') {
@@ -1820,7 +1831,7 @@ export class LayoutRecord extends RecordBase {
 
 export class Field {
     record: RecordBase;
-    id: number;
+    id: string;
     protected _value: string | number | Date;
     edited: boolean;
 
@@ -1845,7 +1856,7 @@ export class Field {
         this.edited = true
     }
 
-    get metadata(): fieldMetaData {
+    get metadata(): FieldMetaData {
         if (!this.record.layout.metadata) {
             // Default to a regular text field
             return {
@@ -1863,10 +1874,10 @@ export class Field {
                 timeOfDay: false,
                 repetitionStart: 1,
                 repetitionEnd: 1
-            } as fieldMetaData
+            } as FieldMetaData
         }
         if (this.record instanceof PortalRecord) {
-            return this.record.layout.metadata.portalMetaData[this.record.portal.name || "portal not attached"].find(i => i.name === this.id) as fieldMetaData || {
+            return this.record.layout.metadata.portalMetaData[this.record.portal.name || "portal not attached"].find(i => i.name === this.id) as FieldMetaData || {
                 name: this.id.toString(),
                 type: 'normal',
                 displayType: 'editText',
@@ -1881,10 +1892,10 @@ export class Field {
                 timeOfDay: false,
                 repetitionStart: 1,
                 repetitionEnd: 1
-            } as fieldMetaData
+            } as FieldMetaData
         }
         else {
-            return this.record.layout.metadata.fieldMetaData.find(i => i.name === this.id) as fieldMetaData || {
+            return this.record.layout.metadata.fieldMetaData.find(i => i.name === this.id) as FieldMetaData || {
                 name: this.id.toString(),
                 type: 'normal',
                 displayType: 'editText',
@@ -1899,7 +1910,7 @@ export class Field {
                 timeOfDay: false,
                 repetitionStart: 1,
                 repetitionEnd: 1
-            } as fieldMetaData
+            } as FieldMetaData
         }
     }
 
@@ -1976,6 +1987,16 @@ export class Portal {
         this.record = record
         this.name = name
     }
+
+    create() {
+        let fields = {}
+        for (let _field of this.record.layout.metadata.portalMetaData[this.name]) {
+            fields[_field.name] = ""
+        }
+        let record = new PortalRecord(this.record, this, -1, -1, fields)
+        this.records.push(record)
+        return record
+    }
 }
 
 export class PortalRecord extends RecordBase {
@@ -1993,19 +2014,23 @@ export class PortalRecord extends RecordBase {
         this.portal.record._onSave()
     }
 
-    commit(extraBody = {fieldData: undefined}) {
+    commit(extraBody: extraBodyOptions) {
         return this.portal.record.commit(extraBody)
     }
 
     toObject(fieldFilter): any {
         super.toObject()
         let res = {
-            recordId: this.recordId, modId: this.modId
+            recordId: this.recordId === -1 ? undefined : this.recordId, modId: this.modId === - 1 ? undefined : this.modId
         } as recordObject
         for (let field of this.fields.filter(a => fieldFilter(a))) res[field.id] = field.value
         // console.log(res)
         return res
     }
+
+    getField(field) {
+        return this.fields.find(_field => _field.id === field) || this.fields.find(_field => _field.id === this.portal.name + "::" + field)
+    }
 }
 
 export class RecordGetOperation {
@@ -2076,15 +2101,15 @@ export class RecordGetRange extends RecordGetOperation {
         if (extraBody.scripts) {
             if (extraBody.scripts.prerequest) {
                 params.push("script.prerequest=" + extraBody.scripts.prerequest.name)
-                if (extraBody.scripts.prerequest.param) params.push("script.prerequest.param=" + extraBody.scripts.prerequest.param)
+                if (extraBody.scripts.prerequest.parameter) params.push("script.prerequest.param=" + extraBody.scripts.prerequest.parameter)
             }
             if (extraBody.scripts.presort) {
                 params.push("script.presort=" + extraBody.scripts.presort.name)
-                if (extraBody.scripts.presort.param) params.push("script.presort.param=" + extraBody.scripts.presort.param)
+                if (extraBody.scripts.presort.parameter) params.push("script.presort.param=" + extraBody.scripts.presort.parameter)
             }
             if (extraBody.scripts.after) {
                 params.push("script=" + extraBody.scripts.after.name)
-                if (extraBody.scripts.after.param) params.push("script.param=" + extraBody.scripts.after.param)
+                if (extraBody.scripts.after.parameter) params.push("script.param=" + extraBody.scripts.after.parameter)
             }
         }
 

package/test.js

@@ -1,6 +1,6 @@
-import FMHost from "./dist/index.js";
+import FMHost from "./src/index.js";
 import * as fs from "fs";
-import {DOWNLOAD_MODES} from "./dist/index.js";
+import {DOWNLOAD_MODES} from "./src/index.js";
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 
@@ -16,17 +16,20 @@ const database = host.database({
 })
 database.login()
     .then(async () => {
-        let layout = database.getLayout("Archive")
-        let records = await layout.records.range(0, 500).fetch()
+        let layout = database.getLayout("ReportsJSON")
+        await layout.getLayoutMeta()
+        console.log(layout.metadata)
 
-        for (let i = 0; i < records.length; i++) {
-            try {
-                let request = await records[i].getField("Container").download(DOWNLOAD_MODES.Stream)
-                let write_stream = fs.createWriteStream("./images/" + i + ".jpeg")
-                request.pipe(write_stream)
-                console.log("Downloading " + i + ".jpeg")
-            } catch(e) {
-                console.error(e)
-            }
-        }
+        let record = (await layout.records.range(4, 9).fetch())[0]
+
+        record.getField("In|PartnerID").set("42565F30-5F5D-44A4-83A0-E52128974581")
+
+
+        let portal = record.getPortal("Reports|Archive")
+        let portal_record = portal.create()
+        portal_record.getField("SampleClass").set("Hello!")
+
+        await record.commit()
+        await record.get()
+        console.log(record.getField("__PrimaryKey").value)
     })