feat(cli): better loading ui #800
Merged
Conversation
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
PatrickJS
commented
Jul 30, 2020
| logWarn(` | ||
| ---------------- | ||
| Error, missing "${yellow('<scully-content>')}" in route "${yellow(route.route)}" | ||
| without <scully-content> we can not render this route. | ||
| Make sure it is in there, and not inside any conditionals (*ngIf) | ||
| You can check this by opening "${yellow(`http${ssl ? 'S' : ''}://localhost:4200/${route.route}`)}" | ||
| You can check this by opening "${yellow(`http${ssl ? 'S' : ''}://localhost:4200/${route.route.replace(/^\//, '')}`)}" |
There was a problem hiding this comment.
route.route sometimes starts with /
PatrickJS
commented
Jul 30, 2020
| @@ -14,12 +15,16 @@ export function injectHtml(html: string, additionalHTML: string, route: HandledR | |||
| try { | |||
| attr = getIdAttrName(html.split('<scully-content')[1].split('>')[0].trim()); | |||
| } catch (e) { | |||
| // clear any progress | |||
| if (process.stdout.cursorTo) { | |||
| readline.clearLine(process.stdout, 0); | |||
There was a problem hiding this comment.
this is just to clear out any loading indicators
PatrickJS
commented
Jul 30, 2020
| printProgress(state.count, 'Total Routes'); | ||
| setTimeout(() => { | ||
| resolve(data); | ||
| }, 1); |
There was a problem hiding this comment.
you can change this to 100 to see "loading" of when its reading the directories
PatrickJS
commented
Jul 30, 2020
| @@ -21,20 +21,35 @@ export async function contentFolderPlugin(angularRoute: string, conf: RouteTypeC | |||
| } | |||
| const baseRoute = angularRoute.split(':' + param)[0]; | |||
| basePath = join(scullyConfig.homeFolder, paramConfig.folder); | |||
| const state = { count: 0 }; | |||
There was a problem hiding this comment.
used a global shared state rather than getting fancy
PatrickJS
commented
Jul 30, 2020
| createFolderFor(file); | ||
| printProgress(i + 1, 'Creating Route List:', collection.length); |
There was a problem hiding this comment.
this will be better when its write async rather than sync
PatrickJS
commented
Jul 30, 2020
| @@ -21,7 +21,8 @@ export async function asyncPool<T>(MaxParralellTasks: number, array: T[], taskFn | |||
| executing.push(e); | |||
| const now = performance.now(); | |||
| if (now - logTime > progressTime) { | |||
| printProgress(Math.max(array.length - ret.length, executing.length)); | |||
| const tasksLeft = Math.max(array.length - ret.length, executing.length); | |||
| printProgress(array.length + 1 - tasksLeft, 'Rendering Routes:', array.length); | |||
There was a problem hiding this comment.
counting up rather than down
PatrickJS
commented
Jul 30, 2020
| @@ -17,6 +17,9 @@ registerPlugin(scullySystem, generateAll, plugin); | |||
| async function plugin(localBaseFilter = baseFilter): Promise<HandledRoute[]> { | |||
| await loadConfig; | |||
| try { | |||
| // maintain progress ui | |||
| startProgress(); | |||
There was a problem hiding this comment.
we need a way to maintain state within logging during this time
SanderElias
approved these changes
Aug 4, 2020
jorgeucano
approved these changes
Aug 4, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
PR Checklist
Please check if your PR fulfills the following requirements:
PR Type
What kind of change does this PR introduce?
Better loading ui indicator
What is the current behavior?
loading indicator doesn't really show whats going on
Issue Number: N/A
What is the new behavior?
more loading indicators
Does this PR introduce a breaking change?
Other information
fixes #654