Skip to content
Snippets Groups Projects
Commit a3623772 authored by Sebastian Listl's avatar Sebastian Listl :speech_balloon:
Browse files

Merge branch '#1058737-DublettenKonfiguration' into '2020.1' 

#1058737 dubletten konfiguration

See merge request xrm/basic!292
parents 5e6f9fda 67386ac4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 89 additions and 11 deletions
.liquibase/Data_alias/basic/_demoData/generatedData/duplicates/duplicatescanner.xml
+ 2
− 2
View file @ a3623772
......@@ -8,7 +8,7 @@
<column name="FILTER_NAME" value="PersonDuplicates" />
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
<column name="ID_FIELD_NAME" value="CONTACTID" />
<column name="SCAN_PATTERN" value="firstname:({&quot;entityfield&quot;: &quot;FIRSTNAME&quot;}) AND lastname:({&quot;entityfield&quot;: &quot;LASTNAME&quot;})" />
<column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Person_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;FIRSTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;LASTNAME&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}" />
<column name="USER_NEW" value="Admin" />
<column name="DATE_NEW" valueDate="2020-06-26T00:00:00" />
<column name="USER_EDIT" value="Admin" />
......@@ -20,7 +20,7 @@
<column name="FILTER_NAME" value="OrganisationDuplicates" />
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" valueNumeric="0" />
<column name="ID_FIELD_NAME" value="CONTACTID" />
<column name="SCAN_PATTERN" value="name:({&quot;entityfield&quot;: &quot;NAME&quot;, &quot;exclude&quot;: [&quot;gmbh&quot;, &quot;co&quot;, &quot;kg&quot;, &quot;ag&quot;, &quot;bank&quot;, &quot;deutsche&quot;, &quot;van&quot;, &quot;software&quot;, &quot;medien&quot;, &quot;print&quot;] }) AND city:({&quot;entityfield&quot;: &quot;STANDARD_CITY&quot;})" />
<column name="SCAN_PATTERN" value="{&quot;entity&quot;:&quot;Organisation_entity&quot;,&quot;provider&quot;:&quot;indexP&quot;,&quot;filter&quot;:{&quot;type&quot;:&quot;group&quot;,&quot;operator&quot;:&quot;AND&quot;,&quot;childs&quot;:[{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;NAME&quot;,&quot;operator&quot;:&quot;CONTAINSNOT&quot;,&quot;value&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;key&quot;:&quot;[\&quot;gmbh\&quot;, \&quot;co\&quot;, \&quot;kg\&quot;, \&quot;ag\&quot;, \&quot;bank\&quot;, \&quot;deutsche\&quot;, \&quot;van\&quot;, \&quot;software\&quot;, \&quot;medien\&quot;, \&quot;print\&quot;]&quot;,&quot;contenttype&quot;:&quot;LONG_TEXT&quot;},{&quot;type&quot;:&quot;row&quot;,&quot;name&quot;:&quot;STANDARD_CITY&quot;,&quot;operator&quot;:&quot;ISNOTNULL&quot;,&quot;value&quot;:&quot;&quot;,&quot;key&quot;:&quot;&quot;,&quot;contenttype&quot;:&quot;TEXT&quot;}]}}" />
<column name="USER_NEW" value="Admin" />
<column name="DATE_NEW" valueDate="2020-06-26T00:00:00" />
<column name="USER_EDIT" value="Admin" />
......
entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+ 6
− 1
View file @ a3623772
......@@ -14,6 +14,7 @@
<entityField>
<name>ENTITY_TO_SCAN_NAME</name>
<title>Target Entity</title>
<stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js</stateProcess>
</entityField>
<entityField>
<name>UID</name>
......@@ -64,7 +65,9 @@
<entityField>
<name>SCAN_PATTERN</name>
<title>Scan pattern</title>
<contentType>LONG_TEXT</contentType>
<contentType>FILTER_TREE</contentType>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js</stateProcess>
</entityField>
<entityConsumer>
<name>ScannerResultFieldsConfig_Consumer</name>
......@@ -100,6 +103,8 @@
<dbRecordContainer>
<name>DBRecordContainer</name>
<alias>Data_alias</alias>
<onDBInsert>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js</onDBInsert>
<onDBUpdate>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
<onDBDelete>%aditoprj%/entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
......
entity/DuplicateScanner_entity/entityfields/entity_to_scan_name/stateProcess.js 0 → 100644
+ 9
− 0
View file @ a3623772
import("system.neon");
import("system.result");
import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
result.string(neon.COMPONENTSTATE_EDITABLE);
} else {
result.string(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
entity/DuplicateScanner_entity/entityfields/scan_pattern/stateProcess.js 0 → 100644
+ 9
− 0
View file @ a3623772
import("system.neon");
import("system.result");
import("system.vars");
if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW) {
result.string(neon.COMPONENTSTATE_INVISIBLE);
} else {
result.string(neon.COMPONENTSTATE_EDITABLE);
}
\ No newline at end of file
entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBInsert.js 0 → 100644
+ 8
− 0
View file @ a3623772
import("Sql_lib");
import("system.neon");
import("system.vars");
var rowdata = vars.get("$local.rowdata");
newWhere("DUPLICATESCANNER.ID", rowdata["DUPLICATESCANNER.ID"])
.updateFields({"DUPLICATESCANNER.SCAN_PATTERN" : JSON.stringify({entity: "" + rowdata["DUPLICATESCANNER.ENTITY_TO_SCAN_NAME"] + "", provider: "indexP", filter: {type: "group", operator: "AND", childs: []}})}, "DUPLICATESCANNER");
\ No newline at end of file
entity/DuplicateScanner_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js 0 → 100644
+ 10
− 0
View file @ a3623772
import("system.vars");
var rowdata = vars.get("$local.rowdata");
let scanPattern = JSON.parse(rowdata["DUPLICATESCANNER.SCAN_PATTERN"]);
if (scanPattern.provider == undefined)
{
scanPattern.provider = "indexP";
vars.set("$field.SCAN_PATTERN", JSON.stringify(scanPattern));
}
\ No newline at end of file
entity/Organisation_entity/Organisation_entity.aod
+ 4
− 0
View file @ a3623772
......@@ -1114,6 +1114,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
<entityProvider>
<name>indexP</name>
<recordContainer>index</recordContainer>
</entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
entity/PermissionDetail_entity/PermissionDetail_entity.aod
+ 0
− 5
View file @ a3623772
......@@ -131,11 +131,6 @@
<entityName>PermissionMetaData_entity</entityName>
<fieldName>MetaData</fieldName>
</dependency>
<children>
<entityParameter>
<name>EntityName_param</name>
</entityParameter>
</children>
</entityConsumer>
<entityParameter>
<name>EntityTitle_param</name>
......
entity/Person_entity/Person_entity.aod
+ 4
− 0
View file @ a3623772
......@@ -1277,6 +1277,10 @@
<parentField>COUNT</parentField>
<title>Count</title>
</entityAggregateField>
<entityProvider>
<name>indexP</name>
<recordContainer>index</recordContainer>
</entityProvider>
</entityFields>
<recordContainers>
<dbRecordContainer>
......
neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+ 1
− 1
View file @ a3623772
......@@ -23,7 +23,7 @@
<entityField>ENTITY_TO_SCAN_NAME</entityField>
</entityFieldLink>
<entityFieldLink>
<name>a0eefe38-cd65-432e-819b-e108f44db7f2</name>
<name>840dda8e-0a7a-4c09-80d1-f7cec15b49fc</name>
<entityField>ID_FIELD_NAME</entityField>
</entityFieldLink>
<entityFieldLink>
......
process/DuplicateScanner_lib/process.js
+ 36
− 2
View file @ a3623772
......@@ -883,15 +883,49 @@ _DuplicateScannerUtils._buildUpdateResetStandardCommunications = function(pSourc
*/
_DuplicateScannerUtils._loadIndexPattern = function(pScannerName, pTargetEntity)
{
let scanPattern = newSelect("SCAN_PATTERN")
let scanPattern = _DuplicateScannerUtils._filterToScanPattern( newSelect("SCAN_PATTERN")
.from("DUPLICATESCANNER")
.where("DUPLICATESCANNER.FILTER_NAME", pScannerName)
.and("DUPLICATESCANNER.ENTITY_TO_SCAN_NAME", pTargetEntity)
.cell();
.cell());
scanPattern = scanPattern.trim();
return scanPattern;
}
_DuplicateScannerUtils._filterToScanPattern = function(filterString) {
let filter = JSON.parse(filterString);
return _DuplicateScannerUtils._filterChildsToScanPattern(filter.filter.childs, filter.filter.operator);
}
_DuplicateScannerUtils._filterChildsToScanPattern = function(childs, operator) {
let group = "";
for (let i = 0; i < childs.length; i++) {
if (group != ""){
group = group + " " + operator+ " ";
}
if (childs[i].type == "row"){
group = group + _DuplicateScannerUtils._filterChildsRowToScanPattern(childs[i].name, childs[i].operator, childs[i].value);
} else if (childs[i].type == "group") {
group = group + "(" + _DuplicateScannerUtils._filterChildsToScanPattern(childs[i].childs, childs[i].operator) + ")";
}
}
return group;
}
_DuplicateScannerUtils._filterChildsRowToScanPattern = function (name, operator, value) {
let row = "";
row = row + name.toLowerCase() + ':({"entityfield":"' + name + '"';
switch (operator){
case 'NOT_EQUAL':
row = row + ', "exclude":' + JSON.parse(value);
case 'ISNOTNULL':
row = row + ', "empty":' + false;
}
row = row + '})';
return row;
}
_DuplicateScannerUtils._loadEntityFieldConfigsFromPattern = function(indexPattern)
{
return indexPattern.match(/[^{}]+(?=\})/g);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment