Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-30 10:49:40 +02:00
Code Issues Releases Activity

moved formvalue to kube app component

Browse source
This commit is contained in:
Felix Han 2021-08-25 14:50:26 +12:00
parent 6d87c77ab0
commit 87ef8092ba
5 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/kubernetes/views/applications/create/createApplication.html
View file

@ -57,10 +57,8 @@
<!-- #region Git repository -->
<kubernetes-app-git-form
ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.GIT"
git-form-values="ctrl.gitFormValues"
stack="ctrl.stack"
namespace="ctrl.formValues.ResourcePool.Namespace.Name"
is-edit="ctrl.state.isEdit"
></kubernetes-app-git-form>
<!-- #endregion -->

11
app/kubernetes/views/applications/create/createApplicationController.js
View file

@ -130,12 +130,6 @@ class KubernetesCreateApplicationController {
this.state.useServerMetrics = false;
this.formValues = new KubernetesApplicationFormValues();
this.gitFormValues = {
RefName: '',
RepositoryAuthentication: false,
RepositoryUsername: '',
RepositoryPassword: '',
};
this.updateApplicationAsync = this.updateApplicationAsync.bind(this);
this.deployApplicationAsync = this.deployApplicationAsync.bind(this);
@ -1033,11 +1027,6 @@ class KubernetesCreateApplicationController {
if (this.application.StackId) {
if (this.application.ApplicationKind === this.KubernetesDeploymentTypes.GIT) {
this.stack = await this.StackService.stack(this.application.StackId);
this.gitFormValues.RefName = this.stack.GitConfig.ReferenceName;
if (this.stack.GitConfig && this.stack.GitConfig.Authentication) {
this.gitFormValues.RepositoryUsername = this.stack.GitConfig.Authentication.Username;
this.gitFormValues.RepositoryAuthentication = true;
}
} else if (this.application.ApplicationKind === this.KubernetesDeploymentTypes.CONTENT) {
this.stackFileContent = await this.StackService.getStackFile(this.application.StackId);
}

16
app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.controller.js
View file

@ -14,6 +14,13 @@ class KubernetesAppGitFormController {
isEdit: false,
};
this.formValues = {
RefName: '',
RepositoryAuthentication: false,
RepositoryUsername: '',
RepositoryPassword: '',
};
this.onChange = this.onChange.bind(this);
this.onChangeRef = this.onChangeRef.bind(this);
}
@ -23,8 +30,8 @@ class KubernetesAppGitFormController {
}
onChange(values) {
this.gitFormValues = {
...this.gitFormValues,
this.formValues = {
...this.formValues,
...values,
};
}
@ -46,8 +53,8 @@ class KubernetesAppGitFormController {
return;
}
this.state.redeployInProgress = true;
await this.StackService.updateKubeGit(this.stack.Id, this.stack.EndpointId, this.namespace, this.formValues);
this.Notifications.success('Pulled and redeployed stack successfully');
await this.StackService.updateKubeGit(this.stack.Id, this.stack.EndpointId, this.namespace, this.gitFormValues);
await this.$state.reload();
} catch (err) {
this.Notifications.error('Failure', err, 'Failed redeploying application');
@ -61,7 +68,7 @@ class KubernetesAppGitFormController {
return this.$async(async () => {
try {
this.state.saveGitSettingsInProgress = true;
await this.StackService.updateKubeStack({ EndpointId: this.stack.EndpointId, Id: this.stack.Id }, null, this.gitFormValues);
await this.StackService.updateKubeStack({ EndpointId: this.stack.EndpointId, Id: this.stack.Id }, null, this.formValues);
this.Notifications.success('Save stack settings successfully');
} catch (err) {
this.Notifications.error('Failure', err, 'Unable to save application settings');
@ -76,6 +83,7 @@ class KubernetesAppGitFormController {
}
$onInit() {
this.formValues.RefName = this.stack.GitConfig.ReferenceName;
if (this.stack.GitConfig && this.stack.GitConfig.Authentication) {
this.formValues.RepositoryUsername = this.stack.GitConfig.Authentication.Username;
this.formValues.RepositoryAuthentication = true;

2
app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.html
View file

@ -24,7 +24,7 @@
<git-form-auth-fieldset
ng-if="$ctrl.state.showConfig"
model="$ctrl.gitFormValues"
is-edit="$ctrl.isEdit"
is-edit="$ctrl.state.isEdit"
on-change="($ctrl.onChange)"
show-auth-explanation="true"
></git-form-auth-fieldset>

2
app/portainer/components/forms/kubernetes-app-git-form/kubernetes-app-git-form.js
View file

@ -5,10 +5,8 @@ const kubernetesAppGitForm = {
templateUrl: './kubernetes-app-git-form.html',
controller,
bindings: {
gitFormValues: '<',
namespace: '<',
stack: '<',
isEdit: '<',
},
};