Merge pull request #913 from utmstack/bugfix/10.5.17/Unable-to-change-status-to-complete-if-observations-contain-french-characters

Unable to change status to complete if observations contain french characters

Author: c3s4rfred

CHANGELOG.md

@@ -1,7 +1,7 @@
-# UTMStack 10.5.17 Release Notes
+# UTMStack 10.5.18 Release Notes
 ## Bugfix
--Fixed an issue preventing incident status updates when entering long solutions.
--Fixed an issue blocking incident creation from the Alerts panel.
--Added Asia/Jakarta timezone to the TIMEZONES list.
--Fixed Timezone changes on an instance don't get updated when access by Federation Server
--Fixed Last log not displayed for a generated alert 
+-Fixed unable-to-change-status-to-complete-if-observations-contain-french-characters.
+-Fixed Elastic filter time adds unnecessary /d to intervals in Log Explorer
+-Fixed handle special characters in password query parameter
+-Fixed filter duplication issue in Log Explorer when removing filters
+

backend/src/main/java/com/park/utmstack/service/impl/UtmAlertServiceImpl.java

@@ -21,6 +21,7 @@
 import com.park.utmstack.service.elasticsearch.ElasticsearchService;
 import com.park.utmstack.service.elasticsearch.SearchUtil;
 import com.park.utmstack.service.soc_ai.SocAIService;
+import com.park.utmstack.util.UnicodeReplacer;
 import com.park.utmstack.util.enums.AlertStatus;
 import com.park.utmstack.util.events.RulesEvaluationEndEvent;
 import com.park.utmstack.util.exceptions.DashboardOverviewException;
@@ -187,6 +188,8 @@ public void updateStatus(List<String> alertIds, int status, String statusObserva
             String script = String.format(ruleScript, status,
                     AlertStatus.getByCode(status).getName(), StringEscapeUtils.escapeJava(statusObservation));
 
+            script = UnicodeReplacer.replaceUnicode(script);
+
             elasticsearchService.updateByQuery(SearchUtil.toQuery(filters),
                     Constants.SYS_INDEX_PATTERN.get(SystemIndexPattern.ALERTS), script);
         } catch (Exception e) {

backend/src/main/java/com/park/utmstack/util/UnicodeReplacer.java

@@ -0,0 +1,32 @@
+package com.park.utmstack.util;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class UnicodeReplacer {
+    // Pattern to detect Unicode sequences like \u00E9
+    private static final Pattern UNICODE_PATTERN = Pattern.compile("\\\\u([0-9A-Fa-f]{4})");
+
+    /**
+     * Method to replace Unicode sequences with their corresponding characters.
+     *
+     * @param input The text containing Unicode sequences.
+     * @return The text with Unicode sequences replaced by their actual characters.
+     */
+    public static String replaceUnicode(String input) {
+        Matcher matcher = UNICODE_PATTERN.matcher(input);
+        StringBuffer result = new StringBuffer();
+
+        while (matcher.find()) {
+            // Converts the Unicode sequence to its equivalent character
+            String unicode = matcher.group(1);
+            char character = (char) Integer.parseInt(unicode, 16);
+            matcher.appendReplacement(result, String.valueOf(character));
+        }
+
+        matcher.appendTail(result);
+        return result.toString();
+    }
+
+}
+

backend/src/main/resources/config/application-dev.yml

@@ -44,7 +44,7 @@ spring:
         cache: false
 
 server:
-    port: 8080
+    port: 8081
 
 jhipster:
     # CORS is only enabled by default with the "dev" profile

backend/src/main/resources/config/liquibase/changelog/20241120001_update_compliance_menu.xml

@@ -67,7 +67,4 @@
 
     <include file="/config/liquibase/changelog/20241122001_alter_action_detail_length.xml" relativeToChangelogFile="false"/>
 
-    <include file="/config/liquibase/changelog/20241120001_update_compliance_menu.xml" relativeToChangelogFile="false"/>
-
-
 </databaseChangeLog>

backend/src/main/resources/config/liquibase/master.xml

@@ -120,9 +120,7 @@ export class AppComponent implements OnInit {
   }
 
   isInExportRoute() {
-    return this.router.url.includes('dashboard/export/') || 
-           this.router.url.includes('dashboard/export-compliance') ||
-           this.router.url.includes('compliance/print-view') ||
+    return this.router.url.includes('dashboard/export/') || this.router.url.includes('dashboard/export-compliance') ||
       this.router.url.includes('/getting-started') ||
       this.router.url.includes('/dashboard/export-report/') || this.iframeView || this.router.url.includes('/data/alert/detail/');
   }

frontend/src/app/app.component.ts

@@ -35,7 +35,6 @@ import {NewAlertBehavior} from './shared/behaviors/new-alert.behavior';
 import {TimezoneFormatService} from './shared/services/utm-timezone.service';
 import {UtmSharedModule} from './shared/utm-shared.module';
 import {AccountService} from "./core/auth/account.service";
-import {AlertManagementSharedModule} from "./data-management/alert-management/shared/alert-management-shared.module";
 
 export function initTimezoneFormat(timezoneService: TimezoneFormatService) {
   return () => timezoneService.loadTimezoneAndFormat();
@@ -74,7 +73,6 @@ export function initTimezoneFormat(timezoneService: TimezoneFormatService) {
     Ng2TelInputModule,
     NgxFlagIconCssModule,
     Ng2Webstorage.forRoot(),
-    AlertManagementSharedModule,
   ],
   providers: [
     LocalStorageService,