")
.addClass("wk-header")
diff --git a/karma-web/src/main/webapp/js/tableColumnOptions.js b/karma-web/src/main/webapp/js/tableColumnOptions.js
index 1840c691b..b7def225d 100755
--- a/karma-web/src/main/webapp/js/tableColumnOptions.js
+++ b/karma-web/src/main/webapp/js/tableColumnOptions.js
@@ -96,23 +96,14 @@ function TableColumnOptions(wsId, wsColumnId, wsColumnTitle, isLeafNode, isOutof
leafOnly: false,
leafExcluded: true
}, {
- name: "Selection",
+ name: "Filters",
func: undefined,
addLevel: true,
leafOnly: false,
leafExcluded: true,
levels: [{
- name: "Add Rows",
+ name: "Add/Edit",
func: addRows
- }, {
- name: "Intersect Rows",
- func: intersectRows
- }, {
- name: "Subtract Rows",
- func: subtractRows
- }, {
- name: "Invert",
- func: invertRows
}, {
name: "Clear",
func: undefined,
@@ -139,35 +130,11 @@ function TableColumnOptions(wsId, wsColumnId, wsColumnTitle, isLeafNode, isOutof
PyTransformSelectionDialog.getInstance(wsId, wsColumnId).show();
}
- function intersectRows() {
- hideDropdown();
- $("#pyTransformSelectionDialog").data("operation", "Intersect");
- PyTransformSelectionDialog.getInstance(wsId, wsColumnId).show();
- }
-
- function subtractRows() {
- hideDropdown();
- $("#pyTransformSelectionDialog").data("operation", "Subtract");
- PyTransformSelectionDialog.getInstance(wsId, wsColumnId).show();
- }
-
function aggregation() {
hideDropdown();
AggregationDialog.getInstance().show(wsId, wsColumnId, wsColumnTitle);
}
- function invertRows() {
- hideDropdown();
- var headers = getColumnHeadingsForColumn(wsId, wsColumnId, "GroupBy");
- var info = generateInfoObject(wsId, headers[0]['HNodeId'], "OperateSelectionCommand");
- var newInfo = info['newInfo'];
- newInfo.push(getParamObject("pythonCode", "", "other"));
- newInfo.push(getParamObject("operation", "Invert", "other"));
- info["newInfo"] = JSON.stringify(newInfo);
- showLoading(worksheetId);
- sendRequest(info, worksheetId);
- }
-
function refreshRows() {
var headers = getColumnHeadingsForColumn(wsId, wsColumnId, "GroupBy");
var info = generateInfoObject(wsId, headers[0]['HNodeId'], "RefreshSelectionCommand");
@@ -848,7 +815,7 @@ var PyTransformDialog = (function() {
var hNode = $("td#" + columnId);
if (hNode.data("pythonTransformation"))
- initPyCode = hNode.data("pythonTransformation");
+ initPyCode = hNode.data("pythonTransformation");
else
initPyCode = "return getValue(\"" + columnName + "\")";
@@ -1747,6 +1714,8 @@ var PyTransformSelectionDialog = (function() {
function init(wsId, colId) {
worksheetId = wsId;
columnId = colId;
+ var hNode = $("td#" + columnId);
+
headers = getColumnHeadingsForColumn(worksheetId, columnId, "GroupBy");
console.log(headers);
console.log(headers);
@@ -1761,7 +1730,13 @@ var PyTransformSelectionDialog = (function() {
editor.getSession().setMode("ace/mode/python");
editor.getSession().setUseWrapMode(true);
}
- editor.getSession().setValue("return getValue(\"" + headers[0]['ColumnName'] + "\")");
+ if (hNode.data("selectionPyCode")) {
+ initPyCode = hNode.data("selectionPyCode");
+ }
+ else {
+ initPyCode = "return getValue(\"" + headers[0]['ColumnName'] + "\")";
+ }
+ editor.getSession().setValue(initPyCode);
dialog.on("resize", function(event, ui) {
editor.resize();
});
diff --git a/karma-web/src/main/webapp/js/worksheetOptions.js b/karma-web/src/main/webapp/js/worksheetOptions.js
index ae57bb9f0..fd5f230e8 100755
--- a/karma-web/src/main/webapp/js/worksheetOptions.js
+++ b/karma-web/src/main/webapp/js/worksheetOptions.js
@@ -106,21 +106,12 @@ function WorksheetOptions(wsId, wsTitle) {
}, {
name: "divider"
}, {
- name: "Selection",
+ name: "Filters",
func: undefined,
addLevel: true,
levels: [{
- name: "Add Rows",
+ name: "Add/Edit",
func: addRows
- }, {
- name: "Intersect Rows",
- func: intersectRows
- }, {
- name: "Subtract Rows",
- func: subtractRows
- }, {
- name: "Invert",
- func: invertRows
}, {
name: "Clear",
func: undefined,
@@ -165,30 +156,6 @@ function WorksheetOptions(wsId, wsTitle) {
PyTransformSelectionDialog.getInstance(wsId, "").show();
}
- function intersectRows() {
- hideDropdown();
- $("#pyTransformSelectionDialog").data("operation", "Intersect");
- PyTransformSelectionDialog.getInstance(wsId, "").show();
- }
-
- function subtractRows() {
- hideDropdown();
- $("#pyTransformSelectionDialog").data("operation", "Subtract");
- PyTransformSelectionDialog.getInstance(wsId, "").show();
- }
-
- function invertRows() {
- hideDropdown();
- var headers = getColumnHeadingsForColumn(wsId, "", "GroupBy");
- var info = generateInfoObject(wsId, headers[0]['HNodeId'], "OperateSelectionCommand");
- var newInfo = info['newInfo'];
- newInfo.push(getParamObject("pythonCode", "", "other"));
- newInfo.push(getParamObject("operation", "Invert", "other"));
- info["newInfo"] = JSON.stringify(newInfo);
- showLoading(worksheetId);
- sendRequest(info, worksheetId);
- }
-
function clearAll() {
hideDropdown();
var headers = getColumnHeadingsForColumn(wsId, "", "GroupBy");
@@ -384,7 +351,7 @@ function WorksheetOptions(wsId, wsTitle) {
var info = generateInfoObject(worksheetId, "", "GenerateR2RMLModelCommand");
info['tripleStoreUrl'] = $('#txtModel_URL').text();
showLoading(info["worksheetId"]);
- var repoUrl = $.cookie("github-url-" + worksheetId);
+ var repoUrl = $("#txtGithubUrl_" + worksheetId).text();
var returned = sendRequest(info, worksheetId,
function(data) {
var newWorksheetId = worksheetId;
@@ -392,8 +359,6 @@ function WorksheetOptions(wsId, wsTitle) {
if(element) {
if (element["updateType"] == "PublishR2RMLUpdate") {
newWorksheetId = element["worksheetId"];
- if(worksheetId != newWorksheetId)
- $.cookie("github-url-" + newWorksheetId, repoUrl);
}
}
});
@@ -401,16 +366,15 @@ function WorksheetOptions(wsId, wsTitle) {
var info = generateInfoObject(newWorksheetId, "", "PublishReportCommand");
showLoading(newWorksheetId);
var returned = sendRequest(info, newWorksheetId, function(json) {
- publishToGithub(newWorksheetId);
+ publishToGithub(newWorksheetId, repoUrl);
});
});
return false;
}
- function publishToGithub(worksheetId) {
- var repo = $.cookie("github-url-" + worksheetId);
+ function publishToGithub(worksheetId, repo) {
var auth = Settings.getInstance().getGithubAuth();
- if(repo) {
+ if(repo != "disabled" && !repo.endsWith("disabled)")) {
if(auth) {
showLoading(worksheetId);
var githubInfo = generateInfoObject(worksheetId, "", "PublishGithubCommand");
diff --git a/karma-web/src/main/webapp/version.jsp b/karma-web/src/main/webapp/version.jsp
index 4e7f05929..28c213927 100644
--- a/karma-web/src/main/webapp/version.jsp
+++ b/karma-web/src/main/webapp/version.jsp
@@ -1 +1 @@
-v2.053
+v2.1
diff --git a/pom.xml b/pom.xml
index 88779450b..41ced315b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
true
- 9.0.5.v20130815
+ 9.4.8.v20171121
UTF-8