Skip to content

Commit 6512bb2

Browse files
jongpiejongpie
committed
[WIP] Renamed fields OriginSystemName__c to OriginServiceName__c
1 parent e828e28 commit 6512bb2

12 files changed

Lines changed: 30 additions & 24 deletions

‎nebula-logger/core/main/log-management/classes/LogEntryEventHandler.cls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,11 +335,11 @@ public without sharing class LogEntryEventHandler extends LoggerSObjectHandler {
335335
MessageTruncated__c = logEntryEvent.MessageTruncated__c,
336336
Name = null, // Salesforce will auto-set the record ID as the name when null
337337
OriginLocation__c = logEntryEvent.OriginLocation__c,
338+
OriginServiceName__c = logEntryEvent.OriginServiceName__c,
338339
OriginSourceActionName__c = logEntryEvent.OriginSourceActionName__c,
339340
OriginSourceApiName__c = logEntryEvent.OriginSourceApiName__c,
340341
OriginSourceId__c = logEntryEvent.OriginSourceId__c,
341342
OriginSourceMetadataType__c = logEntryEvent.OriginSourceMetadataType__c,
342-
OriginSystemName__c = logEntryEvent.OriginSystemName__c,
343343
OriginType__c = logEntryEvent.OriginType__c,
344344
RecordCollectionSize__c = logEntryEvent.RecordCollectionSize__c,
345345
RecordCollectionType__c = logEntryEvent.RecordCollectionType__c,

‎nebula-logger/core/main/log-management/classes/LogManagementDataSelector.cls‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,13 @@ public without sharing virtual class LogManagementDataSelector {
424424
return new List<Schema.User>();
425425
}
426426

427-
return [SELECT Id, Name, Username, SmallPhotoUrl FROM User WHERE Name LIKE :searchTerm OR Username LIKE :searchTerm ORDER BY Username LIMIT 20];
427+
return [
428+
SELECT Id, Name, Username, SmallPhotoUrl
429+
FROM User
430+
WHERE IsActive = TRUE AND (Name LIKE :searchTerm OR Username LIKE :searchTerm)
431+
ORDER BY Username
432+
LIMIT 20
433+
];
428434
}
429435

