Skip to content

Commit 62182da

Browse files
committed
[NAB-389] Cannot change the number of columns in form editor
- fix according to PR
1 parent 4142aaa commit 62182da

3 files changed

Lines changed: 15 additions & 19 deletions

File tree

src/app/form-builder/edit-panel/edit-panel.component.ts

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ import {animate, state, style, transition, trigger} from '@angular/animations';
33
import {GridsterService} from '../gridster/gridster.service';
44
import {
55
Appearance,
6-
Component as PetriflowComponent, DataGroup,
6+
Component as PetriflowComponent,
77
DataRef,
88
DataRefBehavior,
99
DataType,
1010
DataVariable,
1111
I18nString,
1212
I18nWithDynamic,
1313
Icon,
14-
IconType, LayoutType,
14+
IconType,
1515
Option,
1616
Property,
1717
Template,
@@ -226,14 +226,7 @@ export class EditPanelComponent implements OnInit, AfterViewInit {
226226
this.gridsterService.options.minCols = newCols;
227227
this.gridsterService.options.maxCols = newCols;
228228
this.gridsterService.options.maxItemCols = newCols;
229-
if (this.modelService.model.getTransition(this.transId).dataGroups?.length > 0) {
230-
this.modelService.model.getTransition(this.transId).dataGroups[0].cols = newCols;
231-
} else {
232-
const dataGroup = new DataGroup(`${this.transId}_0`);
233-
dataGroup.layout = LayoutType.GRID;
234-
dataGroup.cols = newCols;
235-
this.modelService.model.getTransition(this.transId).dataGroups.push(dataGroup);
236-
}
229+
this.modelService.model.getTransition(this.transId).dataGroups[0].cols = newCols;
237230
this.gridsterService.options.api.optionsChanged();
238231
this.registerChange();
239232
}

src/app/form-builder/form-builder.component.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ import {AfterViewInit, Component, OnDestroy, OnInit} from '@angular/core';
22
import {Router} from '@angular/router';
33
import {ModelService} from '../modeler/services/model/model.service';
44
import {ModelerUtils} from '../modeler/modeler-utils';
5+
import {ModelerConfig} from "../modeler/modeler-config";
6+
import {SelectedTransitionService} from "../modeler/selected-transition.service";
7+
import {DataGroup, LayoutType} from '@netgrif/petriflow';
58

69
@Component({
710
selector: 'nab-form-builder',
@@ -12,10 +15,16 @@ export class FormBuilderComponent implements AfterViewInit {
1215
title = 'form-builder';
1316
width: number;
1417

15-
constructor(private router: Router, private modelService: ModelService) {
18+
constructor(private router: Router, private modelService: ModelService, private transitionService: SelectedTransitionService) {
1619
if (!this.modelService.model) {
1720
this.router.navigate(['/modeler']);
1821
}
22+
if (this.modelService.model.getTransition(this.transitionService.id)?.dataGroups?.length === 0) {
23+
const dataGroup = new DataGroup(`${this.transitionService.id}_0`);
24+
dataGroup.layout = LayoutType.GRID;
25+
dataGroup.cols = ModelerConfig.LAYOUT_DEFAULT_COLS;
26+
this.modelService.model.getTransition(this.transitionService.id).dataGroups.push(dataGroup);
27+
}
1928
}
2029

2130
ngAfterViewInit(): void {

src/app/form-builder/gridster/gridster.service.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ import {
1818
DataType,
1919
DataVariable,
2020
Expression, I18nWithDynamic,
21-
LayoutType, Property,
21+
Property,
2222
Template,
2323
Transition,
2424
TransitionLayout
2525
} from '@netgrif/petriflow';
2626
import {BehaviorSubject, ReplaySubject, Subject} from 'rxjs';
2727
import {DataFieldUtils} from '../data-field-utils';
2828
import {SelectedTransitionService} from '../../modeler/selected-transition.service';
29-
import {ComponentDef, FieldListService, PropertyDef} from '../field-list/field-list.service';
29+
import {FieldListService, PropertyDef} from '../field-list/field-list.service';
3030
import {ModelerConfig} from '../../modeler/modeler-config';
3131
import {debounceTime} from 'rxjs/operators';
3232

@@ -221,12 +221,6 @@ export class GridsterService {
221221
dataRef.component = new Component(componentName);
222222
}
223223
const transition = this.modelService.model.getTransition(this.transitionId);
224-
if (transition.dataGroups.length === 0) {
225-
const dataGroup = new DataGroup(`${transition.id}_0`);
226-
dataGroup.layout = LayoutType.GRID;
227-
dataGroup.cols = this.options.minCols;
228-
transition.dataGroups.push(dataGroup);
229-
}
230224
transition.dataGroups[0].addDataRef(dataRef);
231225
if (dataVariable.type === DataType.TASK_REF && dataVariable.init?.value === this.transitionId) {
232226
dataVariable.init.value = undefined;

0 commit comments

Comments
 (0)