dashboard: remove hidden user import/export feature
This commit is contained in:
@@ -292,48 +292,6 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal user import -->
|
||||
<div class="modal fade" id="userImportModal" tabindex="-1" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">{{ 'users.userImportDialog.title' | tr }}</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div ng-show="!userImport.done">
|
||||
<div ng-show="!userImport.busy">
|
||||
<p ng-bind-html=" 'users.userImportDialog.description' | tr:{ docsLink: 'https://docs.cloudron.io/user-management/#import-users' } "></p>
|
||||
<input type="file" style="display: none;" id="userImportFileInput" accept="application/json,text/csv"/>
|
||||
<button class="btn btn-primary" ng-click="userImport.openFileInput()">{{ 'users.userImportDialog.fileInput' | tr }}</button>
|
||||
<br/>
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" ng-model="userImport.sendInvite" id="inputUserImportSendInvite"> {{ 'users.userImportDialog.sendInviteCheckbox' | tr }}
|
||||
</label>
|
||||
</div>
|
||||
<p class="text-danger" ng-show="userImport.error.file">{{ userImport.error.file }}</p>
|
||||
<p class="text-info" ng-show="userImport.users.length">{{ 'users.userImportDialog.usersFound' | tr:{ count: userImport.users.length } }}</p>
|
||||
</div>
|
||||
<div ng-show="userImport.busy" class="progress progress-striped active">
|
||||
<div class="progress-bar progress-bar-success" role="progressbar" style="width: {{ userImport.percent }}%"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div ng-show="userImport.done">
|
||||
<p>{{ 'users.userImportDialog.success' | tr:{ count: userImport.success } }}</p>
|
||||
<div ng-show="userImport.error.import.length">
|
||||
<p class="text-danger">{{ 'users.userImportDialog.failed' | tr }}</p>
|
||||
<div ng-repeat="tmp in userImport.error.import"><b>{{ tmp.user.email }}:</b> {{ tmp.error.message }}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">{{ 'main.dialog.close' | tr }}</button>
|
||||
<button type="button" class="btn btn-primary" ng-click="userImport.import()" ng-show="!userImport.done" ng-disabled="userImport.busy || !userImport.users.length"><i class="fa fa-circle-notch fa-spin" ng-show="userImport.busy"></i> {{ 'users.userImportDialog.importAction' | tr }}</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modal password reset -->
|
||||
<div class="modal fade" id="passwordResetModal" tabindex="-1" role="dialog">
|
||||
<div class="modal-dialog">
|
||||
@@ -454,19 +412,6 @@
|
||||
<input type="text" id="userSearchInput" class="form-control" style="max-width: 350px;" ng-model="userSearchString" ng-model-options="{ debounce: 1000 }" ng-change="updateFilter()" placeholder="{{ 'main.searchPlaceholder' | tr }}"/>
|
||||
<multiselect ng-model="userStateFilter" ms-header="{{ 'apps.stateFilterHeader' | tr }}" ms-selected="{{ userStateFilter }}" options="state.label for state in userStates" data-multiple="false"></multiselect>
|
||||
<div style="flex-grow: 1;"></div>
|
||||
<!-- import/export buttons are hidden until we figure what the exact use case is -->
|
||||
<div class="btn-group" ng-hide="true">
|
||||
<button class="btn btn-default" ng-click="userImport.show()" uib-tooltip="{{ 'users.userImport.tooltip' | tr }}" tooltip-append-to-body="true"><i class="fas fa-download"></i></button>
|
||||
<div class="btn-group" role="group">
|
||||
<button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown" uib-tooltip="{{ 'users.userExport.tooltip' | tr }}" tooltip-append-to-body="true">
|
||||
<i class="fas fa-upload"></i>
|
||||
</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="" ng-click="userExport('csv')">{{ 'users.userExport.csv' | tr }}</a></li>
|
||||
<li><a href="" ng-click="userExport('json')">{{ 'users.userExport.json' | tr }}</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<button class="btn btn-primary btn-outline" ng-click="userAdd.show()">
|
||||
<i class="fa fa-user-plus"></i> {{ 'users.newUserAction' | tr }}
|
||||
</button>
|
||||
|
||||
@@ -67,171 +67,6 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio
|
||||
return true;
|
||||
};
|
||||
|
||||
$scope.userImport = {
|
||||
busy: false,
|
||||
done: false,
|
||||
error: null,
|
||||
percent: 0,
|
||||
success: 0,
|
||||
users: [],
|
||||
sendInvite: false,
|
||||
|
||||
reset: function () {
|
||||
$scope.userImport.busy = false;
|
||||
$scope.userImport.error = null;
|
||||
$scope.userImport.users = [];
|
||||
$scope.userImport.percent = 0;
|
||||
$scope.userImport.success = 0;
|
||||
$scope.userImport.done = false;
|
||||
$scope.userImport.sendInvite = false;
|
||||
},
|
||||
|
||||
handleFileChanged: function () {
|
||||
$scope.userImport.reset();
|
||||
|
||||
var fileInput = document.getElementById('userImportFileInput');
|
||||
if (!fileInput.files || !fileInput.files[0]) return;
|
||||
|
||||
var file = fileInput.files[0];
|
||||
if (file.type !== 'application/json' && file.type !== 'text/csv') return console.log('Unsupported file type.');
|
||||
|
||||
const reader = new FileReader();
|
||||
reader.addEventListener('load', function () {
|
||||
$scope.$apply(function () {
|
||||
$scope.userImport.users = [];
|
||||
var users = [];
|
||||
if (file.type === 'text/csv') {
|
||||
var lines = reader.result.split('\n');
|
||||
if (lines.length === 0) return $scope.userImport.error = { file: 'Imported file has no lines' };
|
||||
|
||||
for (var i = 0; i < lines.length; i++) {
|
||||
var line = lines[i].trim();
|
||||
if (!line) continue;
|
||||
var items = line.split(',');
|
||||
if (items.length !== 5) {
|
||||
$scope.userImport.error = { file: 'Line ' + (i+1) + ' has wrong column count. Expecting 5' };
|
||||
return;
|
||||
}
|
||||
users.push({
|
||||
username: items[0].trim(),
|
||||
email: items[1].trim(),
|
||||
fallbackEmail: items[2].trim(),
|
||||
displayName: items[3].trim(),
|
||||
role: items[4].trim()
|
||||
});
|
||||
}
|
||||
} else {
|
||||
try {
|
||||
users = JSON.parse(reader.result).map(function (user) {
|
||||
return {
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
fallbackEmail: user.fallbackEmail,
|
||||
displayName: user.displayName,
|
||||
role: user.role
|
||||
};
|
||||
});
|
||||
} catch (e) {
|
||||
console.error('Failed to parse users.', e);
|
||||
$scope.userImport.error = { file: 'Imported file is not valid JSON:' + e.message };
|
||||
}
|
||||
}
|
||||
$scope.userImport.users = users;
|
||||
});
|
||||
}, false);
|
||||
reader.readAsText(file);
|
||||
},
|
||||
|
||||
show: function () {
|
||||
$scope.userImport.reset();
|
||||
|
||||
// named so no duplactes
|
||||
document.getElementById('userImportFileInput').addEventListener('change', $scope.userImport.handleFileChanged);
|
||||
|
||||
$('#userImportModal').modal('show');
|
||||
},
|
||||
|
||||
openFileInput: function () {
|
||||
$('#userImportFileInput').click();
|
||||
},
|
||||
|
||||
import: function () {
|
||||
$scope.userImport.percent = 0;
|
||||
$scope.userImport.success = 0;
|
||||
$scope.userImport.done = false;
|
||||
$scope.userImport.error = { import: [] };
|
||||
$scope.userImport.busy = true;
|
||||
|
||||
var processed = 0;
|
||||
|
||||
async.eachSeries($scope.userImport.users, function (user, callback) {
|
||||
Client.addUser(user, function (error, userId) {
|
||||
if (error) $scope.userImport.error.import.push({ error: error, user: user });
|
||||
else ++$scope.userImport.success;
|
||||
|
||||
++processed;
|
||||
$scope.userImport.percent = 100 * processed / $scope.userImport.users.length;
|
||||
|
||||
if (!error && $scope.userImport.sendInvite) {
|
||||
console.log('sending', userId, user.email);
|
||||
Client.sendInviteEmail(userId, user.email, function (error) {
|
||||
if (error) console.error('Failed to send invite.', error);
|
||||
});
|
||||
}
|
||||
|
||||
callback();
|
||||
});
|
||||
}, function (error) {
|
||||
if (error) return console.error(error);
|
||||
|
||||
$scope.userImport.busy = false;
|
||||
$scope.userImport.done = true;
|
||||
if ($scope.userImport.success) {
|
||||
refreshCurrentPage();
|
||||
refreshAllUsers();
|
||||
}
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
// supported types are 'json' and 'csv'
|
||||
$scope.userExport = function (type) {
|
||||
Client.getAllUsers(function (error, result) {
|
||||
if (error) {
|
||||
Client.error('Failed to list users. Full error in the webinspector.');
|
||||
return console.error('Failed to list users.', error);
|
||||
}
|
||||
|
||||
var content = '';
|
||||
if (type === 'json') {
|
||||
content = JSON.stringify(result.map(function (user) {
|
||||
return {
|
||||
id: user.id,
|
||||
username: user.username,
|
||||
email: user.email,
|
||||
fallbackEmail: user.fallbackEmail,
|
||||
displayName: user.displayName,
|
||||
role: user.role,
|
||||
active: user.active
|
||||
};
|
||||
}), null, 2);
|
||||
} else if (type === 'csv') {
|
||||
content = result.map(function (user) {
|
||||
return [ user.id, user.username, user.email, user.fallbackEmail, user.displayName, user.role, user.active ].join(',');
|
||||
}).join('\n');
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
var file = new Blob([ content ], { type: type === 'json' ? 'application/json' : 'text/csv' });
|
||||
var a = document.createElement('a');
|
||||
a.href = URL.createObjectURL(file);
|
||||
a.download = type === 'json' ? 'users.json' : 'users.csv';
|
||||
document.body.appendChild(a);
|
||||
a.click();
|
||||
});
|
||||
};
|
||||
|
||||
$scope.userRemove = {
|
||||
busy: false,
|
||||
error: null,
|
||||
|
||||
Reference in New Issue
Block a user