From 30f55108b9d6cd29f0e712c84294e235589abf8a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Mon, 4 Nov 2019 13:08:11 +0100
Subject: [PATCH] fix some ScanService Warnings
---
.../2019.1.4/add_ObjectRelation_type.xml | 4 ++--
entity/Address_entity/Address_entity.aod | 24 -------------------
.../QuickEntry_entity/QuickEntry_entity.aod | 4 ----
.../personcontactid_param/valueProcess.js | 4 ----
process/DuplicateScanner_lib/process.js | 1 +
process/ImporterTest_lib/process.js | 6 ++---
6 files changed, 6 insertions(+), 37 deletions(-)
delete mode 100644 entity/QuickEntry_entity/entityfields/adresses/children/personcontactid_param/valueProcess.js
diff --git a/.liquibase/Data_alias/basic/2019.1.4/add_ObjectRelation_type.xml b/.liquibase/Data_alias/basic/2019.1.4/add_ObjectRelation_type.xml
index dd117cd726..877e89c938 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/add_ObjectRelation_type.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/add_ObjectRelation_type.xml
@@ -55,7 +55,7 @@
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="c74ad02c-1db9-4f47-8691-aba349dbe316"/>
- <column name="OBJECT_TYPE" value="Person"/><!-- TODO: use Private, Private -->
+ <column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="parent of"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
<column name="SIDE" valueNumeric="1"/>
@@ -63,7 +63,7 @@
</insert>
<insert tableName="AB_OBJECTRELATIONTYPE">
<column name="AB_OBJECTRELATIONTYPEID" value="b3b85332-1c86-4cd8-a3b9-34c49c51f01a"/>
- <column name="OBJECT_TYPE" value="Person"/><!-- TODO: use Private, Private -->
+ <column name="OBJECT_TYPE" value="Person"/>
<column name="RELATION_TITLE" value="child of"/>
<column name="RELATION_TYPE" value="52f3ec58-71d5-469f-85e4-37ef2eeeb3e0"/>
<column name="SIDE" valueNumeric="2"/>
diff --git a/entity/Address_entity/Address_entity.aod b/entity/Address_entity/Address_entity.aod
index c5c6b35e00..89fe156c9c 100644
--- a/entity/Address_entity/Address_entity.aod
+++ b/entity/Address_entity/Address_entity.aod
@@ -116,10 +116,6 @@
<name>OrganisationId_param</name>
<expose v="false" />
</entityParameter>
- <entityParameter>
- <name>ContactIds_param</name>
- <expose v="false" />
- </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -164,10 +160,6 @@
<name>OrganisationId_param</name>
<expose v="false" />
</entityParameter>
- <entityParameter>
- <name>ContactIds_param</name>
- <expose v="false" />
- </entityParameter>
</children>
</entityProvider>
<entityProvider>
@@ -204,10 +196,6 @@
<name>OrganisationId_param</name>
<expose v="false" />
</entityParameter>
- <entityParameter>
- <name>ContactIds_param</name>
- <expose v="false" />
- </entityParameter>
</children>
</entityProvider>
<entityField>
@@ -274,14 +262,6 @@
<name>ContactId_param</name>
<expose v="true" />
</entityParameter>
- <entityParameter>
- <name>PersonContactId_param</name>
- <expose v="false" />
- </entityParameter>
- <entityParameter>
- <name>ContactIds_param</name>
- <expose v="false" />
- </entityParameter>
</children>
</entityProvider>
<entityParameter>
@@ -484,10 +464,6 @@
</entityParameter>
</children>
</entityProvider>
- <entityParameter>
- <name>ContactIds_param</name>
- <expose v="true" />
- </entityParameter>
<entityParameter>
<name>ReplaceStandardAddress_param</name>
<expose v="true" />
diff --git a/entity/QuickEntry_entity/QuickEntry_entity.aod b/entity/QuickEntry_entity/QuickEntry_entity.aod
index 844fe5e7e9..3e9190a968 100644
--- a/entity/QuickEntry_entity/QuickEntry_entity.aod
+++ b/entity/QuickEntry_entity/QuickEntry_entity.aod
@@ -30,10 +30,6 @@
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/contactid_param/valueProcess.js</valueProcess>
</entityParameter>
- <entityParameter>
- <name>PersonContactId_param</name>
- <valueProcess>%aditoprj%/entity/QuickEntry_entity/entityfields/adresses/children/personcontactid_param/valueProcess.js</valueProcess>
- </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
diff --git a/entity/QuickEntry_entity/entityfields/adresses/children/personcontactid_param/valueProcess.js b/entity/QuickEntry_entity/entityfields/adresses/children/personcontactid_param/valueProcess.js
deleted file mode 100644
index 2877ad1ea1..0000000000
--- a/entity/QuickEntry_entity/entityfields/adresses/children/personcontactid_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.vars");
-import("system.result");
-
-result.string(vars.get("$field.PERSON_CONTACT_ID"));
\ No newline at end of file
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 59c676b3e7..cd6f8c0d9a 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -1436,6 +1436,7 @@ _DuplicateScannerUtils._loadFilters = function(pFilterName, pTargetEntity)
*
* @param {JSON} pJsonRootNode A filter Json
* @param {Map{"key", "value"}}} pEntitiyFieldAndValueMap {"key", "value"}
+ * @param {String} pCountCharsOfValueToUse Hopefully a number
* @returns {JSON} The JSON with filled values based on pEntitiyFieldAndValueMap and pCountCharsOfValueToUse
*/
_DuplicateScannerUtils._insertValuesInFilterTemplate = function(pJsonRootNode, pEntitiyFieldAndValueMap, pCountCharsOfValueToUse)
diff --git a/process/ImporterTest_lib/process.js b/process/ImporterTest_lib/process.js
index 342d3997fd..f389533c1b 100644
--- a/process/ImporterTest_lib/process.js
+++ b/process/ImporterTest_lib/process.js
@@ -5,7 +5,7 @@ import("Importer_lib");
function ImporterTest() {
this.startImporter = function (pTestCases) {
- var parse = function (pElement, pPath) {
+ var parseElement = function (pElement, pPath) {
if (pElement.childs == undefined) {
return [{
id: text.encodeMS(pPath.concat(pElement.name)),
@@ -13,7 +13,7 @@ function ImporterTest() {
}
var childs = [];
for (let i = 0; i < pElement.childs.length; i++) {
- childs.push(parse(pElement.childs[i], pPath.concat(pElement.name))[0])
+ childs.push(parseElement(pElement.childs[i], pPath.concat(pElement.name))[0])
}
return [{
id: text.encodeMS(pPath.concat(pElement.name)),
@@ -26,7 +26,7 @@ function ImporterTest() {
}.bind(this)
for (let i = 0 ; i < Object.keys(pTestCases).length; i++) {
- var res = parse(pTestCases[Object.keys(pTestCases)[i]], []);
+ var res = parseElement(pTestCases[Object.keys(pTestCases)[i]], []);
if (res.length == 1) {
this.startProcess(res[0].element);
} else {
--
GitLab