mirror of https://github.com/portainer/portainer
				
				
				
			fix(app): passing an initial table state overrides the default global filter state (#180)
							parent
							
								
									219c9593e0
								
							
						
					
					
						commit
						d393529026
					
				| 
						 | 
				
			
			@ -125,12 +125,13 @@ export function Datatable<D extends DefaultType>({
 | 
			
		|||
          pageIndex: page || 0,
 | 
			
		||||
        },
 | 
			
		||||
        sorting: settings.sortBy ? [settings.sortBy] : [],
 | 
			
		||||
 | 
			
		||||
        ...initialTableState,
 | 
			
		||||
 | 
			
		||||
        globalFilter: {
 | 
			
		||||
          search: settings.search,
 | 
			
		||||
          ...initialTableState.globalFilter,
 | 
			
		||||
        },
 | 
			
		||||
 | 
			
		||||
        ...initialTableState,
 | 
			
		||||
      },
 | 
			
		||||
      defaultColumn: {
 | 
			
		||||
        enableColumnFilter: false,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue