Skip to content
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

Add updaet model by file #241

Merged
merged 3 commits into from
May 19, 2023
Merged

Add updaet model by file #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cb1971e
Add updaet model by file
haneslinger May 15, 2023
59b5a14
Append files
haneslinger May 16, 2023
b655f88
Fix spelling
haneslinger May 16, 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
4 changes: 0 additions & 4 deletions buildingmotif-app/src/app/model-detail/model-detail.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@
padding-top: 1rem;
}

button {
width: 5rem;
}

.side-nav-button {
display: flex;
}
Expand Down
55 changes: 32 additions & 23 deletions buildingmotif-app/src/app/model-detail/model-detail.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,42 @@
<mat-drawer-container class="container">
<div class="main-content-and-button">
<!-- Main Content -->
<div class="main-content">
<div class="title">{{model.name}}</div>

<mat-drawer-container class="container">
<div class="main-content-and-button">
<!-- Main Content -->
<div class="main-content">
<div class="title">{{model.name}}</div>
<mat-progress-bar mode="indeterminate" *ngIf="updatingGraphSpinner"></mat-progress-bar>
<div class="graph-info" *ngIf="!updatingGraphSpinner">
<ngx-codemirror #codemirror class="graph" [options]="codeMirrorOptions" [formControl]="graphFormControl">
</ngx-codemirror>

<!-- Buttons -->
<div class="buttons">
<button mat-raised-button (click)="onSave()" color="primary">Save</button>
<button mat-raised-button (click)="undoChangesToGraph()" color="primary">Undo</button>
<button mat-raised-button color="primary" (click)="fileInput.click()">
<div>Update with file</div>
<input type="file" id="file" hidden #fileInput (change)="updateGraphWithFile($event)">
</button>
</div>
</div>

<button class="side-nav-button" mat-flat-button (click)="drawer.toggle()" color="basic">
<mat-icon *ngIf="!drawer.opened"> arrow_backward </mat-icon>
<mat-icon *ngIf="drawer.opened"> arrow_forward </mat-icon>
</button>
</div>

<!-- Side Nav -->
<mat-drawer #drawer class="sidenav-content" mode="side" position="end">
<mat-tab-group>
<mat-tab label="Evaluate">
<app-template-search [evaulateModelId]=model.id (openEvaulateEvent)="openEvaulateEvent($event)"></app-template-search>
</mat-tab>
<mat-tab label="Validate">
<app-model-validate [modelId]=model.id></app-model-validate>
</mat-tab>
</mat-tab-group>
</mat-drawer>
</mat-drawer-container>
<!-- Side Nav Handle -->
<button class="side-nav-button" mat-flat-button (click)="drawer.toggle()" color="basic">
<mat-icon *ngIf="!drawer.opened"> arrow_backward </mat-icon>
<mat-icon *ngIf="drawer.opened"> arrow_forward </mat-icon>
</button>
</div>


<!-- Side Nav Content-->
<mat-drawer #drawer class="sidenav-content" mode="side" position="end">
<mat-tab-group>
<mat-tab label="Evaluate">
<app-template-search [evaulateModelId]=model.id (openEvaulateEvent)="openEvaulateEvent($event)"></app-template-search>
</mat-tab>
<mat-tab label="Validate">
<app-model-validate [modelId]=model.id></app-model-validate>
</mat-tab>
</mat-tab-group>
</mat-drawer>
</mat-drawer-container>
27 changes: 26 additions & 1 deletion buildingmotif-app/src/app/model-detail/model-detail.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class ModelDetailComponent{
};
showFiller: boolean = true;
sideNaveOpen: boolean = false;
updatingGraphSpinner: boolean = false;

constructor(
private route: ActivatedRoute,
Expand All @@ -60,7 +61,7 @@ export class ModelDetailComponent{
}

openSnackBar(message: string) {
this._snackBar.open(message, "oh", {});
this._snackBar.open(message, "close", {});
}

undoChangesToGraph(): void {
Expand All @@ -73,4 +74,28 @@ export class ModelDetailComponent{
{data: {templateId, modelId: this.model.id}}
);
}

updateGraphWithFile(event: Event) {
this.updatingGraphSpinner = true;
const element = event.currentTarget as HTMLInputElement;
let files: FileList | null = element.files;
const fileToUpload = files?.item(0) ?? null;

if (!fileToUpload) return;

this.ModelDetailService.updateModelGraph(this.model.id, fileToUpload, true)
.subscribe({
next: (data: string) => {
this.graph = data;
this.graphFormControl.setValue(this.graph);
this.openSnackBar("success")
}, // success path
error: (error) => {
this.openSnackBar("error")
}, // error path
complete: () => {
this.updatingGraphSpinner = false;
}
});
}
}
2 changes: 1 addition & 1 deletion buildingmotif-app/src/app/model-detail/model-detail.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class ModelDetailService {
);
}

updateModelGraph(id: number, newGraph: string, append: boolean = false) {
updateModelGraph(id: number, newGraph: string | File, append: boolean = false) {
const headers = {'Content-Type': "application/xml"}

return this.http[append? "patch": "put"](`http://localhost:5000/models/${id}/graph`, newGraph, {headers, responseType: 'text'})
Expand Down