Clean entity service

[KlapTrap]

This will fix issues where entities were not updating in the UI correctly.

This fix has been applied to #2518 as it fixes an issue found there.
@nwmac also hit an issue that was fixed in a similar way. I have undone the change that I did for @nwmac and applied a general fix for the issue.

It shouldn't have any issues but because it's a widely used code path, we should test well.

[cfdreddbot]

Hey KlapTrap!

Thanks for submitting this pull request! I'm here to inform the recipients of the pull request that you and the commit authors have already signed the CLA.

[codecov]

Codecov Report

Merging #2551 into v2-master will increase coverage by 0.01%.
The diff coverage is 100%.

@@              Coverage Diff              @@
##           v2-master    #2551      +/-   ##
=============================================
+ Coverage      70.42%   70.43%   +0.01%     
=============================================
  Files            594      594              
  Lines          25132    25136       +4     
  Branches        5674     5673       -1     
=============================================
+ Hits           17698    17704       +6     
+ Misses          7434     7432       -2

[richard-cox]

Code looks good, picked up three issues... two on master (#2559 and #2560) and one on this branch.

• Nav to a space summary tab
• Delete the space
• Console fails to nav back to org spaces tab
• Deleting a space from the org space tab works fine