[Backport 2.x] [Multiple Datasource] Refactor data source menu and interface to allow cleaner selection of component and related configurations #36980