felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

gui: Modal dialog for listeners and discovery status (#7539)

Browse Source
This commit is contained in:
André Colomb
2021-06-07 09:08:44 +02:00
committed by GitHub
parent 18592af993
commit ea0a408849
6 changed files with 139 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/default/syncthing/core/connectivityStatusModalView.html
+60
View File
@@ -0,0 +1,60 @@
<modal id="connectivity-status" status="{{connectivityStatusParams.status}}" icon="fas fa-fw {{connectivityStatusParams.type == 'listeners' ? 'fa-sitemap' : 'fa-map-signs'}}" heading="{{connectivityStatusParams.heading}}" large="no" closeable="yes">
<div class="modal-body" ng-switch="connectivityStatusParams.type">
<div ng-switch-when="listeners">
<p translate ng-if="listenersRunning.length == 0">
Syncthing is not listening for connection attempts from other devices on any address. Only outgoing connections from this device may work.
</p>
<div ng-if="listenersRunning.length > 0">
<p translate>
Syncthing is listening on the following network addresses for connection attempts from other devices:
</p>
<ul>
<li ng-repeat="listener in listenersRunning">{{listener}}</li>
</ul>
</div>
<div ng-if="listenersFailed.length > 0">
<p translate>
Some listening addresses could not be enabled to accept connections:
</p>
<ul>
<li ng-repeat="listener in listenersFailed">{{listener}}</li>
</ul>
</div>
</div>
<div ng-switch-default><!-- discovery methods -->
<p translate ng-if="discoveryRunning.length == 0">
This device cannot automatically discover other devices or announce its own address to be found by others. Only devices with statically configured addresses can connect.
</p>
<div ng-if="discoveryRunning.length > 0">
<p translate>
The following methods are used to discover other devices on the network and announce this device to be found by others:
</p>
<ul>
<li ng-repeat="discovery in discoveryRunning">{{discovery}}</li>
</ul>
</div>
<div ng-if="discoveryFailed.length > 0">
<p translate>
Some discovery methods could not be established for finding other devices or announcing this device:
</p>
<ul>
<li ng-repeat="discovery in discoveryFailed">{{discovery}}</li>
</ul>
</div>
<div class="row">
<div class="col-md-offset-2 col-md-8">
<div class="panel panel-default">
<div translate class="panel-body">
Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.
</div>
</div>
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
<span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
</button>
</div>
</modal>
gui/default/syncthing/core/discoveryFailuresModalView.html
-21
View File
@@ -1,21 +0,0 @@
<modal id="discovery-failures" status="danger" icon="fas fa-exclamation-circle" heading="{{'Discovery Failures' | translate}}" large="yes" closeable="yes">
<div class="modal-body">
<ul>
<li ng-repeat="failure in discoveryFailed">{{failure}}</li>
</ul>
</div>
<div class="row">
<div class="col-md-offset-2 col-md-8">
<div class="panel panel-default">
<div translate class="panel-body">
Failure to connect to IPv6 servers is expected if there is no IPv6 connectivity.
</div>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default btn-sm" data-dismiss="modal">
<span class="fas fa-times"></span>&nbsp;<span translate>Close</span>
</button>
</div>
</modal>
gui/default/syncthing/core/syncthingController.js
+40 -6
View File
@@ -471,22 +471,30 @@ angular.module('syncthing.core')
}
var listenersFailed = [];
var listenersRunning = [];
for (var address in data.connectionServiceStatus) {
if (data.connectionServiceStatus[address].error) {
listenersFailed.push(address + ": " + data.connectionServiceStatus[address].error);
} else {
listenersRunning.push(address);
}
}
$scope.listenersFailed = listenersFailed;
$scope.listenersRunning = listenersRunning;
$scope.listenersTotal = $scope.sizeOf(data.connectionServiceStatus);
$scope.discoveryTotal = data.discoveryMethods;
var discoveryFailed = [];
for (var disco in data.discoveryErrors) {
if (data.discoveryErrors[disco]) {
discoveryFailed.push(disco + ": " + data.discoveryErrors[disco]);
var discoveryRunning = [];
for (var disco in data.discoveryStatus) {
if (data.discoveryStatus[disco] && data.discoveryStatus[disco].error) {
discoveryFailed.push(disco + ": " + data.discoveryStatus[disco].error);
} else {
discoveryRunning.push(disco);
}
}
$scope.discoveryFailed = discoveryFailed;
$scope.discoveryRunning = discoveryRunning;
$scope.discoveryTotal = $scope.sizeOf(data.discoveryStatus);
refreshNoAuthWarning();
@@ -1249,8 +1257,34 @@ angular.module('syncthing.core')
}
};
$scope.showDiscoveryFailures = function () {
$('#discovery-failures').modal();
$scope.showListenerStatus = function () {
var params = {
type: 'listeners',
};
if ($scope.listenersFailed.length > 0) {
params.status = 'danger';
params.heading = $translate.instant("Listener Failures");
} else {
params.status = 'default';
params.heading = $translate.instant("Listener Status");
}
$scope.connectivityStatusParams = params;
$('#connectivity-status').modal();
};
$scope.showDiscoveryStatus = function () {
var params = {
type: 'discovery',
};
if ($scope.discoveryFailed.length > 0) {
params.status = 'danger';
params.heading = $translate.instant("Discovery Failures");
} else {
params.status = 'default';
params.heading = $translate.instant("Discovery Status");
}
$scope.connectivityStatusParams = params;
$('#connectivity-status').modal();
};
$scope.logging = {