Implement new format workspace key {namespace}/{workspaceName} or {workspaceId}

dashboard/src/app/ide/ide-config.ts

@@ -45,7 +45,7 @@ export class IdeConfig {
     // config routes
     register.app.config(function ($routeProvider) {
       $routeProvider.accessWhen('/ide', ideProvider)
-        .accessWhen('/ide/:namespace/:workspaceName', ideProvider);
+        .accessWhen('/ide/:namespace*/:workspaceName', ideProvider);
 
     });
   }

dashboard/src/app/projects/projects-config.ts

@@ -81,7 +81,7 @@ export class ProjectsConfig {
 
     // config routes
     register.app.config(function ($routeProvider) {
-      $routeProvider.accessWhen('/project/:namespace/:workspaceName/:projectName', {
+      $routeProvider.accessWhen('/project/:namespace*/:workspaceName/:projectName', {
           title: (params) => {return params.workspaceName + ' | ' + params.projectName},
           templateUrl: 'app/projects/project-details/project-details.html',
           controller: 'ProjectDetailsController',

dashboard/src/app/workspaces/workspace-details/workspace-details.controller.ts

@@ -204,7 +204,7 @@ export class WorkspaceDetailsController {
     if (this.cheWorkspace.getWorkspaceByName(this.namespace, this.workspaceName)) {
       defer.resolve();
     } else {
-      this.cheWorkspace.fetchWorkspaceDetails(this.namespace + ':' + this.workspaceName).then(() => {
+      this.cheWorkspace.fetchWorkspaceDetails(this.namespace + '/' + this.workspaceName).then(() => {
         defer.resolve();
       }, (error: any) => {
         if (error.status === 304) {

dashboard/src/app/workspaces/workspace-details/workspace-projects/workspace-details-projects.controller.ts

@@ -57,7 +57,7 @@ export class WorkspaceDetailsProjectsCtrl {
 
     this.namespace = $route.current.params.namespace;
     this.workspaceName = $route.current.params.workspaceName;
-    this.workspaceKey = this.namespace + ':' + this.workspaceName;
+    this.workspaceKey = this.namespace + '/' + this.workspaceName;
 
     let preferences = cheAPI.getPreferences().getPreferences();
 

dashboard/src/app/workspaces/workspaces-config.ts

@@ -175,8 +175,8 @@ export class WorkspacesConfig {
         controller: 'ListWorkspacesCtrl',
         controllerAs: 'listWorkspacesCtrl'
       })
-      .accessWhen('/workspace/:namespace/:workspaceName', locationProvider)
-      .accessWhen('/workspace/:namespace/:workspaceName/:page', locationProvider)
+      .accessWhen('/workspace/:namespace*/:workspaceName', locationProvider)
+      .accessWhen('/workspace/:namespace*/:workspaceName/:page', locationProvider)
       .accessWhen('/create-workspace', {
         title: 'New Workspace',
         templateUrl: 'app/workspaces/workspace-details/workspace-details.html',

ide/che-core-ide-api/src/main/java/org/eclipse/che/ide/api/workspace/WorkspaceServiceClient.java

@@ -46,19 +46,19 @@ public interface WorkspaceServiceClient {
     /**
      * Gets users workspace by key.
      *
-     * @param wsId
-     *         workspace ID
+     * @param key
+     *         composite key can be just workspace ID or in the namespace/workspace_name form
      * @return a promise that resolves to the {@link WorkspaceDto}, or rejects with an error
      * @see WorkspaceService#getByKey(String)
      */
-    Promise<WorkspaceDto> getWorkspace(String wsId);
+    Promise<WorkspaceDto> getWorkspace(String key);
 
     /**
      * Gets workspace by namespace and name
      *
      * @param namespace
      *         namespace
-     * @param  workspaceName
+     * @param workspaceName
      *         workspace name
      * @return a promise that resolves to the {@link WorkspaceDto}, or rejects with an error
      * @see WorkspaceService#getByKey(String)

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/AppContextImpl.java

@@ -87,8 +87,8 @@ public class AppContextImpl implements AppContext,
 
     private static final Project[] NO_PROJECTS = {};
 
-    private final BrowserQueryFieldRenderer browserQueryFieldRenderer;
-    private final List<String>              projectsInImport;
+    private final QueryParameters queryParameters;
+    private final List<String>    projectsInImport;
 
     private Workspace           usersWorkspace;
     private CurrentUser         currentUser;
@@ -106,12 +106,12 @@ public class AppContextImpl implements AppContext,
 
     @Inject
     public AppContextImpl(EventBus eventBus,
-                          BrowserQueryFieldRenderer browserQueryFieldRenderer,
+                          QueryParameters queryParameters,
                           ResourceManager.ResourceManagerFactory resourceManagerFactory,
                           Provider<EditorAgent> editorAgentProvider,
                           Provider<AppStateManager> appStateManager) {
         this.eventBus = eventBus;
-        this.browserQueryFieldRenderer = browserQueryFieldRenderer;
+        this.queryParameters = queryParameters;
         this.resourceManagerFactory = resourceManagerFactory;
         this.editorAgentProvider = editorAgentProvider;
         this.appStateManager = appStateManager;
@@ -206,8 +206,6 @@ public void initResourceManager(final Callback<ResourceManager, Exception> callb
             callback.onFailure(new NullPointerException("Dev machine is not initialized"));
         }
 
-        browserQueryFieldRenderer.setProjectName("");
-
         if (projects != null) {
             for (Project project : projects) {
                 eventBus.fireEvent(new ResourceChangedEvent(new ResourceDeltaImpl(project, REMOVED)));
@@ -325,8 +323,6 @@ public void onSelectionChanged(SelectionChangedEvent event) {
             return;
         }
 
-        browserQueryFieldRenderer.setProjectName("");
-
         currentResource = null;
         currentResources = null;
 
@@ -464,7 +460,6 @@ public void onWorkspaceStopped(WorkspaceStoppedEvent event) {
         appStateManager.get().persistWorkspaceState(getWorkspaceId()).then(new Operation<Void>() {
             @Override
             public void apply(Void arg) throws OperationException {
-                browserQueryFieldRenderer.setProjectName("");
                 for (Project project : projects) {
                     eventBus.fireEvent(new ResourceChangedEvent(new ResourceDeltaImpl(project, REMOVED)));
                 }
@@ -489,7 +484,7 @@ public void onWindowClosed(WindowActionEvent event) {
 
     @Override
     public String getMasterEndpoint() {
-        String fromUrl = this.browserQueryFieldRenderer.getParameterFromURLByName("master");
+        String fromUrl = queryParameters.getByName("master");
         if(fromUrl == null || fromUrl.isEmpty())
             return masterFromIDEConfig();
         else
@@ -498,7 +493,7 @@ public String getMasterEndpoint() {
 
     @Override
     public String getDevAgentEndpoint() {
-        String fromUrl = this.browserQueryFieldRenderer.getParameterFromURLByName("agent");
+        String fromUrl = queryParameters.getByName("agent");
         if(fromUrl == null || fromUrl.isEmpty())
             return runtime.getDevMachine().getWsAgentBaseUrl();
         else

ide/che-core-ide-app/src/main/java/org/eclipse/che/ide/context/BrowserAddress.java

@@ -0,0 +1,109 @@
+/*******************************************************************************
+ * Copyright (c) 2012-2017 Codenvy, S.A.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *   Codenvy, S.A. - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.che.ide.context;
+
+import com.google.gwt.user.client.Window;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
+import org.eclipse.che.ide.api.ProductInfoDataProvider;
+
+/**
+ * Helps to update address and extract information from current address.
+ *
+ * @author Alexander Andrienko
+ * @author Sergii Leschenko
+ */
+@Singleton
+public class BrowserAddress {
+    private static final int NAMESPACE_START_SEGMENT = 1;
+
+    private final ProductInfoDataProvider productInfoDataProvider;
+
+    @Inject
+    public BrowserAddress(ProductInfoDataProvider productInfoDataProvider) {
+        this.productInfoDataProvider = productInfoDataProvider;
+    }
+
+    /**
+     * Updates browser's address along with tab title in accordance to current running workspace.
+     *
+     * @param namespace
+     *         namespace of workspace
+     * @param workspaceName
+     *         name of the current running workspace. Can be null or empty if workspace was stopped.
+     */
+    public void setAddress(String namespace, String workspaceName) {
+        String browserUrl = Window.Location.getPath();
+        int currentSlashIndex = 0;
+        int currentSlashNumber = 0;
+        while (currentSlashNumber < NAMESPACE_START_SEGMENT) {
+            currentSlashIndex = browserUrl.indexOf('/', currentSlashIndex);
+            currentSlashNumber++;
+        }
+
+        String baseUrl = browserUrl.substring(0, currentSlashIndex) + "/" + namespace + "/" + workspaceName;
+
+        String title;
+        if (workspaceName == null || workspaceName.isEmpty()) {
+            title = productInfoDataProvider.getDocumentTitle();
+        } else {
+            title = productInfoDataProvider.getDocumentTitle(workspaceName);
+        }
+        doSetAddress(baseUrl, title);
+    }
+
+    /**
+     * Returns workspace name from current address
+     * or empty string when it is undefined.
+     */
+    public String getWorkspaceName() {
+        String workspaceKey = getWorkspaceKey();
+        String[] split = workspaceKey.split("/", 2);
+        if (split.length != 2) {
+            return "";
+        }
+        return workspaceKey.substring(workspaceKey.lastIndexOf("/") + 1);
+    }
+
+    /**
+     * Returns workspace key from current address
+     * or empty string when it is undefined.
+     *
+     * @see org.eclipse.che.ide.api.workspace.WorkspaceServiceClient#getWorkspace(String)
+     */
+    public String getWorkspaceKey() {
+        String browserUrl = Window.Location.getPath();
+        String[] urlParts = browserUrl.split("/", NAMESPACE_START_SEGMENT + 1);
+        if (urlParts.length < NAMESPACE_START_SEGMENT) {
+            return "";
+        } else {
+            return urlParts[NAMESPACE_START_SEGMENT];
+        }
+    }
+
+    private native void doSetAddress(String url, String title) /*-{
+        try {
+            var window = $wnd;
+
+            if (!window["_history_relocation_id"]) {
+                window["_history_relocation_id"] = 0;
+            }
+
+            window.top.document.title = title;
+
+            window.history.pushState(window["_history_relocation_id"], window.top.document.title, url);
+            window["_history_relocation_id"]++;
+        } catch (e) {
+            console.log(e.message);
+        }
+    }-*/;
+}