database_dashboard-3422911/3422911-fix-the-issues - Fix the Phpcs isseue and...

database_dashboard-3422911/3422911-fix-the-issues - Fix the Phpcs isseue and Convert Patch into the MR.

Closes #3422911