From 5b0060fc8371e6627eedf6fa06f15b84d4130a53 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Tue, 5 Nov 2019 14:45:01 +0100
Subject: [PATCH] Removed Entity for index configuration. The fields are now
located in the DuplicateScanner entity. Changed liquibase files accordingly.
---
.../Duplicates/create_duplicateScanner.xml | 2 +
.../create_duplicateScannerIndexConfig.xml | 28 ----
...create_duplicateScannerPrefilterConfig.xml | 26 ----
.../Data_alias/basic/2019.2.1/changelog.xml | 2 -
.../DuplicateScannerIndexConfig_entity.aod | 126 ---------------
.../entityfields/date_edit/valueProcess.js | 7 -
.../entityfields/date_new/valueProcess.js | 7 -
.../duplicatescanner_id/valueProcess.js | 7 -
.../entityfields/is_id_field/valueProcess.js | 8 -
.../valueProcess.js | 12 --
.../entityfields/user_edit/valueProcess.js | 7 -
.../entityfields/user_new/valueProcess.js | 7 -
.../recordcontainer/conditionProcess.js | 7 -
...DuplicateScannerPrefilterConfig_entity.aod | 147 ------------------
.../entityfields/condition/onValueChange.js | 3 -
.../entityfields/condition/valueProcess.js | 12 --
.../entityfields/date_edit/valueProcess.js | 7 -
.../entityfields/date_new/valueProcess.js | 7 -
.../duplicatescanner_id/valueProcess.js | 7 -
.../entityfields/parameter/valueProcess.js | 4 -
.../entityfields/user_edit/valueProcess.js | 7 -
.../entityfields/user_new/valueProcess.js | 7 -
.../dbrecordcontainer/conditionProcess.js | 7 -
.../dbrecordcontainer/onDBUpdate.js | 3 -
.../DuplicateScanner_entity.aod | 54 +++----
.../id_field_name}/dropDownProcess.js | 2 +-
.../duplicatescannerid_param/valueProcess.js | 6 -
.../scannerentity_param/valueProcess.js | 3 -
.../duplicatescannerid_param/valueProcess.js | 3 -
.../entitytofilter_param/valueProcess.js | 3 -
.../DuplicateScannerIndexConfig.aod | 12 --
.../DuplicateScannerPrefilterConfig.aod | 14 --
.../DuplicateEdit_view/DuplicateEdit_view.aod | 35 -----
.../DuplicateScannerEdit_view.aod | 18 +--
.../DuplicateScannerIndexConfigEdit_view.aod | 33 ----
.../DuplicateScannerPreview_view.aod | 23 +--
36 files changed, 37 insertions(+), 626 deletions(-)
delete mode 100644 .liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerIndexConfig.xml
delete mode 100644 .liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerPrefilterConfig.xml
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/entityfields/date_edit/valueProcess.js
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/entityfields/date_new/valueProcess.js
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/entityfields/duplicatescanner_id/valueProcess.js
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/entityfields/is_id_field/valueProcess.js
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/entityfields/use_for_index_duplicate_search/valueProcess.js
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/entityfields/user_edit/valueProcess.js
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/entityfields/user_new/valueProcess.js
delete mode 100644 entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_edit/valueProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_new/valueProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/duplicatescanner_id/valueProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/parameter/valueProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_edit/valueProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_new/valueProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
delete mode 100644 entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
rename entity/{DuplicateScannerIndexConfig_entity/entityfields/entity_field_name => DuplicateScanner_entity/entityfields/id_field_name}/dropDownProcess.js (95%)
delete mode 100644 entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/duplicatescannerid_param/valueProcess.js
delete mode 100644 entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/scannerentity_param/valueProcess.js
delete mode 100644 entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/duplicatescannerid_param/valueProcess.js
delete mode 100644 entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/entitytofilter_param/valueProcess.js
delete mode 100644 neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod
delete mode 100644 neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod
delete mode 100644 neonView/DuplicateEdit_view/DuplicateEdit_view.aod
delete mode 100644 neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod
diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
index fc7be7e82c..81770bcb11 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScanner.xml
@@ -14,6 +14,8 @@
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" type="INTEGER" >
<constraints nullable="false"/>
</column>
+ <column name="ID_FIELD_NAME" type="NVARCHAR(100)" />
+ <column name="SCAN_PATTERN" type="NVARCHAR(4000)" />
<column name="USER_NEW" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerIndexConfig.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerIndexConfig.xml
deleted file mode 100644
index eb66aa7f87..0000000000
--- a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerIndexConfig.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="d.buechler" id="1c532327-8b0f-4f0d-b160-dd75db93cecb">
- <createTable tableName="DUPLICATESCANNERINDEXCONFIG">
- <column name="ID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_DUPLICATESCANNERINDEXCONFIG_ID"/>
- </column>
- <column name="DUPLICATESCANNER_ID" type="CHAR(36)">
- <constraints nullable="false" />
- </column>
- <column name="ENTITY_FIELD_NAME" type="NVARCHAR(100)" />
- <column name="IS_ID_FIELD" type="INTEGER" >
- <constraints nullable="false"/>
- </column>
- <column name="USE_FOR_INDEX_DUPLICATE_SEARCH" type="INTEGER" >
- <constraints nullable="false"/>
- </column>
- <column name="USER_NEW" type="NVARCHAR(50)">
- <constraints nullable="false"/>
- </column>
- <column name="DATE_NEW" type="DATE">
- <constraints nullable="false"/>
- </column>
- <column name="USER_EDIT" type="NVARCHAR(50)" />
- <column name="DATE_EDIT" type="DATE"/>
- </createTable>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerPrefilterConfig.xml b/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerPrefilterConfig.xml
deleted file mode 100644
index 78e3f8c3d8..0000000000
--- a/.liquibase/Data_alias/basic/2019.2.1/Duplicates/create_duplicateScannerPrefilterConfig.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.1" encoding="UTF-8" standalone="no"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
- <changeSet author="d.buechler" id="cf165521-f2bb-4941-82ee-c4a5812ea8b8">
- <createTable tableName="DUPLICATESCANNERPREFILTERCONFIG">
- <column name="ID" type="CHAR(36)">
- <constraints primaryKey="true" primaryKeyName="PK_DUPLICATESCANNERPREFILTERCONFIG_ID"/>
- </column>
- <column name="DUPLICATESCANNER_ID" type="CHAR(36)">
- <constraints nullable="false" />
- </column>
- <column name="FILTER_CONDITION" type="CLOB" />
- <column name="COUNT_CHARACTERS_TO_USE" type="INTEGER" />
- <column name="MAX_RESULTS_THRESHOLD" type="INTEGER" />
- <column name="CONDITION_CONFIG_NAME" type="NVARCHAR(200)"/>
-
- <column name="USER_NEW" type="NVARCHAR(50)">
- <constraints nullable="false"/>
- </column>
- <column name="DATE_NEW" type="DATE">
- <constraints nullable="false"/>
- </column>
- <column name="USER_EDIT" type="NVARCHAR(50)" />
- <column name="DATE_EDIT" type="DATE"/>
- </createTable>
- </changeSet>
-</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.2.1/changelog.xml b/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
index 6f631428d2..959073dddf 100644
--- a/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
+++ b/.liquibase/Data_alias/basic/2019.2.1/changelog.xml
@@ -14,8 +14,6 @@
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateClusters.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateScanner.xml"/>
- <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerPrefilterConfig.xml"/>
- <include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerIndexConfig.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerResultFieldsConfig.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_unrelatedDuplicates.xml"/>
</databaseChangeLog>
diff --git a/entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod b/entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod
deleted file mode 100644
index 9384f46bfb..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
- <name>DuplicateScannerIndexConfig_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <recordContainer>recordContainer</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>ENTITY_FIELD_NAME</name>
- <title>Entity field name</title>
- <dropDownProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js</dropDownProcess>
- </entityField>
- <entityProvider>
- <name>ScannerIndexConfigProvider</name>
- <dependencies>
- <entityDependency>
- <name>031ba527-13cf-4b28-9db4-8f666f81bc8e</name>
- <entityName>DuplicateScanner_entity</entityName>
- <fieldName>ScannerIndexConfigs_Consumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityField>
- <name>DUPLICATESCANNER_ID</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/duplicatescanner_id/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>DuplicateScannerId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USE_FOR_INDEX_DUPLICATE_SEARCH</name>
- <title>Use for duplicate search</title>
- <contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/use_for_index_duplicate_search/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>IS_ID_FIELD</name>
- <title>Is ID field</title>
- <contentType>BOOLEAN</contentType>
- <valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/is_id_field/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>ScannerEntity_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>recordContainer</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js</conditionProcess>
- <linkInformation>
- <linkInformation>
- <name>20b6821f-5de0-4fd6-b30f-38749dd075e8</name>
- <tableName>DUPLICATESCANNERINDEXCONFIG</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="false" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DUPLICATESCANNER_ID.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.DUPLICATESCANNER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ENTITY_FIELD_NAME.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.ENTITY_FIELD_NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>IS_ID_FIELD.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.IS_ID_FIELD</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UID.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USE_FOR_INDEX_DUPLICATE_SEARCH.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.USE_FOR_INDEX_DUPLICATE_SEARCH</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>DUPLICATESCANNERINDEXCONFIG.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/date_edit/valueProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 5e6ef05973..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/date_new/valueProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index a72892783b..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/duplicatescanner_id/valueProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/duplicatescanner_id/valueProcess.js
deleted file mode 100644
index b8c682ad67..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/duplicatescanner_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if(vars.get("$this.value") == null || vars.get("$this.value") == "")
-{
- result.string(vars.get("$param.DuplicateScannerId_param"));
-}
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/is_id_field/valueProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/is_id_field/valueProcess.js
deleted file mode 100644
index 672a8e237d..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/is_id_field/valueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.logging");
-
-if(vars.get("$this.value") == null || vars.get("$this.value") == "")
-{
- result.string("0");
-}
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/use_for_index_duplicate_search/valueProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/use_for_index_duplicate_search/valueProcess.js
deleted file mode 100644
index c0cd3f68ac..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/use_for_index_duplicate_search/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.logging");
-
-logging.log("this value -> " + vars.get("$this.value"));
-logging.log("vars get field -> " + vars.get("$field.USE_FOR_INDEX_DUPLICATE_SEARCH"));
-
-if(vars.get("$this.value") == null || vars.get("$this.value") == "")
-{
- logging.log("im if -> ");
- result.string("0");
-}
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/user_edit/valueProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 6af880ae3e..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/user_new/valueProcess.js b/entity/DuplicateScannerIndexConfig_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index e518bc75a9..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js b/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
deleted file mode 100644
index 09f2397fdf..0000000000
--- a/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-
-if(vars.get("$param.DuplicateScannerId_param"))
-{
- result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod b/entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
deleted file mode 100644
index 64b9a1e738..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.11" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.11">
- <name>DuplicateScannerPrefilterConfig_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <title>Prefilter Configuration</title>
- <recordContainer>DBRecordContainer</recordContainer>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityField>
- <name>COUNT_CHARACTERS_TO_USE</name>
- <title>Characters to use</title>
- <contentType>NUMBER</contentType>
- </entityField>
- <entityField>
- <name>FILTER_CONDITION</name>
- <title>Condition</title>
- <contentType>FILTER_TREE</contentType>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- <element>PROCESS</element>
- <element>PROCESS_SETVALUE</element>
- </onValueChangeTypes>
- </entityField>
- <entityProvider>
- <name>ScannerPrefilterConfigsProvider</name>
- <recordContainer>DBRecordContainer</recordContainer>
- <dependencies>
- <entityDependency>
- <name>a546a627-7b08-42a7-86af-c3759d163235</name>
- <entityName>DuplicateScanner_entity</entityName>
- <fieldName>ScannerPrefilterConfigs_Consumer</fieldName>
- <isConsumer v="false" />
- </entityDependency>
- </dependencies>
- </entityProvider>
- <entityField>
- <name>DUPLICATESCANNER_ID</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/duplicatescanner_id/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>UID</name>
- </entityField>
- <entityParameter>
- <name>EntityToFilter_param</name>
- <title>EntityToFilterParam</title>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityField>
- <name>CONDITION_CONFIG_NAME</name>
- <title>Configuration name</title>
- </entityField>
- <entityField>
- <name>parameter</name>
- <title>parameter</title>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/parameter/valueProcess.js</valueProcess>
- </entityField>
- <entityParameter>
- <name>DuplicateScannerId_param</name>
- <expose v="true" />
- <mandatory v="true" />
- </entityParameter>
- <entityField>
- <name>DATE_EDIT</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>DATE_NEW</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_NEW</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_new/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>USER_EDIT</name>
- <valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_edit/valueProcess.js</valueProcess>
- </entityField>
- <entityField>
- <name>MAX_RESULTS_THRESHOLD</name>
- <title>Max results threshold</title>
- </entityField>
- </entityFields>
- <recordContainers>
- <dbRecordContainer>
- <name>DBRecordContainer</name>
- <alias>Data_alias</alias>
- <conditionProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js</conditionProcess>
- <onDBUpdate>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
- <linkInformation>
- <linkInformation>
- <name>072783b0-8914-4886-bfa3-74565db81474</name>
- <tableName>DUPLICATESCANNERPREFILTERCONFIG</tableName>
- <primaryKey>ID</primaryKey>
- <isUIDTable v="true" />
- <readonly v="false" />
- </linkInformation>
- </linkInformation>
- <recordFieldMappings>
- <dbRecordFieldMapping>
- <name>FILTER_CONDITION.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.FILTER_CONDITION</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>COUNT_CHARACTERS_TO_USE.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.COUNT_CHARACTERS_TO_USE</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DUPLICATESCANNER_ID.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.DUPLICATESCANNER_ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>UID.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.ID</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CONDITION_CONFIG_NAME.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.CONDITION_CONFIG_NAME</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_EDIT.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.DATE_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>DATE_NEW.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.DATE_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_EDIT.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.USER_EDIT</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>USER_NEW.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.USER_NEW</recordfield>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>MAX_RESULTS_THRESHOLD.value</name>
- <recordfield>DUPLICATESCANNERPREFILTERCONFIG.MAX_RESULTS_THRESHOLD</recordfield>
- </dbRecordFieldMapping>
- </recordFieldMappings>
- </dbRecordContainer>
- </recordContainers>
-</entity>
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js
deleted file mode 100644
index 2aec56b45f..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.logging");
-logging.log("condition onValueChange -> " + vars.get("$field.FILTER_CONDITION"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js
deleted file mode 100644
index be039b8954..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-
-logging.log("this.value -> " + vars.get("$this.value"));
-if(vars.get("$this.value") == "")
-{
- let entityToScan = vars.get("$param.EntityToFilter_param");
-
- let defaultFilterJson = JSON.stringify({entity: entityToScan, filter: {type: "group", operator: "AND", childs: []}});
- result.string(defaultFilterJson);
-}
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_edit/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_edit/valueProcess.js
deleted file mode 100644
index 5e6ef05973..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_edit/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_new/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_new/valueProcess.js
deleted file mode 100644
index a72892783b..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.date"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/duplicatescanner_id/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/duplicatescanner_id/valueProcess.js
deleted file mode 100644
index b8c682ad67..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/duplicatescanner_id/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.result");
-import("system.vars");
-
-if(vars.get("$this.value") == null || vars.get("$this.value") == "")
-{
- result.string(vars.get("$param.DuplicateScannerId_param"));
-}
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/parameter/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/parameter/valueProcess.js
deleted file mode 100644
index 9eab3ae2e0..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/parameter/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$param.EntityToFilter_param"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_edit/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_edit/valueProcess.js
deleted file mode 100644
index 6af880ae3e..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_edit/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
- result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_new/valueProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_new/valueProcess.js
deleted file mode 100644
index e518bc75a9..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_new/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.util");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
- result.string(vars.get("$sys.user"));
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js b/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
deleted file mode 100644
index 09f2397fdf..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.vars");
-import("system.result");
-
-if(vars.get("$param.DuplicateScannerId_param"))
-{
- result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
-}
\ No newline at end of file
diff --git a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js b/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
deleted file mode 100644
index 12677a1774..0000000000
--- a/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.logging");
-logging.log("onDbUpdate condition -> " + vars.get("$field.FILTER_CONDITION"));
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
index 7d29b2f6db..0a7feeefe1 100644
--- a/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+++ b/entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
@@ -29,24 +29,6 @@
<dropDownProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/external_service_usage_allowed/dropDownProcess.js</dropDownProcess>
<valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/external_service_usage_allowed/valueProcess.js</valueProcess>
</entityField>
- <entityConsumer>
- <name>ScannerPrefilterConfigs_Consumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicateScannerPrefilterConfig_entity</entityName>
- <fieldName>ScannerPrefilterConfigsProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>EntityToFilter_param</name>
- <valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/entitytofilter_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>DuplicateScannerId_param</name>
- <valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/duplicatescannerid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityActionGroup>
<name>TestActionGroup</name>
<children>
@@ -73,24 +55,16 @@
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
- <entityConsumer>
- <name>ScannerIndexConfigs_Consumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicateScannerIndexConfig_entity</entityName>
- <fieldName>ScannerIndexConfigProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>DuplicateScannerId_param</name>
- <valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/duplicatescannerid_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ScannerEntity_param</name>
- <valueProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/scannerentity_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
+ <entityField>
+ <name>ID_FIELD_NAME</name>
+ <title>Entity id field name</title>
+ <dropDownProcess>%aditoprj%/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js</dropDownProcess>
+ </entityField>
+ <entityField>
+ <name>SCAN_PATTERN</name>
+ <title>Scan pattern</title>
+ <contentType>LONG_TEXT</contentType>
+ </entityField>
<entityConsumer>
<name>ScannerResultFieldsConfig_Consumer</name>
<dependency>
@@ -168,6 +142,14 @@
<name>DATE_EDIT.value</name>
<recordfield>DUPLICATESCANNER.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ID_FIELD_NAME.value</name>
+ <recordfield>DUPLICATESCANNER.ID_FIELD_NAME</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SCAN_PATTERN.value</name>
+ <recordfield>DUPLICATESCANNER.SCAN_PATTERN</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js b/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
similarity index 95%
rename from entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js
rename to entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
index d4796d833a..7981f50ddd 100644
--- a/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
@@ -2,7 +2,7 @@ import("system.result");
import("system.vars");
import("system.project");
-let currentEntity = vars.get("$param.ScannerEntity_param");
+let currentEntity = vars.get("$field.ENTITY_TO_SCAN_NAME");
var model = project.getEntityStructure(currentEntity);
let entityFields = [];
diff --git a/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/duplicatescannerid_param/valueProcess.js b/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/duplicatescannerid_param/valueProcess.js
deleted file mode 100644
index 22f23dda2f..0000000000
--- a/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/duplicatescannerid_param/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-
-logging.log("$field.UID -> " + vars.get("$field.UID"));
-result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/scannerentity_param/valueProcess.js b/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/scannerentity_param/valueProcess.js
deleted file mode 100644
index de6d42ab28..0000000000
--- a/entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/scannerentity_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.ENTITY_TO_SCAN_NAME"));
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/duplicatescannerid_param/valueProcess.js b/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/duplicatescannerid_param/valueProcess.js
deleted file mode 100644
index 3c559d4200..0000000000
--- a/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/duplicatescannerid_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/entitytofilter_param/valueProcess.js b/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/entitytofilter_param/valueProcess.js
deleted file mode 100644
index de6d42ab28..0000000000
--- a/entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/entitytofilter_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$field.ENTITY_TO_SCAN_NAME"));
\ No newline at end of file
diff --git a/neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod b/neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod
deleted file mode 100644
index a586520902..0000000000
--- a/neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>DuplicateScannerIndexConfig</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>DuplicateScannerIndexConfig_entity</entity>
- <references>
- <neonViewReference>
- <name>2b64a1d4-3c88-43f0-9270-265d7bd2c093</name>
- <view>DuplicateScannerIndexConfigEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod b/neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod
deleted file mode 100644
index 5e8c148548..0000000000
--- a/neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
- <name>DuplicateScannerPrefilterConfig</name>
- <title>Prefilter Configuration</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <editview>DuplicateEdit_view</editview>
- <entity>DuplicateScannerPrefilterConfig_entity</entity>
- <references>
- <neonViewReference>
- <name>f20b5358-0ec3-4695-92d5-17028383a823</name>
- <view>DuplicateEdit_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonView/DuplicateEdit_view/DuplicateEdit_view.aod b/neonView/DuplicateEdit_view/DuplicateEdit_view.aod
deleted file mode 100644
index 70d6cfa6f1..0000000000
--- a/neonView/DuplicateEdit_view/DuplicateEdit_view.aod
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2">
- <name>DuplicateEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <isSmall v="false" />
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>Configurations</name>
- <entityField>#ENTITY</entityField>
- <columns>
- <neonTableColumn>
- <name>bdd00b5b-d61d-4952-aa96-6d79e5fad254</name>
- <entityField>CONDITION_CONFIG_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>1b14133f-3152-44e0-b555-58b8e909561a</name>
- <entityField>COUNT_CHARACTERS_TO_USE</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>22120b0a-d76b-4172-b274-fac1e7940c3d</name>
- <entityField>MAX_RESULTS_THRESHOLD</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>b07a0cb4-0385-4dac-a6d6-40e985601b00</name>
- <entityField>FILTER_CONDITION</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
index 51be866e59..e012f73122 100644
--- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
@@ -23,17 +23,15 @@
<name>c021711c-9f3e-454d-964c-1339e3463329</name>
<entityField>ENTITY_TO_SCAN_NAME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>a0eefe38-cd65-432e-819b-e108f44db7f2</name>
+ <entityField>ID_FIELD_NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>029be045-0cfa-4789-9f7c-80662508cf39</name>
+ <entityField>SCAN_PATTERN</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>bd267f54-084a-4284-8c83-924115c5f1d2</name>
- <entityField>ScannerPrefilterConfigs_Consumer</entityField>
- <view>DuplicateEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>c5835213-b777-42ac-b0cc-d8923957d723</name>
- <entityField>ScannerIndexConfigs_Consumer</entityField>
- <view>DuplicateScannerIndexConfigEdit_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod b/neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod
deleted file mode 100644
index 8bc3637c66..0000000000
--- a/neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2">
- <name>DuplicateScannerIndexConfigEdit_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <genericMultipleViewTemplate>
- <name>EntityFieldsConfig</name>
- <autoNewRow v="true" />
- <entityField>#ENTITY</entityField>
- <title>Field configuration</title>
- <devices />
- <columns>
- <neonTableColumn>
- <name>b32d6711-17bc-4783-841d-b4adc1d35432</name>
- <entityField>ENTITY_FIELD_NAME</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>4d2274f7-bd1b-4637-b25c-f3bd0f52bb9b</name>
- <entityField>IS_ID_FIELD</entityField>
- </neonTableColumn>
- <neonTableColumn>
- <name>7e80f268-bb47-408d-9f7f-d31d6461de2f</name>
- <entityField>USE_FOR_INDEX_DUPLICATE_SEARCH</entityField>
- </neonTableColumn>
- </columns>
- </genericMultipleViewTemplate>
- </children>
-</neonView>
diff --git a/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod b/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod
index 3aee7953ea..25d849b7a2 100644
--- a/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod
+++ b/neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod
@@ -25,22 +25,15 @@
<name>ba6cde5d-7661-4662-9e92-dca40b597015</name>
<entityField>EXTERNAL_SERVICE_USAGE_ALLOWED</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>51bf489d-7536-4fc5-a187-8f2610b35b3d</name>
+ <entityField>ID_FIELD_NAME</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>5b3994d4-ec48-4cf0-af6b-a61c28341aa0</name>
+ <entityField>SCAN_PATTERN</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
- <neonViewReference>
- <name>16a22309-3957-4d13-95b6-958a2cfe95bb</name>
- <entityField>ScannerPrefilterConfigs_Consumer</entityField>
- <view>DuplicateEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>37c931f5-021f-485f-9a89-9938f2fb3570</name>
- <entityField>ScannerIndexConfigs_Consumer</entityField>
- <view>DuplicateScannerIndexConfigEdit_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>df1a5775-1a21-44ca-9829-e49fdbbebc10</name>
- <entityField>ScannerResultFieldsConfig_Consumer</entityField>
- <view>DuplicateScannerResultFieldConfigEdit_view</view>
- </neonViewReference>
</children>
</neonView>
--
GitLab