From 091663afe062a9fe4004e0ed926d470ce93b1316 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Mon, 25 Jun 2018 18:55:07 -0700 Subject: [PATCH] Add Client.getApp that uses REST API --- src/js/client.js | 7 +++++++ src/js/logs.js | 2 +- src/js/terminal.js | 10 +++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/js/client.js b/src/js/client.js index ac5090998..d0d79f508 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -735,6 +735,13 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }; Client.prototype.getApp = function (appId, callback) { + get('/api/v1/apps/' + appId).success(function (data, status) { + if (status !== 200 || typeof data !== 'object') return callback(new ClientError(status, data)); + callback(null, data); + }).error(defaultErrorHandler(callback)); + }; + + Client.prototype.getCachedApp = function (appId, callback) { var appFound = null; this._installedApps.some(function (app) { if (app.id === appId) { diff --git a/src/js/logs.js b/src/js/logs.js index 66e451ba4..74b491792 100644 --- a/src/js/logs.js +++ b/src/js/logs.js @@ -72,7 +72,7 @@ app.controller('LogsController', ['$scope', '$timeout', '$location', 'Client', f var appId = $scope.selected.value; - Client.getApp(appId, function (error, result) { + Client.getCachedApp(appId, function (error, result) { if (error) return console.error(error); $scope.selectedAppInfo = result; diff --git a/src/js/terminal.js b/src/js/terminal.js index 1b6a1a7fe..5deafd7f9 100644 --- a/src/js/terminal.js +++ b/src/js/terminal.js @@ -139,7 +139,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client Client.refreshInstalledApps(function (error) { if (error) return callback(error); - Client.getApp(appId, function (error, result) { + Client.getCachedApp(appId, function (error, result) { if (error) return callback(error); if (result.runState === 'stopped') return callback(); @@ -174,7 +174,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client Client.refreshInstalledApps(function (error) { if (error) return console.error('Failed to refresh app status.', error); - Client.getApp($scope.selected.value, function (error, result) { + Client.getCachedApp($scope.selected.value, function (error, result) { if (error) return console.error('Failed to get app status.', error); if (result.installationState === 'installed') $scope.appBusy = false; @@ -203,7 +203,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client Client.refreshInstalledApps(function (error) { if (error) return console.error('Failed to refresh app status.', error); - Client.getApp($scope.selected.value, function (error, result) { + Client.getCachedApp($scope.selected.value, function (error, result) { if (error) return console.error('Failed to get app status.', error); if (result.installationState === 'installed') $scope.appBusy = false; @@ -249,7 +249,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client var appId = $scope.selected.value; - Client.getApp(appId, function (error, result) { + Client.getCachedApp(appId, function (error, result) { if (error) return console.error(error); // we expect this to be called _after_ a reconfigure was issued @@ -317,7 +317,7 @@ app.controller('TerminalController', ['$scope', '$timeout', '$location', 'Client // var appId = $scope.selected.value; - // Client.getApp(appId, function (error, result) { + // Client.getCachedApp(appId, function (error, result) { // if (error) return console.error(error); // // we expect this to be called _after_ a reconfigure was issued