CHE-5188: fix a bug with showing commands when a ws has started (ecli…

…pse-che#5309)
dgomezleon · Jun 9, 2017 · 1e9e912 · 1e9e912
1 parent a5dec28
commit 1e9e912
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 17 deletions.
diff --git a/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/command/CommandManager.java b/ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/command/CommandManager.java
@@ -24,6 +24,9 @@ public interface CommandManager {
     /** Returns all commands. */
     List<CommandImpl> getCommands();
 
+    /** Fetches all commands related to the workspace. */
+    void fetchCommands();
+
     /** Returns optional command by the specified name or {@link Optional#empty()} if none. */
     Optional<CommandImpl> getCommand(String name);
 

diff --git a/...ide-app/src/main/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenter.java b/...ide-app/src/main/java/org/eclipse/che/ide/command/explorer/CommandsExplorerPresenter.java
@@ -78,6 +78,8 @@ public class CommandsExplorerPresenter extends BasePresenter implements Commands
     private final AppContext           appContext;
     private final EventBus             eventBus;
 
+    private boolean isFirstActivation;
+
     @Inject
     public CommandsExplorerPresenter(CommandsExplorerView view,
                                      CommandResources commandResources,
@@ -109,6 +111,17 @@ public CommandsExplorerPresenter(CommandsExplorerView view,
         view.setDelegate(this);
     }
 
+    @Override
+    public void onOpen() {
+        super.onOpen();
+
+        if (isFirstActivation) {
+            commandManager.fetchCommands();
+            refreshView();
+            isFirstActivation = false;
+        }
+    }
+
     @Override
     public void start(Callback<WsAgentComponent, Exception> callback) {
         callback.onSuccess(this);
@@ -126,6 +139,7 @@ public void start(Callback<WsAgentComponent, Exception> callback) {
 
     @Override
     public void go(AcceptsOneWidget container) {
+        isFirstActivation = true;
         refreshView();
 
         container.setWidget(getView());

diff --git a/...he-core-ide-app/src/main/java/org/eclipse/che/ide/command/manager/CommandManagerImpl.java b/...he-core-ide-app/src/main/java/org/eclipse/che/ide/command/manager/CommandManagerImpl.java
@@ -100,30 +100,45 @@ private void fetchCommands(Callback<WsAgentComponent, Exception> callback) {
             workspaceCommands.forEach(workspaceCommand -> commands.put(workspaceCommand.getName(),
                                                                        new CommandImpl(workspaceCommand, new ApplicableContext())));
 
-            // get all commands related to the projects
-            Arrays.stream(appContext.getProjects())
-                  .forEach(project -> projectCommandManager.getCommands(project).forEach(projectCommand -> {
-                      final CommandImpl existedCommand = commands.get(projectCommand.getName());
-
-                      if (existedCommand == null) {
-                          commands.put(projectCommand.getName(),
-                                       new CommandImpl(projectCommand, new ApplicableContext(project.getPath())));
-                      } else {
-                          if (projectCommand.equalsIgnoreContext(existedCommand)) {
-                              existedCommand.getApplicableContext().addProject(project.getPath());
-                          } else {
-                              // normally, should never happen
-                              Log.error(CommandManagerImpl.this.getClass(), "Different commands with the same names found");
-                          }
-                      }
-                  }));
+            addCommands();
 
             callback.onSuccess(this);
 
             notifyCommandsLoaded();
         });
     }
 
+    public void fetchCommands() {
+        workspaceCommandManager.getCommands(appContext.getWorkspaceId()).then(workspaceCommands -> {
+            workspaceCommands.forEach(workspaceCommand -> commands.put(workspaceCommand.getName(),
+                    new CommandImpl(workspaceCommand, new ApplicableContext())));
+
+            addCommands();
+
+            notifyCommandsLoaded();
+        });
+    }
+
+    private void addCommands() {
+        // get all commands related to the projects
+        Arrays.stream(appContext.getProjects())
+                .forEach(project -> projectCommandManager.getCommands(project).forEach(projectCommand -> {
+                    final CommandImpl existedCommand = commands.get(projectCommand.getName());
+
+                    if (existedCommand == null) {
+                        commands.put(projectCommand.getName(),
+                                new CommandImpl(projectCommand, new ApplicableContext(project.getPath())));
+                    } else {
+                        if (projectCommand.equalsIgnoreContext(existedCommand)) {
+                            existedCommand.getApplicableContext().addProject(project.getPath());
+                        } else {
+                            // normally, should never happen
+                            Log.error(CommandManagerImpl.this.getClass(), "Different commands with the same names found");
+                        }
+                    }
+                }));
+    }
+
     @Override
     public List<CommandImpl> getCommands() {
         return commands.values()