From 9ef29343b3b62ad13db37eead45a9a3a55db572d Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Fri, 19 Jan 2024 23:35:02 +0100 Subject: [PATCH] lint: camel case the variables --- dashboard/src/views/users.html | 130 +++++++++++++++---------------- dashboard/src/views/users.js | 136 ++++++++++++++++----------------- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/dashboard/src/views/users.html b/dashboard/src/views/users.html index e74dff609..6778ceca4 100644 --- a/dashboard/src/views/users.html +++ b/dashboard/src/views/users.html @@ -6,49 +6,49 @@

{{ 'users.addUserDialog.title' | tr }}

-
-
+ +
- -
+ +
{{ 'users.user.errorNotValidFullName' | tr }} - {{ useradd.error.displayName }} + {{ userAdd.error.displayName }}
-
+
- -
+ +
{{ 'users.user.errorEmailRequired' | tr }} {{ 'users.user.errorInvalidEmail' | tr }} - {{ useradd.error.email }} + {{ userAdd.error.email }}
-
+
- -
+ +
{{ 'users.user.errorEmailRequired' | tr }} {{ 'users.user.errorInvalidEmail' | tr }} - {{ useradd.error.fallbackEmail }} + {{ userAdd.error.fallbackEmail }}
-
+
- -
+ +
{{ 'users.user.errorInvalidUsername' | tr }} - {{ useradd.error.username }} + {{ userAdd.error.username }}
- +
@@ -56,22 +56,22 @@
{{ 'users.user.noGroups' | tr }}
- +
- +
- +
@@ -82,15 +82,15 @@
-

{{ 'users.deleteUserDialog.title' | tr:{ username: (userremove.userInfo.username || userremove.userInfo.email) } }}

+

{{ 'users.deleteUserDialog.title' | tr:{ username: (userRemove.userInfo.username || userRemove.userInfo.email) } }}

-

{{ userremove.error }}

-

{{ 'users.deleteUserDialog.description' | tr }}

+

{{ userRemove.error }}

+

{{ 'users.deleteUserDialog.description' | tr }}

- +
@@ -101,83 +101,83 @@
-

{{ 'users.editUserDialog.title' | tr:{ username: (useredit.userInfo.username || useredit.userInfo.email) } }}

+

{{ 'users.editUserDialog.title' | tr:{ username: (userEdit.userInfo.username || userEdit.userInfo.email) } }}

-
+

{{ 'users.editUserDialog.externalLdapWarning' | tr }}

-


-


+


+


-
-

{{ useredit.error.generic }}

+ +

{{ userEdit.error.generic }}

-
+
-
- {{ useredit.error.username }} +
+ {{ userEdit.error.username }}
- +
-
+
-
+
{{ 'users.user.errorDisplayNameRequired' | tr }} - {{ useredit.error.displayName }} + {{ userEdit.error.displayName }}
- +
-
+
-
+
{{ 'users.user.errorEmailRequired' | tr }} {{ 'users.user.errorInvalidEmail' | tr }} - {{ useredit.error.email }} + {{ userEdit.error.email }}
- +
-
+
-
+
{{ 'users.user.errorInvalidEmail' | tr }} - {{ useredit.error.fallbackEmail }} + {{ userEdit.error.fallbackEmail }}
- +
-
+
- +
{{ 'users.user.noGroups' | tr }}
- +
-
+
- +
-

{{ 'users.passwordResetDialog.no2FASetup' | tr }}

-

{{ 'users.passwordResetDialog.2FAIsSetup' | tr }}

- +

{{ 'users.passwordResetDialog.no2FASetup' | tr }}

+

{{ 'users.passwordResetDialog.2FAIsSetup' | tr }}

