Skip to content

Commit f1c7292

Browse files
committed
Merge branch 'secret-spread' into 'main'
Assign revised key structures after copying secrets for conversion See merge request weblogic-cloud/weblogic-toolkit-ui!272
2 parents 6568908 + 2ad8354 commit f1c7292

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

webui/src/js/models/k8s-domain-definition.js

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,10 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
213213
});
214214
}
215215
// Cannot use object spread operator because Jet 14 does not support it!
216-
//
217-
const newSecret = { keys: newKeys };
216+
// build a copy of secret, but assign the new key structure.
217+
const newSecret = {};
218218
Object.assign(newSecret, secret);
219+
newSecret.keys = newKeys;
219220
flattenedSecrets.push(newSecret);
220221
});
221222
this.secrets.observable(flattenedSecrets);
@@ -233,9 +234,10 @@ define(['knockout', 'utils/observable-properties', 'utils/common-utilities', 'ut
233234
};
234235
});
235236
// Cannot use the object spread operator because Jet 14 does not support it.
236-
//
237-
const newSecret = { keys: mappedKeys};
237+
// build a copy of secret, but assign the new key structure.
238+
const newSecret = {};
238239
Object.assign(newSecret, secret);
240+
newSecret.keys = mappedKeys;
239241
mappedSecrets.push(newSecret);
240242
});
241243
internalFields.secrets.observable(mappedSecrets);

0 commit comments

Comments
 (0)