Skip to content

[NIFI-6292] update variables slickgrid table row ids #3469

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

Closed
scottyaslan wants to merge 1 commit into from
Closed

[NIFI-6292] update variables slickgrid table row ids #3469

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions .../nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,8 @@
return false;
};

var variablesCount = 0;

/**
* Loads the specified variable registry.
*
Expand All @@ -1085,7 +1087,6 @@
*/
var loadVariables = function (variableRegistry, variableToSelect) {
if (nfCommon.isDefinedAndNotNull(variableRegistry)) {
var count = 0;
var index = 0;

var variableGrid = $('#variable-registry-table').data('gridInstance');
Expand All @@ -1098,7 +1099,7 @@
$.each(variableRegistry.variables, function (i, variableEntity) {
var variable = variableEntity.variable;
variables.push({
id: count++,
id: variablesCount++,
hidden: false,
canWrite: variableEntity.canWrite,
name: variable.name,
Expand Down Expand Up @@ -1452,9 +1453,8 @@

if (matchingVariable === null) {
// add a row for the new variable
var id = variableData.getLength();
variableData.addItem({
id: id,
id: variablesCount,
hidden: false,
canWrite: true,
name: variableName,
Expand All @@ -1476,9 +1476,10 @@
variableData.reSort();

// select the new variable row
var row = variableData.getRowById(id);
var row = variableData.getRowById(variablesCount);
variableGrid.setActiveCell(row, variableGrid.getColumnIndex('value'));
variableGrid.editActiveCell();
variablesCount++
} else {
// if this row is currently hidden, clear the value and show it
if (matchingVariable.hidden === true) {
Expand Down Expand Up @@ -1654,4 +1655,4 @@
return showVariables(processGroupId);
}
};
}));
}));