Add new creatorField property

conterra · May 25, 2021 · dc185cf · dc185cf
1 parent 08591da
commit dc185cf
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 7 deletions.
diff --git a/src/main/js/apps/sample/app.json b/src/main/js/apps/sample/app.json
@@ -35,6 +35,7 @@
     "bundles": {
         "dn_editingusernameprocessor": {
             "Config": {
+                "creatorField": "",
                 "usernameField": "kommentar",
                 "usernameAttributes": [
                     "givenname",

diff --git a/src/main/js/bundles/dn_editingusernameprocessor/README.md b/src/main/js/bundles/dn_editingusernameprocessor/README.md
@@ -12,6 +12,7 @@ Simply add the bundle "dn_editingusernameprocessor" to your app.
 "dn_editingusernameprocessor": {
     "Config": {
         "usernameField": "description",
+        "creatorField": "",
         "usernameAttributes": [
             "givenname",
             "sn"
@@ -20,7 +21,8 @@ Simply add the bundle "dn_editingusernameprocessor" to your app.
 }
 ```
 
-| Property                       | Type               | Possible Values                    | Default                              | Description                                         |
-|--------------------------------|--------------------|------------------------------------|--------------------------------------|-----------------------------------------------------|
-| usernameField                  | String             |                                    | ```""```                             | Define the username field.                          |
-| usernameAttributes             | Array              |                                    | ```["givenname", "sn"]```            | Configure the attributes that make up the username. |
+| Property                       | Type               | Possible Values                    | Default                              | Description                                                                                                                                                                                                                            |
+|--------------------------------|--------------------|------------------------------------|--------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| usernameField                  | String             |                                    | ```""```                             | Define the username field.                                                                                                                                                                                                             |
+| creatorField                   | String             |                                    | ```""```                             | Define the creator field to save the user name to another attribute if a new features gets created. If this property has the value ```""``` the user name will be written to the username field in case of create and update workflow. |
+| usernameAttributes             | Array              |                                    | ```["givenname", "sn"]```            | Configure the attributes that make up the username.                                                                                                                                                                                    |
diff --git a/src/main/js/bundles/dn_editingusernameprocessor/UsernameInterceptor.js b/src/main/js/bundles/dn_editingusernameprocessor/UsernameInterceptor.js
@@ -17,18 +17,36 @@ import async from "apprt-core/async";
 
 export default class UsernameInterceptor {
 
+    #watcher = null;
+
     interceptConfig(config) {
     }
 
     interceptEditor(editorWidget) {
-        const featureFormViewModel = editorWidget.viewModel.featureFormViewModel;
-        featureFormViewModel.watch("feature", (feature) => {
+        this.#watcher?.remove();
+        const viewModel = editorWidget.viewModel;
+        const featureFormViewModel = viewModel.featureFormViewModel;
+        const properties = this._properties;
+        this.#watcher = featureFormViewModel.watch("feature", (feature) => {
+            const workFlowType = viewModel.activeWorkflow.type;
             const username = this.getUserName();
             if (!feature || !username) {
                 return;
             }
             async(() => {
-                featureFormViewModel.setValue(this._properties.usernameField, username);
+                if (properties.creatorField && properties.creatorField !== "") {
+                    switch (workFlowType) {
+                        case "create":
+                            featureFormViewModel.setValue(properties.creatorField, username);
+                            break;
+                        case "update":
+                            featureFormViewModel.setValue(properties.usernameField, username);
+                            break;
+                    }
+                } else {
+                    featureFormViewModel.setValue(properties.usernameField, username);
+                }
+
                 //feature.setAttribute(this._properties.usernameField, username);
                 //featureFormViewModel.submit();
                 //featureFormViewModel.emit("value-change");

diff --git a/src/main/js/bundles/dn_editingusernameprocessor/manifest.json b/src/main/js/bundles/dn_editingusernameprocessor/manifest.json
@@ -16,6 +16,7 @@
             "provides": "editing.EditorInterceptor",
             "properties": {
                 "usernameField": "",
+                "creatorField": "",
                 "usernameAttributes": [
                     "givenname",
                     "sn"