Merge pull request rancher#12998 from ly5156/workload_data_method

chore(workload): disable access to unreturned data attributes in data method
votdev · Jan 13, 2025 · 0c6eb64 · 0c6eb64
2 parents babdcee + 3ef4c72
commit 0c6eb64
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/shell/edit/workload/mixins/workload.js b/shell/edit/workload/mixins/workload.js
@@ -250,7 +250,6 @@ export default {
       }
     }
 
-    this.selectContainer(container);
     if (this.realMode === _CLONE && this.value.type === WORKLOAD_TYPES.JOB) {
       this.cleanUpClonedJobData();
     }
@@ -280,12 +279,10 @@ export default {
       podFsGroup:                 podTemplateSpec.securityContext?.fsGroup,
       savePvcHookName:            'savePvcHook',
       tabWeightMap:               TAB_WEIGHT_MAP,
-      fvFormRuleSets:             [{
-        path: 'image', rootObject: this.container, rules: ['required'], translationKey: 'workload.container.image'
-      }],
-      fvReportedValidationPaths: ['spec'],
-      isNamespaceNew:            false,
-      idKey:                     ID_KEY
+      fvFormRuleSets:             [],
+      fvReportedValidationPaths:  ['spec'],
+      isNamespaceNew:             false,
+      idKey:                      ID_KEY
     };
   },
 
@@ -605,13 +602,24 @@ export default {
       this.value['type'] = neu;
       delete this.value.apiVersion;
     },
+
+    container: {
+      handler(c) {
+        this.fvFormRuleSets = [{
+          path: 'image', rootObject: c, rules: ['required'], translationKey: 'workload.container.image'
+        }];
+      },
+      immediate: true
+    }
   },
 
   created() {
     this.registerBeforeHook(this.saveWorkload, 'willSaveWorkload');
     this.registerBeforeHook(this.getPorts, 'getPorts');
 
     this.registerAfterHook(this.saveService, 'saveService');
+
+    this.selectContainer(this.container);
   },
 
   methods: {