From e54c8bbf99bf9a69e193d83a55db8def27660487 Mon Sep 17 00:00:00 2001
From: Johannes Zellner <johannes@cloudron.io>
Date: Wed, 21 Oct 2020 13:27:31 +0200
Subject: [PATCH] Handle memory limit errors

---
 src/views/app.html | 5 ++++-
 src/views/app.js   | 5 +++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/views/app.html b/src/views/app.html
index ab5630033..1190d4c0c 100644
--- a/src/views/app.html
+++ b/src/views/app.html
@@ -754,7 +754,10 @@
           </div>
         </div>
         <div class="row">
-          <div class="col-md-12 text-right">
+          <div class="col-md-8">
+            <span ng-show="resources.error.memoryLimit" class="text-danger">Unable to set memory limit, try less.</span>
+          </div>
+          <div class="col-md-4 text-right">
             <button class="btn btn-outline btn-primary pull-right" ng-click="resources.submitMemoryLimit()" ng-disabled="resources.memoryLimit === resources.currentMemoryLimit || resourcesForm.$invalid || resources.busy || app.error || app.taskId" tooltip-enable="app.error || app.taskId" uib-tooltip="{{ app.error ? 'App is in error state' : 'App is busy' }}">
               <i class="fa fa-circle-notch fa-spin" ng-show="resources.busy"></i> Resize
             </button>
diff --git a/src/views/app.js b/src/views/app.js
index d83b65ea3..28e91909c 100644
--- a/src/views/app.js
+++ b/src/views/app.js
@@ -501,6 +501,11 @@ angular.module('Application').controller('AppController', ['$scope', '$location'
 
             var memoryLimit = $scope.resources.memoryLimit === $scope.resources.memoryTicks[0] ? 0 : $scope.resources.memoryLimit;
             Client.configureApp($scope.app.id, 'memory_limit', { memoryLimit: memoryLimit }, function (error) {
+                if (error && error.statusCode === 400) {
+                    $scope.resources.busy = false;
+                    $scope.resources.error.memoryLimit = true;
+                    return;
+                }
                 if (error) return Client.error(error);
 
                 $scope.resources.currentMemoryLimit = $scope.resources.memoryLimit;