From 1bd5f46922e8dd241fe0f43f840200ee3ab8a0ca Mon Sep 17 00:00:00 2001
From: Sebastian Listl <s.listl@adito.de>
Date: Mon, 2 Sep 2024 16:41:53 +0200
Subject: [PATCH] refactor!: removed home dashboard and some usersettings
---
.../children/blacklist_param/valueProcess.js | 3 -
.../recordcontainers/jdito/contentProcess.js | 4 +-
.../Usersettings_entity.aod | 55 +---------------
.../displayValueProcess.js | 5 --
.../containername_param/valueProcess.js | 4 --
.../prefferredapprover/displayValueProcess.js | 17 -----
.../prefferredapprover/documentation.adoc | 11 ----
.../usercurrency/displayValueProcess.js | 7 ---
.../usercurrency/dropDownProcess.js | 28 ---------
neonDashboard/Home/Home.aod | 63 -------------------
.../UsersettingsEdit_view.aod | 16 -----
11 files changed, 5 insertions(+), 208 deletions(-)
delete mode 100644 entity/Context_entity/entityfields/visitplanentrylinkable_s/children/blacklist_param/valueProcess.js
delete mode 100644 entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js
delete mode 100644 entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js
delete mode 100644 entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js
delete mode 100644 entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc
delete mode 100644 entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js
delete mode 100644 entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js
delete mode 100644 neonDashboard/Home/Home.aod
diff --git a/entity/Context_entity/entityfields/visitplanentrylinkable_s/children/blacklist_param/valueProcess.js b/entity/Context_entity/entityfields/visitplanentrylinkable_s/children/blacklist_param/valueProcess.js
deleted file mode 100644
index 3e60e36..0000000
--- a/entity/Context_entity/entityfields/visitplanentrylinkable_s/children/blacklist_param/valueProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { result } from "@aditosoftware/jdito-types";
-
-result.object(["Salesproject", "Offer"]);
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index 8eec4d4..78e4a49 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -16,9 +16,9 @@ if (vars.get("$param.ObjectType_param"))
}
var contactId;
- if (vars.exists("$param.ContactId") && vars.get("$param.ContactId"))
+ if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
{
- contactId = vars.get("$param.ContactId");
+ contactId = vars.get("$param.ContactId_param");
}
result.object(ContextUtils.loadContent(ProjectModelUtils.getEntityByContext(objectType), [contactId], ["#UID", "#CONTENTTITLE"], excludedIds));
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index e8b9edf..98ef02d 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -81,49 +81,6 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
- <entityField>
- <name>userCurrency</name>
- <title>root.Usersettings_entity.userCurrency.title</title>
- <consumer/>
- <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js</dropDownProcess>
- <displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>incomingCallContext</name>
- <title>root.Usersettings_entity.incomingCallContext.title</title>
- <consumer>KeywordIncomingCallContext_consumer</consumer>
- <displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>KeywordIncomingCallContext_consumer</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>prefferredApprover</name>
- <documentation>%aditoprj%/entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc</documentation>
- <title>root.Usersettings_entity.prefferredApprover.title</title>
- <description>used by "Approval Workflows"</description>
- <consumer>Employees</consumer>
- <displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityConsumer>
- <name>Employees</name>
- <dependency>
- <name>dependency</name>
- <entityName>Employee_entity</entityName>
- <fieldName>Employees</fieldName>
- </dependency>
- </entityConsumer>
<entityField>
<name>sendNotificationAsMail</name>
<title>root.Usersettings_entity.sendNotificationAsMail.title</title>
@@ -137,6 +94,9 @@
<entityFieldExtensionPoint>
<name>Settings_FieldExtensionPoint</name>
</entityFieldExtensionPoint>
+ <entityConsumerExtensionPoint>
+ <name>Usersettings_ConsumerExtensionPoint</name>
+ </entityConsumerExtensionPoint>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -171,15 +131,6 @@
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>userCurrency.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>incomingCallContext.value</name>
- </jDitoRecordFieldMapping>
- <jDitoRecordFieldMapping>
- <name>prefferredApprover.value</name>
- </jDitoRecordFieldMapping>
<jDitoRecordFieldMapping>
<name>sendNotificationAsMail.value</name>
</jDitoRecordFieldMapping>
diff --git a/entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js b/entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js
deleted file mode 100644
index d53073f..0000000
--- a/entity/Usersettings_entity/entityfields/incomingcallcontext/displayValueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { result, vars } from "@aditosoftware/jdito-types";
-import { KeywordUtils } from "Keyword_lib";
-import { $KeywordRegistry } from "KeywordRegistry_basic";
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.incomingCallContext(), vars.get("$field.incomingCallContext")));
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js b/entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js
deleted file mode 100644
index 1813025..0000000
--- a/entity/Usersettings_entity/entityfields/keywordincomingcallcontext_consumer/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { result } from "@aditosoftware/jdito-types";
-import { $KeywordRegistry } from "KeywordRegistry_basic";
-
-result.string($KeywordRegistry.incomingCallContext());
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js b/entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js
deleted file mode 100644
index 982eca8..0000000
--- a/entity/Usersettings_entity/entityfields/prefferredapprover/displayValueProcess.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { result, vars } from "@aditosoftware/jdito-types";
-import { Contact, ContactTitleRenderer } from "Contact_lib";
-import { newSelect } from "SqlBuilder_lib";
-
-var contactId = vars.get("$field.prefferredApprover");
-if(contactId)
-{
- var contact = new Contact();
- [contact.salutation, contact.title, contact.firstname, contact.middlename, contact.lastname]
- = newSelect("PERSON.SALUTATION, PERSON.TITLE, PERSON.FIRSTNAME, PERSON.MIDDLENAME, PERSON.LASTNAME", "Data_alias")
- .from("CONTACT")
- .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
- .whereIfSet("CONTACT.CONTACTID", contactId)
- .arrayRow(true);
- result.string(new ContactTitleRenderer(contact, ContactTitleRenderer.OPTIONS.NoOption)
- .asString());
-}
diff --git a/entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc b/entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc
deleted file mode 100644
index 356d1b5..0000000
--- a/entity/Usersettings_entity/entityfields/prefferredapprover/documentation.adoc
+++ /dev/null
@@ -1,11 +0,0 @@
-== Preffered approver
-this will be used as the default value for "Approver" when the user try to start a Approval Workflow (with Person option).
-For example for Service ticket
-
-== used for:
-"Approval" workflows with _person
-and a start view from WorkflowApprove context. For example "WorkflowApproveStartWithApprover_view"
-
-== STATE property
-per default is this field "invisible"
-
diff --git a/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js b/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js
deleted file mode 100644
index b979b34..0000000
--- a/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { result, vars } from "@aditosoftware/jdito-types";
-import { CurrencyUtils } from "Currency_lib";
-
-var currencyIso = vars.get("$field.userCurrency");
-var title = CurrencyUtils.getTranslatedNameForAlpha3(currencyIso);
-
-result.string(title + " (" + currencyIso + ")");
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js b/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js
deleted file mode 100644
index 3a33771..0000000
--- a/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { entities, result } from "@aditosoftware/jdito-types";
-import { CurrencyUtils } from "Currency_lib";
-import { SqlBuilder } from "SqlBuilder_lib";
-
-//dropDownProcess isntead of consumer so we can add the local currency
-var currenciesWithRateSet = new SqlBuilder("Data_alias")
- .selectDistinct("CURRENCYRATE.SOURCECURRENCYISO")
- .from("CURRENCYRATE")
- .arrayColumn();
-
-currenciesWithRateSet.unshift(CurrencyUtils.getLocalCurrency());//add local Currency
-
-var loadingConfig = entities.createConfigForLoadingRows()
- .fields(["ALPHA3", "#CONTENTTITLE"])
- .entity("Currency_entity")
- .provider("Currencies")
- .addParameter("DisplayLongTitle_param", true)
- .addParameter("InvertBlacklist_param", true)
- .addParameter("Blacklist_param", JSON.stringify(currenciesWithRateSet));
-
-var currencies = entities.getRows(loadingConfig);
-var res = [];
-for (var currency in currencies)
-{
- res.push([currencies[currency]["ALPHA3"], currencies[currency]["#CONTENTTITLE"]]);
-}
-
-result.object(res);
\ No newline at end of file
diff --git a/neonDashboard/Home/Home.aod b/neonDashboard/Home/Home.aod
deleted file mode 100644
index 054a19d..0000000
--- a/neonDashboard/Home/Home.aod
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonDashboard xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonDashboard/1.2.0">
- <name>Home</name>
- <title>My Dashboard</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <icon>VAADIN:HOME</icon>
- <dashboardType>PRIVATE</dashboardType>
- <editRoles />
- <defaultDashlets>
- <neonDashlet>
- <name>InformationDashlet</name>
- <viewName>MyDashboardScoreCard_view</viewName>
- <configName>Information</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="0" />
- <yPos v="0" />
- <colspan v="1" />
- <rowspan v="4" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>HandelsblattTwitterDashlet</name>
- <viewName>TwitterTimeline_view</viewName>
- <configName>HandelsblattTwitterConfig</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="2" />
- <rowspan v="8" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>MailDropzoneDashlet</name>
- <viewName>UniversalFileProcessorDropzone_view</viewName>
- <configName>MailDropzone</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <xPos v="1" />
- <yPos v="0" />
- <rowspan v="8" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>MyResponsibleOrgsDashlet</name>
- <viewName>OrganisationFilter_view</viewName>
- <configName>MyResponsibleOrgsConfig</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <yPos v="8" />
- <colspan v="3" />
- </uiConfiguration>
- </neonDashlet>
- <neonDashlet>
- <name>mytasksDashlet</name>
- <viewName>TaskFilter_view</viewName>
- <configName>mytasks</configName>
- <uiConfiguration>
- <name>uiConfiguration</name>
- <yPos v="4" />
- </uiConfiguration>
- </neonDashlet>
- </defaultDashlets>
-</neonDashboard>
diff --git a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index bb1e219..8dc398c 100644
--- a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -42,16 +42,6 @@
<hideLabels v="false" />
<hideEmptyFields v="false" />
<title>root.UsersettingsEdit_view.CurrencyEdit.title</title>
- <fields>
- <entityFieldLink>
- <name>06e4af54-9604-4139-9be1-ba7a7025d231</name>
- <entityField>userCurrency</entityField>
- </entityFieldLink>
- <entityFieldLink>
- <name>ce460e64-dc1e-4951-b590-c3834e35393f</name>
- <entityField>prefferredApprover</entityField>
- </entityFieldLink>
- </fields>
</genericViewTemplate>
<genericViewTemplate>
<name>PhoneEdit</name>
@@ -60,12 +50,6 @@
<drawerCaption>root.UsersettingsEdit_view.PhoneEdit.drawerCaption</drawerCaption>
<fixedDrawer v="true" />
<hideEmptyFields v="false" />
- <fields>
- <entityFieldLink>
- <name>370fdbc1-b6b8-4288-a954-d9c7f8aebe35</name>
- <entityField>incomingCallContext</entityField>
- </entityFieldLink>
- </fields>
</genericViewTemplate>
<genericViewTemplate>
<name>Notification</name>
--
GitLab