Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-24 09:28:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[post-modularisation] Fixing audit-log filters (#12652)

Browse source 
* fixed: audit log user search filter

* fixed: added invite user log

---------

Co-authored-by: gsmithun4 <gsmithun4@gmail.com>
This commit is contained in:
Muhsin Shah C P 2025-04-21 19:41:30 +05:30 committed by GitHub
parent 258469f78d
commit bdcd84bef5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/_services/organization.service.js
View file

@ -17,7 +17,7 @@ export const organizationService = {
function getUsersByValue(searchInput) { function getUsersByValue(searchInput) {
const requestOptions = { method: 'GET', headers: authHeader(), credentials: 'include' }; const requestOptions = { method: 'GET', headers: authHeader(), credentials: 'include' };
return fetch(`${config.apiUrl}/organizations/users/suggest?input=${searchInput}`, requestOptions).then( return fetch(`${config.apiUrl}/organization-users/users/suggest?input=${searchInput}`, requestOptions).then(
handleResponse handleResponse
); );
} }

2
server/src/modules/organization-users/controller.ts
View file

@ -41,7 +41,7 @@ export class OrganizationUsersController implements IOrganizationUsersController
@InitFeature(FEATURE_KEY.SUGGEST_USERS) @InitFeature(FEATURE_KEY.SUGGEST_USERS)
@Get('users/suggest') @Get('users/suggest')
async getUserSuggestions(@User() user, @Query('input') searchInput) { async getUserSuggestions(@User() user, @Query('input') searchInput) {
const users = await this.organizationUsersService.fetchUsersByValue(user?.organization_id, searchInput); const users = await this.organizationUsersService.fetchUsersByValue(user?.organizationId, searchInput);
const response = { const response = {
users, users,
}; };

6
server/src/modules/organization-users/repository.ts
View file

@ -62,9 +62,9 @@ export class OrganizationUsersRepository extends Repository<OrganizationUser> {
return organizationUsers.map((row) => ({ return organizationUsers.map((row) => ({
email: row.user_email, email: row.user_email,
firstName: row.user_firstName, firstName: row.user_first_name,
lastName: row.user_lastName, lastName: row.user_last_name,
name: `${row.user_firstName || ''} ${row.user_lastName || ''}`.trim(), name: `${row.user_first_name || ''} ${row.user_last_name || ''}`.trim(),
id: row.organization_user_id, id: row.organization_user_id,
userId: row.user_id, userId: row.user_id,
})); }));

20
server/src/modules/organization-users/util.service.ts
View file

@ -40,6 +40,8 @@ import { SessionUtilService } from '@modules/session/util.service';
import { SetupOrganizationsUtilService } from '@modules/setup-organization/util.service'; import { SetupOrganizationsUtilService } from '@modules/setup-organization/util.service';
import { IOrganizationUsersUtilService } from './interfaces/IUtilService'; import { IOrganizationUsersUtilService } from './interfaces/IUtilService';
import { EventEmitter2 } from '@nestjs/event-emitter'; import { EventEmitter2 } from '@nestjs/event-emitter';
import { AUDIT_LOGS_REQUEST_CONTEXT_KEY } from '@modules/app/constants';
import { RequestContext } from '@modules/request-context/service';
@Injectable() @Injectable()
export class OrganizationUsersUtilService implements IOrganizationUsersUtilService { export class OrganizationUsersUtilService implements IOrganizationUsersUtilService {
constructor( constructor(
@ -509,18 +511,12 @@ export class OrganizationUsersUtilService implements IOrganizationUsersUtilServi
!user || !!user.invitationToken !user || !!user.invitationToken
); );
this.eventEmitter.emit( RequestContext.setLocals(AUDIT_LOGS_REQUEST_CONTEXT_KEY, {
'auditLogEntry', userId: currentUser.id,
{ organizationId: currentOrganization.id,
userId: currentUser.id, resourceId: currentOrganization.id,
organizationId: currentOrganization.id, resourceName: updatedUser.email,
resourceId: currentOrganization.id, });
resourceName: updatedUser.email,
resourceType: MODULES.USER,
actionType: MODULE_INFO.USER_INVITE,
},
manager
);
return organizationUser; return organizationUser;
}, manager); }, manager);