awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-08 11:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: project-independent log support

Browse Source
This commit is contained in:
Daniel Hougaard
2024-09-20 23:07:53 +04:00
parent 59b8e83476
commit 9f61177b62
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/ee/services/audit-log/audit-log-dal.ts
+7 -6
View File
@@ -55,8 +55,7 @@ export const auditLogDALFactory = (db: TDbClient) => {
// eslint-disable-next-line func-names
.where(function () {
if (orgId) {
void this.where(`${TableName.Project}.orgId`, orgId);
// .orWhere(`${TableName.AuditLog}.orgId`, orgId);
void this.where(`${TableName.Project}.orgId`, orgId).orWhere(`${TableName.AuditLog}.orgId`, orgId);
} else if (projectId) {
void this.where(`${TableName.AuditLog}.projectId`, projectId);
}
@@ -114,10 +113,12 @@ export const auditLogDALFactory = (db: TDbClient) => {
return {
...AuditLogsSchema.parse(doc),
project: {
name: projectDoc.projectName,
slug: projectDoc.projectSlug
}
...(projectDoc?.projectSlug && {
project: {
name: projectDoc.projectName,
slug: projectDoc.projectSlug
}
})
};
});
} catch (error) {