Fix menu item visibility issues

hatzhang · May 15, 2024 · d580af2 · d580af2
1 parent c733ed8
commit d580af2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/GUI/EFCorePowerTools/EFCorePowerToolsPackage.cs b/src/GUI/EFCorePowerTools/EFCorePowerToolsPackage.cs
@@ -485,7 +485,6 @@ private async void OnServerExplorerDatabaseBeforeQueryStatus(object sender, Even
             }
 
             menuCommand.Visible = false;
-            menuCommand.Enabled = false;
 
             await ThreadHelper.JoinableTaskFactory.SwitchToMainThreadAsync();
 
@@ -526,19 +525,19 @@ private async void OnServerExplorerDatabaseBeforeQueryStatus(object sender, Even
                                 return;
                             }
 
-                            menuCommand.Visible = menuCommand.Enabled = await project.CanUseReverseEngineerAsync();
+                            menuCommand.Visible = await project.CanUseReverseEngineerAsync();
                             return;
                         }
 
                         if (menuCommand.CommandID.ID == PkgCmdIDList.cmdidServerExplorerDiagram)
                         {
-                            menuCommand.Visible = menuCommand.Enabled = true;
+                            menuCommand.Visible = true;
                             return;
                         }
 
                         if (menuCommand.CommandID.ID == PkgCmdIDList.cmdidServerExplorerAnalyze)
                         {
-                            menuCommand.Visible = menuCommand.Enabled = VsDataHelper.SqlServerProviders.Contains(connection.Provider);
+                            menuCommand.Visible = VsDataHelper.SqlServerProviders.Contains(connection.Provider);
                         }
                     }
                 }

diff --git a/src/GUI/EFCorePowerTools/EFCorePowerToolsPackage.en.vsct b/src/GUI/EFCorePowerTools/EFCorePowerToolsPackage.en.vsct
@@ -226,7 +226,6 @@
         <CommandFlag>DefaultInvisible</CommandFlag>
         <Strings>
           <ButtonText>Analyze this! (preview)</ButtonText>
-          <ToolTipText>Run T-SQL static code analysis with an extensive set of rules</ToolTipText>
         </Strings>
       </Button>
 
@@ -268,6 +267,8 @@
         <Parent guid="guidCRUDSPCommandsPackageCmdSet1" id="DatabaseMenuGroup" />
         <Icon guid="ImageCatalogGuid" id="DatabaseScript" />
         <CommandFlag>IconIsMoniker</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>DefaultInvisible</CommandFlag>
         <Strings>
           <ButtonText>EF Core Power Tools - Reverse Engineer</ButtonText>
         </Strings>
@@ -277,6 +278,8 @@
         <Parent guid="guidCRUDSPCommandsPackageCmdSet1" id="DatabaseMenuGroup" />
         <Icon guid="ImageCatalogGuid" id="DatabaseAuditSpecification" />
         <CommandFlag>IconIsMoniker</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>DefaultInvisible</CommandFlag>
         <Strings>
           <ButtonText>EF Core Power Tools - Generate ER Diagram</ButtonText>
         </Strings>
@@ -286,6 +289,8 @@
         <Parent guid="guidCRUDSPCommandsPackageCmdSet1" id="DatabaseMenuGroup" />
         <Icon guid="ImageCatalogGuid" id="CodeInformationRule" />
         <CommandFlag>IconIsMoniker</CommandFlag>
+        <CommandFlag>DynamicVisibility</CommandFlag>
+        <CommandFlag>DefaultInvisible</CommandFlag>        
         <Strings>
           <ButtonText>EF Core Power Tools - Analyze Database (experimental)</ButtonText>
         </Strings>