Merge branch 'main' into lewissanchez/feat/add-lanaguge-service-switch-2

Author: lewis-sanchez

.github/workflows/file-size-check.yml .github/workflows/pr-checks.yml

@@ -1,15 +1,17 @@
-name: File Size Check
-# Trigger the workflow on PRs to the main branch. It builds the extension in prod mode and checks the size of the
-# vsix file and webview bundle file and compares it with the main branch. It fails if the size has increased by more than 10%.
-# For vsix, we also check if the size is greater than 25MB.
+name: PR Checks
+# Trigger the workflow on PRs to the main branch.
+# It performs the following checks:
+# 1. Calculate the size difference between the webview bundles of the main branch and the PR branch.
+# 2. Calculate the size difference between the VSIX files of the main branch and the PR branch.
+# 3. Does a check if the PR has properly localized strings.
 
 on:
   pull_request:
     branches:
       - main
 
 jobs:
-  size-check:
+  pr-checks:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -119,21 +121,14 @@ jobs:
           body-includes: |
             ### VSIX Size Comparison
 
-      - name: Create comment
+      - name: Create or update comment
         if: steps.fc.outputs.comment-id == ''
         uses: peter-evans/create-or-update-comment@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           issue-number: ${{ github.event.pull_request.number }}
           body-path: ./results.md
-
-      - name: Update comment
-        if: steps.fc.outputs.comment-id != ''
-        uses: peter-evans/create-or-update-comment@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
           comment-id: ${{ steps.fc.outputs.comment-id }}
-          body-path: ./results.md
           edit-mode: replace
 
       - name: Fail if vsix size is increased by 5% or size is above 25mb
@@ -144,7 +139,56 @@ jobs:
         if: ${{ env.webview_bundle_percentage_change > 5 }}
         run: exit 1
 
+      - name: Generate xliff files in PR branch
+        run: |
+          cd pr
+          yarn localization
 
+      # Check if there are git changes in english xlf files
+      - name: Check for changes in english xlf files
+        run: |
+          cd pr
+          if git diff --quiet --exit-code ./localization/xliff/vscode-mssql.xlf; then
+            echo "Changes not found in english xlf files"
+            echo "loc_update_required=false" >> $GITHUB_ENV
+          else
+            echo "Changes found in english xlf files"
+            echo "loc_update_required=true" >> $GITHUB_ENV
+          fi
 
+      - name: Find comment
+        uses: peter-evans/find-comment@v3
+        id: loc-comment
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          comment-author: 'github-actions[bot]'
+          body-includes: |
+            # Updates to localized strings required
 
