Merge pull request #1555 from forcedotcom/sc/W-16357846

stephen-carter-at-sf · web-flow · commit 0c65a24973a8 · 2024-07-29T11:38:17.000-04:00
FIX (html): @W-16357846@: Fix html syntax issues
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -13,5 +13,8 @@
 	},
 	"plugins": [
 		"@typescript-eslint"
-	]
+	],
+	"rules": {
+		"sf-plugin/only-extend-SfCommand": "off"
+	}
 }
diff --git a/.github/workflows/create-release-branch.yml b/.github/workflows/create-release-branch.yml
@@ -145,7 +145,7 @@ jobs:
           git checkout -b release-$NEW_VERSION
           git push --set-upstream origin release-$NEW_VERSION
           # Now that we're done with the interim branch, delete it.
-          git push -d ${NEW_VERSION}-interim
+          git push -d origin ${NEW_VERSION}-interim
           # Output the release branch name so we can use it in later jobs.
           echo "branch_name=release-$NEW_VERSION" >> "$GITHUB_OUTPUT"
   # Run all the various tests against the newly created branch.
diff --git a/html-templates/simple.mustache b/html-templates/simple.mustache
@@ -65,7 +65,7 @@
 	<script type="text/javascript" language="javascript"
 		src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
 	<script type="text/javascript" language="javascript" src="https://cdn.datatables.net/rowgroup/1.1.2/js/dataTables.rowGroup.min.js"></script>
-    <script type="text/javascript" language="javascript" src="https://cdn.jsdelivr.net/npm/chart.js@2.9.3/dist/Chart.min.js"></script>
+	<script type="text/javascript" language="javascript" src="https://cdn.jsdelivr.net/npm/chart.js@2.9.3/dist/Chart.min.js"></script>
 	<script type="text/javascript" class="init">
 
 	// BEGIN - Placeholders filled in by the scanner
@@ -294,11 +294,12 @@
 			});
 		});
 	</script>
+	<title>Salesforce Code Analyzer Report</title>
 </head>
 
 <body>
     <h1 id="reportTitle">Salesforce Code Analyzer Report</h1>
-	<div id="summaryChart"/></div>
+	<div id="summaryChart"></div>
 	<h4 id="summaryFiles"></h4>
 	<h4 id="summaryViolations"></h4>
 	<div class="fw-container">
@@ -319,7 +320,7 @@
 							<th>End Column</th>
 						</tr>
 					</thead>
-					<tbody/>
+					<tbody></tbody>
 				</table>
 			</div>
 		</div>
diff --git a/src/commands/scanner/rule/add.ts b/src/commands/scanner/rule/add.ts
@@ -20,6 +20,7 @@ export default class Add extends ScannerCommand {
 	// This defines the flags accepted by this command. The key is the longname, the char property is the shortname,
 	// and summary and description is what's printed when the -h/--help flag is supplied.
 	public static readonly flags = {
+		...ScannerCommand.flags,
 		language: Flags.string({
 			char: 'l',
 			summary: getMessage(BundleName.Add, 'flags.languageSummary'),
diff --git a/src/commands/scanner/rule/describe.ts b/src/commands/scanner/rule/describe.ts
@@ -19,6 +19,7 @@ export default class Describe extends ScannerCommand {
 	// This defines the flags accepted by this command. The key is the longname, the char property is the shortname,
 	// and summary and description is what's printed when the -h/--help flag is supplied.
 	public static readonly flags = {
+		...ScannerCommand.flags,
 		rulename: Flags.string({
 			char: 'n',
 			summary: getMessage(BundleName.Describe, 'flags.rulenameSummary'),
diff --git a/src/commands/scanner/rule/list.ts b/src/commands/scanner/rule/list.ts
@@ -22,6 +22,7 @@ export default class List extends ScannerCommand {
 	// This defines the flags accepted by this command. The key is the longname, the char property is the shortname,
 	// and summary and description is what's printed when the -h/--help flag is supplied.
 	public static readonly flags = {
+		...ScannerCommand.flags,
 		verbose: Flags.boolean({
 			summary: getMessage(BundleName.Common, 'flags.verboseSummary')
 		}),
diff --git a/src/commands/scanner/rule/remove.ts b/src/commands/scanner/rule/remove.ts
@@ -21,6 +21,7 @@ export default class Remove extends ScannerCommand {
 	// This defines the flags accepted by this command. The key is the longname, the char property is the shortname,
 	// and summary and description is what's printed when the -h/--help flag is supplied.
 	public static readonly flags = {
+		...ScannerCommand.flags,
 		verbose: Flags.boolean({
 			summary: getMessage(BundleName.Common, 'flags.verboseSummary')
 		}),
diff --git a/src/lib/ScannerRunCommand.ts b/src/lib/ScannerRunCommand.ts
@@ -9,6 +9,7 @@ export abstract class ScannerRunCommand extends ScannerCommand {
 	 * here to avoid duplicate code.
 	 */
 	public static readonly flags = {
+		...ScannerCommand.flags,
 		verbose: Flags.boolean({
 			summary: getMessage(BundleName.Common, 'flags.verboseSummary')
 		}),
