From 229de6f89ef5bcb26668f52141eaeab8f7087386 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Thu, 22 Aug 2019 17:28:22 +0200
Subject: [PATCH] =?UTF-8?q?Unn=C3=B6tige=20Entities/Contexte/Views=20gel?=
=?UTF-8?q?=C3=B6scht?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../DuplicatesDetails_entity.aod | 53 -------------------
.../onlyshowcontactids_param/valueProcess.js | 18 -------
.../children/clusterid_param/valueProcess.js | 3 --
.../children/targetentity/valueProcess.js | 3 --
.../Duplicates_entity/Duplicates_entity.aod | 18 -------
.../children/clusterid_param/valueProcess.js | 6 ---
.../targetentity_param/valueProcess.js | 6 ---
neonContext/Duplicates/Duplicates.aod | 4 --
.../DuplicatesDetails/DuplicatesDetails.aod | 16 ------
.../DuplicatesDetails_view.aod | 23 --------
.../DuplicatesMain_view.aod | 17 ------
11 files changed, 167 deletions(-)
delete mode 100644 entity/DuplicatesDetails_entity/DuplicatesDetails_entity.aod
delete mode 100644 entity/DuplicatesDetails_entity/entityfields/personsconsumer/children/onlyshowcontactids_param/valueProcess.js
delete mode 100644 entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/clusterid_param/valueProcess.js
delete mode 100644 entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/targetentity/valueProcess.js
delete mode 100644 entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/clusterid_param/valueProcess.js
delete mode 100644 entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/targetentity_param/valueProcess.js
delete mode 100644 neonContext/DuplicatesDetails/DuplicatesDetails.aod
delete mode 100644 neonView/DuplicatesDetails_view/DuplicatesDetails_view.aod
delete mode 100644 neonView/DuplicatesMain_view/DuplicatesMain_view.aod
diff --git a/entity/DuplicatesDetails_entity/DuplicatesDetails_entity.aod b/entity/DuplicatesDetails_entity/DuplicatesDetails_entity.aod
deleted file mode 100644
index 07887627dd..0000000000
--- a/entity/DuplicatesDetails_entity/DuplicatesDetails_entity.aod
+++ /dev/null
@@ -1,53 +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>DuplicatesDetails_entity</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityFields>
- <entityProvider>
- <name>#PROVIDER</name>
- </entityProvider>
- <entityConsumer>
- <name>PersonsConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>Person_entity</entityName>
- <fieldName>Contacts</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>OnlyShowContactIds_param</name>
- <valueProcess>%aditoprj%/entity/DuplicatesDetails_entity/entityfields/personsconsumer/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityConsumer>
- <name>UnrelatedDuplicatesConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicatesUnrelated_entity</entityName>
- <fieldName>UnrelatedPersonsProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>TargetEntity</name>
- <valueProcess>%aditoprj%/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/targetentity/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClusterId_param</name>
- <valueProcess>%aditoprj%/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/clusterid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityProvider>
- <name>DuplicatesDetailsProvider</name>
- </entityProvider>
- <entityParameter>
- <name>ClusterId_param</name>
- <expose v="true" />
- </entityParameter>
- <entityParameter>
- <name>TargetEntity_param</name>
- <expose v="true" />
- </entityParameter>
- </entityFields>
-</entity>
diff --git a/entity/DuplicatesDetails_entity/entityfields/personsconsumer/children/onlyshowcontactids_param/valueProcess.js b/entity/DuplicatesDetails_entity/entityfields/personsconsumer/children/onlyshowcontactids_param/valueProcess.js
deleted file mode 100644
index 1af1476f48..0000000000
--- a/entity/DuplicatesDetails_entity/entityfields/personsconsumer/children/onlyshowcontactids_param/valueProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-import("DuplicateScanner_lib");
-
-let clusterRecordId = vars.get("$param.ClusterId_param");
-
-let contactIdsInCluster = DuplicateScannerUtils.GetCachedDuplicatesForClusterId(clusterRecordId);
-logging.log("contactIdsInCluster -> " + contactIdsInCluster);
-/*
- * To achieve that if there are no duplicates, no contacts should be shown and therefore returned by the
- * recordcontainer, an invalid id gets returned. It then is used in the conditionProcess to load the duplicates.
- * Because of its invalidity, no records are shown.
-*/
-if(contactIdsInCluster.length == 0)
- result.string(JSON.stringify(["nodata"]));
-else
- result.string(JSON.stringify(contactIdsInCluster));
\ No newline at end of file
diff --git a/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/clusterid_param/valueProcess.js b/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/clusterid_param/valueProcess.js
deleted file mode 100644
index fefd359271..0000000000
--- a/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/clusterid_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$param.ClusterId_param"));
\ No newline at end of file
diff --git a/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/targetentity/valueProcess.js b/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/targetentity/valueProcess.js
deleted file mode 100644
index bceec6fbd6..0000000000
--- a/entity/DuplicatesDetails_entity/entityfields/unrelatedduplicatesconsumer/children/targetentity/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.vars");
-import("system.result");
-result.string(vars.get("$param.TargetEntity_param"));
\ No newline at end of file
diff --git a/entity/Duplicates_entity/Duplicates_entity.aod b/entity/Duplicates_entity/Duplicates_entity.aod
index 124885c93d..01053a50ee 100644
--- a/entity/Duplicates_entity/Duplicates_entity.aod
+++ b/entity/Duplicates_entity/Duplicates_entity.aod
@@ -92,24 +92,6 @@
<entityField>
<name>CLUSTER_ID</name>
</entityField>
- <entityConsumer>
- <name>DuplicatesDetailsConsumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>DuplicatesDetails_entity</entityName>
- <fieldName>DuplicatesDetailsProvider</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>TargetEntity_param</name>
- <valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/targetentity_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ClusterId_param</name>
- <valueProcess>%aditoprj%/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/clusterid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityConsumer>
<name>DuplicatePersonsConsumer</name>
<dependency>
diff --git a/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/clusterid_param/valueProcess.js b/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/clusterid_param/valueProcess.js
deleted file mode 100644
index 5470848805..0000000000
--- a/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/clusterid_param/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.logging");
-import("system.result");
-
-logging.log("DUPLICATES CLUSTER PARAM -> " + vars.get("$field.UID"));
-result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/targetentity_param/valueProcess.js b/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/targetentity_param/valueProcess.js
deleted file mode 100644
index dcebc1ff2b..0000000000
--- a/entity/Duplicates_entity/entityfields/duplicatesdetailsconsumer/children/targetentity_param/valueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.vars");
-import("system.logging");
-import("system.result");
-logging.log("DUPLICATES ETNTITA PARAM -> " + "Person_entity");
-logging.log("consumer selectionasd -> " + vars.get("$sys.selection"));
-result.string("Person_entity");
\ No newline at end of file
diff --git a/neonContext/Duplicates/Duplicates.aod b/neonContext/Duplicates/Duplicates.aod
index c9a0ba31d9..0926349b86 100644
--- a/neonContext/Duplicates/Duplicates.aod
+++ b/neonContext/Duplicates/Duplicates.aod
@@ -19,10 +19,6 @@
<name>5bdeb931-4e69-4520-bbc9-94fb17679331</name>
<view>PersonDublicatesTab_view</view>
</neonViewReference>
- <neonViewReference>
- <name>2edee35f-54dc-4727-8e42-0f74d02fbee3</name>
- <view>DuplicatesMain_view</view>
- </neonViewReference>
<neonViewReference>
<name>70cb2e96-5bc1-46cb-982f-b27db5d143d2</name>
<view>DuplicatesMainTest_view</view>
diff --git a/neonContext/DuplicatesDetails/DuplicatesDetails.aod b/neonContext/DuplicatesDetails/DuplicatesDetails.aod
deleted file mode 100644
index eb1da4a2c4..0000000000
--- a/neonContext/DuplicatesDetails/DuplicatesDetails.aod
+++ /dev/null
@@ -1,16 +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>DuplicatesDetails</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entity>DuplicatesDetails_entity</entity>
- <references>
- <neonViewReference>
- <name>39ae2ad5-b5e0-42d4-979a-2b787cf90350</name>
- <view>DuplicateDetail_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>1f2bc4e0-9049-4cfc-a1da-9b80cc569b75</name>
- <view>DuplicatesDetails_view</view>
- </neonViewReference>
- </references>
-</neonContext>
diff --git a/neonView/DuplicatesDetails_view/DuplicatesDetails_view.aod b/neonView/DuplicatesDetails_view/DuplicatesDetails_view.aod
deleted file mode 100644
index 7d31f758f7..0000000000
--- a/neonView/DuplicatesDetails_view/DuplicatesDetails_view.aod
+++ /dev/null
@@ -1,23 +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>DuplicatesDetails_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- <direction>HORIZONTAL</direction>
- </boxLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>7117a1a8-c038-415d-9566-ab9401e50c07</name>
- <entityField>PersonsConsumer</entityField>
- <view>PersonFilter_view</view>
- </neonViewReference>
- <neonViewReference>
- <name>aad14f6f-73dc-4597-866f-53cd20b5be12</name>
- <entityField>UnrelatedDuplicatesConsumer</entityField>
- <view>DuplicatesUnrelatedPersonFilter_view</view>
- </neonViewReference>
- </children>
-</neonView>
diff --git a/neonView/DuplicatesMain_view/DuplicatesMain_view.aod b/neonView/DuplicatesMain_view/DuplicatesMain_view.aod
deleted file mode 100644
index fb6ee98e00..0000000000
--- a/neonView/DuplicatesMain_view/DuplicatesMain_view.aod
+++ /dev/null
@@ -1,17 +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>DuplicatesMain_view</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <layout>
- <boxLayout>
- <name>layout</name>
- </boxLayout>
- </layout>
- <children>
- <neonViewReference>
- <name>11db3221-5308-434f-87e6-9a19ce244bf0</name>
- <entityField>DuplicatesDetailsConsumer</entityField>
- <view>DuplicatesDetails_view</view>
- </neonViewReference>
- </children>
-</neonView>
--
GitLab