Fix inconsistent GraphQL type declarations
What does this MR do and why?
In GraphQL 2.x, the declared type in the resolver takes precedence so we update these to the correct values and remove the redundant type declarations in the fields
MR acceptance checklist
This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.
-
I have evaluated the MR acceptance checklist for this MR.
Related to #363131 (closed)
Edited by Heinrich Lee Yu