430436
/**

‎nebula-logger/core/main/log-management/classes/LoggerRestResource.cls‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ global with sharing class LoggerRestResource {
343343
for (OTelAttribute entryAttribute : this.attributes) {
344344
switch on entryAttribute.key {
345345
when 'service.name' {
346-
supplementalFieldToValue.put(LogEntryEvent__e.OriginSystemName__c, entryAttribute.value?.stringValue);
346+
supplementalFieldToValue.put(LogEntryEvent__e.OriginServiceName__c, entryAttribute.value?.stringValue);
347347
}
348348
// TODO
349349
// when 'service.version' {

nebula-logger/core/main/log-management/objects/LogEntry__c/fields/OriginSystemName__c.field-meta.xml renamed to nebula-logger/core/main/log-management/objects/LogEntry__c/fields/OriginServiceName__c.field-meta.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<fullName>OriginSystemName__c</fullName>
3+
<fullName>OriginServiceName__c</fullName>
44
<businessStatus>Active</businessStatus>
55
<complianceGroup>None</complianceGroup>
66
<externalId>true</externalId>
7-
<label>Origin System Name</label>
7+
<label>Origin Service Name</label>
88
<length>255</length>
99
<required>false</required>
1010
<securityClassification>Confidential</securityClassification>

‎nebula-logger/core/main/log-management/objects/LogEntry__c/listViews/AllApiLogEntries.listView-meta.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<columns>LoggingLevel__c</columns>
77
<columns>LoggedByUsernameLink__c</columns>
88
<columns>Message__c</columns>
9-
<columns>OriginSystemName__c</columns>
9+
<columns>OriginServiceName__c</columns>
1010
<columns>Timestamp__c</columns>
1111
<filterScope>Everything</filterScope>
1212
<filters>

‎nebula-logger/core/main/log-management/permissionsets/LoggerAdmin.permissionset-meta.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -935,6 +935,11 @@
935935
<field>LogEntry__c.OriginLocation__c</field>
936936
<readable>true</readable>
937937
</fieldPermissions>
938+
<fieldPermissions>
939+
<editable>false</editable>
940+
<field>LogEntry__c.OriginServiceName__c</field>
941+
<readable>true</readable>
942+
</fieldPermissions>
938943
<fieldPermissions>
939944
<editable>false</editable>
940945
<field>LogEntry__c.OriginSourceActionName__c</field>
@@ -1005,11 +1010,6 @@
10051010
<field>LogEntry__c.OriginSourceSnippet__c</field>
10061011
<readable>true</readable>
10071012
</fieldPermissions>
1008-
<fieldPermissions>
1009-
<editable>false</editable>
1010-
<field>LogEntry__c.OriginSystemName__c</field>
1011-
<readable>true</readable>
1012-
</fieldPermissions>
10131013
<fieldPermissions>
10141014
<editable>false</editable>
10151015
<field>LogEntry__c.OriginType__c</field>

‎nebula-logger/core/main/log-management/permissionsets/LoggerEndUser.permissionset-meta.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,17 +619,17 @@
619619
</fieldPermissions>
620620
<fieldPermissions>
621621
<editable>false</editable>
622-
<field>LogEntry__c.OriginSourceApiName__c</field>
622+
<field>LogEntry__c.OriginServiceName__c</field>
623623
<readable>true</readable>
624624
</fieldPermissions>
625625
<fieldPermissions>
626626
<editable>false</editable>
627-
<field>LogEntry__c.OriginSourceMetadataType__c</field>
627+
<field>LogEntry__c.OriginSourceApiName__c</field>
628628
<readable>true</readable>
629629
</fieldPermissions>
630630
<fieldPermissions>
631631
<editable>false</editable>
632-
<field>LogEntry__c.OriginSystemName__c</field>
632+
<field>LogEntry__c.OriginSourceMetadataType__c</field>
633633
<readable>true</readable>
634634
</fieldPermissions>
635635
<fieldPermissions>

‎nebula-logger/core/main/log-management/permissionsets/LoggerLogViewer.permissionset-meta.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -851,6 +851,11 @@
851851
<field>LogEntry__c.OriginLocation__c</field>
852852
<readable>true</readable>
853853
</fieldPermissions>
854+
<fieldPermissions>
855+
<editable>false</editable>
856+
<field>LogEntry__c.OriginServiceName__c</field>
857+
<readable>true</readable>
858+
</fieldPermissions>
854859
<fieldPermissions>
855860
<editable>false</editable>
856861
<field>LogEntry__c.OriginSourceActionName__c</field>
@@ -921,11 +926,6 @@
921926
<field>LogEntry__c.OriginSourceSnippet__c</field>
922927
<readable>true</readable>
923928
</fieldPermissions>
924-
<fieldPermissions>
925-
<editable>false</editable>
926-
<field>LogEntry__c.OriginSystemName__c</field>
927-
<readable>true</readable>
928-
</fieldPermissions>
929929
<fieldPermissions>
930930
<editable>false</editable>
931931
<field>LogEntry__c.OriginType__c</field>

nebula-logger/core/main/logger-engine/objects/LogEntryEvent__e/fields/OriginSystemName__c.field-meta.xml renamed to nebula-logger/core/main/logger-engine/objects/LogEntryEvent__e/fields/OriginServiceName__c.field-meta.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<CustomField xmlns="http://soap.sforce.com/2006/04/metadata">
3-
<fullName>OriginSystemName__c</fullName>
3+
<fullName>OriginServiceName__c</fullName>
44
<businessStatus>Active</businessStatus>
55
<complianceGroup>None</complianceGroup>
66
<externalId>false</externalId>

‎nebula-logger/core/tests/log-management/classes/LogEntryEventHandler_Tests.cls‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,11 +1436,11 @@ private class LogEntryEventHandler_Tests {
14361436
Id,
14371437
Name,
14381438
OriginLocation__c,
1439+
OriginServiceName__c,
14391440
OriginSourceActionName__c,
14401441
OriginSourceApiName__c,
14411442
OriginSourceId__c,
14421443
OriginSourceMetadataType__c,
1443-
OriginSystemName__c,
14441444
OriginType__c,
14451445
RecordCollectionSize__c,
14461446
RecordCollectionType__c,
@@ -1762,7 +1762,7 @@ private class LogEntryEventHandler_Tests {
17621762
logEntry.OriginSourceMetadataType__c,
17631763
'logEntry.OriginSourceMetadataType__c was not properly set'
17641764
);
1765-
System.Assert.areEqual(logEntryEvent.OriginSystemName__c, logEntry.OriginSystemName__c, 'logEntry.OriginSystemName__c was not properly set');
1765+
System.Assert.areEqual(logEntryEvent.OriginServiceName__c, logEntry.OriginServiceName__c, 'logEntry.OriginServiceName__c was not properly set');
17661766
System.Assert.areEqual(logEntryEvent.OriginType__c, logEntry.OriginType__c, 'logEntry.OriginType__c was not properly set');
17671767
System.Assert.areEqual(logEntryEvent.RecordCollectionSize__c, logEntry.RecordCollectionSize__c, 'logEntry.RecordCollectionSize__c was not properly set');
17681768
System.Assert.areEqual(logEntryEvent.RecordCollectionType__c, logEntry.RecordCollectionType__c, 'logEntry.RecordCollectionType__c was not properly set');

0 commit comments

Comments
 (0)