Clean up filter components: remove dead code, debug logs, and redundant state

Remove dead setWidgets() from saved-filters-dialog and panel, no-op
cast.subscribe() calls, spurious @Injectable() decorators, debug
console.log statements, commented-out code, and redundant textValue
state in email/phone filters. Cache country and timezone lists at
module level. Replace O(n) isWidget array scan with O(1) object lookup.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: gugu

frontend/src/app/components/dashboard/db-table-view/db-table-filters-dialog/db-table-filters-dialog.component.ts

@@ -23,7 +23,6 @@ import { getComparatorsFromUrl, getFiltersFromUrl } from 'src/app/lib/parse-filt
 import { getTableTypes } from 'src/app/lib/setup-table-row-structure';
 import { TableField, TableForeignKey, Widget } from 'src/app/models/table';
 import { ConnectionsService } from 'src/app/services/connections.service';
-import { TablesService } from 'src/app/services/tables.service';
 import { ContentLoaderComponent } from '../../../ui-components/content-loader/content-loader.component';
 
 @Component({
@@ -65,22 +64,19 @@ export class DbTableFiltersDialogComponent implements OnInit, AfterViewInit {
 	public differ: KeyValueDiffer<string, any>;
 	public tableTypes: Object;
 	public tableWidgets: object;
-	public tableWidgetsList: string[] = [];
 	public UIwidgets = { ...EditUIwidgets, ...FilterUIwidgets };
 	public autofocusField: string | null = null;
 
 	constructor(
 		@Inject(MAT_DIALOG_DATA) public data: any,
 		private _connections: ConnectionsService,
-		private _tables: TablesService,
 		public route: ActivatedRoute,
 		private differs: KeyValueDiffers,
 	) {
 		this.differ = this.differs.find({}).create();
 	}
 
 	ngOnInit(): void {
-		this._tables.cast.subscribe();
 		this.tableForeignKeys = { ...this.data.structure.foreignKeys };
 		this.tableRowFields = Object.assign(
 			{},
@@ -90,36 +86,28 @@ export class DbTableFiltersDialogComponent implements OnInit, AfterViewInit {
 		this.fields = this.data.structure.structure
 			.filter((field: TableField) => this.getInputType(field.column_name) !== 'file')
 			.map((field: TableField) => field.column_name);
-		// this.foundFields = [...this.fields];
 		this.tableRowStructure = Object.assign(
 			{},
 			...this.data.structure.structure.map((field: TableField) => {
 				return { [field.column_name]: field };
 			}),
 		);
 
-		// Set autofocus field if provided
 		if (this.data.autofocusField) {
 			this.autofocusField = this.data.autofocusField;
 		}
 
 		const queryParams = this.route.snapshot.queryParams;
 
-		// If saved_filter is present in queryParams, show empty form without applying filters
 		if (queryParams.saved_filter) {
-			// Show empty form without filters
 			this.tableFilters = [];
 			this.tableRowFieldsShown = {};
 			this.tableRowFieldsComparator = {};
 		} else {
-			// Original behavior - parse and apply filters from URL
 			let filters = {};
 			if (queryParams.filters) filters = JsonURL.parse(queryParams.filters);
-			// const filters = JsonURL.parse(queryParams.filters || '{}');
 			const filtersValues = getFiltersFromUrl(filters);
 
-			console.log('Parsed filters from URL:', filtersValues);
-
 			if (Object.keys(filtersValues).length) {
 				this.tableFilters = Object.keys(filtersValues).map((key) => key);
 				this.tableRowFieldsShown = filtersValues;
@@ -146,7 +134,6 @@ export class DbTableFiltersDialogComponent implements OnInit, AfterViewInit {
 			this.setWidgets(widgetsArray);
 		}
 
-		// If autofocusField is provided, ensure it's in the filters list
 		if (this.autofocusField && this.tableFilters && !this.tableFilters.includes(this.autofocusField)) {
 			this.tableFilters.push(this.autofocusField);
 			if (!this.tableRowFieldsShown[this.autofocusField]) {
@@ -164,7 +151,6 @@ export class DbTableFiltersDialogComponent implements OnInit, AfterViewInit {
 	}
 
 	ngAfterViewInit(): void {
-		// Set focus on the autofocus field after view is initialized
 		if (this.autofocusField) {
 			setTimeout(() => {
 				this.focusOnField(this.autofocusField);
@@ -173,7 +159,6 @@ export class DbTableFiltersDialogComponent implements OnInit, AfterViewInit {
 	}
 
 	focusOnField(fieldName: string) {
-		// Try multiple selectors to find the input field
 		const selectors = [
 			`input[name*="${fieldName}"]`,
 			`textarea[name*="${fieldName}"]`,
@@ -228,7 +213,6 @@ export class DbTableFiltersDialogComponent implements OnInit, AfterViewInit {
 	}
 
 	setWidgets(widgets: Widget[]) {
-		this.tableWidgetsList = widgets.map((widget: Widget) => widget.field_name);
 		this.tableWidgets = Object.assign(
 			{},
 			...widgets.map((widget: Widget) => {
@@ -248,11 +232,11 @@ export class DbTableFiltersDialogComponent implements OnInit, AfterViewInit {
 	}
 
 	trackByFn(_index: number, item: any) {
-		return item.key; // or item.id
+		return item.key;
 	}
 
 	isWidget(columnName: string) {
-		return this.tableWidgetsList.includes(columnName);
+		return this.tableWidgets && columnName in this.tableWidgets;
 	}
 
 	updateField = (updatedValue: any, field: string) => {

frontend/src/app/components/dashboard/db-table-view/saved-filters-panel/saved-filters-dialog/saved-filters-dialog.component.ts

@@ -57,11 +57,6 @@ import { TablesService } from 'src/app/services/tables.service';
 	styleUrl: './saved-filters-dialog.component.css',
 })
 export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
-	// @Input() connectionID: string;
-	// @Input() tableName: string;
-	// @Input() displayTableName: string;
-	// @Input() filtersSet: any;
-
 	public tableFilters = [];
 	public fieldSearchControl = new FormControl('');
 	public fields: string[];
@@ -71,11 +66,9 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 	public tableRowStructure: Object;
 	public tableRowFieldsShown: Object = {};
 	public tableRowFieldsComparator: Object = {};
-	// public tableForeignKeys: {[key: string]: TableForeignKey};
 	public tableFiltersCount: number = 0;
 	public tableTypes: Object;
 	public tableWidgets: object;
-	public tableWidgetsList: string[] = [];
 	public UIwidgets = { ...EditUIwidgets, ...FilterUIwidgets };
 	public dynamicColumn: string | null = null;
 	public showAddConditionField = false;
@@ -95,8 +88,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 	) {}
 
 	ngOnInit(): void {
-		this._tables.cast.subscribe();
-
 		if (this.data.filtersSet) {
 			this.tableRowFieldsShown = Object.entries(this.data.filtersSet.filters).reduce((acc, [field, conditions]) => {
 				const [_comparator, value] = Object.entries(conditions)[0];
@@ -113,7 +104,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 				{},
 			);
 
-			// Initialize dynamic column if it exists in the filters set
 			if (this.data.filtersSet.dynamic_column?.column_name) {
 				this.tableRowFieldsShown[this.data.filtersSet.dynamic_column.column_name] = null;
 				this.tableRowFieldsComparator[this.data.filtersSet.dynamic_column.column_name] =
@@ -122,7 +112,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 			}
 		}
 
-		// this.tableForeignKeys = {...this.data.structure.foreignKeys};
 		this.tableRowFields = Object.assign(
 			{},
 			...this.data.structure.map((field: TableField) => ({ [field.column_name]: undefined })),
@@ -140,10 +129,8 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 			}),
 		);
 
-		// Setup widgets - data comes pre-processed as object { field_name: { widget_type, widget_params, ... } }
 		const tableWidgets = this.data.tableWidgets;
 		if (tableWidgets && Object.keys(tableWidgets).length) {
-			this.tableWidgetsList = Object.keys(tableWidgets);
 			this.tableWidgets = tableWidgets;
 		}
 
@@ -154,7 +141,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 	}
 
 	ngAfterViewInit(): void {
-		// If editing an existing filter (has id), remove focus from the filter name input
 		if (this.data.filtersSet && this.data.filtersSet.id) {
 			setTimeout(() => {
 				const nameInput = this.elementRef.nativeElement.querySelector(
@@ -192,36 +178,12 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 		return filterTypes[this._connections.currentConnection.type];
 	}
 
-	setWidgets(widgets: any[]) {
-		this.tableWidgetsList = widgets.map((widget: any) => widget.field_name);
-		this.tableWidgets = Object.assign(
-			{},
-			...widgets.map((widget: any) => {
-				let params;
-				if (typeof widget.widget_params === 'string' && widget.widget_params !== '// No settings required') {
-					try {
-						params = JSON.parse(widget.widget_params);
-					} catch (_e) {
-						params = '';
-					}
-				} else if (typeof widget.widget_params !== 'string') {
-					params = widget.widget_params;
-				} else {
-					params = '';
-				}
-				return {
-					[widget.field_name]: { ...widget, widget_params: params },
-				};
-			}),
-		);
-	}
-
 	trackByFn(_index: number, item: any) {
 		return item.key;
 	}
 
 	isWidget(columnName: string) {
-		return this.tableWidgetsList.includes(columnName);
+		return this.tableWidgets && columnName in this.tableWidgets;
 	}
 
 	updateComparatorFromComponent = (comparator: string, field: string) => {
@@ -231,7 +193,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 	updateField = (updatedValue: any, field: string) => {
 		this.tableRowFieldsShown[field] = updatedValue;
 		this.updateFiltersCount();
-		// Reset conditions error when a filter is added
 		if (this.showConditionsError && Object.keys(this.tableRowFieldsShown).length > 0) {
 			this.showConditionsError = false;
 		}
@@ -246,15 +207,13 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 		};
 		this.fieldSearchControl.setValue('');
 		this.updateFiltersCount();
-		// Reset conditions error when a filter is added
 		this.showConditionsError = false;
 		if (this.hasSelectedFilters) {
 			this.showAddConditionField = false;
 		}
 	}
 
 	handleInputBlur(): void {
-		// Hide the field if it's empty when it loses focus
 		if (!this.fieldSearchControl.value || this.fieldSearchControl.value.trim() === '') {
 			setTimeout(() => {
 				if (!this.fieldSearchControl.value || this.fieldSearchControl.value.trim() === '') {
@@ -265,7 +224,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 	}
 
 	updateComparator(event, fieldName: string) {
-		console.log('Updating comparator for field:', fieldName, 'obj', this.tableRowFieldsComparator);
 		if (event === 'empty') this.tableRowFieldsShown[fieldName] = '';
 	}
 
@@ -324,7 +282,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 			this.dynamicColumn = null;
 		}
 		this.updateFiltersCount();
-		// Reset conditions error when filters are removed (will be re-validated on save)
 		this.showConditionsError = false;
 		if (!this.hasSelectedFilters) {
 			this.showAddConditionField = false;
@@ -344,11 +301,9 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 	}
 
 	handleSaveFilters() {
-		// Reset error flags
 		this.showNameError = false;
 		this.showConditionsError = false;
 
-		// Validate filter name
 		if (!this.data.filtersSet.name || this.data.filtersSet.name.trim() === '') {
 			this.showNameError = true;
 			setTimeout(() => {
@@ -363,19 +318,13 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 			return;
 		}
 
-		// Validate conditions - check if there are any filters
-		// A valid filter must have a comparator defined
-		// Either regular filters OR dynamic column with comparator should exist
 		const hasRegularFilters = Object.keys(this.tableRowFieldsShown).some((key) => {
-			// Skip dynamic column for regular filter check
 			if (key === this.dynamicColumn) {
 				return false;
 			}
-			// Check if comparator is defined (even if value is empty/null, comparator must exist)
 			return this.tableRowFieldsComparator[key] !== undefined && this.tableRowFieldsComparator[key] !== null;
 		});
 
-		// Check if dynamic column has a comparator (it counts as a valid filter condition)
 		const hasDynamicColumnFilter =
 			this.dynamicColumn &&
 			this.tableRowFieldsComparator[this.dynamicColumn] !== undefined &&
@@ -391,7 +340,6 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 					conditionInput.focus();
 					conditionInput.scrollIntoView({ behavior: 'smooth', block: 'center' });
 				} else {
-					// If input is not visible, show the add condition button area
 					const addButton = this.elementRef.nativeElement.querySelector('.add-condition-footer button') as HTMLElement;
 					if (addButton) {
 						addButton.scrollIntoView({ behavior: 'smooth', block: 'center' });
@@ -406,13 +354,11 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 			let filters = {};
 
 			for (const key in this.tableRowFieldsShown) {
-				// Skip fields that are marked as dynamic column
 				if (key === this.dynamicColumn) {
 					continue;
 				}
 
 				if (this.tableRowFieldsComparator[key] !== undefined) {
-					// If value is empty or undefined, use null
 					const value =
 						this.tableRowFieldsShown[key] === '' || this.tableRowFieldsShown[key] === undefined
 							? null
@@ -424,15 +370,12 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 				}
 			}
 
-			// const filters = JsonURL.stringify( this.filters );
 			payload = {
 				name: this.data.filtersSet.name,
 				filters,
 			};
 
-			// Only add dynamic_column if one is selected
 			if (this.dynamicColumn) {
-				// Create object with column_name and comparator properties
 				payload.dynamic_column = {
 					column_name: this.dynamicColumn,
 					comparator: this.tableRowFieldsComparator[this.dynamicColumn] || '',
@@ -471,16 +414,5 @@ export class SavedFiltersDialogComponent implements OnInit, AfterViewInit {
 				);
 			}
 		}
-
-		// saveFilter() {
-
-		//     this._tables.createSavedFilter(this.data.connectionID, this.data.tableName, payload)
-		//       .subscribe(() => {
-		//         this.dialogRef.close(true);
-		//       }, (error) => {
-		//         console.error('Error saving filter:', error);
-		//         this.snackBar.open('Error saving filter', 'Close', { duration: 3000 });
-		//       });
-		//   }
 	}
 }