@contrail/document-generation 1.0.32 → 1.0.34

package/lib/components/component-generator.d.ts

@@ -2,10 +2,5 @@ import { DocumentElement } from "@contrail/documents";
 import { ComponentPropertyTemplate, ComponentTemplate } from "../interfaces";
 export declare class ComponentGenerator {
     static generateComponent(data: any, options: DocumentElement, template: ComponentTemplate): any;
-    static generatedModelBindings(data: any): {
-        item: string;
-        projectItem: string;
-        viewable: string;
-    };
     static generateComponentFromPropertyTemplate(data: any, options: DocumentElement, template: ComponentPropertyTemplate): DocumentElement;
 }

package/lib/components/component-generator.js

@@ -5,6 +5,7 @@ const documents_1 = require("@contrail/documents");
 const nanoid_1 = require("nanoid");
 const util_1 = require("@contrail/util");
 const document_property_util_1 = require("../util/document-property-util");
+const component_util_1 = require("./component-util");
 class ComponentGenerator {
     static generateComponent(data, options, template) {
         let component;
@@ -16,13 +17,6 @@ class ComponentGenerator {
         }
         return component;
     }
-    static generatedModelBindings(data) {
-        return {
-            item: `item:${data.item.id}`,
-            projectItem: `project-item:${data.projectItem.id}`,
-            viewable: `item:${data.item.id}`,
-        };
-    }
     static generateComponentFromPropertyTemplate(data, options, template) {
         var _a;
         let componentElement = documents_1.DocumentElementFactory.initNewElement('component');
@@ -52,7 +46,7 @@ class ComponentGenerator {
             }
         };
         elements.push(...document_property_util_1.DocumentPropertyUtil.generatePropertyTextElements(data, template.properties, textOptions, { y: yPosition }, true));
-        const modelBindings = this.generatedModelBindings(data);
+        const modelBindings = component_util_1.ComponentUtil.generatedModelBindings(data);
         componentElement.elements = elements;
         componentElement.modelBindings = modelBindings;
         if (((_a = componentElement === null || componentElement === void 0 ? void 0 : componentElement.elements) === null || _a === void 0 ? void 0 : _a.length) > 0) {

package/lib/components/component-util.d.ts

@@ -1,4 +1,5 @@
 import { DocumentElement, SizeDefinition } from "@contrail/documents";
 export declare class ComponentUtil {
+    static generatedModelBindings(data: any): any;
     static getComponentSize(element: DocumentElement): SizeDefinition;
 }

package/lib/components/component-util.js

@@ -2,6 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ComponentUtil = void 0;
 class ComponentUtil {
+    static generatedModelBindings(data) {
+        const model = {};
+        if (data.item) {
+            model.item = `item:${data.item.id}`;
+            model.viewable = `item:${data.item.id}`;
+        }
+        if (data.projectItem) {
+            model.projectItem = `project-item:${data.projectItem.id}`;
+        }
+        return model;
+    }
     static getComponentSize(element) {
         var _a, _b, _c, _d, _e;
         const sizeDefinition = {

package/lib/info-panel/info-panel-generator.d.ts

@@ -1,5 +1,6 @@
 import { DocumentElement, PositionDefinition, SizeDefinition } from "@contrail/documents";
 import { FrameInfoPanelTemplate } from "../interfaces";
 export declare class InfoPanelGenerator {
+    static generatedModelBindings(data: any): any;
     static generatePanelFromTemplate(data: any, template: FrameInfoPanelTemplate, position: PositionDefinition, panelSize: SizeDefinition): Array<DocumentElement>;
 }

package/lib/info-panel/info-panel-generator.js

@@ -5,6 +5,16 @@ const documents_1 = require("@contrail/documents");
 const util_1 = require("@contrail/util");
 const document_property_util_1 = require("../util/document-property-util");
 class InfoPanelGenerator {
+    static generatedModelBindings(data) {
+        const model = {};
+        if (data.item) {
+            model.item = `item:${data.item.id}`;
+        }
+        if (data.projectItem) {
+            model.projectItem = `project-item:${data.projectItem.id}`;
+        }
+        return model;
+    }
     static generatePanelFromTemplate(data, template, position, panelSize) {
         var _a;
         if (!template.propertyTemplate) {
@@ -16,6 +26,7 @@ class InfoPanelGenerator {
         panel.size = util_1.ObjectUtil.cloneDeep(panelSize) || {};
         panel.position = util_1.ObjectUtil.cloneDeep(position);
         elements.push(panel);
+        const modelBindings = this.generatedModelBindings(data);
         const textOptions = {
             style: {
                 text: {
@@ -24,7 +35,8 @@ class InfoPanelGenerator {
             },
             size: {
                 width: panelSize.width - 10
-            }
+            },
+            modelBindings,
         };
         const textElements = document_property_util_1.DocumentPropertyUtil.generatePropertyTextElements(data, template.propertyTemplate.properties, textOptions, { x: panel.position.x, y: panel.position.y }, false);
         elements.push(...textElements);

package/lib/util/document-util.js

@@ -13,11 +13,12 @@ class DocumentUtil {
         if (text === undefined || text === null) {
             return '';
         }
+        if (typeof text !== 'string') {
+            return text;
+        }
         return text.replace(/&/g, "&")
             .replace(/</g, "&lt;")
-            .replace(/>/g, "&gt;")
-            .replace(/"/g, "&quot;")
-            .replace(/'/g, "&#39;");
+            .replace(/>/g, "&gt;");
     }
 }
 exports.DocumentUtil = DocumentUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/document-generation",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Utilities for automatic generation of documents.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",