-
-
Notifications
You must be signed in to change notification settings - Fork 6
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
State execution documentation #439
Draft
lukestanley
wants to merge
6
commits into
develop
Choose a base branch
from
state
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
3a43fd5
WIP BlocksWorkflowComponent documentation and logging
lukestanley 248051f
Adds Compodoc to help investigate Component dependencies
lukestanley 30756a3
WIP Block Workflow Component experiment with temporary copy of old fo…
lukestanley 4a516a0
Experimental refactor of BlocksWorkflowComponent to dynamically load …
lukestanley 52e36e2
Attempts using injector to set config with no visible change
lukestanley 25fa9a0
BlocksWorkflowComponent: Fix passing config and context input, removi…
lukestanley 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
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
64 changes: 2 additions & 62 deletions
64
src/app/components/blocks-workflow/blocks-workflow.component.html
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 |
|---|---|---|
| @@ -1,62 +1,2 @@ | ||
| <ng-container *ngFor="let block of blocks; let i = index"> | ||
| <ng-container [ngSwitch]="block.type"> | ||
| <app-form-block class="block-wrapper" *ngSwitchCase="'form'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-form-block> | ||
| <app-debug-block class="block-wrapper" *ngSwitchCase="'debug'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-debug-block> | ||
| <app-query-block class="block-wrapper" *ngSwitchCase="'query'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-query-block> | ||
| <app-mapping-block class="block-wrapper" *ngSwitchCase="'mapping'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-mapping-block> | ||
| <app-grid-block class="block-wrapper" *ngSwitchCase="'grid'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-grid-block> | ||
| <app-http-block class="block-wrapper" *ngSwitchCase="'http'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-http-block> | ||
| <app-chart-block class="block-wrapper" *ngSwitchCase="'chart'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-chart-block> | ||
| <app-init-block class="block-wrapper" *ngSwitchCase="'init'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-init-block> | ||
| <app-message-block class="block-wrapper" *ngSwitchCase="'message'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-message-block> | ||
| <app-image-block class="block-wrapper" *ngSwitchCase="'image'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-image-block> | ||
| <app-vimeo-block class="block-wrapper" *ngSwitchCase="'vimeoPlayer'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-vimeo-block> | ||
| <app-template-block class="block-wrapper" *ngSwitchCase="'template'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-template-block> | ||
| <app-button-block class="block-wrapper" *ngSwitchCase="'button'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-button-block> | ||
| <app-dialog-block class="block-wrapper" *ngSwitchCase="'dialog'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-dialog-block> | ||
| <app-actions-block class="block-wrapper" *ngSwitchCase="'actions'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-actions-block> | ||
| <app-variable-get class="block-wrapper" *ngSwitchCase="'variable-get'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-variable-get> | ||
| <app-variable-set class="block-wrapper" *ngSwitchCase="'variable-set'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-variable-set> | ||
| <app-switch-block class="block-wrapper" *ngSwitchCase="'switch'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-switch-block> | ||
| <app-batch-block class="block-wrapper" *ngSwitchCase="'batch'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-batch-block> | ||
| <app-multi-block class="block-wrapper" *ngSwitchCase="'multi'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-multi-block> | ||
| <app-event-dispatch-block class="block-wrapper" *ngSwitchCase="'dispatch'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-event-dispatch-block> | ||
| <app-csv-import-block class="block-wrapper" *ngSwitchCase="'csv-import'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-csv-import-block> | ||
| <app-csv-export-block class="block-wrapper" *ngSwitchCase="'csv-export'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-csv-export-block> | ||
| <app-card-block class="block-wrapper" *ngSwitchCase="'card'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-card-block> | ||
| <app-faker-block class="block-wrapper" *ngSwitchCase="'faker'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-faker-block> | ||
| <app-data-import-block class="block-wrapper" *ngSwitchCase="'import'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-data-import-block> | ||
| <app-data-export-block class="block-wrapper" *ngSwitchCase="'export'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-data-export-block> | ||
| <app-file-input-block class="block-wrapper" *ngSwitchCase="'file-input'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-file-input-block> | ||
| <app-parse-data-block class="block-wrapper" *ngSwitchCase="'parse-data'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-parse-data-block> | ||
| <app-file-export-block class="block-wrapper" *ngSwitchCase="'file-export'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-file-export-block> | ||
| <app-serialize-data-block class="block-wrapper" *ngSwitchCase="'serialize'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-serialize-data-block> | ||
| <app-launch-block class="block-wrapper" *ngSwitchCase="'launch'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-launch-block> | ||
| <app-db-block class="block-wrapper" *ngSwitchCase="'db'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-db-block> | ||
| <app-reference-block class="block-wrapper" *ngSwitchCase="'reference'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-reference-block> | ||
| <app-context-block class="block-wrapper" *ngSwitchCase="'context'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-context-block> | ||
| <app-auth0-profile-data-block class="block-wrapper" *ngSwitchCase="'auth0'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-auth0-profile-data-block> | ||
| <app-adapter-list-block class="block-wrapper" *ngSwitchCase="'adapter-list'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-adapter-list-block> | ||
| <app-adapter-info-block class="block-wrapper" *ngSwitchCase="'adapter-info'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-adapter-info-block> | ||
| <app-read-file-block class="block-wrapper" *ngSwitchCase="'read-file'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-read-file-block> | ||
| <app-context-save-block class="block-wrapper" *ngSwitchCase="'context-save'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-context-save-block> | ||
| <app-video-upload-block class="block-wrapper" *ngSwitchCase="'video-upload'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-video-upload-block> | ||
| <app-gosub-block class="block-wrapper" *ngSwitchCase="'gosub'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-gosub-block> | ||
| <app-gsheet-block class="block-wrapper" *ngSwitchCase="'gsheet'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-gsheet-block> | ||
| <app-map-block class="block-wrapper" *ngSwitchCase="'map'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-map-block> | ||
| <app-graphql-block class="block-wrapper" *ngSwitchCase="'graphql'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-graphql-block> | ||
| <app-validator-block class="block-wrapper" *ngSwitchCase="'validator'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-validator-block> | ||
| <app-load-auth-block class="block-wrapper" *ngSwitchCase="'load-auth'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-load-auth-block> | ||
| <app-xlsx-template-block class="block-wrapper" *ngSwitchCase="'xlsx-template'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-xlsx-template-block> | ||
| <app-validate-block class="block-wrapper" *ngSwitchCase="'validate'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-validate-block> | ||
| <app-audio-player-block class="block-wrapper" *ngSwitchCase="'player'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-audio-player-block> | ||
| <app-web-money-block class="block-wrapper" *ngSwitchCase="'web-money'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-web-money-block> | ||
| <app-wallet-block class="block-wrapper" *ngSwitchCase="'wallet'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-wallet-block> | ||
| <app-load-schema-block class="block-wrapper" *ngSwitchCase="'load-schema'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-load-schema-block> | ||
| <app-app-layout-block class="block-wrapper" *ngSwitchCase="'app-layout'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-app-layout-block> | ||
| <app-rename-fields-block class="block-wrapper" *ngSwitchCase="'rename-fields'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-rename-fields-block> | ||
| <app-mermaid-block class="block-wrapper" *ngSwitchCase="'mermaid'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-mermaid-block> | ||
| <app-comparison class="block-wrapper" *ngSwitchCase="'comparison'" [context]="context" [config]="block" [model]="models[i]" (output)="updateModel(i + 1, $event)"></app-comparison> | ||
| </ng-container> | ||
| </ng-container> | ||
| <!-- <pre>workblock: {{ context | json }}</pre> --> | ||
| <!-- blocks-workflow.component.html --> | ||
| <ng-container #blockHost></ng-container> |
81 changes: 62 additions & 19 deletions
81
src/app/components/blocks-workflow/blocks-workflow.component.ts
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 |
|---|---|---|
| @@ -1,39 +1,82 @@ | ||
| import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; | ||
| import {clone} from 'lodash-es'; | ||
| import { Component, OnInit, ViewChild, ViewContainerRef, ChangeDetectorRef, ComponentFactoryResolver, SimpleChange, Input, Output, EventEmitter, OnChanges, Injector, NgZone } from '@angular/core'; | ||
|
|
||
| import { FormBlockComponent } from 'src/app/blocks/form-block/form-block.component'; | ||
| import { DebugBlockComponent } from 'src/app/blocks/debug-block/debug-block.component'; | ||
| import { QueryBlockComponent } from 'src/app/blocks/query-block/query-block.component'; | ||
| // Add other imports for other block components here | ||
|
|
||
| // Simple interface to describe the expected structure of dynamically loaded block components | ||
| interface DynamicBlockComponent { | ||
| output?: EventEmitter<any>; | ||
| // TODO: Add other common properties and methods here | ||
| } | ||
|
|
||
| // Mapping from block types to component classes | ||
| const blockComponentMapping = { | ||
| 'form': FormBlockComponent, | ||
| 'debug': DebugBlockComponent, | ||
| 'query': QueryBlockComponent, | ||
| // TODO: Add other block types here | ||
| }; | ||
|
|
||
| @Component({ | ||
| selector: 'app-blocks-workflow', | ||
| templateUrl: './blocks-workflow.component.html', | ||
| styleUrls: ['./blocks-workflow.component.scss'] | ||
| styleUrls: ['./blocks-workflow.component.scss'], | ||
| }) | ||
| export class BlocksWorkflowComponent implements OnInit { | ||
| export class BlocksWorkflowComponent implements OnInit, OnChanges { | ||
| @ViewChild('blockHost', { read: ViewContainerRef }) blockHost: ViewContainerRef; | ||
|
|
||
| @Input() blocks = []; | ||
| @Input() models = []; | ||
| @Input() context = {}; | ||
|
|
||
| @Output() workflowComplete = new EventEmitter(); | ||
| // TODO: Use output events to emit data so that if this component is used in a parent component, the parent component can listen to the output events and get the data from the blocks | ||
|
|
||
| constructor() { } | ||
| constructor( | ||
| private componentFactoryResolver: ComponentFactoryResolver, | ||
| private readonly cd: ChangeDetectorRef, | ||
| private readonly zone: NgZone | ||
| ) { } | ||
|
|
||
| ngOnInit() { | ||
| this.loadBlocks(); | ||
| // let's log the blocks, models and context to see if they are being passed correctly | ||
| console.log('blocks:',this.blocks); | ||
| console.log('models:',this.models); | ||
| console.log('context:',this.context); | ||
| } | ||
|
|
||
| updateModel(modelNumber, value) { | ||
| // console.log({ modelNumber, value }); | ||
| // console.log(this.models); | ||
| this.models = [...this.models.slice(0, modelNumber), value, ...this.models.slice(modelNumber + 1)]; | ||
| // Force change | ||
| this.blocks = [...this.blocks]; | ||
| // Output as complete workflow if final block is causing the updating | ||
| if (modelNumber >= this.blocks.length) { | ||
| this.workflowComplete.emit(value); | ||
|
|
||
| ngOnChanges(changes) { | ||
| if (changes.blocks || changes.models || changes.context) { | ||
| console.log('ngOnChanges ran with changes:', changes); | ||
| this.loadBlocks(); | ||
| } | ||
| } | ||
| loadBlocks() { | ||
| window['componentRefs'] = []; | ||
| console.log('loadBlocks is running with blocks:', this.blocks); | ||
| window['data'] = {"blocks": this.blocks, "models": this.models, "context": this.context}; | ||
| this.blocks.forEach((block, index) => { | ||
| console.log('loadBlocks block:', block.type, 'index', index); | ||
| const blockComponent = blockComponentMapping[block.type]; | ||
| if (blockComponent) { | ||
|
|
||
| runWorkflow() { | ||
| if (this.models.length > 0) { | ||
| this.models[0] = clone(this.models[0]); | ||
| } | ||
| const componentRef = this.blockHost.createComponent(blockComponent); | ||
| console.log('loadBlocks blockComponent:', blockComponent, componentRef); | ||
|
|
||
| window['componentRefs'][index] = componentRef; // For debugging investigation in the browser console | ||
| if (componentRef.instance) { | ||
| componentRef.instance['config'] = block; | ||
| componentRef.instance['context'] = {}; // TODO: Pass the context to the block component | ||
| console.log('loadBlocks config and context set, running ngOnChanges'); | ||
| componentRef.instance['ngOnChanges']({config: block}); | ||
| } | ||
|
|
||
| } else { | ||
| console.log(`No component mapped for type: ${block.type}`); | ||
| } | ||
| }); | ||
| } | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
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.
@lukestanley what about trying
DoChecktoo here?