fixup! Rework dashboard to work through JSON RPC protocol

eclipse-che · Aug 16, 2017 · b06b037 · b06b037
1 parent 906f101
commit b06b037
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 10 deletions.
diff --git a/...orkspaces/workspace-details/export-workspace/dialog/export-workspace-dialog.controller.ts b/...orkspaces/workspace-details/export-workspace/dialog/export-workspace-dialog.controller.ts
@@ -158,7 +158,7 @@ export class ExportWorkspaceDialogController {
    *
    * @param remoteWorkspace the remote exported workspace
    */
-  finishWorkspaceExporting(remoteWorkspace: any) {
+  finishWorkspaceExporting(remoteWorkspace: che.IWorkspace) {
     this.exportInCloudSteps += 'Export of workspace ' + remoteWorkspace.config.name + 'finished <br>';
     this.cheNotification.showInfo('Successfully exported the workspace to ' + remoteWorkspace.config.name + ' on ' + this.privateCloudUrl);
     this.hide();

diff --git a/dashboard/src/components/api/json-rpc/json-rpc-client.ts b/dashboard/src/components/api/json-rpc/json-rpc-client.ts
@@ -108,7 +108,7 @@ export class JsonRpcClient {
    */
   request(method: string, params?: any): ng.IPromise<any> {
     let deferred = this.client.getDeferred();
-    let id: string = this.counter++ + '';
+    let id: string = (this.counter++).toString();
     this.pendingRequests.set(id, deferred);
 
     let request: IRequest = {

diff --git a/dashboard/src/components/api/json-rpc/websocket-client.ts b/dashboard/src/components/api/json-rpc/websocket-client.ts
@@ -29,6 +29,8 @@ export class WebsocketClient implements ICommunicationClient {
 
   /**
    * Performs connection to the pointed entrypoint.
+   *
+   * @param entrypoint the entrypoint to connect to
    */
   connect(entrypoint: string): ng.IPromise<any> {
     let deferred = this.$q.defer();
@@ -60,7 +62,7 @@ export class WebsocketClient implements ICommunicationClient {
   /**
    * Sends pointed data.
    *
-   * @param data
+   * @param data to be sent
    */
   send(data: any): void {
     this.websocketStream.send(data);

diff --git a/dashboard/src/components/api/remote/che-remote-workspace.ts b/dashboard/src/components/api/remote/che-remote-workspace.ts
@@ -51,7 +51,7 @@ export class CheRemoteWorkspace {
     );
   }
 
-  createWorkspaceFromConfig(workspaceConfig: any) {
+  createWorkspaceFromConfig(workspaceConfig: any): ng.IPromise<any> {
     return this.remoteWorkspaceAPI.create(workspaceConfig).$promise;
   }
 
@@ -60,7 +60,7 @@ export class CheRemoteWorkspace {
    * @param workspaceId the ID of the workspace
    * @returns {*}
    */
-  getMachineToken(workspaceId: string) {
+  getMachineToken(workspaceId: string): ng.IPromise<any> {
     let deferred = this.$q.defer();
     let deferredPromise = deferred.promise;
 
@@ -80,7 +80,7 @@ export class CheRemoteWorkspace {
    * @param envName the name of the environment
    * @returns {*} promise
    */
-  startWorkspace(remoteWsURL: string, workspaceId: string, envName: string) {
+  startWorkspace(remoteWsURL: string, workspaceId: string, envName: string): ng.IPromise<any> {
     let deferred = this.$q.defer();
     let deferredPromise = deferred.promise;
     this.cheJsonRpcMasterApi.connect(remoteWsURL).then(() => {

diff --git a/dashboard/src/components/api/remote/che-remote.factory.ts b/dashboard/src/components/api/remote/che-remote.factory.ts
@@ -41,7 +41,7 @@ export class CheRemote {
    * @param password the password on the remote server
    * @returns {*|promise|N|n}
    */
-  newAuth(url: string, login: string, password: string) {
+  newAuth(url: string, login: string, password: string): ng.IPromise<any> {
     let remoteLogin = new CheRemoteLogin(this.$resource, url);
     return remoteLogin.authenticate(login, password);
   }
@@ -52,7 +52,7 @@ export class CheRemote {
    * @param token
    * @returns {*}
    */
-  newWorkspace(remoteConfig: any) {
+  newWorkspace(remoteConfig: any): CheRemoteWorkspace {
     return new CheRemoteWorkspace(this.$resource, this.$q, this.$websocket, remoteConfig);
   }
 
@@ -62,7 +62,7 @@ export class CheRemote {
    * @param token
    * @returns {*}
    */
-  newProject(remoteConfig: any) {
+  newProject(remoteConfig: any): CheRemoteProject {
     return new CheRemoteProject(this.$resource, remoteConfig);
   }
 
@@ -72,7 +72,7 @@ export class CheRemote {
    * @param token
    * @returns {*}
    */
-  newRecipe(remoteConfig): any {
+  newRecipe(remoteConfig: any): CheRemoteRecipe {
     return new CheRemoteRecipe(this.$resource, remoteConfig);
   }
 }