jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

externalldap: sync log history

Browse Source
This commit is contained in:
Girish Ramakrishnan
2024-01-13 16:45:29 +01:00
parent 6e42cf4ec5
commit a007a8e40c
3 changed files with 67 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/views/user-settings.html
+20 -9
View File
@@ -97,7 +97,7 @@
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.cancel' | tr }}</button>
<button type="button" class="btn btn-primary" ng-click="externalLdap.submit()" ng-disabled="externalLdapConfigForm.$invalid || externalLdap.busy"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.busy"></i> {{ 'main.dialog.save' | tr }}</button>
<button type="button" class="btn btn-primary" ng-click="externalLdap.submit()" ng-disabled="externalLdapConfigForm.$invalid || externalLdap.saveBusy"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.saveBusy"></i> {{ 'main.dialog.save' | tr }}</button>
</div>
</div>
</div>
@@ -267,7 +267,21 @@
</div>
<div class="text-left section-header">
<h3>{{ 'users.externalLdap.title' | tr }}</h3>
<h3>
{{ 'users.externalLdap.title' | tr }}
<div class="btn-group btn-group-sm pull-right">
<button type="button" class="btn btn-small btn-default dropdown-toggle" ng-show="externalLdap.tasks.length" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" uib-tooltip="{{ 'domains.renewCerts.showLogsAction' | tr }}">
<i class="fas fa-align-left"></i> <span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li ng-repeat="task in externalLdap.tasks">
<a ng-href="/frontend/logs.html?taskId={{task.id}}" target="_blank" class="text-right">
{{ task.ts | prettyLongDate }} <i class="fa" style="margin-left: 20px" ng-class="{ 'status-active fa-check-circle': !task.active && task.success, 'fa-circle-notch fa-spin': task.active, 'status-error fa-times-circle': !task.active && !task.success }"></i>
</a>
</li>
</ul>
</div>
</h3>
</div>
<div class="card card-large">
@@ -394,21 +408,18 @@
<div class="row">
<br/>
<div class="col-md-12" style="margin-bottom: 10px;">
<div ng-show="externalLdap.syncBusy" class="progress progress-striped active animateMe">
<div ng-show="externalLdap.busy" class="progress progress-striped active animateMe">
<div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ externalLdap.percent }}%"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<p ng-show="externalLdap.syncBusy">{{ externalLdap.message }}</p>
<p ng-hide="externalLdap.syncBusy">
<div class="col-md-12">
<p ng-show="externalLdap.busy">{{ externalLdap.message }}</p>
<p ng-hide="externalLdap.busy">
<div class="has-error" ng-show="!externalLdap.active">{{ externalLdap.errorMessage }}</div>
</p>
</div>
<div class="col-md-6 text-right">
<button class="btn btn-primary pull-right" ng-click="externalLdap.show()">{{ 'users.externalLdap.configureAction' | tr }}</button>
<button class="btn btn-success pull-right" ng-disabled="externalLdap.currentConfig.provider === 'noop'" ng-click="externalLdap.sync()"><i class="fa fa-circle-notch fa-spin" ng-show="externalLdap.syncBusy"></i> {{ 'users.externalLdap.syncAction' | tr }}</button>
<a class="btn btn-primary pull-right" ng-show="externalLdap.taskId" ng-href="/frontend/logs.html?taskId={{ externalLdap.taskId }}" target="_blank">{{ 'users.externalLdap.showLogsAction' | tr }}</a>
dashboard/src/views/user-settings.js
+45 -42
View File
@@ -2,7 +2,7 @@
/* global angular */
/* global Clipboard */
/* global $ */
/* global $, TASK_TYPES */
angular.module('Application').controller('UserSettingsController', ['$scope', '$location', '$translate', '$timeout', 'Client', function ($scope, $location, $translate, $timeout, Client) {
Client.onReady(function () { if (!Client.getUserInfo().isAtLeastAdmin) $location.path('/'); });
@@ -119,11 +119,11 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
busy: false,
percent: 0,
message: '',
errorMessage: '',
error: {},
taskId: 0,
errorMessage: '', // last task error
tasks: [],
syncBusy: false,
error: {}, // save error
saveBusy: false,
// fields
provider: 'noop',
@@ -139,57 +139,43 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
currentConfig: {},
checkStatus: function () {
Client.getLatestTaskByType('syncExternalLdap', function (error, task) {
if (error) return console.error(error);
if (!task) return;
$scope.externalLdap.taskId = task.id;
$scope.externalLdap.updateStatus();
});
},
sync: function () {
$scope.externalLdap.syncBusy = true;
Client.startExternalLdapSync(function (error, taskId) {
if (error) {
$scope.externalLdap.syncBusy = false;
console.error('Unable to start ldap syncer task.', error);
return;
}
$scope.externalLdap.taskId = taskId;
$scope.externalLdap.updateStatus();
});
},
refresh: function() {
init: function () {
Client.getExternalLdapConfig(function (error, result) {
if (error) return console.error('Unable to get external ldap config.', error);
$scope.externalLdap.currentConfig = result;
$scope.externalLdap.checkStatus();
$scope.externalLdap.refreshTasks();
});
},
refreshTasks: function () {
Client.getTasksByType(TASK_TYPES.TASK_SYNC_EXTERNAL_LDAP, function (error, tasks) {
if (error) return console.error(error);
$scope.externalLdap.tasks = tasks.slice(0, 10);
if ($scope.externalLdap.tasks.length && $scope.externalLdap.tasks[0].active) $scope.externalLdap.updateStatus();
});
},
updateStatus: function () {
Client.getTask($scope.externalLdap.taskId, function (error, data) {
var taskId = $scope.externalLdap.tasks[0].id;
Client.getTask(taskId, function (error, data) {
if (error) return window.setTimeout($scope.externalLdap.updateStatus, 5000);
if (!data.active) {
$scope.externalLdap.syncBusy = false;
$scope.externalLdap.busy = false;
$scope.externalLdap.message = '';
$scope.externalLdap.percent = 100; // indicates that 'result' is valid
$scope.externalLdap.errorMessage = data.success ? '' : data.error.message;
$scope.externalLdap.refreshTasks(); // update the tasks list dropdown
return;
}
$scope.externalLdap.syncBusy = true;
$scope.externalLdap.busy = true;
$scope.externalLdap.percent = data.percent;
$scope.externalLdap.message = data.message;
window.setTimeout($scope.externalLdap.updateStatus, 3000);
window.setTimeout($scope.externalLdap.updateStatus, 500);
});
},
@@ -214,8 +200,25 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
$('#externalLdapModal').modal('show');
},
submit: function () {
sync: function () {
$scope.externalLdap.busy = true;
$scope.externalLdap.percent = 0;
$scope.externalLdap.message = '';
$scope.externalLdap.errorMessage = '';
Client.startExternalLdapSync(function (error) {
if (error) {
console.error(error);
$scope.externalLdap.errorMessage = error.message;
$scope.externalLdap.busy = false;
} else {
$scope.externalLdap.refreshTasks();
}
});
},
submit: function () {
$scope.externalLdap.saveBusy = true;
$scope.externalLdap.error = {};
var config = {
@@ -256,7 +259,7 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
}
Client.setExternalLdapConfig(config, function (error) {
$scope.externalLdap.busy = false;
$scope.externalLdap.saveBusy = false;
if (error) {
if (error.statusCode === 424) {
@@ -282,7 +285,7 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
}
} else {
$('#externalLdapModal').modal('hide');
$scope.externalLdap.refresh();
$scope.externalLdap.init();
}
});
}
@@ -402,7 +405,7 @@ angular.module('Application').controller('UserSettingsController', ['$scope', '$
};
Client.onReady(function () {
$scope.externalLdap.refresh();
$scope.externalLdap.init();
$scope.profileConfig.refresh();
$scope.userDirectoryConfig.refresh();
$scope.refreshOIDCClients();