Merge pull request #176 from codefori/feature/133_show_state_and_code

Cleanup of result set UI
codefori · Dec 5, 2023 · 4fc2010 · 4fc2010
2 parents 3005c04 + 0e3a59c
commit 4fc2010
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -55,6 +55,11 @@
           "description": "Page size for Schema browser",
           "default": 500
         },
+        "vscode-db2i.collapsedResultSet": {
+          "type": "boolean",
+          "description": "Make larger cells collapsed by default",
+          "default": false
+        },
         "vscode-db2i.alwaysStartSQLJob": {
           "type": "string",
           "description": "Name of configuration to use when auto starting a job. 'new' for brand new default job, 'ask' to be asked, 'never' to never start, or a name of a stored configuration",

diff --git a/src/connection/query.ts b/src/connection/query.ts
@@ -1,7 +1,6 @@
-import { changedCache} from "../language/providers/completionItemCache";
-import Document from "../language/sql/document";
+
 import { SQLJob } from "./sqlJob";
-import { CLCommandResult, JobLogEntry, QueryOptions, QueryResult, ServerResponse } from "./types";
+import { QueryOptions, QueryResult } from "./types";
 export enum QueryState {
   NOT_YET_RUN = 1,
   RUN_MORE_DATA_AVAILABLE = 2,
@@ -95,7 +94,14 @@ export class Query<T> {
 
     if (queryResult.success !== true && !this.isCLCommand) {
       this.state = QueryState.ERROR;
-      throw new Error(queryResult.error || `Failed to run query (unknown error)`);
+
+      let errorList = [queryResult.error, queryResult.sql_state, queryResult.sql_rc].filter(e => e !== undefined);
+
+      if (errorList.length === 0) {
+        errorList.push(`Failed to run query (unknown error)`);
+      }
+
+      throw new Error(errorList.join(', '));
     }
     this.correlationId = queryResult.id;
 

diff --git a/src/connection/types.ts b/src/connection/types.ts
@@ -1,9 +1,9 @@
-import { Server } from "http";
-
 export interface ServerResponse {
   id: string;
   success: boolean;
   error?: string;
+  sql_rc: number;
+  sql_state: string;
 }
 
 export interface ConnectionResult extends ServerResponse {

diff --git a/src/views/html.ts b/src/views/html.ts
@@ -1,5 +1,6 @@
 
-export const head = /*html*/`
+export function getHeader(options: {withCollapsed?: boolean} = {}): string {
+  return /*html*/`
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <style>
@@ -19,13 +20,35 @@ export const head = /*html*/`
 
     #resultset th,
     #resultset td {
-      padding: 12px 15px;
+      padding: 5px 15px;
     }
     
     #resultset tbody tr {
       border-bottom: 1px solid var(--vscode-activityBar-border);
     }
 
+    ${options.withCollapsed ? /*css*/`
+      .hoverable {
+        /* your initial height  */
+        height: 12px;
+        /* stop content from "spilling" */
+        overflow: hidden;
+
+        text-overflow: ellipsis;
+        max-width: 200px;
+        text-wrap: nowrap;
+      }
+      .hoverable:hover {
+        /* or height: auto then it will expand to text height */
+        max-width: initial;
+        height: auto;
+        text-wrap: initial;
+      }
+      #resultset tbody tr {
+        overflow: hidden;
+      }
+    ` : ''}
+
     .center-screen {
       overflow: hidden;
       display: grid;
@@ -107,8 +130,9 @@ export const head = /*html*/`
         background-size: 80px 80px;
       }
     }
-  </style>`;
-
+  </style>
+  `;
+}
 
 export const escapeHTML = str => str.replace(/[&<>'"]/g, 
   tag => ({

diff --git a/src/views/jobManager/jobLog.ts b/src/views/jobManager/jobLog.ts
@@ -1,6 +1,6 @@
 import { ViewColumn, window } from "vscode";
 import { JobInfo } from "../../connection/manager";
-import { escapeHTML, head } from "../html";
+import { escapeHTML, getHeader } from "../html";
 import { JobLogEntry } from "../../connection/types";
 import { JobManager } from "../../config";
 
@@ -22,7 +22,7 @@ function generatePage(rows: JobLogEntry[]) {
     <!DOCTYPE html>
     <html lang="en">
       <head>
-        ${head}
+        ${getHeader()}
       </head>
       <body>
         <table id="resultset">

diff --git a/src/views/results/html.ts b/src/views/results/html.ts
@@ -1,5 +1,7 @@
 import { Webview } from "vscode";
-import { head } from "../html";
+import { getHeader } from "../html";
+
+import Configuration from "../../configuration";
 
 export function setLoadingText(webview: Webview, text: string) {
   webview.postMessage({
@@ -13,7 +15,7 @@ export function getLoadingHTML(): string {
     <!DOCTYPE html>
     <html lang="en">
       <head>
-        ${head}
+        ${getHeader()}
         <script>
           window.addEventListener("message", (event) => {
             const command = event.data.command;
@@ -37,11 +39,13 @@ export function getLoadingHTML(): string {
 }
 
 export function generateScroller(basicSelect: string, isCL: boolean): string {
+  const withCollapsed = Configuration.get<boolean>('collapsedResultSet');
+
   return /*html*/`
     <!DOCTYPE html>
     <html lang="en">
       <head>
-        ${head}
+        ${getHeader({withCollapsed})}
         <script>
           /* 
           ${new Date().getTime()}
@@ -142,15 +146,20 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
 
             for (const row of arrayOfObjects) {
               // Insert a row at the end of table
-              var newRow = tBodyRef.insertRow();
+              var newRow = tBodyRef.insertRow()
 
               for (const cell of row) {
                 // Insert a cell at the end of the row
                 var newCell = newRow.insertCell();
 
                 // Append a text node to the cell
-                var newText = document.createTextNode(cell === undefined ? 'null' : cell);
-                newCell.appendChild(newText);
+
+                //TODO: handle cell formatting here
+                var newDiv = document.createElement("div");
+                newDiv.className = "hoverable";
+                newDiv.appendChild(document.createTextNode(cell === undefined ? 'null' : cell));
+
+                newCell.appendChild(newDiv);
               }
             }
 
@@ -170,6 +179,4 @@ export function generateScroller(basicSelect: string, isCL: boolean): string {
       </body>
     </html>
   `;
-}
-
-interface ColumnDetail {title: string, columnDataKey: string|number, transform?: (row: object) => string|number};
+}