dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- improved "signature panel". "leads to" select for WHs now groups already linked systems, closed #727

Browse Source
This commit is contained in:
Mark Friedrich
2019-04-18 23:44:41 +02:00
parent 5d17f81bb8
commit 51b3fd41f0
4 changed files with 120 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
js/app/ui/module/system_signature.js
View File

@@ -1083,16 +1083,69 @@ define([
/**
* helper function - set 'shown' observer for xEditable connection cell
* -> enable Select2 for xEditable form
* @param tableApi
* @param cell
*/
let editableConnectionOnShown = cell => {
let editableConnectionOnShown = (tableApi, cell) => {
$(cell).on('shown', function(e, editable){
let inputField = editable.input.$input;
if(!$(tableApi.table().node()).hasClass(config.sigTablePrimaryClass)){
// we need the primary table API to get selected connections
let metaData = getTableMetaData(tableApi);
tableApi = getDataTableInstance(metaData.mapId, metaData.systemId, 'primary');
}
// Select2 init would work without passing select options as "data", Select2 would grap data from DOM
// -> We want to pass "meta" data for each option into Select2 for formatting
let selectOptions = Util.convertXEditableOptionsToSelect2(editable);
// for better UX, systems that are already linked to a wh signatures should be "disabled"
// -> and grouped into a new <optgroup>
let linkedConnectionIds = tableApi.column('connection:name').data().toArray();
linkedConnectionIds = linkedConnectionIds.filter(id => id > 0);
if(linkedConnectionIds.length){
let groupedSelectOptions = [];
let newSelectOptionGroupDisabled = [];
for(let selectOptionGroup of selectOptions){
if(Array.isArray(selectOptionGroup.children)){
let newSelectOptionGroup = [];
for(let option of selectOptionGroup.children){
if(!option.selected && linkedConnectionIds.includes(option.id)){
// connection already linked -> move to "disabled" group
option.disabled = true;
newSelectOptionGroupDisabled.push(option);
}else{
// connection is available for link
newSelectOptionGroup.push(option);
}
}
if(newSelectOptionGroup.length){
groupedSelectOptions.push({
text: selectOptionGroup.text,
children: newSelectOptionGroup
});
}
}else{
// option has no children -> is prepend (id = 0) option
groupedSelectOptions.push(selectOptionGroup);
}
}
if(newSelectOptionGroupDisabled.length){
groupedSelectOptions.push({
text: 'linked',
children: newSelectOptionGroupDisabled
});
}
selectOptions = groupedSelectOptions;
}
let options = {
data: Util.convertXEditableOptionsToSelect2(editable)
data: selectOptions
};
inputField.addClass('pf-select2').initSignatureConnectionSelect(options);
@@ -1484,7 +1537,7 @@ define([
editableOnSave(tableApi, cell, [], ['action:name']);
editableOnHidden(tableApi, cell);
editableConnectionOnInit(cell);
editableConnectionOnShown(cell);
editableConnectionOnShown(tableApi, cell);
editableConnectionOnSave(cell);
$(cell).editable($.extend({

4
js/app/util.js
View File

@@ -1046,6 +1046,10 @@ define([
data.selected = true;
}
if(option.disabled === true){
data.disabled = true;
}
// optional "metaData" that belongs to this option
if(option.hasOwnProperty('metaData')){
data.metaData = option.metaData;

59
public/js/v1.5.1/app/ui/module/system_signature.js
View File

@@ -1083,16 +1083,69 @@ define([
/**
* helper function - set 'shown' observer for xEditable connection cell
* -> enable Select2 for xEditable form
* @param tableApi
* @param cell
*/
let editableConnectionOnShown = cell => {
let editableConnectionOnShown = (tableApi, cell) => {
$(cell).on('shown', function(e, editable){
let inputField = editable.input.$input;
if(!$(tableApi.table().node()).hasClass(config.sigTablePrimaryClass)){
// we need the primary table API to get selected connections
let metaData = getTableMetaData(tableApi);
tableApi = getDataTableInstance(metaData.mapId, metaData.systemId, 'primary');
}
// Select2 init would work without passing select options as "data", Select2 would grap data from DOM
// -> We want to pass "meta" data for each option into Select2 for formatting
let selectOptions = Util.convertXEditableOptionsToSelect2(editable);
// for better UX, systems that are already linked to a wh signatures should be "disabled"
// -> and grouped into a new <optgroup>
let linkedConnectionIds = tableApi.column('connection:name').data().toArray();
linkedConnectionIds = linkedConnectionIds.filter(id => id > 0);
if(linkedConnectionIds.length){
let groupedSelectOptions = [];
let newSelectOptionGroupDisabled = [];
for(let selectOptionGroup of selectOptions){
if(Array.isArray(selectOptionGroup.children)){
let newSelectOptionGroup = [];
for(let option of selectOptionGroup.children){
if(!option.selected && linkedConnectionIds.includes(option.id)){
// connection already linked -> move to "disabled" group
option.disabled = true;
newSelectOptionGroupDisabled.push(option);
}else{
// connection is available for link
newSelectOptionGroup.push(option);
}
}
if(newSelectOptionGroup.length){
groupedSelectOptions.push({
text: selectOptionGroup.text,
children: newSelectOptionGroup
});
}
}else{
// option has no children -> is prepend (id = 0) option
groupedSelectOptions.push(selectOptionGroup);
}
}
if(newSelectOptionGroupDisabled.length){
groupedSelectOptions.push({
text: 'linked',
children: newSelectOptionGroupDisabled
});
}
selectOptions = groupedSelectOptions;
}
let options = {
data: Util.convertXEditableOptionsToSelect2(editable)
data: selectOptions
};
inputField.addClass('pf-select2').initSignatureConnectionSelect(options);
@@ -1484,7 +1537,7 @@ define([
editableOnSave(tableApi, cell, [], ['action:name']);
editableOnHidden(tableApi, cell);
editableConnectionOnInit(cell);
editableConnectionOnShown(cell);
editableConnectionOnShown(tableApi, cell);
editableConnectionOnSave(cell);
$(cell).editable($.extend({

4
public/js/v1.5.1/app/util.js
View File

@@ -1046,6 +1046,10 @@ define([
data.selected = true;
}
if(option.disabled === true){
data.disabled = true;
}
// optional "metaData" that belongs to this option
if(option.hasOwnProperty('metaData')){
data.metaData = option.metaData;