+      - name: Create or update comment
+        if: ${{ env.loc_update_required == 'true' }}
+        uses: peter-evans/create-or-update-comment@v4
+        with:
+          comment-id: ${{ steps.loc-comment.outputs.comment-id }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          issue-number: ${{ github.event.pull_request.number }}
+          body: |
+            # Updates to localized strings required
+              Please update the localized strings in the PR with following steps:
+              1. Run `yarn localization` in the PR branch.
+              1. Based on the changes,
+                  * If there are changes in localized strings in source code, make sure that `src/localization/xliff/vscode-mssql.xlf` and `src/l10n/bundle.l10n.json` files are updated.
+                  * If there are changes in localized strings in `package.nls.json`, make sure that `src/localization/xliff/vscode-mssql.xlf` is updated.
+          edit-mode: replace
 
+      - name: Delete comment
+        if: ${{ env.loc_update_required == 'false' }} && steps.loc-comment.outputs.comment-id != ''
+        run: |
+          curl -X DELETE \
+          -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -H "Accept: application/vnd.github.v3+json" \
+          https://api.github.com/repos/${{ github.repository }}/issues/comments/${{ steps.loc-comment.outputs.comment-id }}
+
+      - name: Fail if there are changes required in english xlf files
+        if: ${{ env.loc_update_required == 'true' }}
+        run: exit 1

.gitignore

@@ -18,7 +18,6 @@ coverage
 coverage-remapped
 test-reports
 .vscode-test
-localization/i18n/
 src/constants/localizedConstants.ts
 package.nls.*.json
 /test-results/

localization/xliff/vscode-mssql.xlf

@@ -1046,6 +1046,9 @@
     <trans-unit id="mssql.queryHistoryLimit">
       <source xml:lang="en">Number of query history entries to show in the Query History view</source>
     </trans-unit>
+    <trans-unit id="mssql.openExecutionPlanFile">
+      <source xml:lang="en">Open Execution Plan File</source>
+    </trans-unit>
     <trans-unit id="mssql.openQueryHistory">
       <source xml:lang="en">Open Query</source>
     </trans-unit>

src/connectionconfig/connectionDialogWebviewController.ts

@@ -81,7 +81,7 @@ export class ConnectionDialogWebviewController extends ReactWebviewPanelControll
 
 	private async loadRecentConnections() {
 		const recentConnections = this._mainController.connectionManager.connectionStore.loadAllConnections(true).map(c => c.connectionCreds);
-		const dialogConnections = [];
+		const dialogConnections: IConnectionDialogProfile[] = [];
 		for (let i = 0; i < recentConnections.length; i++) {
 			dialogConnections.push(await this.initializeConnectionForDialog(recentConnections[i]));
 		}
@@ -105,28 +105,41 @@ export class ConnectionDialogWebviewController extends ReactWebviewPanelControll
 		this.state.connectionProfile = emptyConnection;
 	}
 
-	private async initializeConnectionForDialog(connection: IConnectionInfo) {
+	private async initializeConnectionForDialog(connection: IConnectionInfo): Promise<IConnectionDialogProfile> {
 		// Load the password if it's saved
 		const isConnectionStringConnection = connection.connectionString !== undefined && connection.connectionString !== '';
-		const password = await this._mainController.connectionManager.connectionStore.lookupPassword(connection, isConnectionStringConnection);
 		if (!isConnectionStringConnection) {
+			const password = await this._mainController.connectionManager.connectionStore.lookupPassword(connection, isConnectionStringConnection);
 			connection.password = password;
 		} else {
-			connection.connectionString = '';
-			// extract password from connection string it starts after 'Password=' and ends before ';'
-			const passwordIndex = password.indexOf('Password=') === -1 ? password.indexOf('password=') : password.indexOf('Password=');
-			if (passwordIndex !== -1) {
-				const passwordStart = passwordIndex + 'Password='.length;
-				const passwordEnd = password.indexOf(';', passwordStart);
-				if (passwordEnd !== -1) {
-					connection.password = password.substring(passwordStart, passwordEnd);
+			// If the connection is a connection string connection with SQL Auth:
+			//   * the full connection string is stored as the "password" in the credential store
+			//   * we need to extract the password from the connection string
+			// If the connection is a connection string connection with a different auth type, then there's nothing in the credential store.
+
+			const connectionString = await this._mainController.connectionManager.connectionStore.lookupPassword(connection, isConnectionStringConnection);
+
+			if (connectionString) {
+				const passwordIndex = connectionString.toLowerCase().indexOf('password=');
+
+				if (passwordIndex !== -1) {
+					// extract password from connection string; found between 'Password=' and the next ';'
+					const passwordStart = passwordIndex + 'password='.length;
+					const passwordEnd = connectionString.indexOf(';', passwordStart);
+					if (passwordEnd !== -1) {
+						connection.password = connectionString.substring(passwordStart, passwordEnd);
+					}
+
+					// clear the connection string from the IConnectionDialogProfile so that the ugly connection string key
+					// that's used to look up the actual connection string (with password) isn't displayed
+					connection.connectionString = '';
 				}
 			}
-
 		}
+
 		const dialogConnection = connection as IConnectionDialogProfile;
-		// Set the profile name
-		dialogConnection.profileName = dialogConnection.profileName ?? getConnectionDisplayName(connection);
+		// Set the display name
+		dialogConnection.displayName = dialogConnection.profileName ? dialogConnection.profileName : getConnectionDisplayName(connection);
 		return dialogConnection;
 	}
 

src/reactviews/pages/ConnectionDialog/mruConnectionsContainer.tsx

@@ -54,7 +54,7 @@ export const MruConnectionsContainer = () => {
 							connectionDialogContext.loadConnection(connection);
 						}}>
 							<TreeItemLayout iconBefore={<ServerRegular />}>
-								{connection.profileName}
+								{connection.displayName}
 							</TreeItemLayout>
 						</TreeItem>;
 					})

src/sharedInterfaces/connectionDialog.ts

@@ -66,10 +66,10 @@ export interface IConnectionDialogProfile extends vscodeMssql.IConnectionInfo {
 	savePassword?: boolean;
 	emptyPasswordInput?: boolean;
 	azureAuthType?: vscodeMssql.AzureAuthType;
+    /** display name for the MRU pane; should be set to the profileName if available, otherwise generated from connection details */
+    displayName?: string;
 }
 
-
-
 export interface ConnectionDialogContextProps extends FormContextProps<ConnectionDialogWebviewState, IConnectionDialogProfile> {
 	theme: Theme;
 	loadConnection: (connection: IConnectionDialogProfile) => void;