github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(frontend): application edit page initializes the overridenKeyType of new added configuration key to NONE so that the user can select how to load it (#4548) (#4593) 

Co-authored-by: Simon Meng <simon.meng@portainer.io>
pull/4521/head
cong meng 2021-01-08 12:51:27 +13:00 committed by GitHub
parent eab828279e
commit cf508065ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/kubernetes/helpers/application/index.js
View File

@ -175,7 +175,10 @@ class KubernetesApplicationHelper {
item.OverridenKeys = _.map(keys, (k) => { item.OverridenKeys = _.map(keys, (k) => {
const fvKey = new KubernetesApplicationConfigurationFormValueOverridenKey(); const fvKey = new KubernetesApplicationConfigurationFormValueOverridenKey();
fvKey.Key = k.Key; fvKey.Key = k.Key;
if (index < k.EnvCount) { if (!k.Count) {
// !k.Count indicates k.Key is new added to the configuration and has not been loaded to the application yet
fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.NONE;
} else if (index < k.EnvCount) {
fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.ENVIRONMENT; fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.ENVIRONMENT;
} else { } else {
fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM; fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM;

1
app/kubernetes/models/application/formValues.js
View File

@ -35,6 +35,7 @@ export class KubernetesApplicationFormValues {
} }
export const KubernetesApplicationConfigurationFormValueOverridenKeyTypes = Object.freeze({ export const KubernetesApplicationConfigurationFormValueOverridenKeyTypes = Object.freeze({
NONE: 0,
ENVIRONMENT: 1, ENVIRONMENT: 1,
FILESYSTEM: 2, FILESYSTEM: 2,
}); });