From b434847d659303e8ab85bcfa23ed16377ece8229 Mon Sep 17 00:00:00 2001 From: uday biswas Date: Sat, 23 Aug 2025 16:55:40 +0530 Subject: [PATCH 1/3] create new notebook validations implemented --- .../modal-upload-notebook.component.html | 13 +++++-- .../modal-upload-notebook.component.ts | 34 +++++++++++++++++-- 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html index 920a88b..3f939a9 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html @@ -29,7 +29,11 @@
Add Notebook
- + +
+ File is required +
@@ -46,6 +50,11 @@
Add Notebook
+
+ URL is required + Enter a valid URL +
@@ -69,7 +78,7 @@
Add Notebook
-
@@ -74,6 +75,13 @@
Add Notebook
+ +
+ +

+ A minimal Jupyter notebook (.ipynb) will be generated. +

+
diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts index 551687f..604a39a 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts @@ -23,6 +23,7 @@ export class ModalUploadNotebookComponent implements OnInit { existingNotebookURL: NotebookURL; showCreateNotebook: Boolean; showAddExistingNotebook: Boolean; + showBlankNotebook: boolean; file: File; url: string; notebookType: "jupyter" | "observablehq" | "colab" = "jupyter"; @@ -38,6 +39,8 @@ export class ModalUploadNotebookComponent implements OnInit { ngOnInit(): void { // console.log(this.project); this.showCreateNotebook = true; + this.showAddExistingNotebook = false; + this.showBlankNotebook = false; this.notebookName = new FormControl('', [Validators.required, Validators.minLength(1), Validators.maxLength(20)]); this.notebookURL = new FormControl(''); @@ -49,35 +52,33 @@ export class ModalUploadNotebookComponent implements OnInit { 'notebookFile': this.notebookFile }); - this.applyModeValidators(true); + this.applyModeValidators('file'); } - private applyModeValidators(isCreateMode: boolean) { - if (isCreateMode) { + private applyModeValidators(mode: string) { + if (mode === 'file') { this.notebookFile.setValidators([Validators.required]); this.notebookURL.clearValidators(); - } else { + } else if (mode === 'url'){ this.notebookURL.setValidators([ Validators.required, Validators.pattern(/^(https?:\/\/)[^\s]+$/i) ]); this.notebookFile.clearValidators(); + } else { + this.notebookFile.clearValidators(); + this.notebookURL.clearValidators(); } this.notebookFile.updateValueAndValidity(); this.notebookURL.updateValueAndValidity(); } - onChange(selectedType) { - if (selectedType === "true") { - this.showCreateNotebook = true; - this.showAddExistingNotebook = false; - this.applyModeValidators(true); - } - else { - this.showCreateNotebook = false; - this.showAddExistingNotebook = true; - this.applyModeValidators(false); - } + onChange(selected: string) { + this.showCreateNotebook = selected === 'file'; + this.showAddExistingNotebook = selected === 'url'; + this.showBlankNotebook = selected === 'blank'; + + this.applyModeValidators(selected as 'file' | 'url' | 'blank'); } onChangeNotebookType(selectedType) { @@ -98,6 +99,24 @@ export class ModalUploadNotebookComponent implements OnInit { this.notebookURL.updateValueAndValidity(); } + private buildBlankNotebookFile(): File { + const title = this.notebookName.value?.trim() || 'Untitled'; + const content = { + cells: [ + { + cell_type: 'code', + metadata: {}, + source: [``] + } + ], + metadata: {}, + nbformat: 4, + nbformat_minor: 2 + }; + const blob = new Blob([JSON.stringify(content, null, 2)], { type: 'application/json' }); + return new File([blob], `${title}.ipynb`, { type: 'application/json' }); + } + addNotebook() { for(let notebook of this.project.notebooks){ @@ -117,7 +136,9 @@ export class ModalUploadNotebookComponent implements OnInit { this.closeModal.emit(); this.getNotebooks.emit(this.currentDirectory); }); + return; } + if (this.showAddExistingNotebook) { if (this.notebookType === "observablehq") { let datasetMap = { @@ -150,6 +171,21 @@ export class ModalUploadNotebookComponent implements OnInit { this.closeModal.emit(); this.getNotebooks.emit(this.currentDirectory); }); + return; + } + + if (this.showBlankNotebook) { + const blankFile = this.buildBlankNotebookFile(); + const payload: NotebookFile = { + file: blankFile, + name: this.notebookName.value, + projectID: this.project.projectID + }; + this.projectService.uploadNotebook(payload, this.currentDirectory).subscribe(result => { + this.closeModal.emit(); + this.getNotebooks.emit(this.currentDirectory); + }); + return; } } From f0ba1a38d36b505bcad34a2b2e6fb85a11119bde Mon Sep 17 00:00:00 2001 From: uday biswas Date: Mon, 8 Sep 2025 22:11:09 +0530 Subject: [PATCH 3/3] removed jupyter option --- .../modal-upload-notebook.component.html | 3 +-- .../modal-upload-notebook.component.ts | 2 +- .../Controllers/ProjectController.cs | 22 ------------------- 3 files changed, 2 insertions(+), 25 deletions(-) diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html index 2d1fb17..0a0f8b8 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.html @@ -41,9 +41,8 @@
Add Notebook
diff --git a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts index 604a39a..12222dc 100644 --- a/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts +++ b/src/Analysim.Web/ClientApp/src/app/projects/project-overview/project-overview-view/project-content/modal-upload-notebook/modal-upload-notebook.component.ts @@ -26,7 +26,7 @@ export class ModalUploadNotebookComponent implements OnInit { showBlankNotebook: boolean; file: File; url: string; - notebookType: "jupyter" | "observablehq" | "colab" = "jupyter"; + notebookType: "observablehq" | "colab" = "colab"; datasets: ObservableHQDataset[] = []; diff --git a/src/Analysim.Web/Controllers/ProjectController.cs b/src/Analysim.Web/Controllers/ProjectController.cs index 4aff8f9..60db849 100644 --- a/src/Analysim.Web/Controllers/ProjectController.cs +++ b/src/Analysim.Web/Controllers/ProjectController.cs @@ -1223,28 +1223,6 @@ public async Task UploadExistingNotebook([FromForm] ExistingProje await _dbContext.SaveChangesAsync(); - } - else if (noteBookData.Type == "jupyter") - { - string fileName = noteBookData.Directory + $"{noteBookData.NotebookName}.ipynb"; - newNotebook = new Notebook - { - Container = "notebook-" + project.Name.ToLower(), - Directory = noteBookData.Directory, - Name = Path.GetFileNameWithoutExtension(noteBookData.NotebookName), - Extension = Path.GetExtension(fileName), - Size = 0, - Uri = notebookUrl, - DateCreated = DateTimeOffset.Now.UtcDateTime, - LastModified = DateTimeOffset.Now.UtcDateTime, - ProjectID = noteBookData.ProjectID, - type = "jupyter", - Route = user.UserName + "/" + project.Name - }; - - await _dbContext.Notebook.AddAsync(newNotebook); - await _dbContext.SaveChangesAsync(); - } else {