Add authentication #681
Add authentication #681
Conversation
WalkthroughThis pull request introduces significant updates to the application's authentication and user management system. Key changes include the addition of a new login page, the implementation of a user roles management system, and the removal of the previous access level controller. The updates enhance localization for user roles and access notices while modifying the installation process for font files. Overall, the changes aim to streamline user experience and improve security through better role-based access control. Changes
Sequence DiagramsequenceDiagram
participant User
participant LoginPage
participant AuthService
participant Backend
User->>LoginPage: Enter credentials
LoginPage->>AuthService: Submit login request
AuthService->>Backend: POST /login
Backend-->>AuthService: Authentication result
alt Authentication Successful
AuthService-->>LoginPage: Login success
LoginPage->>User: Redirect to home page
else Authentication Failed
AuthService-->>LoginPage: Login error
LoginPage->>User: Display error message
end
Poem
Tip CodeRabbit's docstrings feature is now available as part of our Early Access Program! Simply use the command Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? 🪧 TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (Invoked using PR comments)
Other keywords and placeholders
CodeRabbit Configuration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 48
🔭 Outside diff range comments (1)
app/scripts/i18n/devices/en.json (1)
Line range hint
1-1: Security Considerations for Authentication ImplementationSince this PR implements core authentication functionality, please ensure:
- All authentication state changes are properly logged
- Session management is implemented securely
- Authentication failures are rate-limited
- Password policies are enforced if applicable
- CSRF protection is in place for authentication endpoints
Consider implementing:
- Authentication activity logging
- Session timeout mechanisms
- Rate limiting for failed login attempts
- Security headers (HSTS, CSP, etc.)
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (39)
Makefile(2 hunks)app/index.ejs(3 hunks)app/scripts/app.js(2 hunks)app/scripts/app.routes.js(0 hunks)app/scripts/components/loginForm/loginForm.controller.js(2 hunks)app/scripts/controllers/accessLevelController.js(0 hunks)app/scripts/controllers/navigationController.js(2 hunks)app/scripts/i18n/access/en.json(0 hunks)app/scripts/i18n/access/ru.json(0 hunks)app/scripts/i18n/app/en.json(1 hunks)app/scripts/i18n/app/ru.json(1 hunks)app/scripts/i18n/configurations/en.json(1 hunks)app/scripts/i18n/configurations/ru.json(1 hunks)app/scripts/i18n/devices/en.json(1 hunks)app/scripts/i18n/devices/ru.json(1 hunks)app/scripts/i18n/react/locales/en/translations.json(2 hunks)app/scripts/i18n/react/locales/ru/translations.json(2 hunks)app/scripts/i18n/rules/en.json(1 hunks)app/scripts/i18n/rules/ru.json(1 hunks)app/scripts/react-directives/components/access-level/accessLevel.jsx(0 hunks)app/scripts/react-directives/forms/formStore.js(1 hunks)app/scripts/react-directives/users/pageStore.js(1 hunks)app/scripts/react-directives/users/users.js(1 hunks)app/scripts/react-directives/users/usersPage.jsx(1 hunks)app/scripts/services/roles.factory.js(2 hunks)app/styles/css/new.css(1 hunks)app/styles/main.css(1 hunks)app/views/access-level.html(1 hunks)app/views/config.html(1 hunks)app/views/configs.html(1 hunks)app/views/devices.html(1 hunks)app/views/logs.html(1 hunks)app/views/network-connections.html(1 hunks)app/views/scripts.html(1 hunks)app/views/system.html(1 hunks)debian/changelog(1 hunks)debian/control(2 hunks)login/login.html(1 hunks)webpack.config.js(2 hunks)
💤 Files with no reviewable changes (5)
- app/scripts/react-directives/components/access-level/accessLevel.jsx
- app/scripts/app.routes.js
- app/scripts/i18n/access/ru.json
- app/scripts/i18n/access/en.json
- app/scripts/controllers/accessLevelController.js
🧰 Additional context used
🪛 eslint
app/scripts/app.js
[error] 97-97: Cannot use import declarations in modules that export using CommonJS (module.exports = 'foo' or exports.bar = 'hi')
(import/no-import-module-exports)
app/scripts/react-directives/users/users.js
[error] 15-23: Expected method shorthand.
(object-shorthand)
[error] 16-16: Assignment to property of function parameter 'scope'.
(no-param-reassign)
[error] 17-17: Assignment to property of function parameter 'scope'.
(no-param-reassign)
[error] 20-22: Unexpected function expression.
(prefer-arrow-callback)
app/scripts/components/loginForm/loginForm.controller.js
[error] 6-6: Unexpected var, use let or const instead.
(no-var)
app/scripts/controllers/navigationController.js
[error] 12-13: Missing trailing comma.
(comma-dangle)
[error] 17-17: Assignment to property of function parameter '$rootScope'.
(no-param-reassign)
app/scripts/react-directives/users/usersPage.jsx
[error] 4-4: react-i18next import should occur before import of ../components/page-wrapper/pageWrapper
(import/order)
[error] 13-13: Curly braces are unnecessary here.
(react/jsx-curly-brace-presence)
[error] 16-16: Prop spreading is forbidden
(react/jsx-props-no-spreading)
[error] 20-20: Expected a line break after this opening brace.
(object-curly-newline)
[error] 20-20: Expected a line break before this closing brace.
(object-curly-newline)
[error] 49-49: 'store' is missing in props validation
(react/prop-types)
app/scripts/services/roles.factory.js
[error] 11-11: Unexpected dangling '_' in '_ROLE_ONE'.
(no-underscore-dangle)
[error] 16-16: Unexpected dangling '_' in '_ROLE_TWO'.
(no-underscore-dangle)
[error] 21-21: Unexpected dangling '_' in '_ROLE_THREE'.
(no-underscore-dangle)
[error] 46-46: There should be no line break before or after '='.
(operator-linebreak)
[error] 47-47: Unexpected string concatenation.
(prefer-template)
[error] 53-53: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 53-55: Unexpected block statement surrounding arrow body; move the returned value immediately after the =>.
(arrow-body-style)
[error] 57-57: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 66-66: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 67-67: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 67-67: Expected '!==' and instead saw '!='.
(eqeqeq)
[error] 72-72: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 73-73: Expected parentheses around arrow function argument.
(arrow-parens)
app/scripts/react-directives/users/pageStore.js
[error] 1-113: File has too many classes (2). Maximum allowed is 1.
(max-classes-per-file)
[error] 44-48: Redundant use of await on a return value.
(no-return-await)
[error] 47-48: Missing trailing comma.
(comma-dangle)
[error] 54-54: ["type"] is better written in dot notation.
(dot-notation)
[error] 77-77: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 78-78: Expected no linebreak before this expression.
(implicit-arrow-linebreak)
[error] 78-79: Missing trailing comma.
(comma-dangle)
[error] 79-79: Unexpected newline before ')'.
(function-paren-newline)
🪛 Biome (1.9.4)
app/scripts/react-directives/users/users.js
[error] 1-1: Redundant use strict directive.
The entire contents of JavaScript modules are automatically in strict mode, with no statement needed to initiate it.
Safe fix: Remove the redundant use strict directive.
(lint/suspicious/noRedundantUseStrict)
app/scripts/components/loginForm/loginForm.controller.js
[error] 6-6: Use let or const instead of var.
A variable declared with var is accessible in the whole body of the function. Thus, the variable can be accessed before its initialization and outside the block where it is declared.
See MDN web docs for more details.
Unsafe fix: Use 'const' instead.
(lint/style/noVar)
app/scripts/services/roles.factory.js
[error] 47-47: Template literals are preferred over string concatenation.
Unsafe fix: Use a template literal.
(lint/style/useTemplate)
app/scripts/react-directives/users/pageStore.js
[error] 1-1: Redundant use strict directive.
The entire contents of JavaScript modules are automatically in strict mode, with no statement needed to initiate it.
Safe fix: Remove the redundant use strict directive.
(lint/suspicious/noRedundantUseStrict)
🔇 Additional comments (32)
debian/control (2)
2-2: Confirm Maintainer info and official email domain.
Ensure that the updated Maintainer line reflects the correct and official contact information.
13-13: Validate new dependency version requirement.
Check that wb-configs (>= 3.35.0~~) is available and compatible with your project.
app/scripts/react-directives/forms/formStore.js (1)
6-9: Constructor enhancement is correct; verify usage across codebase.
Passing params into the constructor adds flexibility. Ensure all FormStore instantiations have been updated to supply or omit params as needed.
✅ Verification successful
Constructor usage is consistent across the codebase
The verification shows that FormStore instantiations across the codebase are correctly handling both cases:
- With named parameters:
new FormStore('userParams', {...}),new FormStore('edit-svg-dashboard.labels.common-parameters-title') - Without parameters:
new FormStore()
All usages align with the constructor's implementation that makes params optional with params || {}. No updates are needed as the codebase already handles both scenarios appropriately.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Searching for all FormStore instantiations to confirm constructor usage:
rg -A 2 "new FormStore\("
Length of output: 3731
app/scripts/services/roles.factory.js (6)
9-10: Use consistent naming for default constants
Defining a default role as DEFAULT_ROLE is good for clarity. Consider using uppercase naming (DEFAULT_ROLE = 1) consistently across the codebase for constants.
32-35: Good approach to mapping user types to role IDs
The typeToRoleId object streamlines role mapping. Ensure all possible user types are covered, or handle unknown types explicitly to avoid unexpected defaults.
37-38: Initialize current role robustly
Accessing localStorage.getItem('user_type') is effective. Consider adding a try/catch or fallback if localStorage is not accessible (e.g., private browsing modes).
39-40: Initialization of notConfiguredUsers properties
Storing an empty array and message is fine. Verify if there's any external usage that expects non-empty defaults or different data types.
57-63: setNotConfiguredUsers logic is clear
The approach to parse comma-separated users is straightforward. Make sure user strings cannot contain commas by mistake.
🧰 Tools
🪛 eslint
[error] 57-57: Expected parentheses around arrow function argument.
(arrow-parens)
71-73: Add fallback or error handling for fetch
If /not_configured_users fails, user setup might be incomplete. Consider adding .catch(...) for error handling.
🧰 Tools
🪛 eslint
[error] 72-72: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 73-73: Expected parentheses around arrow function argument.
(arrow-parens)
app/scripts/components/loginForm/loginForm.controller.js (1)
65-67: Enclose single statements in braces
Your usage of braces for the if (this.isDev) block is good. Some style guides require braces even for single-line if statements for consistency and maintainability.
app/scripts/controllers/navigationController.js (2)
11-12: Constructor signature update
Adding $rootScope is valid if you need global scope access. However, avoid storing too much logic on the root scope as it can hamper maintainability.
90-92: showAccessControl
Using a simple boolean check for admin or the presence of notConfiguredUsers is straightforward. Verify if these conditions fully capture all security requirements.
app/scripts/react-directives/users/pageStore.js (4)
3-10: MobX stores organization
Imports look good. The approach with PageWrapperStore, FormStore etc. suggests a well-structured layout.
22-40: Initialize store with descriptive defaults
The pageWrapperStore and userParamsStore initialization logic is sound. Just confirm that all user parameters get validated as intended (e.g., extra fields, special characters).
85-91: Graceful handling of edit user scenarios
Wrapping await this.putSettings(...) in try/catch is correct. Ensure that any error is meaningful to the user (UI or logs).
[approve]
101-110: Redirect after editing admin
The redirect is correct if the user no longer has admin rights. Confirm that your server session or token logic is updated accordingly before redirecting.
webpack.config.js (1)
90-90: Ensure consistency in asset handling for SVG files
The new rule correctly isolates .svg files. Nonetheless, confirm that no other parts of your configuration inadvertently process .svg in a conflicting manner.
app/index.ejs (1)
115-115: Conditional access control
The ng-if="showAccessControl()" approach is solid for toggling the access-level menu. Ensure that the logic behind showAccessControl() is also tested for different user roles to avoid any unintentional privilege escalation.
app/scripts/app.js (1)
268-269: Double-check directive chaining
Registering expCheckWidget and usersPage directives in a single chain is fine. Ensure you have relevant unit tests covering each directive’s initialization and usage within the Angular scope.
debian/changelog (1)
1-5: Changelog entries for authentication
Incrementing to version 2.108.0 with an added authentication feature is appropriately documented. Ensure all references in supporting docs and release notes mention the new feature.
app/views/network-connections.html (1)
2-2: Verify translation key and access control implementation
The access denial message has been standardized, but we should verify:
- The translation key 'configurations.labels.access-notice' exists
- The access control implementation in $ctrl.haveRights is secure
Let's check these aspects:
✅ Verification successful
Let me gather more information about the access control implementation with a different approach.
Let me check one more aspect about the roles implementation to ensure complete verification.
Translation key exists and access control is properly implemented
Based on the verification results:
- The translation key 'configurations.labels.access-notice' exists in multiple language files (en.json and ru.json) with appropriate translations.
- The access control implementation in networkConnectionsController.js uses rolesFactory.checkRights(rolesFactory.ROLE_THREE), which is:
- Consistent with other admin-level controllers in the application
- Uses the proper role level (ROLE_THREE is defined as admin role with id: 3)
- Properly gates the functionality behind the permission check
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Check for translation key existence
echo "Checking for translation key..."
rg "access-notice" --type json
echo "Checking access control implementation..."
ast-grep --pattern 'class $_ {
$$$
haveRights
$$$
}'
Length of output: 963
Script:
#!/bin/bash
# Search for haveRights in JavaScript/TypeScript files
echo "Searching for haveRights implementation..."
rg "haveRights" --type js -A 5
# Search for the controller definition
echo -e "\nSearching for network-connections controller..."
rg "\.component\(['\"]networkConnections" --type js -A 5
Length of output: 3966
Script:
#!/bin/bash
# Check roles factory implementation
echo "Checking roles factory implementation..."
rg "ROLE_THREE" --type js -A 3
# Also check for the rolesFactory definition
echo -e "\nChecking rolesFactory definition..."
rg "factory\(['\"]rolesFactory" --type js -A 10
Length of output: 4237
app/scripts/i18n/devices/en.json (1)
6-6: Verify translation consistency across all language files
The access notice message has been standardized. The message is clear, but please ensure:
- All language files (en, ru, etc.) are updated consistently
- The message maintains a professional and helpful tone
Let's check translation consistency:
✅ Verification successful
Let's gather more specific information about the translations.
This script will show us the actual translation values for the "access-notice" key across all language files, which will help us verify if they are consistently updated.
Translation consistency verified across language files
The verification shows that the "access-notice" message is properly translated in both English and Russian language files:
- English (devices/en.json): "You don't have enough permissions to view this page"
- Russian (devices/ru.json): "У вас недостаточно прав для просмотра этой страницы"
The translations are present, consistent, and maintain a professional and helpful tone in both languages.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Check for consistent translations across language files
echo "Checking translation consistency..."
fd . -e json -x jq -r 'paths | select(.[2] == "access-notice") | .[0]' {}
Length of output: 216
Script:
#!/bin/bash
# Check the actual translations for "access-notice" across all language files
echo "Checking access-notice translations in all language files..."
fd . -e json -x sh -c 'echo "=== $1 ==="; jq -r ".. | select(has(\"access-notice\")).\"access-notice\"" "$1"' _ {}
Length of output: 5880
app/scripts/i18n/devices/ru.json (1)
6-6: LGTM! Verify message consistency across all views
The consolidated access notice message is well-translated and properly conveys the meaning. The message is more direct and user-friendly compared to the previous split message approach.
Let's verify the message consistency across all localization files:
✅ Verification successful
This new approach will help us:
- First identify which JSON files contain the access-notice key
- Then see the actual content and context around these occurrences to verify consistency
✓ Access notice message is consistent across all localization files
The verification shows perfect consistency:
- The
access-noticekey is present in all corresponding language pairs (en/ru) across three sections: devices, rules, and configurations - The message content is identical within each language:
- English: "You don't have enough permissions to view this page"
- Russian: "У вас недостаточно прав для просмотра этой страницы"
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check for consistency of access-notice messages across all localization files
# Expected: All views should use the same access-notice key
# Search for access-notice in all JSON files
fd -e json -x jq -r 'paths as $p | select(getpath($p) | type=="string" and contains("access-notice")) | $p | join(".")' {} \;
Length of output: 130
Script:
#!/bin/bash
# Let's try a different approach to find access-notice occurrences
# First, let's use ripgrep to find all JSON files containing "access-notice"
rg -l "access-notice" --type json
# Then let's see the actual content around these occurrences
rg -C 2 "access-notice" --type json
Length of output: 2494
app/scripts/i18n/rules/ru.json (1)
6-6: Ensure consistency with English version if updated.
The Russian translation accurately matches the English version. If the English message is enhanced with additional guidance as suggested, please update this translation accordingly.
app/views/config.html (1)
Line range hint 1-20: Verify consistent permission checks across templates.
The template uses both ng-hide="$ctrl.haveRights" and ng-if="$ctrl.haveRights" for permission checks. Let's verify this pattern across other templates.
✅ Verification successful
Permission check patterns are consistently implemented across templates
The verification shows that the pattern of using both ng-hide="$ctrl.haveRights" for the access notice and ng-if="$ctrl.haveRights" for the main content section is consistently implemented across all templates in the application:
config.htmlconfigs.htmldevices.htmllogs.htmlnetwork-connections.htmlscripts.htmlsystem.html
This is a deliberate and consistent pattern where:
ng-hideis used to show/hide the access notice messageng-ifis used to control the rendering of the main content section
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Search for different permission check patterns in templates
echo "Searching for permission check patterns in templates..."
rg -t html "ng-(if|hide|show)=\".*?haveRights" app/views/
Length of output: 1718
app/views/devices.html (1)
Line range hint 1-40: Verify consistent authentication implementation across views.
Let's verify the authentication implementation across all view files.
✅ Verification successful
Authentication implementation is consistent across views
The verification shows a consistent pattern of authentication implementation across the views:
- All sensitive sections are properly protected with
ng-if="$ctrl.haveRights"directive - Access notice messages are consistently implemented across views using the
labels.access-noticetranslation key - No authentication bypasses were detected
- The following views implement the same authentication pattern:
- devices.html
- system.html
- configs.html
- network-connections.html
- scripts.html
- config.html
- logs.html
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Description: Check for consistent authentication patterns and potential security issues
# Check for consistent access control directives
echo "Checking access control patterns..."
rg -l "ng-if=\"\$ctrl\.haveRights\"" app/views/
rg -l "ng-hide=\"\$ctrl\.haveRights\"" app/views/
# Verify translation keys for access notices
echo "Checking translation keys..."
rg -l "labels\.access-notice" app/views/
# Check for potential authentication bypasses
echo "Checking for potential bypasses..."
rg "ng-if=\"(!|!).*haveRights" app/views/
# Verify proper section protection
echo "Checking section protection..."
rg "<section.*>" app/views/ -A 1
Length of output: 1664
app/views/system.html (1)
3-5: Verify server-side access control implementation
While the UI correctly shows an access denied message, ensure that server-side endpoints also enforce these access restrictions to prevent unauthorized access through API calls.
✅ Verification successful
Server-side access control is properly implemented
Based on the code analysis:
-
The system page access is protected by role-based access control (RBAC) both on client and server side:
- Client-side:
SystemCtrlchecks forROLE_THREEpermissions usingrolesFactory.checkRights(rolesFactory.ROLE_THREE) - Server-side: The roles factory is integrated with the authentication system and user roles are managed through proper authentication middleware
- Client-side:
-
The access control implementation follows a secure pattern:
- Roles are centrally managed through
rolesFactory - Role checks are consistently applied across controllers
- The system requires
ROLE_THREE(highest level) for system access - The authentication state is maintained server-side with proper session management (evidenced by
/logoutendpoint)
- Roles are centrally managed through
-
The UI message is just one part of a comprehensive access control system that includes:
- Server-side role validation
- Client-side role checks
- Proper session management
- Consistent role-based access patterns across the application
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# Search for server-side route handlers and middleware
rg -A 5 "app.(?:get|post|put|delete|patch)\s*\(['\"].*system['\"]"
Length of output: 72
Script:
#!/bin/bash
# Let's try different approaches to find server-side access control:
# 1. Search for route handlers with 'system' in any directory structure
rg -A 5 "router\.(get|post|put|delete|patch)\s*\(['\"].*system['\"]"
# 2. Look for system-related controller files
fd -e js -e ts "system.*controller"
# 3. Search for authentication middleware or guards
rg -A 5 "(isAuthenticated|requireAuth|authGuard|checkAccess|hasPermission)"
# 4. Look for API route definitions containing 'system'
rg -A 5 "'/api/.*system.*'"
Length of output: 270
Script:
#!/bin/bash
# Let's examine the system controller file we found
cat app/scripts/controllers/systemController.js
# Also search for any authentication service or middleware
rg -A 5 "(auth.*service|auth.*middleware)"
# Look for any route configuration files
fd "routes|config" -e js
Length of output: 1170
Script:
#!/bin/bash
# Let's check the roles factory implementation and routes
cat app/scripts/app.routes.js
# Check the roles factory implementation
rg -A 10 "rolesFactory" --type js
# Look for any backend API endpoints
rg -A 5 "'/api/system'" --type js
Length of output: 65686
app/scripts/i18n/app/ru.json (3)
8-11: LGTM: Error messages for unconfigured roles are clear and consistent
The error messages follow a consistent pattern and provide clear instructions to users.
17-19: LGTM: Logout button text is appropriate
The translation for the logout button is concise and follows common conventions.
20-23: LGTM: Role labels are clear and follow standard terminology
The translations for user roles follow standard Russian terminology for access control systems.
app/views/logs.html (1)
8-8: LGTM: Access denied message simplified
The access denied message has been simplified by removing the link to access level page, which aligns with the new authentication system.
app/scripts/i18n/react/locales/ru/translations.json (1)
234-234: LGTM! Clear and appropriate error message.
The access denied message is clear, concise, and effectively communicates the need for proper access rights.
There was a problem hiding this comment.
Actionable comments posted: 12
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (6)
Makefile(2 hunks)app/index.ejs(3 hunks)app/scripts/services/roles.factory.js(2 hunks)app/styles/css/new.css(1 hunks)app/styles/main.css(1 hunks)login/login.html(1 hunks)
🧰 Additional context used
🪛 eslint
app/scripts/services/roles.factory.js
[error] 11-11: Unexpected dangling '_' in '_ROLE_ONE'.
(no-underscore-dangle)
[error] 16-16: Unexpected dangling '_' in '_ROLE_TWO'.
(no-underscore-dangle)
[error] 21-21: Unexpected dangling '_' in '_ROLE_THREE'.
(no-underscore-dangle)
[error] 46-46: There should be no line break before or after '='.
(operator-linebreak)
[error] 47-47: Unexpected string concatenation.
(prefer-template)
[error] 53-53: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 53-55: Unexpected block statement surrounding arrow body; move the returned value immediately after the =>.
(arrow-body-style)
[error] 57-57: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 66-66: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 67-67: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 72-72: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 73-73: Expected parentheses around arrow function argument.
(arrow-parens)
🪛 Biome (1.9.4)
app/scripts/services/roles.factory.js
[error] 47-47: Template literals are preferred over string concatenation.
Unsafe fix: Use a template literal.
(lint/style/useTemplate)
🔇 Additional comments (13)
Makefile (1)
56-56: LGTM: Font files installation looks good
The command correctly copies font files to the newly created fonts directory with appropriate permissions.
login/login.html (2)
4-5: LGTM: Proper meta tags
The charset and viewport meta tags are correctly implemented for proper character encoding and responsive design.
112-127: LGTM: Well-structured form
The form implementation uses proper semantic HTML with correctly associated labels and appropriate input types.
app/scripts/services/roles.factory.js (5)
13-13: **Underscore naming flagged by lint rules **
Static analysis flags the underscore prefix in _ROLE_ONE, _ROLE_TWO, _ROLE_THREE as a violation of the no-underscore-dangle rule. This was previously brought up and marked “useless”, so feel free to disregard if you wish to keep your naming as-is.
Also applies to: 18-18, 23-23
32-35: **Mapping user type to role **
The typeToRoleId object is succinct and improves clarity by mapping string user types to numeric role IDs. This is a neat approach.
39-40: **Initialization of notConfiguredUsers variables **
Good job initializing roles.notConfiguredUsers and roles.notConfiguredUsersMessage to their default states for clarity and consistent usage throughout the code.
42-48: **Template literals for constructing message **
Static analysis suggests using template literals for 'app.errors.not-configured-' + roles.notConfiguredUsers.join('-'). This was previously flagged and dismissed, so consider ignoring if it is your intended style.
🧰 Tools
🪛 Biome (1.9.4)
[error] 47-47: Template literals are preferred over string concatenation.
Unsafe fix: Use a template literal.
(lint/style/useTemplate)
🪛 eslint
[error] 46-46: There should be no line break before or after '='.
(operator-linebreak)
[error] 47-47: Unexpected string concatenation.
(prefer-template)
51-54: **Arrow function simplification **
ESLint suggests omitting braces and using parentheses around the parameter for a more concise arrow function:
roles.checkRights = (onlyRoleGreatThanOrEqual) => roles.current.role >= onlyRoleGreatThanOrEqual;This was previously flagged and dismissed, so feel free to disregard.
🧰 Tools
🪛 eslint
[error] 53-53: Expected parentheses around arrow function argument.
(arrow-parens)
app/styles/css/new.css (3)
373-378: **Possibility of customizing the .user-menu span further **
These styles appear standard and align well with the rest of the user menu. If you want fine-grained control over text color on hover, consider adding a hover declaration for .user-menu span.
380-382: **Divider styling is clear **
A consistent margin is applied to .user-menu .divider, providing clear separation of menu items.
390-392: **Hover effect on .glyphicon-user **
The hover color is a simple yet effective visual feedback. Looks good for usability.
app/index.ejs (2)
45-60: **Add ARIA attributes for improved accessibility **
Previously, we discussed adding role="button", aria-label, and tabindex="0" on the user icon for screen reader support and keyboard navigation. If you wish to improve accessibility, consider those suggestions.
115-115: **Verify showAccessControl() coverage **
Ensure that showAccessControl() is tested and properly toggles the display of this menu item.
Would you like me to generate a search script to locate references to showAccessControl() and confirm any associated test coverage or usage?
There was a problem hiding this comment.
Actionable comments posted: 14
♻️ Duplicate comments (1)
app/scripts/i18n/react/locales/ru/translations.json (1)
327-347: 🧹 Nitpick (assertive)Consider adding translations for common authentication scenarios.
The user management section could benefit from additional translations for:
- Password validation messages
- Account status notifications (locked, expired)
- Session-related messages (timeout, concurrent login)
Based on the past review comments and user feedback indicating this suggestion was considered "useless", I'll retract this suggestion. The current translations appear to be sufficient for the immediate requirements.
📜 Review details
Configuration used: CodeRabbit UI
Review profile: ASSERTIVE
Plan: Pro
📒 Files selected for processing (13)
app/index.ejs(3 hunks)app/scripts/controllers/navigationController.js(2 hunks)app/scripts/i18n/app/en.json(1 hunks)app/scripts/i18n/app/ru.json(1 hunks)app/scripts/i18n/react/locales/en/translations.json(2 hunks)app/scripts/i18n/react/locales/ru/translations.json(2 hunks)app/scripts/react-directives/components/select/select.jsx(2 hunks)app/scripts/react-directives/forms/forms.jsx(1 hunks)app/scripts/react-directives/forms/optionsStore.js(3 hunks)app/scripts/react-directives/users/pageStore.js(1 hunks)app/scripts/react-directives/users/usersPage.jsx(1 hunks)app/scripts/services/roles.factory.js(2 hunks)webpack.config.js(2 hunks)
🧰 Additional context used
🪛 eslint
app/scripts/react-directives/components/select/select.jsx
[error] 13-13: 'disabled' is missing in props validation
(react/prop-types)
app/scripts/react-directives/users/usersPage.jsx
[error] 4-4: react-i18next import should occur before import of ../components/page-wrapper/pageWrapper
(import/order)
[error] 14-14: Curly braces are unnecessary here.
(react/jsx-curly-brace-presence)
[error] 17-17: Prop spreading is forbidden
(react/jsx-props-no-spreading)
[error] 18-18: Prop spreading is forbidden
(react/jsx-props-no-spreading)
[error] 36-36: A control must be associated with a text label.
(jsx-a11y/control-has-associated-label)
[error] 36-36: Empty components are self-closing
(react/self-closing-comp)
[error] 40-40: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 43-43: Unexpected string concatenation.
(prefer-template)
[error] 68-68: 'store' is missing in props validation
(react/prop-types)
app/scripts/controllers/navigationController.js
[error] 12-13: Missing trailing comma.
(comma-dangle)
[error] 17-17: Assignment to property of function parameter '$rootScope'.
(no-param-reassign)
app/scripts/services/roles.factory.js
[error] 11-11: Unexpected dangling '_' in '_ROLE_ONE'.
(no-underscore-dangle)
[error] 16-16: Unexpected dangling '_' in '_ROLE_TWO'.
(no-underscore-dangle)
[error] 21-21: Unexpected dangling '_' in '_ROLE_THREE'.
(no-underscore-dangle)
[error] 41-41: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 47-47: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 47-49: Unexpected block statement surrounding arrow body; move the returned value immediately after the =>.
(arrow-body-style)
[error] 51-51: Expected parentheses around arrow function argument.
(arrow-parens)
app/scripts/react-directives/users/pageStore.js
[error] 1-232: File has too many classes (2). Maximum allowed is 1.
(max-classes-per-file)
[error] 95-95: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 96-96: Expected no linebreak before this expression.
(implicit-arrow-linebreak)
[error] 97-98: Missing trailing comma.
(comma-dangle)
[error] 98-99: Missing trailing comma.
(comma-dangle)
[error] 99-99: Unexpected newline before ')'.
(function-paren-newline)
[error] 104-108: Redundant use of await on a return value.
(no-return-await)
[error] 107-108: Missing trailing comma.
(comma-dangle)
[error] 174-174: Expected parentheses around arrow function argument.
(arrow-parens)
[error] 186-186: 'modifiedUser' is never reassigned. Use 'const' instead.
(prefer-const)
[error] 200-200: Assignment to property of function parameter 'user'.
(no-param-reassign)
[error] 201-201: Assignment to property of function parameter 'user'.
(no-param-reassign)
[error] 213-214: Missing trailing comma.
(comma-dangle)
[error] 218-218: Expected '===' and instead saw '=='.
(eqeqeq)
[error] 226-226: Expected parentheses around arrow function argument.
(arrow-parens)
🪛 Biome (1.9.4)
app/scripts/react-directives/users/usersPage.jsx
[error] 36-36: JSX elements without children should be marked as self-closing. In JSX, it is valid for any element to be self-closing.
Unsafe fix: Use a SelfClosingElement instead
(lint/style/useSelfClosingElements)
[error] 43-43: Template literals are preferred over string concatenation.
Unsafe fix: Use a template literal.
(lint/style/useTemplate)
app/scripts/react-directives/users/pageStore.js
[error] 1-1: Redundant use strict directive.
The entire contents of JavaScript modules are automatically in strict mode, with no statement needed to initiate it.
Safe fix: Remove the redundant use strict directive.
(lint/suspicious/noRedundantUseStrict)
[error] 186-186: This let declares a variable that is only assigned once.
'modifiedUser' is never reassigned.
Safe fix: Use const instead.
(lint/style/useConst)
🔇 Additional comments (20)
webpack.config.js (2)
90-102: LGTM: Asset loading configuration is properly structured
The split configuration for SVG and font files provides clear separation of concerns and proper organization of assets.
314-319: LGTM: Proxy configuration correctly routes authentication endpoints
The proxy configuration properly routes the authentication-related endpoints to the target server.
app/scripts/react-directives/forms/optionsStore.js (1)
91-91: Confirm desired behavior of resetting readOnly to false.
Resetting readOnly to false might be intentional, but it also removes any prior read-only restrictions. Verify this is indeed the intended behavior before merging.
app/scripts/react-directives/forms/forms.jsx (1)
88-88: Properly ties store.readOnly to the disabled state.
The disabled={store.readOnly} usage is aligned with the store’s read-only status and improves user experience by preventing edits when needed. No issues detected.
app/scripts/react-directives/users/pageStore.js (3)
22-38: Consider extracting UsersPageAccessLevelStore into a separate file
This file contains two classes. A past review comment has already recommended separating them for clarity and maintainability.
1-1: 🧹 Nitpick (assertive)
Remove redundant 'use strict' directive
Modules are automatically in strict mode, and this statement is not necessary.
- 'use strict';Likely invalid or redundant comment.
🧰 Tools
🪛 Biome (1.9.4)
[error] 1-1: Redundant use strict directive.
The entire contents of JavaScript modules are automatically in strict mode, with no statement needed to initiate it.
Safe fix: Remove the redundant use strict directive.
(lint/suspicious/noRedundantUseStrict)
🪛 eslint
[error] 1-232: File has too many classes (2). Maximum allowed is 1.
(max-classes-per-file)
104-108: 🧹 Nitpick (assertive)
Remove unneeded await to simplify code
Returning a promise directly is more concise and passes static analysis checks about redundant awaits.
async showUserEditModal() {
- return await this.formModalState.show(
+ return this.formModalState.show(
i18n.t('users.labels.user'),
this.userParamsStore,
i18n.t('users.buttons.save')
);
}Likely invalid or redundant comment.
🧰 Tools
🪛 eslint
[error] 104-108: Redundant use of await on a return value.
(no-return-await)
[error] 107-108: Missing trailing comma.
(comma-dangle)
app/scripts/react-directives/users/usersPage.jsx (2)
17-18: Avoid prop spreading
Prop spreading can obscure which props are being passed. ESLint flags it for maintainability reasons.
🧰 Tools
🪛 eslint
[error] 17-17: Prop spreading is forbidden
(react/jsx-props-no-spreading)
[error] 18-18: Prop spreading is forbidden
(react/jsx-props-no-spreading)
14-14: 🧹 Nitpick (assertive)
Use plain string for className
Curly braces are unnecessary when the value is a simple string.
- className={'users-page'}
+ className="users-page"Likely invalid or redundant comment.
🧰 Tools
🪛 eslint
[error] 14-14: Curly braces are unnecessary here.
(react/jsx-curly-brace-presence)
app/scripts/services/roles.factory.js (1)
11-11: Underscore-dangle usage
Defining _ROLE_ONE, _ROLE_TWO, _ROLE_THREE conflicts with some style guides.
🧰 Tools
🪛 eslint
[error] 11-11: Unexpected dangling '_' in '_ROLE_ONE'.
(no-underscore-dangle)
app/scripts/i18n/app/en.json (1)
18-20: Consider extending role labels with descriptions
A previous comment suggested adding more descriptive information for each role to clarify permissions.
app/scripts/i18n/app/ru.json (3)
7-8: LGTM: Error messages are clear and properly translated.
The error messages for Modbus scan and admin configuration are clear and follow Russian language conventions.
14-16: LGTM: Logout button translation is accurate.
The translation for the logout button is concise and follows common Russian UI patterns.
17-20: LGTM: Role translations are consistent.
The role translations (Пользователь, Оператор, Администратор) follow standard Russian terminology for user roles.
app/index.ejs (2)
27-30: Security alert placement and styling are appropriate.
The admin configuration alert is properly placed at the top of the page and uses appropriate Bootstrap alert styling with warning icon.
115-117: LGTM: Access control visibility is properly conditioned.
The access level menu item is correctly controlled by the showAccessControl() function.
app/scripts/i18n/react/locales/en/translations.json (2)
236-236: LGTM: Access denied message is clear and actionable.
The error message provides clear feedback and indicates the possibility of changing access level.
329-349: LGTM: User management translations are comprehensive.
The "users" section includes all necessary translations for:
- Error states (forbidden access, backend issues)
- User types (admin, operator, user)
- Actions (add, save, delete)
- Confirmation dialogs
app/scripts/i18n/react/locales/ru/translations.json (2)
234-234: LGTM! Clear and consistent error message.
The access denied message is well-written and follows the established translation style.
327-347: LGTM! Well-structured user management translations.
The translations cover the essential user management functionality and follow the established pattern in the file.
| @@ -37,6 +38,7 @@ const BootstrapLikeSelect = ({ | |||
| onChange={onChange} | |||
| className={'wb-react-select' + (className ? ' ' + className : '')} | |||
| classNames={customClasses} | |||
| isDisabled={disabled} | |||
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Ensure bool default for isDisabled if unspecified.
Using isDisabled={disabled} is straightforward. No issues detected, but consider providing a default prop value for disabled (e.g., false) to avoid accidental undefined usage and maintain consistency in the UI state when disabled isn’t set.
| @@ -10,6 +10,7 @@ const BootstrapLikeSelect = ({ | |||
| onChange, | |||
| isClearable, | |||
| className, | |||
| disabled, | |||
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Define disabled in prop-types.
The disabled prop is introduced but isn't validated in propTypes. Consider adding a propTypes definition for the disabled prop to ensure proper usage and type checking.
import PropTypes from 'prop-types';
const BootstrapLikeSelect = ({
options,
selectedOption,
placeholder,
onChange,
isClearable,
className,
+ disabled,
}) => {
...
};
+BootstrapLikeSelect.propTypes = {
+ disabled: PropTypes.bool,
+ // other props
+};Committable suggestion skipped: line range outside the PR's diff.
🧰 Tools
🪛 eslint
[error] 13-13: 'disabled' is missing in props validation
(react/prop-types)
| setReadOnly(value) { | ||
| this.readOnly = value; | ||
| } |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Enforce boolean type for readOnly in setReadOnly.
Consider validating the argument in setReadOnly(value) to ensure it’s strictly boolean, preventing accidental usage with non-boolean values that could break the UI logic.
setReadOnly(value) {
+ if (typeof value !== 'boolean') {
+ console.warn('Attempting to set non-boolean readOnly value, fallback to false');
+ value = false;
+ }
this.readOnly = value;
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| setReadOnly(value) { | |
| this.readOnly = value; | |
| } | |
| setReadOnly(value) { | |
| if (typeof value !== 'boolean') { | |
| console.warn('Attempting to set non-boolean readOnly value, fallback to false'); | |
| value = false; | |
| } | |
| this.readOnly = value; | |
| } |
| @@ -19,6 +19,7 @@ export class OptionsStore { | |||
| this.selectedOption = null; | |||
| this.formColumns = null; | |||
| this.initialValue = value; | |||
| this.readOnly = false; | |||
There was a problem hiding this comment.
💡 Codebase verification
Based on the findings, I can now provide the final response:
Mark readOnly as an observable property
The readOnly property is used to control the disabled state of UI components in forms.jsx. Since this property affects the UI state, it should be marked as an observable to ensure proper reactivity when its value changes.
🔗 Analysis chain
Mark readOnly as an observable.
You have introduced this.readOnly = false; in the constructor, but readOnly is not declared in the makeObservable section. Ensuring this property is observable allows the UI to react to state changes.
makeObservable(this, {
options: observable,
value: observable,
hasErrors: observable,
selectedOption: observable,
formColumns: observable,
+ readOnly: observable,
setValue: action,
setSelectedOption: action,
setOptions: action,
setFormColumns: action,
addOption: action,
});Let me gather information about the usage and implementation of readOnly property.
Let me search for the implementation of optionsStore class to understand how readOnly is used.
Let me check how readOnly is used in the UI components.
🏁 Scripts executed
The following scripts were executed for the analysis:
Error: No shell scripts found
Script:
#!/bin/bash
# Search for the implementation of optionsStore class and its usage of readOnly
ast-grep --pattern 'class $_ {
$$$
readOnly $$$
$$$
}'
# Search for references to readOnly in the codebase
rg "readOnly" -A 2
Length of output: 76138
Script:
#!/bin/bash
# Search for the implementation of optionsStore class
ast-grep --pattern 'class $_ {
$$$
makeObservable(this, {
$$$
});
$$$
}'
# Search for references to readOnly in optionsStore
rg "readOnly" app/scripts/react-directives/forms/optionsStore.js
Length of output: 205
Script:
#!/bin/bash
# Search for UI components using readOnly from optionsStore
rg "store\.readOnly" app/scripts/react-directives/forms/
Length of output: 216
| async execRequest(url, request) { | ||
| try { | ||
| this.pageWrapperStore.clearError(); | ||
| this.pageWrapperStore.setLoading(true); | ||
| const res = await fetch(url, request); | ||
| if (res.ok) { | ||
| this.pageWrapperStore.setLoading(false); | ||
| return res; | ||
| } | ||
| this.processFetchError(res); | ||
| } catch (error) { | ||
| this.pageWrapperStore.setError(error); | ||
| } | ||
| this.pageWrapperStore.setLoading(false); | ||
| return null; | ||
| } |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Consider extending error handling on execRequest
Although processFetchError is invoked when res.ok is false, consider adding explicit .catch(...) handling on the fetch call or returning detailed error objects for more robust error management.
| @@ -8,11 +8,13 @@ class NavigationCtrl { | |||
| whenMqttReady, | |||
| errors, | |||
| uiConfig, | |||
| rolesFactory | |||
| rolesFactory, | |||
| $rootScope | |||
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Add trailing comma for consistency
Trailing commas can improve diffs and code clarity.
🧰 Tools
🪛 eslint
[error] 12-13: Missing trailing comma.
(comma-dangle)
| ) { | ||
| 'ngInject'; | ||
|
|
||
| $scope.roles = rolesFactory; | ||
| $rootScope.roles = rolesFactory; |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Avoid assigning to $rootScope parameter
Modifying injected Angular parameters can lead to unintentional side effects. If possible, consider referencing or wrapping the object instead.
🧰 Tools
🪛 eslint
[error] 17-17: Assignment to property of function parameter '$rootScope'.
(no-param-reassign)
| $scope.logout = function () { | ||
| fetch('/logout', { | ||
| method: 'POST', | ||
| }).then(() => { | ||
| window.location.href = '/login'; | ||
| }); |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Handle errors when logging out
The logout process uses a fetch call without a .catch(...). Consider adding error handling logic (e.g., network issues).
| fetch('/auth/check_config').then(response => { | ||
| if (response.ok) { | ||
| roles.notConfiguredAdmin = true; | ||
| } | ||
| roles.notConfiguredAdminResolve(); | ||
| }); |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
💡 Codebase verification
Add error handling and verify logic is correct
Based on the code analysis, the logic appears correct:
notConfiguredAdminis used to identify if the system needs initial admin configuration- When
/auth/check_configreturns 200 OK, it means the system needs initial admin setup (notConfiguredAdmin = true) - This flag is used in multiple places to control admin-specific UI behavior and redirects
- The webpack config confirms this is a valid endpoint that's proxied in development
However, there are two issues that should be addressed:
- Missing error handling for network failures
- The promise resolution happens regardless of success/failure which could lead to incorrect state
Suggested changes:
fetch('/auth/check_config').then(response => {
if (response.ok) {
roles.notConfiguredAdmin = true;
}
roles.notConfiguredAdminResolve();
}).catch(error => {
console.error('Failed to check admin configuration:', error);
roles.notConfiguredAdminResolve(); // Still resolve to unblock UI
});🔗 Analysis chain
Review logic and add error handling
When /auth/check_config returns a successful response (res.ok), this sets roles.notConfiguredAdmin = true. Verify that logic is correct. Also, consider adding .catch(...) to handle network errors.
Let me gather more information about the usage and context of this code.
🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash
# This script checks the /auth/check_config endpoint response codes for correctness.
curl -i -X GET http://localhost:8080/auth/check_config || echo "Endpoint not reachable"
# Expect: 2XX means notConfiguredAdmin?
Length of output: 617
Script:
#!/bin/bash
# Search for references to notConfiguredAdmin and related code
rg -A 5 "notConfiguredAdmin" --type js
# Search for the auth check_config route definition
rg -A 5 "'/auth/check_config'" --type js
Length of output: 4690
🧰 Tools
🪛 eslint
[error] 51-51: Expected parentheses around arrow function argument.
(arrow-parens)
| <div class="dropdown user-menu navbar-right"> | ||
| <i class="glyphicon glyphicon-user" id="userMenu" type="button" data-toggle="dropdown" aria-label="User menu" aria-haspopup="true" aria-expanded="false"></i> | ||
| <ul class="dropdown-menu" aria-labelledby="userMenu"> | ||
| <li> | ||
| <span class='user-name' translate>{{roles.current.roles.name}}</span> | ||
| </li> | ||
| <li role="separator" class="divider"></li> | ||
| <li> | ||
| <a href="#" ng-click="logout()" translate>{{'app.buttons.logout'}}</a> | ||
| </li> | ||
| </ul> | ||
| </div> |
There was a problem hiding this comment.
🧹 Nitpick (assertive)
Enhance dropdown menu accessibility.
While the user menu implementation is good, consider these accessibility improvements:
- Add
aria-expandedstate management via JavaScript - Add keyboard navigation support for the dropdown menu
- <i class="glyphicon glyphicon-user" id="userMenu" type="button" data-toggle="dropdown" aria-label="User menu" aria-haspopup="true" aria-expanded="false"></i>
+ <button class="btn btn-link" id="userMenu" type="button" data-toggle="dropdown" aria-label="User menu" aria-haspopup="true" aria-expanded="false">
+ <i class="glyphicon glyphicon-user"></i>
+ </button>
<ul class="dropdown-menu" aria-labelledby="userMenu">
<li>
- <span class='user-name' translate>{{roles.current.roles.name}}</span>
+ <span class='user-name' translate tabindex="-1">{{roles.current.roles.name}}</span>
</li>
<li role="separator" class="divider"></li>
<li>
- <a href="#" ng-click="logout()" translate>{{'app.buttons.logout'}}</a>
+ <a href="#" ng-click="logout()" translate tabindex="0">{{'app.buttons.logout'}}</a>
</li>
</ul>📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| <div class="dropdown user-menu navbar-right"> | |
| <i class="glyphicon glyphicon-user" id="userMenu" type="button" data-toggle="dropdown" aria-label="User menu" aria-haspopup="true" aria-expanded="false"></i> | |
| <ul class="dropdown-menu" aria-labelledby="userMenu"> | |
| <li> | |
| <span class='user-name' translate>{{roles.current.roles.name}}</span> | |
| </li> | |
| <li role="separator" class="divider"></li> | |
| <li> | |
| <a href="#" ng-click="logout()" translate>{{'app.buttons.logout'}}</a> | |
| </li> | |
| </ul> | |
| </div> | |
| <div class="dropdown user-menu navbar-right"> | |
| <button class="btn btn-link" id="userMenu" type="button" data-toggle="dropdown" aria-label="User menu" aria-haspopup="true" aria-expanded="false"> | |
| <i class="glyphicon glyphicon-user"></i> | |
| </button> | |
| <ul class="dropdown-menu" aria-labelledby="userMenu"> | |
| <li> | |
| <span class='user-name' translate tabindex="-1">{{roles.current.roles.name}}</span> | |
| </li> | |
| <li role="separator" class="divider"></li> | |
| <li> | |
| <a href="#" ng-click="logout()" translate tabindex="0">{{'app.buttons.logout'}}</a> | |
| </li> | |
| </ul> | |
| </div> |
Summary by CodeRabbit
New Features
Bug Fixes
Documentation
Chores