From 9394ea05a495f4475fc71727cef4c0bf0a6b30a2 Mon Sep 17 00:00:00 2001
From: Cody Jackson <sxenog@gmail.com>
Date: Thu, 18 Feb 2021 12:15:29 -0700
Subject: [PATCH] Enable models to override their cleanForNew method

Constraints were failing to clone because cleanForNew didn't remove `this.constraint` which casued the save method to attempt to save the existing constraint instead of creating a new constraint.

This enables models to be able to create their own cleanForNew method to remove custom props if necessary.

rancher/dashboard#2341
---
 components/ResourceDetail/index.vue            |  3 +--
 models/constraints.gatekeeper.sh.constraint.js | 10 ++++++++++
 plugins/steve/resource-instance.js             |  6 ++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/components/ResourceDetail/index.vue b/components/ResourceDetail/index.vue
index bcbd57188a..b29b06e583 100644
--- a/components/ResourceDetail/index.vue
+++ b/components/ResourceDetail/index.vue
@@ -1,5 +1,4 @@
 <script>
-import { cleanForNew } from '@/plugins/steve/normalize';
 import CreateEditView from '@/mixins/create-edit-view/impl';
 import Loading from '@/components/Loading';
 import ResourceYaml from '@/components/ResourceYaml';
@@ -136,7 +135,7 @@ export default {
       }
 
       if ( realMode === _CLONE || realMode === _STAGE ) {
-        cleanForNew(model);
+        model.cleanForNew();
         yaml = model.cleanYaml(yaml, realMode);
       }
     }
diff --git a/models/constraints.gatekeeper.sh.constraint.js b/models/constraints.gatekeeper.sh.constraint.js
index 515c0d2c03..3c5939babc 100644
--- a/models/constraints.gatekeeper.sh.constraint.js
+++ b/models/constraints.gatekeeper.sh.constraint.js
@@ -1,4 +1,5 @@
 import jsyaml from 'js-yaml';
+import { cleanForNew } from '@/plugins/steve/normalize';
 
 export const ENFORCEMENT_ACTION_VALUES = {
   DENY:   'deny',
@@ -23,6 +24,15 @@ export default {
     };
   },
 
+  cleanForNew() {
+    return () => {
+      cleanForNew(this);
+      if (this.constraint) {
+        delete this.constraint;
+      }
+    };
+  },
+
   saveYaml() {
     return (yaml) => {
       const parsed = jsyaml.safeLoad(yaml);
diff --git a/plugins/steve/resource-instance.js b/plugins/steve/resource-instance.js
index 996f328740..6520e8ee67 100644
--- a/plugins/steve/resource-instance.js
+++ b/plugins/steve/resource-instance.js
@@ -1137,6 +1137,12 @@ export default {
     };
   },
 
+  cleanForNew() {
+    return () => {
+      cleanForNew(this);
+    };
+  },
+
   yamlForSave() {
     return (yaml) => {
       try {