added details for app deletation in case the app has persistent data

Author: githubsaturn

app-backend/dist/js/dashboard.min.js

@@ -27,6 +27,12 @@ angular
  controller: 'AppDefinitionCtrl',
  icon: 'code'
  },
+ {
+ name: 'App details',
+ url: '/apps/:appName',
+ templateUrl: 'templates/app-details.html',
+ controller: 'AppDetailsCtrl',
+ },
  {
  name: 'Nodes',
  url: '/nodes',
@@ -721,20 +727,14 @@ function AlertsCtrl($scope) {
  };
 }
 angular.module('RDash')
- .controller('AppDefinitionCtrl', ['$scope', '$cookieStore',
- '$rootScope', 'pageDefinitions', 'apiManager', 'captainToast',
- '$uibModal', '$state', '$location', '$interval', AppDefinitionCtrl]);
+ .controller('AppDefinitionCtrl', ['$scope','apiManager', 'captainToast','$state', '$location', 
+ AppDefinitionCtrl]);
 
-function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
- apiManager, captainToast, $uibModal, $state, $location, $interval) {
+function AppDefinitionCtrl($scope, apiManager, captainToast, $state, $location) {
 
- $scope.rootDomainWithProtocol = '';
  $scope.loadingState = {};
  $scope.loadingState.enabled = true;
  $scope.search = {};
- $scope.editContent = {
- appsToEdit: []
- };
 
  $scope.allApps = null;
  apiManager.getAllApps(function (data) {
@@ -758,20 +758,100 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  }
  }
 
+ $scope.rootDomain = data.rootDomain;
+ });
+
+
+ (function AppDefinitionsContentCtrl() {
+
+ $scope.newAppData = {};
+
+ $scope.onCreateOneClickAppClick = function () {
+ $location.path('/oneclickapps');
+ }
+
+ $scope.onCreateNewAppClicked = function () {
+ $scope.loadingState.enabled = true;
+
+ var appName = $scope.newAppData.newAppToRegister;
+ var hasPersistentData = $scope.newAppData.newAppHasPersistentData;
+
+ apiManager.registerNewApp(appName, hasPersistentData, function (data) {
+
+ if (captainToast.showErrorToastIfNeeded(data)) {
+ $scope.loadingState.enabled = false;
+ return;
+ }
+
+ captainToast.showToastSuccess('You new app is registered ' + appName);
+ $state.reload();
+
+ });
+ };
+
+ $scope.openAppEdit = function (app) {
+ $location.url('/apps/'+ app.appName);
+ }
+
+ }())
+
+}
+
+angular.module('RDash')
+ .controller('AppDetailsCtrl', ['$scope', 'apiManager', 'captainToast',
+ '$uibModal', '$state', '$location', '$interval', '$stateParams', AppDetailsCtrl]);
+
+function AppDetailsCtrl($scope,
+ apiManager, captainToast, $uibModal, $state, $location, $interval, $stateParams) {
+ $scope.rootDomainWithProtocol = '';
+ $scope.loadingState = {};
+ $scope.loadingState.enabled = true;
+ $scope.editContext = {
+ appToEdit: undefined
+ }
+
+ apiManager.getAllApps(function (data) {
+ $scope.loadingState.enabled = false;
+ if (captainToast.showErrorToastIfNeeded(data)) {
+ return;
+ }
+
+ const allApps = data.data;
+
+ for (var i = 0; i < data.data.length; i++) {
+
+ var app = data.data[i];
+
+ for (var j = 0; j < app.versions.length; j++) {
+ if (app.versions[j].version === app.deployedVersion) {
+ app.deployedGitHash = app.versions[j].gitHash || 'n/a';
+ app.deployedTimeStamp = new Date(app.versions[j].timeStamp).toLocaleString();
+ break;
+ }
+ }
+ }
+
+ const appNameInRoute = $stateParams.appName;
+ const appToEdit = allApps.find(app => app.appName === appNameInRoute);
+ if (!appToEdit) {
+ $location.url('/apps'); // app not found
+ }
+ $scope.editContext.appToEdit = appToEdit;
+ $scope.app = $scope.editContext.appToEdit;
+
  $scope.rootDomain = data.rootDomain;
  $scope.defaultNginxConfig = data.defaultNginxConfig;
  $scope.rootDomainWithProtocol = window.location.protocol + '//captain.' + data.rootDomain;
-
  });
 
  // it is called via interval and it is also called directly
  function fetchBuildLogs() {
 
- if (!$scope.editContent.appsToEdit.length) {
+ if (!$scope.editContext.appToEdit) {
  return;
  }
 
- var app = $scope.editContent.appsToEdit[0];
+ var app = $scope.editContext.appToEdit;
 
  apiManager.fetchBuildLogs(app.appName, function (data) {
 
@@ -780,9 +860,9 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  }
  var logInfo = data.data;
 
- app.isAppBuilding = logInfo.isAppBuilding;
+ $scope.isAppBuilding = logInfo.isAppBuilding;
 
- if (app.isAppBuilding) {
+ if ($scope.isAppBuilding) {
  // forcefully expanding the view such that when building finishes it doesn't collapses automatically
  app.expandedLogs = true;
  }
@@ -826,23 +906,26 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  if (lineAdded) {
  setTimeout(function () {
  var textarea = document.getElementById('buildlog-text-id');
- textarea.scrollTop = textarea.scrollHeight;
+ if (textarea) textarea.scrollTop = textarea.scrollHeight;
  }, 500);
  }
 
  });
  }
 
+ // Fetch the build logs immediately...
+ fetchBuildLogs();
+
+ // ... and every other second
  var promise = $interval(fetchBuildLogs, 2000);
  $scope.$on('$destroy', function () {
  $interval.cancel(promise);
  });
 
  (function AppDefinitionsContentCtrl() {
 
- $scope.newAppData = {};
-
- $scope.onExpandLogClicked = function (app) {
+ $scope.onExpandLogClicked = function () {
+ const app = $scope.editContext.appToEdit;
  app.expandedLogs = !app.expandedLogs;
  };
 
@@ -866,59 +949,31 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  });
  };
 
- $scope.onCreateOneClickAppClick = function () {
- $location.path('/oneclickapps');
- }
-
- $scope.onCreateNewAppClicked = function () {
- $scope.loadingState.enabled = true;
-
- var appName = $scope.newAppData.newAppToRegister;
- var hasPersistentData = $scope.newAppData.newAppHasPersistentData;
-
- apiManager.registerNewApp(appName, hasPersistentData, function (data) {
-
- if (captainToast.showErrorToastIfNeeded(data)) {
- $scope.loadingState.enabled = false;
- return;
- }
-
- captainToast.showToastSuccess('You new app is registered ' + appName);
- $state.reload();
-
- });
- };
-
- $scope.openAppEdit = function (app) {
- // Make a copy of app object to avoid showing the unsaved data in the table
- $scope.editContent.appsToEdit.push(JSON.parse(JSON.stringify(app)));
- fetchBuildLogs();
- }
-
- $scope.closeAppEdit = function (app) {
- var idx = $scope.editContent.appsToEdit.indexOf(app);
- if (idx > -1) {
- $scope.editContent.appsToEdit.splice(idx, 1);
- }
+ $scope.closeAppEdit = function () {
+ $location.url('/apps');
  }
 
- $scope.unlockNodeId = function (app) {
+ $scope.unlockNodeId = function () {
+ const app = $scope.editContext.appToEdit;
  app.unlockNodeIdForEdit = true;
  }
 
- $scope.addPortMappingClicked = function (app) {
+ $scope.addPortMappingClicked = function () {
+ const app = $scope.editContext.appToEdit;
  if (!app.ports)
  app.ports = [];
  app.ports.push({ containerPort: '', hostPort: '' });
  }
 
- $scope.addEnvVarClicked = function (app) {
+ $scope.addEnvVarClicked = function () {
+ const app = $scope.editContext.appToEdit;
  if (!app.envVars)
  app.envVars = [];
  app.envVars.push({ key: '', value: '' });
  }
 
- $scope.addVolumeClicked = function (app) {
+ $scope.addVolumeClicked = function () {
+ const app = $scope.editContext.appToEdit;
  if (!app.volumes)
  app.volumes = [];
  app.volumes.push({ volumeName: '', containerPath: '' });
@@ -931,7 +986,8 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  }
  }
 
- $scope.onEditDefaultNginxConfigClicked = function (app) {
+ $scope.onEditDefaultNginxConfigClicked = function () {
+ const app = $scope.editContext.appToEdit;
  app.customNginxConfig = $scope.defaultNginxConfig;
  }
 
@@ -955,9 +1011,10 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  $scope.modalAppDelete = {};
  var modalAppDelete = $scope.modalAppDelete;
 
- $scope.onDeleteAppClicked = function (appName) {
+ $scope.onDeleteAppClicked = function (appName, hasPersistentData) {
 
  $scope.modalAppDelete.appName = appName;
+ $scope.modalAppDelete.hasPersistentData = hasPersistentData;
  $scope.modalAppDelete.appNameConfirm = '';
 
  $uibModal.open({
@@ -995,10 +1052,10 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  });
  };
 
- $scope.onUploadSourceCodeClicked = function (app) {
+ $scope.onUploadSourceCodeClicked = function () {
+ const app = $scope.editContext.appToEdit;
 
  // file to upload is app.sourceToUpload
-
  console.log(app.sourceToUpload);
 
  $uibModal.open({
@@ -1029,7 +1086,7 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  app.lastLineNumberPrinted = undefined;
  app.buildLogs = undefined;
  fetchBuildLogs();
- 
+
  });
  });
  };
@@ -1066,7 +1123,8 @@ function AppDefinitionCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
  });
  };
 
- $scope.onUpdateConfigAndSave = function (app) {
+ $scope.onUpdateConfigAndSave = function () {
+ const app = $scope.editContext.appToEdit;
  $scope.loadingState.enabled = true;
 
  var appDefinition = {