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

readme error resolved #87

Merged
merged 4 commits into from
Nov 20, 2024
Merged

readme error resolved #87

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
2ae4c5c
readme error resolved
uday-biswas Sep 3, 2024
7f1ff48
versioning update error resolved
uday-biswas Sep 4, 2024
e5a2a2f
readme refresh done
uday-biswas Sep 13, 2024
7b03727
npm upgrade
cengique Nov 20, 2024
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
75 changes: 25 additions & 50 deletions src/Analysim.Web/ClientApp/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/Analysim.Web/ClientApp/src/app/projects/project/project.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

.notebook-readme-full{
margin-bottom: 4px;
overflow-x: scroll;
}

.notebook-cell pre code div {
Expand Down
45 changes: 33 additions & 12 deletions src/Analysim.Web/ClientApp/src/app/projects/project/project.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,21 +95,23 @@ export class ProjectComponent implements OnInit {
if (this.currentUser != null && this.project.projectUsers.find(x => x.userID == this.currentUser.id) != undefined) {
this.projectUser = this.project.projectUsers.find(x => x.userID == this.currentUser.id)
}
// console.log("Result : ", result);
this.readmeNotebook = result.notebooks.filter((notebook) => notebook.name.toLowerCase() === "readme")[0];
// console.log("readme : " ,this.readmeNotebook);
this.projectService.getNotebookVersions(result.notebooks.filter((notebook) => notebook.name.toLowerCase() === "readme")[0]).subscribe(versions => {
this.versions = versions;
//console.log("Versions: ", this.versions);
// console.log("Versions: ", this.versions);
if (this.versions.length > 0) {
this.latestVersion = this.versions[0]; // Default to the latest version
}
// console.log("the loatest version : ", this.latestVersion);
this.projectService.getNotebookFile(result.notebooks.filter((notebook) => notebook.name.toLowerCase() === "readme")[0], this.latestVersion).subscribe(
notebookJson => {
// console.log("the notebook content is : ", notebookJson);
this.notebookContent = this.sanitizer.bypassSecurityTrustHtml(this.renderNotebook(notebookJson));
});
});
// console.log("readme file is : ", result.notebooks.filter((notebook) => notebook.name.toLowerCase() === "readme")[0]);
this.projectService.getNotebookFile(result.notebooks.filter((notebook) => notebook.name.toLowerCase() === "readme")[0], this.latestVersion).subscribe(
cengique marked this conversation as resolved.
Show resolved Hide resolved
notebookJson => {
this.notebookContent = this.sanitizer.bypassSecurityTrustHtml(this.renderNotebook(notebookJson));
// console.log("the notebook content is : ", this.notebookContent);
});
}

)
Expand Down Expand Up @@ -174,28 +176,47 @@ export class ProjectComponent implements OnInit {
closeDisplayNotebookModal() {
this.displayNotebookModalRef.hide();
this.router.navigate([this.router.url.split('/').slice(0,5).join('/')])
this.projectService.getNotebookVersions(this.readmeNotebook).subscribe(versions => {
this.versions = versions;
// console.log("Versions: ", this.versions);
if (this.versions.length > 0) {
this.latestVersion = this.versions[0]; // Default to the latest version
}
// console.log("the loatest version : ", this.latestVersion);
this.projectService.getNotebookFile(this.readmeNotebook, this.latestVersion).subscribe(
notebookJson => {
// console.log("the notebook content is : ", notebookJson);
this.notebookContent = this.sanitizer.bypassSecurityTrustHtml(this.renderNotebook(notebookJson));
});
});
}

renderNotebook(notebookJson: any): string {
// Simple rendering of the notebook. Customize as needed.
// console.log("notebook rendering content :" , notebookJson);
let htmlContent = `<div class="notebookClass">`;
for (const cell of notebookJson.cells) {
htmlContent += '<div class="notebook-cell">';
if (cell.cell_type === 'markdown') {
htmlContent += marked(cell.source.join(''));
const markdownContent = Array.isArray(cell.source) ? cell.source.join('') : cell.source;
htmlContent += marked(markdownContent);
} else if (cell.cell_type === 'code') {
htmlContent += '<pre><code><div>' + hljs.highlight(cell.source.join(''), {language: 'python'}).value + '</div></code></pre>';
// console.log("error: ", hljs.highlight(cell.source, {language: 'python'}));
const codeContent = Array.isArray(cell.source) ? cell.source.join('') : cell.source;
htmlContent += '<pre><code><div>' + hljs.highlight(codeContent, { language: 'python' }).value + '</div></code></pre>';
if (cell.outputs) {
for (const output of cell.outputs) {
if (output.data && output.data['text/html']) {
htmlContent += output.data['text/html'].join('');
const htmlOutput = Array.isArray(output.data['text/html']) ? output.data['text/html'].join('') : output.data['text/html'];
htmlContent += htmlOutput;
} else if (output.data && output.data['image/png']) {
htmlContent += `<img src="data:image/png;base64,${output.data['image/png']}" />`;
} else if (output.data && output.data['text/plain']) {
htmlContent += '<pre>' + output.data['text/plain'].join('') + '</pre>';
const plainTextOutput = Array.isArray(output.data['text/plain']) ? output.data['text/plain'].join('') : output.data['text/plain'];
htmlContent += '<pre>' + plainTextOutput + '</pre>';
}
else if (output.text) {
htmlContent += '<pre>' + output.text.join('') + '</pre>';
const outputText = Array.isArray(output.text) ? output.text.join('') : output.text;
htmlContent += '<pre>' + outputText + '</pre>';
}
}
}
Expand Down
Loading