Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions extensions/mssql/l10n/bundle.l10n.json
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,8 @@
"message": "{0} of {1} rules",
"comment": ["{0} is the filtered count, {1} is the total count"]
},
"Rule enabled": "Rule enabled",
"Rule disabled": "Rule disabled",
"Create new firewall rule for {0}/{0} is the server name that the firewall rule will be created for": {
"message": "Create new firewall rule for {0}",
"comment": ["{0} is the server name that the firewall rule will be created for"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@ export class CodeAnalysisWebViewController extends ReactWebviewPanelController<
}
if (payload.closeAfterSave) {
this.vscodeWrapper.logToOutputChannel(Loc.rulesSaved);
this.vscodeWrapper.outputChannel.show();
this.panel.dispose();
}
// Update the baseline rules so the component's useEffect resets isDirty
Expand Down
2 changes: 2 additions & 0 deletions extensions/mssql/src/reactviews/common/locConstants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ export class LocConstants {
args: [filtered, total],
comment: ["{0} is the filtered count, {1} is the total count"],
}),
ruleEnabled: l10n.t("Rule enabled"),
ruleDisabled: l10n.t("Rule disabled"),
};
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
ChevronDown20Regular,
ChevronRight20Regular,
Search20Regular,
Checkmark20Regular,
} from "@fluentui/react-icons";
import { DialogHeader } from "../../common/dialogHeader.component";
import { DialogMessage } from "../../common/dialogMessage";
Expand Down Expand Up @@ -115,6 +116,14 @@ const useStyles = makeStyles({
gap: "8px",
paddingLeft: "56px",
},
checkmarkContainer: {
width: "20px",
height: "20px",
display: "flex",
alignItems: "center",
justifyContent: "center",
flexShrink: 0,
},

// --- States ---
spinnerContainer: {
Expand Down Expand Up @@ -487,13 +496,20 @@ export const CodeAnalysisDialog = () => {
<TableRow key={rule.ruleId}>
<TableCell className={styles.tableCell}>
<div className={styles.childRuleContent}>
<Checkbox
aria-hidden={true}
checked={rule.enabled}
disabled={!rule.enabled}
style={{ pointerEvents: "none" }}
tabIndex={-1}
/>
<div
className={
styles.checkmarkContainer
}
role="img"
aria-label={
rule.enabled
? loc.ruleEnabled
: loc.ruleDisabled
}>
{rule.enabled && (
<Checkmark20Regular aria-hidden="true" />
)}
</div>
<Text>
{rule.shortRuleId}:{" "}
{rule.displayName}
Expand Down
2 changes: 1 addition & 1 deletion extensions/sql-database-projects/package.nls.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"sqlDatabaseProjects.publish": "Publish",
"sqlDatabaseProjects.createProjectFromDatabase": "Create Project From Database",
"sqlDatabaseProjects.updateProjectFromDatabase": "Update Project From Database",
"sqlDatabaseProjects.configureCodeAnalysisSettings": "Code Analysis Settings (Preview)",
"sqlDatabaseProjects.configureCodeAnalysisSettings": "Code Analysis Settings",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought we were doing a preview release for this feature in March. Is this not the case?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey @kburtram , I got this Go from PM, "since the code is pretty low-risk and stable as-is, we are jumping to GA directly". But we can still discuss about it today and if everyone is not agreed with the decisions, I can simple add the preview tag back :)

"sqlDatabaseProjects.properties": "Properties",
"sqlDatabaseProjects.schemaCompare": "Schema Compare",
"sqlDatabaseProjects.delete": "Delete",
Expand Down
2 changes: 1 addition & 1 deletion localization/xliff/sql-database-projects.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@
<source xml:lang="en">Close Database Project</source>
</trans-unit>
<trans-unit id="sqlDatabaseProjects.configureCodeAnalysisSettings">
<source xml:lang="en">Code Analysis Settings (Preview)</source>
<source xml:lang="en">Code Analysis Settings</source>
</trans-unit>
Comment thread
ssreerama marked this conversation as resolved.
Comment thread
ssreerama marked this conversation as resolved.
<trans-unit id="sqlDatabaseProjects.convertToSdkStyleProject">
<source xml:lang="en">Convert to SDK-style project</source>
Expand Down
6 changes: 6 additions & 0 deletions localization/xliff/vscode-mssql.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -4961,6 +4961,12 @@
<trans-unit id="++CODE++141b69f95916694982e525599db8205af7ecd6ced92d36c8aec6c5a9daa1e90e">
<source xml:lang="en">Rows per page</source>
</trans-unit>
<trans-unit id="++CODE++24601cef1cab3c7af34a853118337c5ac35833d0713571295bdfc7b9b37b994c">
<source xml:lang="en">Rule disabled</source>
</trans-unit>
<trans-unit id="++CODE++57993e10706c49eb54a633479451efd91636bee3f329ca3345632046c4b8060c">
<source xml:lang="en">Rule enabled</source>
Comment thread
ssreerama marked this conversation as resolved.
</trans-unit>
Comment thread
ssreerama marked this conversation as resolved.
<trans-unit id="++CODE++7c9de4e8e989511f39c9c515352856dbfe290c6de0e123d12cc60972e8fa8bf3">
<source xml:lang="en">Rule name</source>
</trans-unit>
Expand Down
Loading