Edit Data Result Filtering

extensions/mssql/l10n/bundle.l10n.json

@@ -1259,8 +1259,6 @@
     "Learn More": "Learn More",
     "Save Changes": "Save Changes",
     "Add Row": "Add Row",
-    "Show Script": "Show Script",
-    "Hide Script": "Hide Script",
     "Open in SQL Editor": "Open in SQL Editor",
     "Copy Script": "Copy Script",
     "Copy Script to Clipboard": "Copy Script to Clipboard",
@@ -1272,7 +1270,6 @@
     "Revert Row": "Revert Row",
     "Total rows to fetch:": "Total rows to fetch:",
     "Rows per page": "Rows per page",
-    "Fetch rows": "Fetch rows",
     "First Page": "First Page",
     "Previous Page": "Previous Page",
     "Next Page": "Next Page",
@@ -1283,6 +1280,36 @@
     "Close Script Pane": "Close Script Pane",
     "Modify Table": "Modify Table",
     "View Table Diagram": "View Table Diagram",
+    "Show SQL Pane": "Show SQL Pane",
+    "Hide SQL Pane": "Hide SQL Pane",
+    "Changes": "Changes",
+    "SQL": "SQL",
+    "Delete 1 row": "Delete 1 row",
+    "Delete {0} rows": "Delete {0} rows",
+    "Show SQL": "Show SQL",
+    "Open the generated SELECT statement in a new editor": "Open the generated SELECT statement in a new editor",
+    "Filters": "Filters",
+    "Add filters to modify the SQL query": "Add filters to modify the SQL query",
+    "WHERE": "WHERE",
+    "and": "and",
+    "or": "or",
+    "Conjunction": "Conjunction",
+    "Logical operator": "Logical operator",
+    "Filter value": "Filter value",
+    "Add filter": "Add filter",
+    "Clear filters": "Clear filters",
+    "Remove filter": "Remove filter",
+    "value": "value",
+    "equals": "equals",
+    "not equals": "not equals",
+    "contains": "contains",
+    "does not contain": "does not contain",
+    "starts with": "starts with",
+    "ends with": "ends with",
+    "greater than": "greater than",
+    "less than": "less than",
+    "is null": "is null",
+    "is not null": "is not null",
     "Search Database Objects": "Search Database Objects",
     "Loading database objects": "Loading database objects",
     "Connecting to {0}.../{0} is the server name": {
@@ -1353,7 +1380,6 @@
     "of": "of",
     "Page": "Page",
     "Refresh dataset": "Refresh dataset",
-    "Remove filter": "Remove filter",
     "Remove sort": "Remove sort",
     "Select all": "Select all",
     "Sort ascending": "Sort ascending",
@@ -1603,7 +1629,6 @@
     },
     "YYYY-MM-DD HH:mm:ss": "YYYY-MM-DD HH:mm:ss",
     "Use format: YYYY-MM-DD HH:mm:ss[.SSS]": "Use format: YYYY-MM-DD HH:mm:ss[.SSS]",
-    "Filter value": "Filter value",
     "Filter operator": "Filter operator",
     "Value is required": "Value is required",
     "Must be a valid number": "Must be a valid number",
@@ -2750,6 +2775,7 @@
         "comment": ["{0} is the error message from the connection attempt"]
     },
     "Loading Schema Designer Model...": "Loading Schema Designer Model...",
+    "Table Diagram": "Table Diagram",
     "Schema Designer Model is ready. Changes can now be published.": "Schema Designer Model is ready. Changes can now be published.",
     "Schema Designer": "Schema Designer",
     "Opening Publish Script. This may take a while...": "Opening Publish Script. This may take a while...",
@@ -3289,6 +3315,13 @@
         "message": "Failed to open Schema Designer: {0}",
         "comment": ["{0} is the error message"]
     },
+    "Failed to run table query: {0}/{0} is the error message": {
+        "message": "Failed to run table query: {0}",
+        "comment": ["{0} is the error message"]
+    },
+    "Failed to run table query.": "Failed to run table query.",
+    "Running a custom query will discard all pending changes. Do you want to continue?": "Running a custom query will discard all pending changes. Do you want to continue?",
+    "Continue": "Continue",
     "Locate an Azure Data Studio settings.json file to import": "Locate an Azure Data Studio settings.json file to import",
     "Ready for import": "Ready for import",
     "Needs attention": "Needs attention",

extensions/mssql/package.json

@@ -129,7 +129,7 @@
         "sinon": "^21.0.3",
         "sinon-chai": "^4.0.1",
         "slickgrid": "github:Microsoft/SlickGrid.ADS#v2.3.51",
-        "slickgrid-react": "10.5.1",
+        "slickgrid-react": "10.7.0",
         "source-map-support": "^0.5.21",
         "ts-node": "^10.9.2",
         "typescript": "^5.8.3",

extensions/mssql/src/constants/locConstants.ts

