added Admin Tool Action to prevent non-admins

Author: porterbot

modules/AdministrationGUI/src/main/java/org/janelia/workstation/admin/AdministrationTopComponent.java

@@ -44,11 +44,6 @@
 )
 @TopComponent.Registration(mode = "editor", openAtStartup = false)
 @ActionID(category = "Window", id = "org.janelia.workstation.admin.AdministrationTopComponent")
-@ActionReference(path = "Menu/Window/Core", position = 10)
-@TopComponent.OpenActionRegistration(
-        displayName = "#CTL_AdministrationTopComponentAction",
-        preferredID = AdministrationTopComponent.PREFERRED_ID
-)
 @Messages({
         "CTL_AdministrationTopComponentAction=Administration Tool",
         "CTL_AdministrationTopComponent=" + AdministrationTopComponent.LABEL_TEXT,
@@ -63,13 +58,12 @@ public final class AdministrationTopComponent extends TopComponent {
 
     private JPanel topMenu;
     private Refreshable currentView;
-    private boolean enabled;
 
     public AdministrationTopComponent() {
         setupGUI();
         setName(Bundle.CTL_AdministrationTopComponent());
         setToolTipText(Bundle.HINT_AdministrationTopComponent());
-        enabled = AccessManager.getAccessManager().isAdmin();
+        boolean enabled = AccessManager.getAccessManager().isAdmin();
         setEnabled(enabled);
     }
 
@@ -93,7 +87,6 @@ private void setupGUI() {
         listUsersButton.setVerticalTextPosition(SwingConstants.BOTTOM);
         listUsersButton.setHorizontalTextPosition(SwingConstants.CENTER);
         listUsersButton.addActionListener(event -> viewUserList());
-        listUsersButton.setEnabled(enabled);
         row1.add(listUsersButton);
 
         row1.add(Box.createHorizontalStrut(20)); // Add space between buttons
@@ -105,7 +98,6 @@ private void setupGUI() {
         listGroupsButton.setVerticalTextPosition(SwingConstants.BOTTOM);
         listGroupsButton.setHorizontalTextPosition(SwingConstants.CENTER);
         listGroupsButton.addActionListener(event -> viewGroupList());
-        listGroupsButton.setEnabled(enabled);
         row1.add(listGroupsButton);
 
         row1.add(Box.createHorizontalStrut(20));
@@ -115,7 +107,6 @@ private void setupGUI() {
         getLogsButton.addActionListener(event -> getLogs());
         getLogsButton.setVerticalTextPosition(SwingConstants.BOTTOM);
         getLogsButton.setHorizontalTextPosition(SwingConstants.CENTER);
-        getLogsButton.setEnabled(enabled);
         row1.add(getLogsButton);
 
         row1.add(Box.createHorizontalStrut(20));
@@ -126,7 +117,6 @@ private void setupGUI() {
         workspaceCleanupButton.setVerticalTextPosition(SwingConstants.BOTTOM);
         workspaceCleanupButton.setHorizontalTextPosition(SwingConstants.CENTER);
         workspaceCleanupButton.addActionListener(event -> databaseCleanup());
-        workspaceCleanupButton.setEnabled(enabled);
         row1.add(workspaceCleanupButton);
 
         // Add both rows to the main menu

modules/AdministrationGUI/src/main/java/org/janelia/workstation/admin/nb_actions/OpenAdminPanelAction.java

@@ -0,0 +1,53 @@
+package org.janelia.workstation.admin.nb_actions;
+import java.awt.event.ActionEvent;
+
+import org.janelia.workstation.admin.AdministrationTopComponent;
+import org.janelia.workstation.core.api.AccessManager;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
+import org.openide.awt.ActionRegistration;
+import org.openide.util.HelpCtx;
+import org.openide.util.NbBundle.Messages;
+import org.openide.util.actions.SystemAction;
+import org.slf4j.LoggerFactory;
+import org.openide.windows.TopComponent;
+import org.openide.windows.WindowManager;
+
+@ActionID(
+        category = "Window",
+        id = "org.janelia.workstation.admin.OpenAdminTopComponentAction"
+)
+@ActionRegistration(
+        displayName = "#CTL_AdministrationTopComponentAction",
+        lazy = false
+)
+@Messages("CTL_AdministrationTopComponentAction=Administration Tool")
+public final class OpenAdminPanelAction extends SystemAction {
+
+    @Override
+    public String getName() {
+        return "Administration Tool";
+    }
+
+    @Override
+    public HelpCtx getHelpCtx() {
+        return null;
+    }
+
+    @Override
+    public void actionPerformed(ActionEvent e) {
+        if (AccessManager.getAccessManager().isAdmin()) {
+            TopComponent win = WindowManager.getDefault()
+                    .findTopComponent(AdministrationTopComponent.PREFERRED_ID);
+            if (win != null) {
+                win.open();
+                win.requestActive();
+            }
+        } else {
+            // either silently disable, or tell the user
+            LoggerFactory.getLogger(getClass())
+                    .warn("Non-admin attempted to open Administration Tool");
+        }
+    }
+}
+

modules/AdministrationGUI/src/main/java/org/janelia/workstation/admin/nb_actions/OpenAdminPanelActionBuilder.java

@@ -0,0 +1,22 @@
+package org.janelia.workstation.admin.nb_actions;
+
+import javax.swing.Action;
+
+import org.janelia.workstation.common.nb_action.RunAsMenuAction;
+import org.janelia.workstation.integration.spi.actions.AdminActionBuilder;
+import org.openide.util.actions.SystemAction;
+import org.openide.util.lookup.ServiceProvider;
+
+/**
+ * Builds the admin menu item for launching the Admin GUI.
+ *
+ * @author <a href="mailto:schauderd@janelia.hhmi.org">David Schauder</a>
+ */
+@ServiceProvider(service = AdminActionBuilder.class, position=1)
+public final class OpenAdminPanelActionBuilder implements AdminActionBuilder {
+    @Override
+    public Action getAction() {
+        return SystemAction.get(OpenAdminPanelAction.class);
+    }
+}
+