Add summit timezone, change action operator, fix placeholder

Signed-off-by: Tomás Castillo <[email protected]>
fntechgit · Jul 17, 2024 · a8a5094 · a8a5094
1 parent 1412d99
commit a8a5094
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/src/actions/audit-log-actions.js b/src/actions/audit-log-actions.js
@@ -82,7 +82,7 @@ const parseFilters = (filters, term = null) => {
         if (isNumericString(term)) {
             searchString += `entity_id==${term}`;
         } else {
-            searchString += `action=@${escapedTerm}`
+            searchString += `action@@${escapedTerm}`
         }
 
         filter.push(searchString);

diff --git a/src/components/audit-logs/index.js b/src/components/audit-logs/index.js
@@ -6,7 +6,7 @@ import { Pagination } from "react-bootstrap";
 import { connect } from "react-redux";
 import { clearAuditLogParams, getAuditLog } from "../../actions/audit-log-actions";
 
-const AuditLogs = ({ entityFilter = [],  term, logEntries, perPage, lastPage, currentPage, order, orderDir, columns, getAuditLog, clearAuditLogParams, filters }) => {
+const AuditLogs = ({ entityFilter = [], currentSummit, term, logEntries, perPage, lastPage, currentPage, order, orderDir, columns, getAuditLog, clearAuditLogParams, filters }) => {
 
   const defaultFilters = {
     user_id_filter: [],
@@ -167,8 +167,8 @@ const AuditLogs = ({ entityFilter = [],  term, logEntries, perPage, lastPage, cu
                 format={{ date: "YYYY-MM-DD", time: "HH:mm" }}
                 inputProps={{ placeholder: T.translate("audit_log.placeholders.created_date_from") }}
                 onChange={(ev) => handleChangeDateFilter(ev, false)}
-                timezone={'UTC'}
-                value={epochToMomentTimeZone(auditLogFilters.created_date_filter[0], 'UTC')}
+                timezone={currentSummit.time_zone_id}
+                value={epochToMomentTimeZone(auditLogFilters.created_date_filter[0], currentSummit.time_zone_id)}
                 className={'event-list-date-picker'}
               />
             </div>
@@ -178,8 +178,8 @@ const AuditLogs = ({ entityFilter = [],  term, logEntries, perPage, lastPage, cu
                 format={{ date: "YYYY-MM-DD", time: "HH:mm" }}
                 inputProps={{ placeholder: T.translate("audit_log.placeholders.created_date_to") }}
                 onChange={(ev) => handleChangeDateFilter(ev, true)}
-                timezone={'UTC'}
-                value={epochToMomentTimeZone(auditLogFilters.created_date_filter[1], 'UTC')}
+                timezone={currentSummit.time_zone_id}
+                value={epochToMomentTimeZone(auditLogFilters.created_date_filter[1], currentSummit.time_zone_id)}
                 className={'event-list-date-picker'}
               />
             </div>
@@ -218,7 +218,8 @@ const AuditLogs = ({ entityFilter = [],  term, logEntries, perPage, lastPage, cu
   );
 };
 
-const mapStateToProps = ({ auditLogState }) => ({
+const mapStateToProps = ({ currentSummitState, auditLogState }) => ({
+  currentSummit: currentSummitState.currentSummit,
   ...auditLogState,
 });
 

diff --git a/src/i18n/en.json b/src/i18n/en.json
@@ -2831,7 +2831,7 @@
     "order": "Order",
     "apply_filters": "Apply Filters",
     "placeholders": {
-      "search_log": "Search By Action / User Full Name",
+      "search_log": "Search By Action / Entity Id",
       "user_id": "Filter by User",
       "created_date_from": "Filter by Created Date From",
       "created_date_to": "Filter by Created Date To"