@@ -1989,6 +1989,7 @@ export class SchemaCompare {
 export class SchemaDesigner {
     public static LoadingSchemaDesginerModel = l10n.t("Loading Schema Designer Model...");
     public static PanelTitle = l10n.t("Visualize and Design Schema");
+    public static ReadOnlyPanelTitle = l10n.t("Table Diagram");
     public static SchemaReady = l10n.t(
         "Schema Designer Model is ready. Changes can now be published.",
     );
@@ -3090,6 +3091,21 @@ export class TableExplorer {
             args: [errorMessage],
             comment: ["{0} is the error message"],
         });
+
+    public static failedToRunTableQuery = (errorMessage: string) =>
+        l10n.t({
+            message: "Failed to run table query: {0}",
+            args: [errorMessage],
+            comment: ["{0} is the error message"],
+        });
+
+    public static failedToRunTableQueryUnknown = l10n.t("Failed to run table query.");
+
+    public static pendingChangesWillBeLost = l10n.t(
+        "Running a custom query will discard all pending changes. Do you want to continue?",
+    );
+
+    public static Continue = l10n.t("Continue");
 }
 
 export class AzureDataStudioMigration {

extensions/mssql/src/controllers/mainController.ts

@@ -1831,6 +1831,8 @@ export default class MainController implements vscode.Disposable {
                             this.schemaDesignerService,
                             databaseName,
                             node,
+                            undefined,
+                            true, // isReadOnly: table-diagram view from Table Explorer
                         );
 
                     schemaDesigner.setInitialFilterTables([filterTable]);

extensions/mssql/src/controllers/webviewPanelController.ts

@@ -25,7 +25,7 @@ export class WebviewPanelController<State, Reducers, Result = void> extends Webv
     State,
     Reducers
 > {
-    private _panel: vscode.WebviewPanel;
+    private _panel!: vscode.WebviewPanel;
     public readonly dialogResult: Deferred<Result | undefined> = new Deferred<Result | undefined>();
 
     /**
@@ -107,10 +107,13 @@ export class WebviewPanelController<State, Reducers, Result = void> extends Webv
         this._panel.reveal(viewColumn, true);
     }
 
-    protected async showRestorePrompt(): Promise<{
-        title: string;
-        run: () => Promise<void>;
-    }> {
+    protected async showRestorePrompt(): Promise<
+        | {
+              title: string;
+              run: () => Promise<void>;
+          }
+        | undefined
+    > {
         return await vscode.window.showInformationMessage(
             locConstants.Webview.webviewRestorePrompt(this._options.title),
             {

extensions/mssql/src/models/utils.ts

@@ -110,7 +110,16 @@ export function azureAuthTypeToString(value: AzureAuthType): string {
 }
 
 export function escapeClosingBrackets(str: string): string {
-    return str.replace("]", "]]");
+    return str.replace(/\]/g, "]]");
+}
+
+/**
+ * Escapes a SQL identifier by wrapping it in square brackets and escaping any
+ * closing brackets within the name.
+ * Example: `my]table` becomes `[my]]table]`
+ */
+export function bracketEscapeSqlIdentifier(name: string): string {
+    return `[${escapeClosingBrackets(name)}]`;
 }
 
 /**

extensions/mssql/src/schemaDesigner/schemaDesignerWebviewController.ts

@@ -100,6 +100,7 @@ export class SchemaDesignerWebviewController extends WebviewPanelController<
         private schemaDesignerCache: Map<string, SchemaDesigner.SchemaDesignerCacheItem>,
         private treeNode?: TreeNodeInfo,
         private connectionUri?: string,
+        isReadOnly: boolean = false,
     ) {
         super(
             context,
@@ -111,9 +112,14 @@ export class SchemaDesignerWebviewController extends WebviewPanelController<
                 isCopilotChatInstalled: isCopilotChatInstalled(),
                 copilotChatDiscoveryDismissed: getCopilotChatDiscoveryDismissedState(context),
                 activeView: SchemaDesigner.SchemaDesignerActiveView.SchemaDesigner,
+                isReadOnly,
             },
             {
-                title: `${LocConstants.SchemaDesigner.PanelTitle} - ${databaseName}`,
+                // Drop the "(Preview)" suffix when launched read-only from the
+                // Table Explorer's table-diagram entry point.
+                title: isReadOnly
+                    ? `${LocConstants.SchemaDesigner.ReadOnlyPanelTitle} - ${databaseName}`
+                    : `${LocConstants.SchemaDesigner.PanelTitle} - ${databaseName}`,
                 viewColumn: vscode.ViewColumn.One,
                 iconPath: {
                     light: vscode.Uri.joinPath(

extensions/mssql/src/schemaDesigner/schemaDesignerWebviewManager.ts

@@ -86,6 +86,7 @@ export class SchemaDesignerWebviewManager {
         databaseName: string,
         treeNode?: TreeNodeInfo,
         connectionUri?: string,
+        isReadOnly: boolean = false,
     ): Promise<SchemaDesignerWebviewController> {
         let connectionString: string | undefined;
         let azureAccountToken: string | undefined;
@@ -117,7 +118,10 @@ export class SchemaDesignerWebviewManager {
             azureAccountToken = connInfo.credentials.azureAccountToken;
         }
 
-        const key = `${connectionString}-${databaseName}`;
+        // Include the mode in the cache key so that opening a read-only and an
+        // editable view for the same database produces two separate panels rather
+        // than reusing one with the wrong toolbar and state.
+        const key = `${connectionString}-${databaseName}-${isReadOnly ? "ro" : "rw"}`;
         if (!this.schemaDesigners.has(key) || this.schemaDesigners.get(key)?.isDisposed) {
             const schemaDesigner = new SchemaDesignerWebviewController(
                 context,
@@ -130,6 +134,7 @@ export class SchemaDesignerWebviewManager {
                 this.schemaDesignerCache,
                 treeNode,
                 connectionUri,
+                isReadOnly,
             );
             const viewStateDisposable = schemaDesigner.panel.onDidChangeViewState((event) => {
                 if (event.webviewPanel.visible) {
@@ -172,6 +177,7 @@ export class SchemaDesignerWebviewManager {
                             databaseName,
                             treeNode,
                             connectionUri,
+                            isReadOnly,
                         );
                     }
                 }