+
- +
@@ -247,7 +247,7 @@
- +
@@ -454,7 +454,7 @@
-
@@ -488,13 +488,13 @@ - + {{ user.displayName }}   {{ user.username }}   - + {{ user.email }} - + {{ groupsById[groupId].name }} @@ -504,8 +504,8 @@ - - + + diff --git a/dashboard/src/views/users.js b/dashboard/src/views/users.js index c179276f1..d537b7ef2 100644 --- a/dashboard/src/views/users.js +++ b/dashboard/src/views/users.js @@ -231,28 +231,28 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio }); }; - $scope.userremove = { + $scope.userRemove = { busy: false, error: null, userInfo: {}, show: function (userInfo) { - $scope.userremove.error = null; - $scope.userremove.userInfo = userInfo; + $scope.userRemove.error = null; + $scope.userRemove.userInfo = userInfo; $('#userRemoveModal').modal('show'); }, submit: function () { - $scope.userremove.busy = true; + $scope.userRemove.busy = true; - Client.removeUser($scope.userremove.userInfo.id, function (error) { - $scope.userremove.busy = false; + Client.removeUser($scope.userRemove.userInfo.id, function (error) { + $scope.userRemove.busy = false; - if (error && error.statusCode === 403) return $scope.userremove.error = error.message; + if (error && error.statusCode === 403) return $scope.userRemove.error = error.message; else if (error) return console.error('Unable to delete user.', error); - $scope.userremove.userInfo = {}; + $scope.userRemove.userInfo = {}; refresh(); refreshAllUsers(); @@ -262,7 +262,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio } }; - $scope.useradd = { + $scope.userAdd = { busy: false, alreadyTaken: false, error: {}, @@ -275,14 +275,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio sendInvite: false, show: function () { - $scope.useradd.error = {}; - $scope.useradd.email = ''; - $scope.useradd.fallbackEmail = ''; - $scope.useradd.username = ''; - $scope.useradd.displayName = ''; - $scope.useradd.selectedGroups = []; - $scope.useradd.role = 'user'; - $scope.useradd.sendInvite = false; + $scope.userAdd.error = {}; + $scope.userAdd.email = ''; + $scope.userAdd.fallbackEmail = ''; + $scope.userAdd.username = ''; + $scope.userAdd.displayName = ''; + $scope.userAdd.selectedGroups = []; + $scope.userAdd.role = 'user'; + $scope.userAdd.sendInvite = false; $scope.useraddForm.$setUntouched(); $scope.useraddForm.$setPristine(); @@ -291,33 +291,33 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio }, submit: function () { - $scope.useradd.busy = true; + $scope.userAdd.busy = true; - $scope.useradd.alreadyTaken = false; - $scope.useradd.error.email = null; - $scope.useradd.error.fallbackEmail = null; - $scope.useradd.error.username = null; - $scope.useradd.error.displayName = null; + $scope.userAdd.alreadyTaken = false; + $scope.userAdd.error.email = null; + $scope.userAdd.error.fallbackEmail = null; + $scope.userAdd.error.username = null; + $scope.userAdd.error.displayName = null; var user = { - username: $scope.useradd.username || null, - email: $scope.useradd.email, - fallbackEmail: $scope.useradd.fallbackEmail, - displayName: $scope.useradd.displayName, - role: $scope.useradd.role + username: $scope.userAdd.username || null, + email: $scope.userAdd.email, + fallbackEmail: $scope.userAdd.fallbackEmail, + displayName: $scope.userAdd.displayName, + role: $scope.userAdd.role }; Client.addUser(user, function (error, userId) { if (error) { - $scope.useradd.busy = false; + $scope.userAdd.busy = false; if (error.statusCode === 409) { if (error.message.toLowerCase().indexOf('email') !== -1) { - $scope.useradd.error.email = 'Email already taken'; + $scope.userAdd.error.email = 'Email already taken'; $scope.useraddForm.email.$setPristine(); $('#inputUserAddEmail').focus(); } else if (error.message.toLowerCase().indexOf('username') !== -1 || error.message.toLowerCase().indexOf('mailbox') !== -1) { - $scope.useradd.error.username = 'Username already taken'; + $scope.userAdd.error.username = 'Username already taken'; $scope.useraddForm.username.$setPristine(); $('#inputUserAddUsername').focus(); } else { @@ -327,12 +327,12 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio return; } else if (error.statusCode === 400) { if (error.message.toLowerCase().indexOf('email') !== -1) { - $scope.useradd.error.email = 'Invalid Email'; - $scope.useradd.error.emailAttempted = $scope.useradd.email; + $scope.userAdd.error.email = 'Invalid Email'; + $scope.userAdd.error.emailAttempted = $scope.userAdd.email; $scope.useraddForm.email.$setPristine(); $('#inputUserAddEmail').focus(); } else if (error.message.toLowerCase().indexOf('username') !== -1) { - $scope.useradd.error.username = error.message; + $scope.userAdd.error.username = error.message; $scope.useraddForm.username.$setPristine(); $('#inputUserAddUsername').focus(); } else { @@ -344,14 +344,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio } } - var groupIds = $scope.useradd.selectedGroups.map(function (g) { return g.id; }); + var groupIds = $scope.userAdd.selectedGroups.map(function (g) { return g.id; }); Client.setGroups(userId, groupIds, function (error) { - $scope.useradd.busy = false; + $scope.userAdd.busy = false; if (error) return console.error(error); - if ($scope.useradd.sendInvite) Client.sendInviteEmail(userId, user.email, function (error) { if (error) console.error('Failed to send invite.', error); }); + if ($scope.userAdd.sendInvite) Client.sendInviteEmail(userId, user.email, function (error) { if (error) console.error('Failed to send invite.', error); }); refresh(); refreshAllUsers(); @@ -362,7 +362,7 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio } }; - $scope.useredit = { + $scope.userEdit = { busy: false, reset2FABusy: false, error: {}, @@ -380,16 +380,16 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio role: '', show: function (userInfo) { - $scope.useredit.error = {}; - $scope.useredit.username = userInfo.username; - $scope.useredit.email = userInfo.email; - $scope.useredit.displayName = userInfo.displayName; - $scope.useredit.fallbackEmail = userInfo.fallbackEmail; - $scope.useredit.userInfo = userInfo; - $scope.useredit.selectedGroups = userInfo.groupIds.map(function (gid) { return $scope.groupsById[gid]; }); - $scope.useredit.active = userInfo.active; - $scope.useredit.source = userInfo.source; - $scope.useredit.role = userInfo.role; + $scope.userEdit.error = {}; + $scope.userEdit.username = userInfo.username; + $scope.userEdit.email = userInfo.email; + $scope.userEdit.displayName = userInfo.displayName; + $scope.userEdit.fallbackEmail = userInfo.fallbackEmail; + $scope.userEdit.userInfo = userInfo; + $scope.userEdit.selectedGroups = userInfo.groupIds.map(function (gid) { return $scope.groupsById[gid]; }); + $scope.userEdit.active = userInfo.active; + $scope.userEdit.source = userInfo.source; + $scope.userEdit.role = userInfo.role; $scope.useredit_form.$setPristine(); $scope.useredit_form.$setUntouched(); @@ -398,53 +398,53 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio }, submit: function () { - $scope.useredit.error = {}; - $scope.useredit.busy = true; + $scope.userEdit.error = {}; + $scope.userEdit.busy = true; - var userId = $scope.useredit.userInfo.id; + var userId = $scope.userEdit.userInfo.id; var data = { id: userId }; // only send if not the current active user if (userId !== $scope.userInfo.id) { - data.active = $scope.useredit.active; - data.role = $scope.useredit.role; + data.active = $scope.userEdit.active; + data.role = $scope.userEdit.role; } // only change those if it is a local user - if (!$scope.useredit.source) { + if (!$scope.userEdit.source) { // username is settable only if it was empty previously. it's editable for the "lock" profiles feature - if (!$scope.useredit.userInfo.username) data.username = $scope.useredit.username; - data.email = $scope.useredit.email; - data.displayName = $scope.useredit.displayName; - data.fallbackEmail = $scope.useredit.fallbackEmail; + if (!$scope.userEdit.userInfo.username) data.username = $scope.userEdit.username; + data.email = $scope.userEdit.email; + data.displayName = $scope.userEdit.displayName; + data.fallbackEmail = $scope.userEdit.fallbackEmail; } Client.updateUser(data, function (error) { if (error) { - $scope.useredit.busy = false; + $scope.userEdit.busy = false; if (error.statusCode === 409) { if (error.message.toLowerCase().indexOf('email') !== -1) { - $scope.useredit.error.email = 'Email already taken'; + $scope.userEdit.error.email = 'Email already taken'; } else if (error.message.toLowerCase().indexOf('username') !== -1) { - $scope.useredit.error.username = 'Username already taken'; + $scope.userEdit.error.username = 'Username already taken'; } $scope.useredit_form.email.$setPristine(); $('#inputUserEditEmail').focus(); } else { - $scope.useredit.error.generic = error.message; + $scope.userEdit.error.generic = error.message; console.error('Unable to update user:', error); } return; } - var groupIds = $scope.useredit.selectedGroups.map(function (g) { return g.id; }); + var groupIds = $scope.userEdit.selectedGroups.map(function (g) { return g.id; }); Client.setGroups(data.id, groupIds, function (error) { - $scope.useredit.busy = false; + $scope.userEdit.busy = false; if (error) return console.error('Unable to update groups for user:', error); @@ -456,14 +456,14 @@ angular.module('Application').controller('UsersController', ['$scope', '$locatio }, reset2FA: function () { - $scope.useredit.reset2FABusy = true; + $scope.userEdit.reset2FABusy = true; - Client.disableTwoFactorAuthenticationByUserId($scope.useredit.userInfo.id, function (error) { + Client.disableTwoFactorAuthenticationByUserId($scope.userEdit.userInfo.id, function (error) { if (error) return console.error(error); $timeout(function () { - $scope.useredit.userInfo.twoFactorAuthenticationEnabled = false; - $scope.useredit.reset2FABusy = false; + $scope.userEdit.userInfo.twoFactorAuthenticationEnabled = false; + $scope.userEdit.reset2FABusy = false; }, 3000); }); }