Skip to content

Grey-out buttons after submission #457

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
shikhavani wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Grey-out buttons after submission #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cfed50a
fix: Grey-out buttons after submission #443
Feb 2, 2022
de64597
Revert "fix: Grey-out buttons after submission #443"
Feb 2, 2022
f59c4e1
fix: grey out button on submit #443
Feb 2, 2022
457d52e
fix: linting and code opt fixes
Feb 11, 2022
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
2 changes: 1 addition & 1 deletion src/app/wizards/dataModel/data-model-main/data-model-main.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ <h4 class="marginless">New Data Model</h4>
</button>
</div>
<div fxFlex fxLayout="row-reverse" fxLayout.md="column" fxLayout.sm="column" fxLayout.xs="column" fxFlex="50" fxFlex.md="100" fxFlex.sm="100" fxFlex.xs="100">
<button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid" (click)="save()">Submit Data Model</button>
<button mat-flat-button type="button" color="primary" class="custom" *ngIf="(i+1) === steps.length" [disabled]="step.invalid || isSaving" (click)="save()">Submit Data Model</button>
<button mat-stroked-button type="button" color="primary" class="custom" *ngIf="(i+1) !== steps.length" [disabled]="step.invalid" matStepperNext>
Next step
<i class="fas fa-chevron-right"></i>
Expand Down
9 changes: 6 additions & 3 deletions src/app/wizards/dataModel/data-model-main/data-model-main.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { MdmResourcesService } from '@mdm/modules/resources';
import { MessageHandlerService } from '@mdm/services/utility/message-handler.service';
import { UIRouterGlobals } from '@uirouter/core';
import { Title } from '@angular/platform-browser';
import { catchError } from 'rxjs/operators';
import { catchError, finalize } from 'rxjs/operators';
import { EMPTY } from 'rxjs';
import { CatalogueItemDomainType, Container, DataModelCreatePayload, DataModelDetailResponse, Uuid } from '@maurodatamapper/mdm-resources';
import { FolderService } from '@mdm/folders-tree/folder.service';
Expand All @@ -42,15 +42,14 @@ export class DataModelMainComponent implements OnInit {
parentFolderId: Uuid;
parentDomainType: CatalogueItemDomainType;
parentFolder: Container;

isSaving = false;
constructor(
private stateHandler: StateHandlerService,
private uiRouterGlobals: UIRouterGlobals,
private resources: MdmResourcesService,
private messageHandler: MessageHandlerService,
private folders: FolderService,
private title: Title) { }

ngOnInit() {
this.title.setTitle('New Data Model');

Expand Down Expand Up @@ -90,6 +89,7 @@ export class DataModelMainComponent implements OnInit {
};

save() {
this.isSaving = true;
const details = this.steps[0].compRef.instance as DataModelStep1Component;
const types = this.steps[1].compRef.instance as DataModelStep2Component;

Expand All @@ -116,6 +116,9 @@ export class DataModelMainComponent implements OnInit {
catchError(error => {
this.messageHandler.showError('There was a problem saving the Data Model.', error);
return EMPTY;
}),
finalize(() => {
this.isSaving = false;
}))
.subscribe((response: DataModelDetailResponse) => {
this.messageHandler.showSuccess('Data Model saved successfully.');
Expand Down