@pb33f/cowboy-components 0.5.2 → 0.5.3

package/dist/components/model-renderer/schema.js

@@ -46,7 +46,7 @@ let RenderedSchemaNodeComponent = class RenderedSchemaNodeComponent extends HasE
                 composed: true,
                 detail: {
                     toast: {
-                        title: 'Cannot generate mock',
+                        title: 'Mock failed',
                         id: crypto.randomUUID(),
                         type: ToastType.ERROR,
                         time: new Date().toISOString(),

package/dist/components/model-tree/tree.d.ts

@@ -28,6 +28,8 @@ export declare class ModelTree extends LitElement {
     renderLabel(node: Node, filtered?: boolean): TemplateResult;
     buildTree(node: Node, depth: number): TemplateResult;
     private selectedNodes;
+    private currentHash;
+    private currentPath;
     nodesSelected(treeItems: SlTreeItem[]): void;
     treeClicked(event: MouseEvent): void;
     render(): TemplateResult<1>;

package/dist/components/model-tree/tree.js

@@ -364,6 +364,11 @@ let ModelTree = class ModelTree extends LitElement {
                 }
                 else {
                     if (path && path != '') {
+                        if (this.currentHash === hash && this.currentPath === path) {
+                            return;
+                        }
+                        this.currentHash = hash;
+                        this.currentPath = path;
                         this.rolodexClicked(hash, path);
                     }
                 }

package/dist/components/paginator/paginator.css.js

@@ -3,7 +3,7 @@ export default css `
 
     .paginator-values {
         overflow-y: auto;
-        max-height: calc(100vh - 460px);
+        max-height: calc(100vh - 400px);
     }
 
     .paginator-values::-webkit-scrollbar {

package/dist/components/problems-overview/problems-overview.css.js

@@ -9,11 +9,11 @@ export default css `
     
     .paginator {
         overflow-y: auto;
-        height: calc(100vh - 485px);
+        //height: calc(100vh - 485px);
     }
 
     pb33f-paginator-navigation::part(values) {
-        max-height: calc(100vh - 450px);
+        max-height: calc(100vh - 490px);
     }
     
     .paginator::part(values) {

package/dist/components/the-doctor/the-doctor.css.js

@@ -34,16 +34,17 @@ export default css `
         height: min-content;
         max-height: calc(100vh - 50px);
     }
+    
 
-    .problems::-webkit-scrollbar {
+    .problems::-webkit-scrollbar,.problems-data::-webkit-scrollbar {
         width: 8px;
     }
 
-    .problems::-webkit-scrollbar-track {
+    .problems::-webkit-scrollbar-track, .problems-data::-webkit-scrollbar-track {
         background-color: black;
     }
 
-    .problems::-webkit-scrollbar-thumb {
+    .problems::-webkit-scrollbar-thumb, .problems-data::-webkit-scrollbar-thumb {
         box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
         background: var(--secondary-color-lowalpha);
         padding: var(--global-padding);

package/dist/components/the-doctor/the-doctor.d.ts

@@ -191,6 +191,7 @@ export declare class TheDoctor extends LitElement {
     ruleDocsClicked(event: CustomEvent<ProblemDrawerEvent>): void;
     rulesetSaved(evt: CustomEvent<RulesetSavedEvent>): void;
     private buildRolodexResultMap;
+    private fetchRefMap;
     private lintSpec;
     updateInspectorDivider(): void;
     updateExplorerDivider(): void;

package/dist/components/the-doctor/the-doctor.js

@@ -375,7 +375,8 @@ let TheDoctor = class TheDoctor extends LitElement {
                     this.editor.editor?.revealLineInCenter(line);
                     this.rolodexTree.explorerClicked(rolodexId);
                     this.editor.setCurrentPath(file);
-                    this.lintSpec(result.rolodexRoot.instance);
+                    this.fetchRefMap(file);
+                    //this.lintSpec(result.rolodexRoot.instance);
                     // apply problems
                     if (this.rolodexProblemMap.has(this.rolodexActivePath)) {
                         const probs = this.rolodexProblemMap.get(this.rolodexActivePath);
@@ -437,6 +438,7 @@ let TheDoctor = class TheDoctor extends LitElement {
             this.rolodexActiveHash = evt.detail.nodeHashId;
             this.editor.setValue(result.instance, true);
             this.editor.setCurrentPath(this.rolodexActivePath);
+            this.fetchRefMap(this.rolodexActivePath);
             const probs = this.rolodexProblemMap.get(this.rolodexActivePath);
             if (probs) {
                 this.editor.setMarkers(probs);
@@ -521,7 +523,7 @@ let TheDoctor = class TheDoctor extends LitElement {
             }
             this.editor.editor?.setPosition({ lineNumber: line, column: col });
             this.editor.editor?.revealLineInCenter(line, col);
-            this.lintSpec(result.instance);
+            //this.lintSpec(result.instance);
             if (evt.detail.path) {
                 this.rolodexTree.openNodeByPath(evt.detail.path);
             }
@@ -817,6 +819,25 @@ let TheDoctor = class TheDoctor extends LitElement {
         });
         return this.rolodexProblemMap;
     }
+    fetchRefMap(currentPath = '') {
+        ModelService.fetchReferenceMap().then((result) => {
+            this.editor.clearDecorations();
+            this.references = result;
+            this.editor.links = result;
+            this.editor.applyLinkDecorations();
+            // add references to our stateful bag
+            this.updateRefmapBag(currentPath, result);
+        }).catch(() => {
+            this.editor.clearDecorations();
+            this.editor.clearAllMarkers();
+            this.toastManager.addToastManually({
+                id: crypto.randomUUID(),
+                type: ToastType.INFO,
+                title: "File not analyzed",
+                body: "This file is not a JSON or YAML file, it has not been analyzed."
+            });
+        });
+    }
     /* LINT SPEC <---------------------------------------------------------------------------------------------
     *
     * This is our main function, man we need to clean this all up, it's bloated to fuck
@@ -863,38 +884,10 @@ let TheDoctor = class TheDoctor extends LitElement {
                 // do nothing for now.
             }
         }
-        const fetchRefMap = (dead = false) => {
-            const currentRefs = this.referenceMapBag?.export().size;
-            ModelService.fetchReferenceMap().then((result) => {
-                if (dead) {
-                    this.editor.clearDecorations();
-                    this.editor.clearAllMarkers();
-                    this.editor.breadcumb.isInvalid = true;
-                    this.editor.dead();
-                    this.problemList.isInvalid = true;
-                    this.editor.requestUpdate();
-                }
-                else {
-                    this.references = result;
-                    this.editor.links = result;
-                    this.editor.applyLinkDecorations();
-                }
-                // add references to our stateful bag
-                this.updateRefmapBag(currentPath, result);
-            }).catch(() => {
-                this.editor.clearDecorations();
-                this.editor.clearAllMarkers();
-                this.toastManager.addToastManually({
-                    id: crypto.randomUUID(),
-                    type: ToastType.INFO,
-                    title: "File not analyzed",
-                    body: "This file is not a JSON or YAML file, it has not been analyzed."
-                });
-            });
-        };
         let revive = true;
         LintingService.lintFile(value, this.brokerConnectionId, url, currentPath).then((result) => {
             //if (replaceResults) {
+            this.activitySpinner.hide();
             const map = this.buildRolodexResultMap(result);
             if (url) {
                 this.urlOverlay.style.display = "none";
@@ -975,7 +968,7 @@ let TheDoctor = class TheDoctor extends LitElement {
                         this.editor.setMarkers(result);
                     }
                     else {
-                        fetchRefMap();
+                        this.fetchRefMap(currentPath);
                         return;
                     }
                 }
@@ -1000,15 +993,15 @@ let TheDoctor = class TheDoctor extends LitElement {
                 return;
             }
             // fetch graph
-            if (this.rolodexRootPath == this.rolodexActivePath || this.rolodexActivePath == 'root') {
+            if ((this.rolodexRootPath == this.rolodexActivePath || this.rolodexActivePath == 'root') || url) {
                 ModelService.createGraph().then((result) => {
                     this.extractGraph(result);
                 });
             }
-            fetchRefMap();
             // TODO: rolodex query should happen elsewhere too!
             if (this.rolodexNeedsReset) {
                 ModelService.queryRolodex().then((result) => {
+                    this.fetchRefMap(currentPath);
                     this.importDisabled = true;
                     this.editor.showBreadcrumb = true;
                     this.rolodexNeedsReset = false;
@@ -1034,6 +1027,9 @@ let TheDoctor = class TheDoctor extends LitElement {
                     this.requestUpdate();
                 });
             }
+            else {
+                this.fetchRefMap(currentPath);
+            }
             // update the overview statistics
             LintingService.fetchStatistics().then((result) => {
                 let oldScore = 0;
@@ -1991,6 +1987,16 @@ let TheDoctor = class TheDoctor extends LitElement {
             this.explorer.moveToNode(this.activeNode);
         }
         this.explorerBooted = true;
+        // check if ths is safari and fire a warning toast!
+        const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+        if (isSafari) {
+            this.sendToast({
+                id: crypto.randomUUID(),
+                type: ToastType.WARNING,
+                body: "Safari is not supported by the explorer. Please use Chrome, Firefox or Edge. As you can see the icons are all messed up.",
+                title: "Safari Warning"
+            });
+        }
     }
     closeExplorer() {
         this.explorerVisible = false;
@@ -2156,15 +2162,15 @@ let TheDoctor = class TheDoctor extends LitElement {
                                         <div class="main-view">
                                             ${this.statusBar}
                                             <div id="editor-url-overlay" class="editor-url-overlay">
-                                               
-                                               
+
+
                                                 <div id="url-spinner">
-                                                   <sl-icon name="arrow-repeat" class="url-spinner-icon"></sl-icon>
+                                                    <sl-icon name="arrow-repeat" class="url-spinner-icon"></sl-icon>
                                                     <h3>Fetching URL</h3>
                                                     <p>${this.activeURL}</p>
                                                 </div>
-                                               
-                                               
+
+
                                                 <div id="url-problem" class="url-problem">
                                                     <pb33f-attention-box type="warning" headerText="Problem with URL">
                                                         <h4>Error: ${this.urlErrorCode}</h4>