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

Feature(403006):Optimization of sidebar component #12

Merged
merged 5 commits into from
Dec 17, 2024
Merged

Feature(403006):Optimization of sidebar component #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1356b04
Feature(403006):reduced code using function
GowthamKumarMVS Dec 11, 2024
65b8092
Feature(403006):changed names
GowthamKumarMVS Dec 11, 2024
5c21ed0
Feature(403006):fixed offset
GowthamKumarMVS Dec 12, 2024
1ade8a9
Feature(403006):review changes
GowthamKumarMVS Dec 17, 2024
edf57a2
Feature(403006):refresh layout
GowthamKumarMVS Dec 17, 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
8 changes: 5 additions & 3 deletions src/app/components/workflow-diagram/workflow-diagram.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
<div> <input id="fileupload" type="file" /></div>
</div>
</div>

<ejs-diagram class="diagram-container" #diagram
<div>
<ejs-diagram class="diagram-container" #diagram
id="diagram" [width]="'100%'" [height]="649" [nodes]="nodes"
[connectors]="connectors" [layout]="layout" [getNodeDefaults]="getNodeDefaults"
[getConnectorDefaults]="getConnectorDefaults" (created)="onDiagramCreated()" [selectedItems]="selectedItems"
Expand Down Expand Up @@ -133,9 +133,11 @@

<ejs-listview #listview id='listview' [dataSource]='listdata' cssClass='bc-block-option' [fields]='fields' [showHeader]='true'
[headerTitle]='headertitle' [animation]='animation' (select)="onSelectListView($event)"></ejs-listview>
</div>

</div>

<app-workflow-sidebar #workflowSidebar [nodeEditType]="nodeEditType" [nodeBlockType]="nodeBlockType" [sidebarHeader]="sidebarHeader" [clickedNodeId]="clickedNodeId" (addNodeAndConnect)="onaddNodeAndConnect($event)"></app-workflow-sidebar>
<app-workflow-sidebar #workflowSidebar [nodeEditType]="nodeEditType" [nodeBlockType]="nodeBlockType" [sidebarHeader]="sidebarHeader" [selectedBlockId]="selectedBlockId" [selectedWorkFlowId]="selectedWorkFlowId" (addNodeAndConnect)="onaddNodeAndConnect($event)"></app-workflow-sidebar>

<!-- <div style="display: none;">
<ejs-uploader #defaultupload id='fileupload' (success)='onUploadSuccess($event)' [asyncSettings]='asyncSettings'></ejs-uploader>
Expand Down
31 changes: 21 additions & 10 deletions src/app/components/workflow-diagram/workflow-diagram.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { AfterViewInit, Component, EventEmitter, Input, Output, viewChild, ViewChild } from '@angular/core';
import { ComplexHierarchicalTree, ConnectionPointOrigin, ConnectorConstraints, ConnectorModel, DecoratorModel, Diagram, DiagramComponent, DiagramModule, HtmlModel, IClickEventArgs, IExportOptions, LayoutModel, LineDistribution, Node, NodeModel, PrintAndExport, SelectorConstraints, SelectorModel, SnapSettingsModel, TextModel, UserHandleEventsArgs, UserHandleModel } from '@syncfusion/ej2-angular-diagrams';
import { ComplexHierarchicalTree, ConnectionPointOrigin, ConnectorConstraints, ConnectorModel, DecoratorModel, Diagram, DiagramComponent, DiagramModule, HierarchicalTree, HierarchicalTreeService, HtmlModel, IClickEventArgs, IExportOptions, LayoutModel, LineDistribution, Node, NodeModel, PrintAndExport, SelectorConstraints, SelectorModel, SnapSettingsModel, TextModel, UserHandleEventsArgs, UserHandleModel } from '@syncfusion/ej2-angular-diagrams';
import { FieldDetails, FieldOptionDetail, FieldValidation, MessageDetails, RuleData, RuleData2 } from '../../models/appModel';
import { RULE_DATA, RULE_DATA2, RULE_DATA3 } from '../../data/rule-data';
import { DialogModule } from '@syncfusion/ej2-angular-popups';
Expand All @@ -21,11 +21,12 @@ import { WorkflowSidebarComponent } from '../workflow-sidebar/workflow-sidebar.c



