Merge branch 'bugfix/4950-server-address-paste-ip' of https://github.…

…com/wazuh/wazuh-kibana-app into bugfix/4950-server-address-paste-ip

CHANGELOG.md

@@ -19,6 +19,7 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Added powerPC architecture in redhat7, in the section 'Deploy new agent'. [4833](https://github.com/wazuh/wazuh-kibana-app/pull/4833)
 - Added a centralized service to handle the requests [#4831](https://github.com/wazuh/wazuh-kibana-app/pull/4831)
 - Added data-test-subj create policy [#4873](https://github.com/wazuh/wazuh-kibana-app/pull/4873)
+- Added file saving conditions in File Editor [#4970](https://github.com/wazuh/wazuh-kibana-app/pull/4970)
 
 ### Changed
 
@@ -41,10 +42,11 @@ All notable changes to the Wazuh app project will be documented in this file.
 - Fixed a bug where the Wazuh logo was used instead of the custom one [#4539](https://github.com/wazuh/wazuh-kibana-app/pull/4539)
 - Fixed rendering problems of the `Agent Overview` section in low resolutions [#4516](https://github.com/wazuh/wazuh-kibana-app/pull/4516)
 - Fixed issue when logging out from Wazuh when SAML is enabled [#4595](https://github.com/wazuh/wazuh-kibana-app/issues/4595)
-- Fixed server errors with code 500 when the Wazuh API is not reachable / up. [#4710](https://github.com/wazuh/wazuh-kibana-app/pull/4710) [#4728](https://github.com/wazuh/wazuh-kibana-app/pull/4728)
+- Fixed server errors with code 500 when the Wazuh API is not reachable / up. [#4710](https://github.com/wazuh/wazuh-kibana-app/pull/4710) [#4728](https://github.com/wazuh/wazuh-kibana-app/pull/4728) [#4998](https://github.com/wazuh/wazuh-kibana-app/pull/4998)
 - Fixed pagination to SCA table [#4653](https://github.com/wazuh/wazuh-kibana-app/issues/4653)
 - Fixed WAZUH_PROTOCOL param suggestion [#4849](https://github.com/wazuh/wazuh-kibana-app/pull/4849)
 - Raspbian OS, Ubuntu, Amazon Linux and Amazon Linux 2 commands in the wizard deploy agent now change when a different architecture is selected [#4876](https://github.com/wazuh/wazuh-kibana-app/pull/4876) [#4880](https://github.com/wazuh/wazuh-kibana-app/pull/4880)
+- Fixed vulnerabilities default last scan date formatter [#4975](https://github.com/wazuh/wazuh-kibana-app/pull/4975)
 
 ## Wazuh v4.3.10 - Kibana 7.10.2, 7.16.x, 7.17.x - Revision 4311
 

public/components/agents/vuls/inventory.tsx

@@ -33,7 +33,7 @@ import {
   VisualizationBasicWidget,
 } from '../../common/charts/visualizations/basic';
 import { WzStat } from '../../wz-stat';
-import { formatUIDate } from '../../../react-services/time-service';
+import { beautifyDate } from './inventory/lib';
 
 interface Aggregation {
   title: number;
@@ -104,11 +104,6 @@ export class Inventory extends Component {
     this.colorsVisualizationVulnerabilitiesSummaryData = euiPaletteColorBlind();
   }
 
-  // when vulnerability module is not configured
-  // its meant to render nothing when such date is received
-  beautifyDate(date?: string) {
-    return date && !['1970-01-01T00:00:00Z', '-'].includes(date) ? formatUIDate(date) : '-';
-  }
 
   async componentDidMount() {
     this._isMount = true;
@@ -234,8 +229,8 @@ export class Inventory extends Component {
     if (isLoading) {
       return this.loadingInventory();
     }
-    const last_full_scan = this.beautifyDate(vulnerabilityLastScan.last_full_scan);
-    const last_partial_scan = this.beautifyDate(vulnerabilityLastScan.last_partial_scan);
+    const last_full_scan = beautifyDate(vulnerabilityLastScan.last_full_scan);
+    const last_partial_scan = beautifyDate(vulnerabilityLastScan.last_partial_scan);
 
     const table = this.renderTable();
     return (

public/components/agents/vuls/inventory/detail.tsx

@@ -36,7 +36,7 @@ import { AppNavigate } from '../../../../react-services/app-navigate';
 import { TruncateHorizontalComponents } from '../../../common/util';
 import { getDataPlugin, getUiSettings } from '../../../../kibana-services';
 import { FilterManager } from '../../../../../../../src/plugins/data/public/';
-import { formatUIDate } from '../../../../react-services/time-service';
+import { beautifyDate } from './lib/';
 export class Details extends Component {
   props!: {
     currentItem: {
@@ -132,28 +132,28 @@ export class Details extends Component {
         name: 'Last full scan',
         icon: 'clock',
         link: false,
-        transformValue: this.beautifyDate
+        transformValue: beautifyDate
       },
       {
         field: 'last_partial_scan',
         name: 'Last partial scan',
         icon: 'clock',
         link: false,
-        transformValue: this.beautifyDate
+        transformValue: beautifyDate
       },
       {
         field: 'published',
         name: 'Published',
         icon: 'clock',
         link: false,
-        transformValue: this.beautifyDate
+        transformValue: beautifyDate
       },
       {
         field: 'updated',
         name: 'Updated',
         icon: 'clock',
         link: false,
-        transformValue: this.beautifyDate
+        transformValue: beautifyDate
       },
       {
         field: 'external_references',
@@ -165,12 +165,7 @@ export class Details extends Component {
     ];
   }
 
-  // This method was created because Wazuh API returns 1970-01-01T00:00:00Z dates or undefined ones
-  // when vulnerability module is not configured
-  // its meant to render nothing when such date is received
-  beautifyDate(date?: string) {
-    return date && !['1970-01-01T00:00:00Z', '-'].includes(date) ? formatUIDate(date) : '-';
-  }
+
 
   viewInEvents = (ev) => {
     const { cve } = this.props.currentItem;

public/components/agents/vuls/inventory/lib/index.ts

@@ -1 +1,2 @@
-export * from './api-requests';
+export * from './api-requests';
+export * from './utils';

public/components/agents/vuls/inventory/lib/utils.ts

@@ -0,0 +1,10 @@
+import { formatUIDate } from '../../../../../react-services/time-service';
+
+// This method was created because Wazuh API returns 1970-01-01T00:00:00Z dates or undefined ones
+// when vulnerability module is not configured
+// its meant to render nothing when such date is received
+export function beautifyDate(date?: string) {
+  return date &&
+    (!['-'].includes(date) && !date.startsWith('1970')) ?
+    formatUIDate(date) : '-';
+}

public/controllers/management/components/management/common/file-editor.tsx

@@ -91,6 +91,12 @@ class WzFileEditor extends Component {
     this._isMounted = true;
   }
 
+  /**
+   * Check if the file content has changed and is not empty
+   */
+  contentHasChanged() {
+    return !!this.state.content.trim() && (this.state.content.trim() !== this.state.initContent.trim());
+  } 
 
   /**
    * Save the new content
@@ -129,7 +135,7 @@ class WzFileEditor extends Component {
 
         let toastMessage;
 
-        if (this.props.state.addingFile != false) {
+        if (this.props.addingFile != false) {
           //remove current invalid file if the file is new.
           await this.resourcesHandler.deleteFile(name);
           toastMessage = 'The new file was deleted.';
@@ -243,7 +249,7 @@ class WzFileEditor extends Component {
           fill
           iconType={isEditable && xmlError ? 'alert' : 'save'}
           isLoading={this.state.isSaving}
-          isDisabled={nameForSaving.length <= 4 || !!(isEditable && xmlError)}
+          isDisabled={nameForSaving.length <= 4 || !!(isEditable && xmlError) || !this.contentHasChanged()}
           onClick={() => this.save(nameForSaving, overwrite)}
         >
           {isEditable && xmlError ? 'XML format error' : 'Save'}

server/controllers/wazuh-api.ts

@@ -784,7 +784,7 @@ export class WazuhApiCtrl {
 
       log('wazuh-api:csv', `Report ${tmpPath}`, 'debug');
       // Real limit, regardless the user query
-      const params = { limit: HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR };
+      const params = { limit: 500 };
 
       if (filters.length) {
         for (const filter of filters) {