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

fix(UI): app summary on forvalues update [EE-6515] (#10932) 

* app summary on forvalues update

* comment added
pull/10939/head
Prabhat Khera 2024-01-11 10:14:23 +13:00 committed by GitHub
parent b7635feff0
commit d0b9e3a732
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 61 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
app/kubernetes/views/applications/create/createApplication.html
View File

@ -103,13 +103,26 @@
></kube-services-form>
</div>
<!-- kubernetes services options -->
<!-- kubernetes summary for external application -->
<application-summary-section
application-kind="ctrl.formValues.ApplicationType"
form-values="ctrl.formValues"
old-form-values="ctrl.savedFormValues"
ng-if="ctrl.isExternalApplication()"
></application-summary-section>
<!-- below workaround is needed because we wanted react to render it again
by hiding/showing it, but the page was fluctuating. so we added two blocks for both the conditions -->
<div ng-if="!ctrl.isTemporaryRefresh">
<application-summary-section
application-kind="ctrl.formValues.ApplicationType"
form-values="ctrl.formValues"
old-form-values="ctrl.savedFormValues"
ng-if="kubernetesApplicationCreationForm.$valid && ctrl.isExternalApplication()"
></application-summary-section>
</div>
<div ng-if="ctrl.isTemporaryRefresh">
<application-summary-section
application-kind="ctrl.formValues.ApplicationType"
form-values="ctrl.formValues"
old-form-values="ctrl.savedFormValues"
ng-if="kubernetesApplicationCreationForm.$valid && ctrl.isExternalApplication()"
></application-summary-section>
</div>
<!-- kubernetes summary for external application -->
<div class="col-sm-12 form-section-title !mt-6" ng-if="ctrl.state.appType !== ctrl.KubernetesDeploymentTypes.GIT" ng-hide="ctrl.stack.IsComposeFormat"> Actions </div>
<!-- #region ACTIONS -->
@ -504,12 +517,29 @@
></kube-services-form>
</div>
<!-- kubernetes services options -->
<application-summary-section
application-kind="ctrl.formValues.ApplicationType"
ng-if="!(!kubernetesApplicationCreationForm.$valid || ctrl.isDeployUpdateButtonDisabled() || !ctrl.state.pullImageValidity)"
form-values="ctrl.formValues"
old-form-values="ctrl.savedFormValues"
></application-summary-section>
<!-- application summary start -->
<!-- below workaround is needed because we wanted react to render it again
by hiding/showing it, but the page was fluctuating. so we added two blocks for both the conditions -->
<div ng-if="!ctrl.isTemporaryRefresh">
<!-- summary -->
<application-summary-section
application-kind="ctrl.formValues.ApplicationType"
ng-if="!(!kubernetesApplicationCreationForm.$valid || ctrl.isDeployUpdateButtonDisabled() || !ctrl.state.pullImageValidity)"
form-values="ctrl.formValues"
old-form-values="ctrl.savedFormValues"
></application-summary-section>
</div>
<div ng-if="ctrl.isTemporaryRefresh">
<!-- summary -->
<application-summary-section
application-kind="ctrl.formValues.ApplicationType"
ng-if="!(!kubernetesApplicationCreationForm.$valid || ctrl.isDeployUpdateButtonDisabled() || !ctrl.state.pullImageValidity)"
form-values="ctrl.formValues"
old-form-values="ctrl.savedFormValues"
></application-summary-section>
</div>
<!-- application summary end -->
</div>
<!-- #region ACTIONS -->
<div class="col-sm-12 form-section-title !mt-6" ng-if="ctrl.state.appType !== ctrl.KubernetesDeploymentTypes.GIT" ng-hide="ctrl.stack.IsComposeFormat"> Actions </div>

19
app/kubernetes/views/applications/create/createApplicationController.js
View File

@ -37,6 +37,7 @@ class KubernetesCreateApplicationController {
$scope,
$async,
$state,
$timeout,
Notifications,
Authentication,
KubernetesResourcePoolService,
@ -54,6 +55,7 @@ class KubernetesCreateApplicationController {
this.$scope = $scope;
this.$async = $async;
this.$state = $state;
this.$timeout = $timeout;
this.Notifications = Notifications;
this.Authentication = Authentication;
this.KubernetesResourcePoolService = KubernetesResourcePoolService;
@ -148,9 +150,26 @@ class KubernetesCreateApplicationController {
this.updateApplicationType = this.updateApplicationType.bind(this);
this.getAppType = this.getAppType.bind(this);
this.showDataAccessPolicySection = this.showDataAccessPolicySection.bind(this);
this.refreshReactComponent = this.refreshReactComponent.bind(this);
this.$scope.$watch(
() => this.formValues,
() => {
this.refreshReactComponent();
},
_.isEqual
);
}
/* #endregion */
refreshReactComponent() {
this.isTemporaryRefresh = true;
this.$timeout(() => {
this.isTemporaryRefresh = false;
}, 10);
}
onChangePlacements(values) {
return this.$async(async () => {
this.formValues.Placements = values.placements;