Resolve conflicts

SplunkAppForWazuh/appserver/static/css/styles/common.css

@@ -777,6 +777,39 @@ kbn-vis .vis-container {
 }
 
 
+@supports (-ms-ime-align:auto) {
+    @media (min-width: 1060px) {      
+      .wz-logo:after {        
+          content: url("../images/wazuh/png/wazuh_white_full_edge.png");
+      } 
+      .wz-logo-container:after {
+          content: url("../images/wazuh/png/wazuh_white_full_edge.png");
+          width: 150px;
+          max-width: 150px;
+      }
+      .wz-menu-content {
+        height:50px;
+      }
+      .wz-logo-container {
+        padding-bottom: 15px;
+      }
+  }
+  @media (max-width: 1059px) {    
+      .wz-logo{         
+        content: url("../images/wazuh/png/wazuh_white_iso_edge.png");
+        max-height: 45px;
+        max-width: 28px;
+    } 
+    .wz-logo-container:after {
+          content: url("../images/wazuh/png/wazuh_white_iso_edge.png");
+          min-width: 20px!important;
+          max-width: 30px!important;
+          margin-right: 5px!important;
+      }
+  }
+}
+
+
 @supports not (-moz-appearance:none) {
   @media (min-width: 1060px) {      
       .wz-logo{        
@@ -815,7 +848,7 @@ kbn-vis .vis-container {
       }
   }
   @media (max-width: 1059px) {    
-      .wz-logo::after{         
+      .wz-logo{         
           content: url("../images/wazuh/png/wazuh_white_iso.png") ;
           display: flex;
           max-height: 45px;

SplunkAppForWazuh/appserver/static/js/controllers/management/groups/groupsCtrl.js

@@ -442,7 +442,7 @@ define(['../../module', 'FileSaver'], function(controllers) {
             await this.scope.loadSelectedAgents()
             this.scope.selectedAgents.offset += 499
           }
-          this.scope.firstSelectedList = [...this.scope.selectedAgents.data]
+          this.scope.firstSelectedList = angular.copy(this.scope.selectedAgents.data)
           await this.scope.loadAllAgents()
           this.scope.multipleSelectorLoading = false
         }
@@ -504,7 +504,9 @@ define(['../../module', 'FileSaver'], function(controllers) {
             throw new Error(response.data.error)
           }
           if (response.data.data.failed_ids) {
-            failedIds.push(...response.data.data.failed_ids)
+            response.data.data.failed_ids.forEach(x=>{
+              failedIds.push(x)
+            })
           }
         }
         // Delete agents from a group
@@ -518,7 +520,9 @@ define(['../../module', 'FileSaver'], function(controllers) {
             throw new Error(response.data.error)
           }
           if (response.data.data.failed_ids) {
-            failedIds.push(...response.data.data.failed_ids)
+            response.data.data.failed_ids.forEach(x=>{
+              failedIds.push(x)
+            })
           }
         }
 
@@ -618,11 +622,10 @@ define(['../../module', 'FileSaver'], function(controllers) {
             this.scope.deletedAgents.push(orig)
           }
         })
-
-        const addedIds = [...new Set(this.scope.addedAgents.map(x => x.key))]
-        const deletedIds = [
-          ...new Set(this.scope.deletedAgents.map(x => x.key))
-        ]
+        const addedSet = new Set(this.scope.addedAgents.map(x => x.key))
+        const addedIds = Array.from(addedSet)
+        const deletedSet = new Set(this.scope.deletedAgents.map(x => x.key))
+        const deletedIds = Array.from(deletedSet)
         return { addedIds, deletedIds }
       } catch (error) {
         throw new Error(error.message || error)

SplunkAppForWazuh/appserver/static/js/directives/wz-tag-filter/wz-tag-filter.js

@@ -282,15 +282,14 @@ define(['../module'], function(app) {
             })
 
             if (model) {
-              $scope.autocompleteContent.list = [
-                ...new Set(
-                  model.list.filter(function(x) {
-                    return x
-                      .toUpperCase()
-                      .includes(term[1].trim().toUpperCase())
-                  })
-                )
-              ]
+              const listTmp = new Set(
+                model.list.filter(function(x) {
+                  return x
+                    .toUpperCase()
+                    .includes(term[1].trim().toUpperCase())
+                })
+              )
+              $scope.autocompleteContent.list = Array.from(listTmp)
             }
           }
         }

SplunkAppForWazuh/appserver/static/js/services/api-manager/apiMgrService.js

@@ -317,8 +317,9 @@ define(['../module'], function(module) {
       try {
         const connectionData = await checkRawConnectionById(id)
         const api = connectionData.data.api.data
-        const apiSaved = { ...api } //eslint-disable-line
-        const updatedApi = await updateApiFilter(connectionData.data)
+        const apiTmp = Object.assign({}, api)
+        const apiSaved = { apiTmp } //eslint-disable-line
+        const updatedApi = await updateApiFilter(api)
         let equal = true
         Object.keys(updatedApi).forEach(key => {
           if (updatedApi[key] !== apiSaved[key]) {

SplunkAppForWazuh/appserver/static/js/services/apiIndexStorageService/apiIndexStorageService.js

@@ -95,21 +95,24 @@ define(['../module'], function(app) {
           let existentApi = false
           for (let i = 0; i < parsedExtensions.length; i++) {
             if (parsedExtensions[i].id === id) {
-              parsedExtensions[i] = { id: id, ...extensions } //eslint-disable-line
+              const extensionsTmp = Object.assign({},extensions) 
+              parsedExtensions[i] = { id: id, extensionsTmp } //eslint-disable-line
               existentApi = true
               break
             }
           }
           if (!existentApi) {
-            parsedExtensions.push({ id: id, ...extensions })
+            const extensionsTmp = Object.assign({},extensions) 
+            parsedExtensions.push({ id: id, extensionsTmp })
           }
           this.sessionStorage.setItem(
             'extensions',
             JSON.stringify(parsedExtensions) || []
           )
         } else if (extensions) {
           const newSet = []
-          newSet.push({ id: id, ...extensions })
+          const extensionsTmp = Object.assign({},extensions) 
+          newSet.push({ id: id, extensionsTmp})
           this.sessionStorage.setItem(
             'extensions',
             JSON.stringify(newSet) || []