Diagram.Inject(ComplexHierarchicalTree, LineDistribution, PrintAndExport);
Diagram.Inject(HierarchicalTree, LineDistribution, PrintAndExport);

@Component({
selector: 'app-workflow-diagram',
standalone: true,
providers: [HierarchicalTreeService],
imports: [DiagramModule, DialogModule, DropDownButtonModule, CommonModule, ListViewModule, DropDownListModule, MultiSelectModule, NumericTextBoxModule, TextBoxModule, TextAreaModule, DatePickerModule, DateTimePickerModule, SwitchModule, ToolbarModule, UploaderModule, WorkflowSidebarComponent],
templateUrl: './workflow-diagram.component.html',
styleUrl: './workflow-diagram.component.scss'
Expand Down Expand Up @@ -75,7 +76,8 @@ export class WorkflowDiagramComponent implements AfterViewInit{
public sidebarHeader!: string;
public nodeBlockType!: number;
public nodeEditType!: number;
public clickedNodeId!: string;
public selectedBlockId!: string;
public selectedWorkFlowId!: number;

// // Async settings for file upload
// public asyncSettings: AsyncSettingsModel = {
Expand Down Expand Up @@ -114,11 +116,18 @@ export class WorkflowDiagramComponent implements AfterViewInit{
}

private initializeDiagramElements(): void {
this.selectedWorkFlowId = 1; // Get from DB
sampleWorkflowData.forEach(item => {
let buttonCount = 0;
if(item.chatWorkflowEditorTypeId == 2){
buttonCount = item.fieldOptionDetails?.length || 0;
}
// Create nodes based on the data
this.nodes.push({
id: `node${item.id}`,
// annotations: [{ content: `Node ${item['id']}` }],
// annotations: [{ content: `node${item['id']}` }],
width: 200,
height: 150 + (buttonCount * 25),
addInfo: item
});

Expand Down Expand Up @@ -163,7 +172,7 @@ export class WorkflowDiagramComponent implements AfterViewInit{
};

public layout: LayoutModel = {
type: 'ComplexHierarchicalTree',
type: 'HierarchicalTree',
connectionPointOrigin: ConnectionPointOrigin.DifferentPoint,
horizontalSpacing: 40,
verticalSpacing: 40,
Expand All @@ -179,8 +188,6 @@ export class WorkflowDiagramComponent implements AfterViewInit{
strokeColor: '#0f2c60',
strokeWidth: 5,
};
obj.width = 200,
obj.height = 150,
obj.borderWidth = 1,
obj.borderColor = '#0f2c60',
(obj.shape as HtmlModel).type = 'HTML'
Expand All @@ -201,15 +208,15 @@ export class WorkflowDiagramComponent implements AfterViewInit{

public onNodeClick(args: IClickEventArgs): void {
if (args.actualObject instanceof Node) {
const clickedNode = args.actualObject as Node;
let isLastNode = clickedNode.outEdges.length == 0;
const clickedBlock = args.actualObject as Node;
let isLastNode = clickedBlock.outEdges.length == 0;
if(isLastNode && this.diagram.selectedItems.userHandles) {
this.diagram.selectedItems.userHandles[0].visible = true;
}
else if(this.diagram.selectedItems.userHandles){
this.diagram.selectedItems.userHandles[0].visible = false;
}
this.clickedNodeId = clickedNode.id;
this.selectedBlockId = clickedBlock.id;
}
}

Expand All @@ -232,6 +239,7 @@ export class WorkflowDiagramComponent implements AfterViewInit{
};
// Add the connector to the diagram
this.diagram.addConnector(newConnector);
this.diagram.doLayout();
}

public onUserHandleMouseDown(event: UserHandleEventsArgs) {
Expand All @@ -241,6 +249,9 @@ export class WorkflowDiagramComponent implements AfterViewInit{
}

public onOpenDropDownButton(args: OpenCloseMenuEventArgs) {
if(this.diagram.selectedItems.userHandles){
this.diagram.selectedItems.userHandles[0].visible = false;
}
let dropDownContainer = document.querySelector('.dropDown-container') as HTMLElement;
args.element.parentElement!.style.top = dropDownContainer.getBoundingClientRect().top + dropDownContainer.offsetHeight +'px';

Expand Down
Loading
Loading