@resolveio/server-lib 4.4.14 → 4.4.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "4.4.14",
+  "version": "4.4.16",
   "description": "",
   "main": "index.ts",
   "scripts": {

package/util/schema-report-builder.d.ts

@@ -12,5 +12,6 @@ $1$2,$3,\n
 export declare function buildRbLookups(rbLookups: LookupTables[], defaultSchema: Schema<any>, default_checked_array?: string[]): any;
 export declare function throwErr(err: any, lkp: any, lookupNode: any, newPropertyName?: string): void;
 export declare function buildTree(current_root: any, schemaTree: any, lookup?: any): any[];
-export declare function getLeafTypes(schemaTree: any, fieldPath: any): any[];
+export declare function getLeafValueTypes(schemaTree: any, fieldPath: any): any[];
+export declare function getLeafFormatTypes(schemaTree: any, fieldPath: any): any[];
 export declare function mongoCommand(commandstr: string, collection: string, field?: any): Promise<any>;

package/util/schema-report-builder.js

@@ -188,8 +188,10 @@ function buildTree(current_root, schemaTree, lookup) {
                         isActive: false,
                         isSelected: false,
                         depth: 0,
-                        leafType: '',
-                        leafTypes: getLeafTypes(schemaTree[key], key)
+                        leafValueType: '',
+                        leafValueTypes: getLeafValueTypes(schemaTree[key], key),
+                        leafFormatType: '',
+                        leafFormatTypes: getLeafFormatTypes(schemaTree[key], key)
                     });
                 }
                 else {
@@ -212,7 +214,8 @@ function buildTree(current_root, schemaTree, lookup) {
                         isActive: false,
                         isSelected: false,
                         depth: 0,
-                        leafTypeValue: '',
+                        leafValueType: '',
+                        leafFormatType: '',
                         children: []
                     });
                 }
@@ -249,8 +252,10 @@ function buildTree(current_root, schemaTree, lookup) {
                                     isActive: false,
                                     isSelected: false,
                                     depth: index,
-                                    leafType: '',
-                                    leafTypes: getLeafTypes(schemaTree[key], key)
+                                    leafValueType: '',
+                                    leafValueTypes: getLeafValueTypes(schemaTree[key], key),
+                                    leafFormatType: '',
+                                    leafFormatTypes: getLeafFormatTypes(schemaTree[key], key)
                                 });
                             }
                             else {
@@ -273,7 +278,8 @@ function buildTree(current_root, schemaTree, lookup) {
                                     isActive: false,
                                     isSelected: false,
                                     depth: index,
-                                    leafTypeValue: '',
+                                    leafValueType: '',
+                                    leafFormatType: '',
                                     children: []
                                 });
                             }
@@ -287,13 +293,13 @@ function buildTree(current_root, schemaTree, lookup) {
     return res;
 }
 exports.buildTree = buildTree;
-function getLeafTypes(schemaTree, fieldPath) {
+function getLeafValueTypes(schemaTree, fieldPath) {
     var leafTypes = [];
     if (schemaTree.rbType === 'String') {
         leafTypes = [
             {
-                text: 'As Text',
-                value: 'String'
+                text: 'As Value',
+                value: 'Value'
             },
             {
                 text: 'As Count',
@@ -312,16 +318,8 @@ function getLeafTypes(schemaTree, fieldPath) {
     else if (schemaTree.rbType === 'Number') {
         leafTypes = [
             {
-                text: 'As Number',
-                value: 'Number'
-            },
-            {
-                text: 'As Currency',
-                value: 'Currency'
-            },
-            {
-                text: 'As Text',
-                value: 'String'
+                text: 'As Value',
+                value: 'Value'
             },
             {
                 text: 'As Average',
@@ -356,21 +354,41 @@ function getLeafTypes(schemaTree, fieldPath) {
     else if (schemaTree.rbType === 'Boolean') {
         leafTypes = [
             {
-                text: 'As Boolean (True/False)',
-                value: 'Boolean'
+                text: 'As Value',
+                value: 'Value'
             },
             {
-                text: 'As Text (Yes/No)',
-                value: 'String'
+                text: 'As Count',
+                value: 'Count'
             },
             {
-                text: 'As Number (1/0)',
-                value: 'Number'
+                text: 'First',
+                value: 'First'
+            },
+            {
+                text: 'Last',
+                value: 'Last'
+            }
+        ];
+    }
+    else if (schemaTree.rbType === 'Date') {
+        leafTypes = [
+            {
+                text: 'As Value',
+                value: 'Value'
             },
             {
                 text: 'As Count',
                 value: 'Count'
             },
+            {
+                text: 'Minimum',
+                value: 'Minimum'
+            },
+            {
+                text: 'Maximum',
+                value: 'Maximum'
+            },
             {
                 text: 'First',
                 value: 'First'
@@ -381,6 +399,51 @@ function getLeafTypes(schemaTree, fieldPath) {
             }
         ];
     }
+    return leafTypes;
+}
+exports.getLeafValueTypes = getLeafValueTypes;
+function getLeafFormatTypes(schemaTree, fieldPath) {
+    var leafTypes = [];
+    if (schemaTree.rbType === 'String') {
+        leafTypes = [
+            {
+                text: 'As Text',
+                value: 'String'
+            }
+        ];
+    }
+    else if (schemaTree.rbType === 'Number') {
+        leafTypes = [
+            {
+                text: 'As Number',
+                value: 'Number'
+            },
+            {
+                text: 'As Currency',
+                value: 'Currency'
+            },
+            {
+                text: 'As Text',
+                value: 'String'
+            }
+        ];
+    }
+    else if (schemaTree.rbType === 'Boolean') {
+        leafTypes = [
+            {
+                text: 'As Boolean (True/False)',
+                value: 'Boolean'
+            },
+            {
+                text: 'As Text (Yes/No)',
+                value: 'String'
+            },
+            {
+                text: 'As Number (1/0)',
+                value: 'Number'
+            }
+        ];
+    }
     else if (schemaTree.rbType === 'Date') {
         leafTypes = [
             {
@@ -406,32 +469,12 @@ function getLeafTypes(schemaTree, fieldPath) {
             {
                 text: 'As Timestamp (MS since 1970)',
                 value: 'Number'
-            },
-            {
-                text: 'As Count',
-                value: 'Count'
-            },
-            {
-                text: 'Minimum',
-                value: 'Minimum'
-            },
-            {
-                text: 'Maximum',
-                value: 'Maximum'
-            },
-            {
-                text: 'First',
-                value: 'First'
-            },
-            {
-                text: 'Last',
-                value: 'Last'
             }
         ];
     }
     return leafTypes;
 }
-exports.getLeafTypes = getLeafTypes;
+exports.getLeafFormatTypes = getLeafFormatTypes;
 function mongoCommand(commandstr, collection, field) {
     return __awaiter(this, void 0, void 0, function () {
         var tmpObj, obj, obj, err_1;