Skip to content
Snippets Groups Projects
Commit 50be8ae4 authored by David Büchler's avatar David Büchler
Browse files

Removed Entity for index configuration. The fields are now located in the DuplicateScanner entity. 

Changed liquibase files accordingly.
parent 28df23ea
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 35 additions and 195 deletions
entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_edit/valueProcess.js deleted 100644 → 0
+ 0
− 7
View file @ 28df23ea
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
entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_new/valueProcess.js deleted 100644 → 0
+ 0
− 7
View file @ 28df23ea
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
entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js deleted 100644 → 0
+ 0
− 7
View file @ 28df23ea
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
entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js deleted 100644 → 0
+ 0
− 3
View file @ 28df23ea
import("system.vars");
import("system.logging");
logging.log("onDbUpdate condition -> " + vars.get("$field.FILTER_CONDITION"));
\ No newline at end of file
entity/DuplicateScanner_entity/DuplicateScanner_entity.aod
+ 18
− 36
View file @ 50be8ae4
......@@ -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>
......
entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js → entity/DuplicateScanner_entity/entityfields/id_field_name/dropDownProcess.js
+ 1
− 1
View file @ 50be8ae4
......@@ -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 = [];
......
entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/duplicatescannerid_param/valueProcess.js deleted 100644 → 0
+ 0
− 6
View file @ 28df23ea
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
entity/DuplicateScanner_entity/entityfields/scannerindexconfigs_consumer/children/scannerentity_param/valueProcess.js deleted 100644 → 0
+ 0
− 3
View file @ 28df23ea
import("system.vars");
import("system.result");
result.string(vars.get("$field.ENTITY_TO_SCAN_NAME"));
\ No newline at end of file
entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/duplicatescannerid_param/valueProcess.js deleted 100644 → 0
+ 0
− 3
View file @ 28df23ea
import("system.vars");
import("system.result");
result.string(vars.get("$field.UID"));
\ No newline at end of file
entity/DuplicateScanner_entity/entityfields/scannerprefilterconfigs_consumer/children/entitytofilter_param/valueProcess.js deleted 100644 → 0
+ 0
− 3
View file @ 28df23ea
import("system.vars");
import("system.result");
result.string(vars.get("$field.ENTITY_TO_SCAN_NAME"));
\ No newline at end of file
neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod deleted 100644 → 0
+ 0
− 12
View file @ 28df23ea
<?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>
neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod deleted 100644 → 0
+ 0
− 14
View file @ 28df23ea
<?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>
neonView/DuplicateEdit_view/DuplicateEdit_view.aod deleted 100644 → 0
+ 0
− 35
View file @ 28df23ea
<?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>
<noneLayout>
<name>layout</name>
</noneLayout>
</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>
neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+ 8
− 10
View file @ 50be8ae4
......@@ -22,17 +22,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>
neonView/DuplicateScannerIndexConfigEdit_view/DuplicateScannerIndexConfigEdit_view.aod deleted 100644 → 0
+ 0
− 33
View file @ 28df23ea
<?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>
<noneLayout>
<name>layout</name>
</noneLayout>
</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>
neonView/DuplicateScannerPreview_view/DuplicateScannerPreview_view.aod
+ 8
− 15
View file @ 50be8ae4
......@@ -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>
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