remove some duplicated code (action and waitOn) for dashboard route