-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
SEAB-5117: Display formatted notebook #1747
Closed
svonworl
wants to merge
66
commits into
release/1.14
from
feature/seab-5117/display-formatted-notebook
Closed
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit
Hold shift + click to select a range
0be8a50
scaffold
svonworl 0527038
refactor into MarkdownWrapperService, add proof of concept code
svonworl faa38c5
develop further
svonworl 456ab9e
develop
svonworl 3f9f4dc
refactor lightly
svonworl b01d978
generalize formatting by type
svonworl dcf22f6
insert TODOs for further work, clean up
svonworl 3298777
add mime bundle, baseUrl input
svonworl d2a9289
remove unused file
svonworl 9530cb0
remove unused file #2
svonworl 758eb83
add baseUrl input setting, adjust test
svonworl fdde446
style notebook divs, add exception handling on failure
svonworl 121549f
make notebook css more scss-ey
svonworl fd6e4f2
correct execution count, lighten count label
svonworl d9bf2dd
add support for img alt and title attrs
svonworl 2c5001b
refactor mime bundle processor
svonworl ce2c56b
rename method
svonworl 9e94ed5
add math support
svonworl e5617bc
add syntax highlighting
svonworl c96564f
set language type of code cells, misc improvements
svonworl 7f3c173
refactor escaping code
svonworl eb5113f
refactor
svonworl 9f57869
honor source/outputs_hidden, add syntax highlighting styles, refactor
svonworl fdce41c
simplify, fix css problem
svonworl 227980b
add test skeleton
svonworl 4e9ea22
improve template html
svonworl 133cc4c
restructure loop
svonworl 0188552
complete basic unit tests, fix bugs
svonworl e7c8bc2
fix intermittent syntax highlighting
svonworl a389da8
fix misc bugs
svonworl a7bdc2a
improve escape
svonworl 78e063b
refactor
svonworl d669962
add return type
svonworl e082dc3
refactor lightly
svonworl c034925
generate formatted notebook in detached element, add light sanitize
svonworl 559ed62
fix license file, comment, tweak syntax highlighting
svonworl f169ee7
tweak license file
svonworl 46c23d3
fix license file
svonworl 5d8835e
fix bugs, make first grid column collapse to fit content
svonworl 3f5f638
fix missing error
svonworl 6e1c4cb
cancel old request subscription before launching new request
svonworl f8f4fda
rejigger attached image support
svonworl bb3f2dd
tweak styles, do not encode html output
svonworl 2610a19
basic mathjax configurations
svonworl aef9135
escape trailing double backslashes in equations
svonworl 90b6e3c
add mathjax font files, remove light sanitize
svonworl 283b04d
add mathjax config file, configure ui/safe module, remove katex load
svonworl c5f6805
remove katex from package json
svonworl 36b22a2
add spam removal
svonworl 38eedba
disable mathjax automatic formatting
svonworl b43e9ac
use WorkflowService, comment, remove cruft
svonworl 7fe9b3f
update license file
svonworl ca95810
add mathjax license, correctly this time
svonworl d951a0b
fix unit tests, address code robot suggestions
svonworl 76b3f95
Merge branch 'develop' into feature/seab-5117/display-formatted-notebook
svonworl 0d69931
remove commented code
svonworl d4d5577
remove unused stuff
svonworl c27419e
improve backslashed dollar handling
svonworl 66e292d
improve regexps
svonworl 96afbcb
improve regexps, add light sanitize of prism outputs
svonworl 67e967d
refactor unit test
svonworl 0212b63
clean up unit test
svonworl 4ce9395
add comments, refactor lightly, fix regexp bug
svonworl d042404
fix spelling error
svonworl 44389b3
change notebook Code tab to Preview tab
svonworl 05a5cde
fix test oopsie
svonworl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix bugs, make first grid column collapse to fit content
- Loading branch information
commit 5d8835e8fffd68f7018b636f41f8f083e03f3281
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -245,14 +245,16 @@ <h3> | |
</mat-tab> | ||
<div *ngIf="entryType === EntryType.Notebook"> | ||
<mat-tab id="codeTab" label="Code"> | ||
<div class="mt-4 ml-4 mr-4"> | ||
<app-formatted-notebook | ||
*ngIf="workflow && selectedVersion" | ||
[workflow]="workflow" | ||
[version]="selectedVersion" | ||
[baseUrl]="workflow.providerUrl | baseUrl: selectedVersion.name" | ||
></app-formatted-notebook> | ||
</div> | ||
<ng-template matTabContent> | ||
<div class="mt-4 ml-4 mr-4"> | ||
<app-formatted-notebook | ||
*ngIf="workflow && selectedVersion && (extendedWorkflow$ | async)" | ||
[workflow]="workflow" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. IDE is giving me compiler errors for this and next line. We have this turned off at build time because there are too many of the errors, sigh, but we should try to avoid introducing new ones. Might be tricky here though. |
||
[version]="selectedVersion" | ||
[baseUrl]="(extendedWorkflow$ | async).providerUrl | baseUrl: selectedVersion.name" | ||
></app-formatted-notebook> | ||
</div> | ||
</ng-template> | ||
</mat-tab> | ||
</div> | ||
<div *ngIf="entryType === EntryType.BioWorkflow || entryType === EntryType.Tool"> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A bit of bikeshedding, but after looking at the screenshots, "Code" seems ambiguous. After all, I would have guessed that the "Files" tab would display code.
This looks like a "Preview" like if you were editing a readme or "Rendered"
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"Preview" sounds good!