Skip to content

Reflect "publishing is running" in modal and disable buttons #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dobestler wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Reflect "publishing is running" in modal and disable buttons #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
850ed16
Disable buttons in "publish to live"-modal while publishing is runnin…
dobestler Dec 13, 2023
8ad0b0d
Put animated loading spinner into button while deployment is running
dobestler Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 16 additions & 3 deletions frontend/src/app/components/header-nav/header-nav.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
: null
"
>
<span *ngIf="deploymentRunningForStage == 'PRELIVE'" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
{{ publishToPreliveButtonText() }}
</button>
<button
Expand Down Expand Up @@ -175,17 +176,29 @@
class="btn btn-success mr-2"
type="button"
(click)="requestPublishRulesTxtToSolr('LIVE')"
[attr.disabled]="
!currentSolrIndexId || deploymentRunningForStage == 'LIVE'
? ''
: null
"
>
<i class="fa fa-thumbs-up smui-icon"></i>
Yes, publish to LIVE
<i *ngIf="deploymentRunningForStage != 'LIVE'" class="fa fa-thumbs-up smui-icon"></i>
<span *ngIf="deploymentRunningForStage == 'LIVE'" class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
{{ publishToLiveButtonText() }}

</button>
<button
class="btn btn-danger"
type="button"
(click)="modalService.close('confirm-publish-live')"
[attr.disabled]="
!currentSolrIndexId || deploymentRunningForStage == 'LIVE'
? ''
: null
"
>
<i class="fa fa-ban smui-icon"></i>
No, cancel publish
Cancel publish
</button>
</div>
</app-smui-modal>
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/app/components/header-nav/header-nav.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ export class HeaderNavComponent implements OnInit {
this.solrService
.updateRulesTxtForSolrIndex(this.currentSolrIndexId, targetPlatform)
.then(apiResult => {
this.deploymentRunningForStage = undefined
this.modalService.close('confirm-publish-live')
this.deploymentRunningForStage = undefined
this.showSuccessMsg(apiResult.message)
this.loadLatestDeploymentLogInfo()
})
.catch(error => {
this.deploymentRunningForStage = undefined
this.modalService.close('confirm-publish-live')
this.deploymentRunningForStage = undefined
this.showErrorMsg(error.error.message)
});
} // TODO handle else-case, if no currentSolrIndexId selected
Expand Down