Handle missing values gracefully

pb33f · Apr 30, 2024 · 9624035 · 9624035
1 parent 6ba832f
commit 9624035
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 20 deletions.
diff --git a/ui/src/components/transaction/transaction-view.ts b/ui/src/components/transaction/transaction-view.ts
@@ -4,7 +4,7 @@ import {map} from "lit/directives/map.js";
 import {LitElement, TemplateResult} from "lit";
 import {BuildLiveTransactionFromState, HttpTransaction} from "@/model/http_transaction";
 import transactionViewComponentCss from "./transaction-view.css";
-import {KVViewComponent} from "@pb33f/cowboy-components/components/kv-view/kv-view";
+import {KVViewComponent} from "@pb33f/cowboy-components/components/kv-view/kv-view.js";
 import sharedCss from "@/components/shared.css";
 import {SlTab, SlTabGroup} from "@shoelace-style/shoelace";
 import {

diff --git a/ui/src/components/violation/violation-details.ts b/ui/src/components/violation/violation-details.ts
@@ -114,33 +114,47 @@ export class ViolationDetailsComponent extends LitElement {
             violationDetails = html`
                 ${map(this._data, (i) => {
                     
-                    const formatted = Prism.highlight(i.referenceSchema,
-                            Prism.languages.json, 'yaml');
-                    
                     let schemaView: TemplateResult;
                     if (this.selectedViolationView === SchemaType.SCHEMA) {
-        
-                        const formattedCode = formatted
+                        
+                        if (i.referenceSchema) {
+                            const formatted = Prism.highlight(i.referenceSchema,
+                                Prism.languages.json, 'yaml');
+
+                            const formattedCode = formatted
                                 .split('\n')
-                                .map((line, num) => `<span class="${((num+1) == i.line) ?
-                                        'line-active' : ''}"><span class="line-num ${((num+1) == i.line) ? 
-                                        'line-active' : ''}">${(num + 1).toString().padStart(4, ' ')}.</span> ${line}</span>`)
+                                .map((line, num) => `<span class="${((num + 1) == i.line) ?
+                                    'line-active' : ''}"><span class="line-num ${((num + 1) == i.line) ?
+                                    'line-active' : ''}">${(num + 1).toString().padStart(4, ' ')}.</span> ${line}</span>`)
                                 .join('\n');
+
+                            schemaView = html`
+                                <div class="schema-violation-object">
+                                    <pre class="line-numbers"><code>${unsafeHTML(formattedCode)}</code></pre>
+                                </div>`
+                        } else {
+                            schemaView = html`
+                                <div class="schema-violation-object">
+                                     <pre><code>Schema unavailable</code></pre>
+                                </div>`
                         
-                        schemaView = html`
-                            <div class="schema-violation-object">
-                                <pre class="line-numbers"><code>${unsafeHTML(formattedCode)}</code></pre>
-                            </div>`
+                        }
                     }
                     if (this.selectedViolationView === SchemaType.OBJECT) {
-                        schemaView = html`
-                            <div class="schema-violation-object">
-                                <pre><code>${unsafeHTML(Prism.highlight(i.referenceObject,
-                                        Prism.languages.json, 'json'))}</code></pre>
-                            </div>`
+                        if (i.referenceObject) {
+                            schemaView = html`
+                                <div class="schema-violation-object">
+                                    <pre><code>${unsafeHTML(Prism.highlight(i.referenceObject,
+                                            Prism.languages.json, 'json'))}</code></pre>
+                                </div>`
+                        } else {
+                            schemaView = html`
+                                <div class="schema-violation-object">
+                                     <pre><code>Object unavailable</code></pre>
+                                </div>`
+                        }
                     }
-
-
+                    
                     if (this.selectedViolationView === SchemaType.EXAMPLE) {
                         // schemaView = html`
                         //     <div class="schema-violation-object">