@elisra-devops/docgen-skins 0.10.8 → 0.10.9

package/bin/models/json/paragraph/JSONRichTextParagraph.js

@@ -3,69 +3,418 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const JSONHtml_1 = __importDefault(require("../html/JSONHtml"));
-const JSONParagraph_1 = __importDefault(require("./JSONParagraph"));
-const JSONTable_1 = __importDefault(require("../table/JSONTable"));
 const logger_1 = __importDefault(require("../../../services/logger"));
 class JSONRichTextParagraph {
     constructor(field, paragraphStyles, wiId, headingLevel, skipImageFormat = false) {
-        this.paragraphStyles = paragraphStyles;
-        this.wiId = wiId;
-        this.paragraphTemplate = this.generateJsonRichTextParagraphs(field, this.paragraphStyles, skipImageFormat);
-        if (headingLevel && field.name === 'Title: ') {
-            this.paragraphTemplate.headingLevel = headingLevel;
+        if (!field || !field.richTextNodes) {
+            throw new Error('Invalid field or missing richTextNodes');
         }
+        this.paragraphStyles = paragraphStyles || {
+            isBold: false,
+            IsItalic: false,
+            IsUnderline: false,
+            Size: 12,
+            Uri: null,
+            Font: 'Arial',
+            InsertLineBreak: false,
+            InsertSpace: false,
+        };
+        this.wiId = wiId;
+        this.paragraphTemplate = this.buildDocFromNodes(field.richTextNodes);
     } //constructor
-    generateJsonRichTextParagraphs(field, paragraphStyles, skipImageFormat = false) {
-        let titleStyle = JSON.parse(JSON.stringify(paragraphStyles));
-        titleStyle.isBold = true;
-        titleStyle.IsUnderline = true;
-        titleStyle.InsertSpace = true;
-        titleStyle.InsertLineBreak = false;
-        let richTextSkin = [];
-        //handle rich text
-        try {
-            field.richText.forEach((content) => {
-                switch (content.type) {
-                    case 'paragraph':
-                        content.data.fields.forEach((richTextField) => {
-                            if (/<\/?[a-z][\s\S]*>/.test(richTextField.value)) {
-                                let html = new JSONHtml_1.default(richTextField.value);
-                                richTextSkin.push(html.getJSONHtml());
-                            }
-                            else {
-                                //making sure ID is not printed
-                                let paragraphSkin = new JSONParagraph_1.default(richTextField, paragraphStyles, 0, 0);
-                                richTextSkin.push(paragraphSkin.getJSONParagraph());
-                            }
-                        });
-                        break;
-                    case 'picture':
-                        if (!skipImageFormat) {
-                            richTextSkin.push({
-                                type: 'picture',
-                                Path: content.data,
-                            });
-                        }
-                        break;
-                    case 'table':
-                        if (content.data) {
-                            let tableSkin = new JSONTable_1.default(content.data, undefined, paragraphStyles, 0);
-                            richTextSkin.push(tableSkin.getJSONTable());
-                        }
-                        break;
+    getJSONRichTextParagraph() {
+        return this.paragraphTemplate;
+    } //getJSONTable
+    /**
+     * Parses a given RichNode and returns a corresponding Paragraph, Table, List,
+     * an array of these types, or null if the node type is not recognized.
+     *
+     * @param node - The RichNode to be parsed.
+     * @returns A Paragraph, Table, List, an array of these types, or null.
+     *
+     * The function handles different node types as follows:
+     * - 'paragraph': Parses the node as a paragraph.
+     * - 'table': Parses the node as a table.
+     * - 'list': Parses the node as a list.
+     * - 'text', 'image', 'break': Converts the node to a paragraph with a single run.
+     * - 'other': Recursively parses child nodes and returns an array of results.
+     * - Default: Returns null for unrecognized node types.
+     */
+    parseNode(node) {
+        if (!node)
+            return null;
+        // Ensure node has valid type
+        if (typeof node.type !== 'string') {
+            logger_1.default.warn(`Invalid node type encountered: ${JSON.stringify(node)}`);
+            return null;
+        }
+        switch (node.type) {
+            case 'paragraph':
+                return this.parseParagraphNode(node);
+            case 'table':
+                return this.parseTableNode(node);
+            case 'list':
+                return this.parseList(node);
+            case 'text':
+            case 'image':
+            case 'break':
+                return { type: 'paragraph', runs: [this.nodeToRun(node)] };
+            case 'other':
+                let childrenResults = [];
+                for (const child of node.children) {
+                    const childResult = this.parseNode(child);
+                    if (Array.isArray(childResult)) {
+                        childrenResults.push(...childResult);
+                    }
+                    else if (childResult) {
+                        childrenResults.push(childResult);
+                    }
                 }
+                return childrenResults.length > 0 ? childrenResults : null;
+            default:
+                return null;
+        }
+    }
+    /**
+     * Parses a paragraph node and converts it into a Paragraph object.
+     *
+     * @param node - The node to parse, expected to have a `children` property.
+     * @returns A Paragraph object containing the parsed runs.
+     */
+    parseParagraphNode(node) {
+        if (!node || !Array.isArray(node.children)) {
+            return { type: 'paragraph', runs: [] };
+        }
+        const runs = this.gatherRuns(node.children);
+        // Ensure at least one run exists
+        if (runs.length === 0) {
+            runs.push({
+                type: 'text',
+                value: '',
+                textStyling: {
+                    Bold: this.paragraphStyles.isBold,
+                    Italic: this.paragraphStyles.IsItalic,
+                    Size: this.paragraphStyles.Size,
+                    Font: this.paragraphStyles.Font,
+                    Uri: this.paragraphStyles.Uri,
+                    InsertLineBreak: this.paragraphStyles.InsertLineBreak,
+                    InsertSpace: this.paragraphStyles.InsertSpace,
+                    Underline: this.paragraphStyles.IsUnderline,
+                },
             });
-            return richTextSkin;
         }
-        catch (e) {
-            logger_1.default.warn(e);
+        return { type: 'paragraph', runs };
+    }
+    /**
+     * Gathers runs from the provided children nodes.
+     *
+     * This method processes an array of child nodes and converts them into an array of `Run` objects.
+     * It handles different types of nodes such as text, image, break, paragraph, table, list, and other.
+     *
+     * - For `text`, `image`, and `break` nodes, it directly converts them to `Run` objects.
+     * - For `paragraph` nodes, it recursively gathers runs from the child paragraphs.
+     * - For `table` and `list` nodes, it adds a placeholder `Run` object indicating the embedded type.
+     * - For `other` nodes, it recursively gathers runs from the child nodes.
+     *
+     * @param children - An array of child nodes to process.
+     * @returns An array of `Run` objects representing the gathered runs.
+     */
+    gatherRuns(children) {
+        if (!Array.isArray(children))
             return [];
+        const runs = [];
+        for (const child of children) {
+            if (!child || typeof child.type !== 'string') {
+                logger_1.default.warn('Invalid child node:', child);
+                continue;
+            }
+            try {
+                if (child.type === 'text' || child.type === 'image' || child.type === 'break') {
+                    runs.push(this.nodeToRun(child));
+                }
+                else if (child.type === 'paragraph') {
+                    // Recursively gather runs from child paragraphs
+                    runs.push(...this.gatherRuns(child.children));
+                }
+                else if (child.type === 'table' || child.type === 'list') {
+                    // Not supported in this context, so we'll just add a placeholder
+                    runs.push({ type: 'other', value: `[Embedded ${child.type}]` });
+                }
+                else if (child.type === 'other') {
+                    // Recursively gather runs from inside <span> or <b>, etc.
+                    runs.push(...this.gatherRuns(child.children));
+                }
+            }
+            catch (error) {
+                logger_1.default.error('Error gathering runs:', error);
+                continue;
+            }
         }
-    } //generateJsonRichTextParagraphs
-    getJSONRichTextParagraph() {
-        return this.paragraphTemplate;
-    } //getJSONRichTextParagraph
+        return runs;
+    }
+    /**
+     * Converts a node object to a Run object based on its type and text styling.
+     *
+     * @param node - The node object to be converted. It can be of type 'text', 'image', or 'break'.
+     * @returns A Run object with the appropriate type and properties based on the input node.
+     *
+     * The Run object can have the following structure:
+     * - For 'text' nodes: { type: 'text', value: string, textStyling: object }
+     * - For 'image' nodes: { type: 'image', value: '', src: string }
+     * - For 'break' nodes: { type: 'break' }
+     * - For other types: { type: 'other', value: '' }
+     *
+     * The textStyling object includes:
+     * - Bold: boolean
+     * - Italic: boolean
+     * - Underline: boolean
+     * - Size: number
+     * - Uri: string | null
+     * - Font: string
+     * - InsertLineBreak: boolean
+     * - InsertSpace: boolean
+     */
+    nodeToRun(node) {
+        var _a, _b, _c, _d;
+        const textStyling = {
+            Bold: ((_a = node.textStyling) === null || _a === void 0 ? void 0 : _a.Bold) || this.paragraphStyles.isBold,
+            Italic: ((_b = node.textStyling) === null || _b === void 0 ? void 0 : _b.Italic) || this.paragraphStyles.IsItalic,
+            Underline: ((_c = node.textStyling) === null || _c === void 0 ? void 0 : _c.Underline) || this.paragraphStyles.IsUnderline,
+            Size: this.paragraphStyles.Size || 12,
+            Uri: this.paragraphStyles.Uri || null,
+            Font: this.paragraphStyles.Font || 'Arial',
+            InsertLineBreak: this.paragraphStyles.InsertLineBreak || false,
+            InsertSpace: ((_d = node.textStyling) === null || _d === void 0 ? void 0 : _d.InsertSpace) || this.paragraphStyles.InsertSpace,
+        };
+        if (node.type === 'text') {
+            return { type: 'text', value: node.value, textStyling: textStyling };
+        }
+        else if (node.type === 'image') {
+            return { type: 'image', value: '', src: node.src || '' };
+        }
+        else if (node.type === 'break') {
+            return { type: 'break' };
+        }
+        else {
+            return { type: 'other', value: '' };
+        }
+    }
+    /**
+     * Converts a given node object into a Table structure.
+     *
+     * @remarks
+     * This function processes the children of the specified node and
+     * transforms them into a table representation, adding default properties
+     * such as heading level, page break insertion, and an empty rows array.
+     *
+     * @param node - The node object containing the structural details needed
+     *               to create a table.
+     * @returns A fully constructed Table object with the parsed node data.
+     */
+    parseTableNode(node) {
+        const table = {
+            type: 'table',
+            headingLevel: 0,
+            insertPageBreak: false,
+            Rows: [],
+        };
+        if (!node || !Array.isArray(node.children)) {
+            logger_1.default.warn('Invalid table node structure');
+            return table;
+        }
+        this.parseTableChildren(node.children, table);
+        if (!this.validateTableStructure(table)) {
+            logger_1.default.warn('Inconsistent table structure detected');
+        }
+        return table;
+    }
+    /**
+     * Parses child elements of a table structure and updates the provided Table instance accordingly.
+     *
+     * @param children - An array of child nodes to be evaluated for table content.
+     * @param table - The Table object to which parsed rows and nested structures will be appended.
+     *
+     * @remarks
+     * This method recursively traverses and identifies relevant table elements (e.g., <tr>, <thead>, <tbody>, etc.)
+     * to generate the final row data for the given Table instance.
+     */
+    parseTableChildren(children, table) {
+        for (const child of children || []) {
+            if (child.type === 'other') {
+                const tn = (child.tagName || '').toLowerCase();
+                if (tn === 'tr') {
+                    // Parse a table row
+                    const row = this.parseTableRow(child);
+                    table.Rows.push(row);
+                }
+                else if (tn === 'thead' || tn === 'tbody' || tn === 'tfoot') {
+                    // Recurse into thead/tbody/tfoot
+                    this.parseTableChildren(child.children, table);
+                }
+                else {
+                    // Recurse into other nodes
+                    this.parseTableChildren(child.children, table);
+                }
+            }
+            else if (child.type === 'table') {
+                this.parseTableChildren(child.children, table);
+            }
+            else {
+                //skip
+                continue;
+            }
+        }
+    }
+    /**
+     * Parses the given table row node and extracts its cells by iterating through its child elements.
+     * Each child element that is recognized as a table cell (td or th) is converted into a corresponding cell object.
+     *
+     * @param trNode - An AST node representing the table row, containing possible table cell or header elements.
+     * @returns A TableRow object containing an array of processed cells.
+     */
+    parseTableRow(trNode) {
+        const row = { Cells: [] };
+        // parse <td> or <th> inside this <tr>
+        for (const child of trNode.children || []) {
+            if (child.type === 'other' && (child.tagName === 'td' || child.tagName === 'th')) {
+                row.Cells.push(this.parseTableCell(child));
+            }
+            else {
+                // skip or recurse
+            }
+        }
+        return row;
+    }
+    /**
+     * Build one TableCell from <td> node
+     */
+    parseTableCell(tdNode) {
+        // We'll collect everything in one paragraph
+        const cellParagraphRuns = this.gatherRunsFromAllParagraphs(tdNode.children);
+        return {
+            Paragraphs: [
+                {
+                    Runs: cellParagraphRuns,
+                },
+            ],
+        };
+    }
+    /**
+     * Gather runs from any text/image/paragraph in <td>
+     * (including nested <other> tags).
+     */
+    gatherRunsFromAllParagraphs(children) {
+        const runs = [];
+        for (const child of children || []) {
+            if (child.type === 'text' || child.type === 'image') {
+                runs.push(this.nodeToRun(child));
+            }
+            else if (child.type === 'paragraph') {
+                runs.push(...this.gatherRuns(child.children));
+            }
+            else if (child.type === 'other' || child.type === 'table' || child.type === 'list') {
+                // recursively gather
+                runs.push(...this.gatherRunsFromAllParagraphs(child.children));
+            }
+        }
+        return runs;
+    }
+    /**
+     * Parses a given node to create a List object.
+     *
+     * @param node - The node to parse, expected to have properties `isOrdered` and `children`.
+     * @returns A List object with the parsed data.
+     */
+    parseList(node) {
+        const list = {
+            type: 'list',
+            isOrdered: node.isOrdered,
+            listItems: [],
+        };
+        this.parseListChildren(node.children, list);
+        return list;
+    }
+    /**
+     * Parses the children of a list and adds them to the provided list object.
+     *
+     * @param children - An array of child nodes to be parsed.
+     * @param list - The list object to which parsed items will be added.
+     * @param level - The current depth level of the list (default is 0).
+     */
+    parseListChildren(children, list, level = 0) {
+        for (const child of children || []) {
+            if (child.type === 'other') {
+                const tn = (child.tagName || '').toLowerCase();
+                if (tn === 'li') {
+                    // Parse a list item
+                    const item = this.parseListItem(child, level);
+                    list.listItems.push(item);
+                }
+                else {
+                    // Recurse into other nodes
+                    this.parseListChildren(child.children, list, level + 1);
+                }
+            }
+            else {
+                //skip
+                continue;
+            }
+        }
+    }
+    /**
+     * Parses a list item node and converts it into a `ListItem` object.
+     *
+     * @param liNode - The list item node to parse.
+     * @param level - The nesting level of the list item.
+     * @returns A `ListItem` object containing the parsed list item data.
+     */
+    parseListItem(liNode, level) {
+        const items = this.gatherRunsFromAllParagraphs(liNode.children);
+        return {
+            Runs: items,
+            level: level,
+        };
+    }
+    /**
+     * Builds an array of document elements (Paragraph, Table, or List) from an array of RichNode objects.
+     *
+     * @param nodes - An array of RichNode objects to be parsed into document elements.
+     * @returns An array of Paragraph, Table, or List elements.
+     */
+    buildDocFromNodes(nodes) {
+        if (!Array.isArray(nodes)) {
+            logger_1.default.error('Invalid nodes array');
+            return [];
+        }
+        const results = [];
+        for (const node of nodes) {
+            try {
+                const items = this.parseNode(node);
+                if (Array.isArray(items)) {
+                    results.push(...items.filter(Boolean));
+                }
+                else if (items) {
+                    results.push(items);
+                }
+            }
+            catch (error) {
+                logger_1.default.error('Error processing node:', error);
+                continue;
+            }
+        }
+        // Ensure there's at least one paragraph
+        if (results.length === 0) {
+            results.push({ type: 'paragraph', runs: [] });
+        }
+        return results;
+    }
+    validateTableStructure(table) {
+        var _a, _b;
+        if (!table.Rows)
+            return false;
+        const firstRowCellCount = ((_b = (_a = table.Rows[0]) === null || _a === void 0 ? void 0 : _a.Cells) === null || _b === void 0 ? void 0 : _b.length) || 0;
+        return table.Rows.every((row) => row.Cells.length === firstRowCellCount);
+    }
 } //class
 exports.default = JSONRichTextParagraph;
 //# sourceMappingURL=JSONRichTextParagraph.js.map

package/bin/models/json/paragraph/JSONRichTextParagraph.js.map

@@ -1 +1 @@
-{"version":3,"file":"JSONRichTextParagraph.js","sourceRoot":"","sources":["../../../../src/models/json/paragraph/JSONRichTextParagraph.ts"],"names":[],"mappings":";;;;;AACA,gEAAwC;AACxC,oEAA4C;AAC5C,mEAA2C;AAC3C,sEAA8C;AAE9C,MAAqB,qBAAqB;IAIxC,YACE,KAAiB,EACjB,eAA6B,EAC7B,IAAY,EACZ,YAAoB,EACpB,eAAe,GAAG,KAAK;QAEvB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,8BAA8B,CAC1D,KAAK,EACL,IAAI,CAAC,eAAe,EACpB,eAAe,CAChB,CAAC;QACF,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YAC5C,IAAI,CAAC,iBAAiB,CAAC,YAAY,GAAG,YAAY,CAAC;SACpD;IACH,CAAC,CAAC,aAAa;IAEf,8BAA8B,CAAC,KAAiB,EAAE,eAAe,EAAE,eAAe,GAAG,KAAK;QACxF,IAAI,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,CAAC;QAE7D,UAAU,CAAC,MAAM,GAAG,IAAI,CAAC;QACzB,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC;QAC9B,UAAU,CAAC,WAAW,GAAG,IAAI,CAAC;QAC9B,UAAU,CAAC,eAAe,GAAG,KAAK,CAAC;QAEnC,IAAI,YAAY,GAAU,EAAE,CAAC;QAC7B,kBAAkB;QAClB,IAAI;YACF,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;gBACjC,QAAQ,OAAO,CAAC,IAAI,EAAE;oBACpB,KAAK,WAAW;wBACd,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,aAAyB,EAAE,EAAE;4BACxD,IAAI,mBAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE;gCACjD,IAAI,IAAI,GAAG,IAAI,kBAAQ,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gCAC7C,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;6BACvC;iCAAM;gCACL,+BAA+B;gCAC/B,IAAI,aAAa,GAAG,IAAI,uBAAa,CAAC,aAAa,EAAE,eAAe,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;gCAC5E,YAAY,CAAC,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC;6BACrD;wBACH,CAAC,CAAC,CAAC;wBACH,MAAM;oBACR,KAAK,SAAS;wBACZ,IAAI,CAAC,eAAe,EAAE;4BACpB,YAAY,CAAC,IAAI,CAAC;gCAChB,IAAI,EAAE,SAAS;gCACf,IAAI,EAAE,OAAO,CAAC,IAAI;6BACnB,CAAC,CAAC;yBACJ;wBAED,MAAM;oBACR,KAAK,OAAO;wBACV,IAAI,OAAO,CAAC,IAAI,EAAE;4BAChB,IAAI,SAAS,GAAG,IAAI,mBAAS,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC;4BAC3E,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,CAAC;yBAC7C;wBACD,MAAM;iBACT;YACH,CAAC,CAAC,CAAC;YACH,OAAO,YAAY,CAAC;SACrB;QAAC,OAAO,CAAC,EAAE;YACV,gBAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,OAAO,EAAE,CAAC;SACX;IACH,CAAC,CAAC,gCAAgC;IAElC,wBAAwB;QACtB,OAAO,IAAI,CAAC,iBAAiB,CAAC;IAChC,CAAC,CAAC,0BAA0B;CA0V7B,CAAC,OAAO;AApaT,wCAoaC"}
+{"version":3,"file":"JSONRichTextParagraph.js","sourceRoot":"","sources":["../../../../src/models/json/paragraph/JSONRichTextParagraph.ts"],"names":[],"mappings":"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"}

package/bin/models/json/wordJsonModels.d.ts

@@ -53,8 +53,7 @@ export interface Attachment {
     isLinkedFile?: boolean;
     IsFlattened?: boolean;
 }
-export interface Run {
-    text: string;
+interface TextStyle {
     Bold: boolean;
     Italic: boolean;
     Underline: boolean;
@@ -65,6 +64,12 @@ export interface Run {
     InsertSpace: boolean;
     src?: string;
 }
+export interface Run {
+    type: 'text' | 'image' | 'break' | 'other';
+    value?: string;
+    src?: string;
+    textStyling?: TextStyle;
+}
 export interface WorkItemData {
 }
 export interface Table {
@@ -105,7 +110,7 @@ export interface WIProperty {
     attachmentLink?: string;
     attachmentType?: string;
     relativeAttachmentLink?: string;
-    richText?: any[];
+    richTextNodes?: any[];
 }
 export interface MultipeValuesWIProperty {
     name: string;
@@ -117,10 +122,42 @@ export interface MultipeValuesWIProperty {
     attachmentLink?: string;
     attachmentType?: string;
     relativeAttachmentLink?: string;
-    richText?: any[];
+    richTextNodes?: any[];
 }
 export interface WIColumns {
     name: string;
     referenceName: string;
     url: string;
 }
+export type RichNode = ParagraphNode | TextNode | ImageNode | TableNode | ListNode | BreakNode | OtherNode;
+export interface ParagraphNode {
+    type: 'paragraph';
+    children: RichNode[];
+}
+export interface TextNode {
+    type: 'text';
+    value: string;
+}
+export interface ImageNode {
+    type: 'image';
+    src: string;
+    alt?: string;
+}
+export interface BreakNode {
+    type: 'break';
+}
+export interface TableNode {
+    type: 'table';
+    children: RichNode[];
+}
+export interface ListNode {
+    type: 'list';
+    isOrdered: boolean;
+    children: RichNode[];
+}
+export interface OtherNode {
+    type: 'other';
+    tagName: string;
+    children: RichNode[];
+}
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elisra-devops/docgen-skins",
-  "version": "0.10.8",
+  "version": "0.10.9",
   "description": "Can be outputed in various types:",
   "main": "./bin/index.js",
   "types": "./bin/index.d.ts",

package/src/index.ts

@@ -287,13 +287,7 @@ export default class Skins {
       let wiSkin = new JSONHeaderParagraph(wiHeaderFields, headerStyle, element.id || 0, element.level);
       testSkins.push(wiSkin.getJSONParagraph());
 
-      let wiDescriptionParagraph = new JSONRichTextParagraph(
-        element.fields[2],
-        styles,
-        element.id || 0,
-        0,
-        true
-      );
+      let wiDescriptionParagraph = new JSONRichTextParagraph(element.fields[2], styles, element.id || 0, 0);
       let richTextDecsSkin: any[] = wiDescriptionParagraph.getJSONRichTextParagraph();
       testSkins.push(...richTextDecsSkin);
     }
@@ -436,7 +430,7 @@ export default class Skins {
 
             let testDescriptionParagraph = new JSONRichTextParagraph(
               testcase.testCaseHeaderSkinData.fields[2],
-              styles,
+              { ...styles, Size: 12, Font: 'Arial' },
               testcase.id || 0,
               0
             );
@@ -497,7 +491,7 @@ export default class Skins {
                 let tableSkin = new JSONTable(
                   testcase.testCaseStepsSkinData,
                   headerStyles,
-                  styles,
+                  { ...styles, Font: 'Arial' },
                   headingLvl,
                   undefined,
                   undefined,