Update so locked template fields are not overwritten

[hardillb]

fix for #4198

Description

When merging snapshots do not overwrite settings that are locked in the template

Related Issue(s)

#4198

Checklist

• I have read the contribution guidelines
• Suitable unit/system level tests have been added and they pass
• Documentation has been updated
  • Upgrade instructions
  • Configuration details
  • Concepts
• Changes flowforge.yml?
  • Issue/PR raised on FlowFuse/helm to update ConfigMap Template
  • Issue/PR raised on FlowFuse/CloudProject to update values for Staging/Production

Labels

• Includes a DB migration? -> add the area:migration label

[codecov]

Codecov Report

Attention: Patch coverage is 85.71429% with 1 line in your changes missing coverage. Please review.

Project coverage is 78.12%. Comparing base (3f397c3) to head (6ab0331).
Report is 82 commits behind head on main.

Files	Patch %	Lines
forge/db/controllers/ProjectTemplate.js	75.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #4244      +/-   ##
==========================================
- Coverage   78.66%   78.12%   -0.54%     
==========================================
  Files         286      287       +1     
  Lines       13161    13289     +128     
  Branches     2949     2980      +31     
==========================================
+ Hits        10353    10382      +29     
- Misses       2808     2907      +99     

Flag	Coverage Δ
backend	78.12% <85.71%> (-0.54%)	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[Steve-Mcl]

Ben, Apart from the missing JSDoc, comment this looks fine.

I just need to follow the step by step instructions on pre-staging before I approve

[Steve-Mcl]

Ben, apart from the missing JSDoc on the function signature you modified (suggestion provided) this appears to be working as expected on the pre-staging env.

If you wish to check out the steps I took, the audit logs on the pre-staging environment for the Plant Enterprise team are fairly descriptive of all the operations but essentially, I setup a prod and dev template and tried several ways to "force" settings from the dev/dev template to get into the prod instance without success.