From 7bebd20bb3c7e16e4bed863a9569295081bde1af Mon Sep 17 00:00:00 2001
From: Simon <simon@aam-digital.com>
Date: Tue, 1 Nov 2022 15:22:03 +0100
Subject: [PATCH 1/3] fix: users can be edited again (#1515)

---
 src/app/core/user/user.spec.ts | 7 +++++++
 src/app/core/user/user.ts      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/app/core/user/user.spec.ts b/src/app/core/user/user.spec.ts
index b3af54acee..d08b719c91 100644
--- a/src/app/core/user/user.spec.ts
+++ b/src/app/core/user/user.spec.ts
@@ -36,4 +36,11 @@ describe("User", () => {
     expect(user.getId()).toBe("test-name");
     expect(() => (user.name = "another-name")).toThrowError();
   });
+
+  it("should not fail when name is actually the same", () => {
+    const user = new User();
+    user.name = "test-name";
+
+    expect(() => (user.name = "test-name")).not.toThrowError();
+  });
 });
diff --git a/src/app/core/user/user.ts b/src/app/core/user/user.ts
index 5f28721864..8ed1077463 100644
--- a/src/app/core/user/user.ts
+++ b/src/app/core/user/user.ts
@@ -35,7 +35,7 @@ export class User extends Entity {
     validators: { required: true },
   })
   set name(value: string) {
-    if (this._name) {
+    if (this._name && value !== this._name) {
       // Throwing error if trying to change existing username
       const label = User.schema.get("name").label;
       throw new Error(

From 4366ff99fb4abb097556c318436df063a24fd7a5 Mon Sep 17 00:00:00 2001
From: Simon <simon@aam-digital.com>
Date: Tue, 1 Nov 2022 17:05:04 +0100
Subject: [PATCH 2/3] doc: describe how user roles can be created and assigned
 (#1516)

Co-authored-by: Sebastian <sebastian.leidig@gmail.com>
---
 doc/compodoc_sources/concepts/permissions.md | 104 ++++++++++++++-----
 1 file changed, 79 insertions(+), 25 deletions(-)

diff --git a/doc/compodoc_sources/concepts/permissions.md b/doc/compodoc_sources/concepts/permissions.md
index f61c151f8b..1164994d4e 100644
--- a/doc/compodoc_sources/concepts/permissions.md
+++ b/doc/compodoc_sources/concepts/permissions.md
@@ -1,10 +1,43 @@
-# Permissions
+# User Roles and Permissions
+
+## User Roles
+
+User roles are used to restrict what components a user can see and what data a user can access and edit.
+These roles are stored in the backend and are available in the frontend after a successful login.
+At the moment there are two places, depending on your system setup, where the roles can be defined.
+
+### CouchDB
+
+When using CouchDB as authenticator, then the roles are directly stored on the `org.couchdb.user` document of a user.
+A new role can be added to a user by simply adding the name of the role to the user document.
+After the next login, the role will be available in the frontend.
+
+### Keycloak
+
+When using Keycloak as an authenticator, the roles are assigned through so called Role-Mappings.
+To assign a new role to a user, this role first has to be created in the realm.
+To do this go to the Keycloak admin console, select the realm for which you want to create a role and go to the *Realm
+roles* menu item.
+Here a new role can be created and also a description can be provided for it.
+This description should explain non-technical users, what this role is there for.
+Default roles that are always available are `user_app`, `admin_app` and `account_manager`.
+After a role has been created, the role can be assigned to a user.
+This can either be done in the frontend using the `UserSecurityComponent` or via the Keycloak admin console under *
+Users*
+-> *\<select user\>* -> *Role mapping* -> *Assign role*.
+
+## Permissions
+
 Aam Digital allows to specify permissions to restrict access of certain user roles to the various entity types.
-Permissions are defined using the [CASL JSON syntax](https://casl.js.org/v5/en/guide/define-rules#the-shape-of-raw-rule).
-The permissions are stored in a [config object](../../classes/Config.html) which is persisted together with other entities in the database.
+Permissions are defined using the [CASL JSON syntax](https://casl.js.org/v5/en/guide/define-rules#the-shape-of-raw-rule)
+.
+The permissions are stored in a [config object](../../classes/Config.html) which is persisted together with other
+entities in the database.
 
-## Permission structure
-As an example, we will define a permission object which allows users with the role `user_app` *not* to *create*, *read*, *update* and *delete* `HealthCheck` entities and *not* *create* and *delete* `School` and `Child` entities.
+### Permission structure
+
+As an example, we will define a permission object which allows users with the role `user_app` *not* to *create*, *read*
+, *update* and *delete* `HealthCheck` entities and *not* *create* and *delete* `School` and `Child` entities.
 Besides that, the role is allowed to do everything.
 A second role `admin_app` is allowed to do everything.
 Additionally, we add a `default` rule which allows each user (independent of role) to read the `Config` entities.
@@ -52,7 +85,9 @@ The default rules can be overwritten in the role-specific rules.
   }
 }
 ```
-The `_id` property needs to be exactly as displayed here, as there is only one permission object allowed in a single database.
+
+The `_id` property needs to be exactly as displayed here, as there is only one permission object allowed in a single
+database.
 In `data`, the permissions for each of the user role are defined.
 In this example we have permissions defined for two roles: `user_app` and `admin_app`.
 The permissions for a given role consist of an array of rules.
@@ -64,30 +99,38 @@ In this case `manage` is also a wildcard which means *any operation is allowed*.
 So the first rule states *any operation is allowed on any entity*.
 
 The second and third rule for `user_app` restrict this through the `"inverted": true` keyword.
-While the first rule defined what this role is **allowed** to do, when `"inverted": true` is specified, this rule defines what the role is **not allowed** to do.
+While the first rule defined what this role is **allowed** to do, when `"inverted": true` is specified, this rule
+defines what the role is **not allowed** to do.
 This allows us to easily take permissions away from a certain role.
-In this case we don't allow users with this role to perform *any* operation on the `HealhCheck` entity and no *create* and *update* on `Child` and `School` entities.
+In this case we don't allow users with this role to perform *any* operation on the `HealhCheck` entity and no *create*
+and *update* on `Child` and `School` entities.
 Other possible actions are `read` and `update` following the *CRUD* concept.
 
 The `admin_app` role simpy allows user with this role to do everything, without restrictions.
 
-To learn more about how to define rules, have a look at the [CASL documentation](https://casl.js.org/v5/en/guide/define-rules#rules).
+To learn more about how to define rules, have a look at
+the [CASL documentation](https://casl.js.org/v5/en/guide/define-rules#rules).
+
+### Implementing components with permissions
 
-## Implementing components with permissions
 This section is about code using permissions to read and edit **entities**.
-If you want to change the menu items which are shown in the navigation bar have a look at the *views* section in the [Configuration Guide](./configuration.html).
+If you want to change the menu items which are shown in the navigation bar have a look at the *views* section in
+the [Configuration Guide](./configuration.html).
 
 The permission object is automatically fetched whenever a user logs in.
 The permissions disable certain buttons based on the users overall permissions.
-This is done in the app through the [DisableEntityOperationDirective](../../directives/DisableEntityOperationDirective.html), which connects certain buttons with their operation.
+This is done in the app through
+the [DisableEntityOperationDirective](../../directives/DisableEntityOperationDirective.html), which connects certain
+buttons with their operation.
 
 As an example lets say we have a class variable called `note` which holds an object of the `Note` entity.
 We want to create a button which allows to *edit* this note.
 In the HTML template we could write the following in order to automatically connect it to the permission system:
 
 ```HTML
+
 <button
-    *appDisabledEntityOperation="{
+  *appDisabledEntityOperation="{
         entity: note,
         operation: 'update'
     }"
@@ -95,6 +138,7 @@ In the HTML template we could write the following in order to automatically conn
   Edit Note
 </button>
 ```
+
 This will automatically disable the button if the user is not allowed to *update* this specific note.
 
 To check permissions inside a `*.ts` file, you can inject the `EntityAbility`:
@@ -117,30 +161,40 @@ export class SomeService {
   }
 }
 ```
-In this example the `EntityAbility` service is used to check whether the currently logged in user is allowed to _create_ new objects of the `Note` entity.
+
+In this example the `EntityAbility` service is used to check whether the currently logged in user is allowed to _create_
+new objects of the `Note` entity.
 In this case a constructor is provided to check for the permissions,
 in other cases it might make more sense to use an instance of an object like `this.ability.can('read', new Note())`.
 
-## Permissions in production
-As permissions cannot directly be created and edited from within the app at the moment, you can use the following steps to define permissions for a deployed system:
+### Permissions in production
+
+As permissions cannot directly be created and edited from within the app at the moment, you can use the following steps
+to define permissions for a deployed system:
 
 1. using CouchDB Fauxton GUI to edit database documents directly:
-Look for or create the document with `"_id": "Config:Permissions"` and define the permissions as described above.
+   Look for or create the document with `"_id": "Config:Permissions"` and define the permissions as described above.
 2. After saving the new permissions document, update the replication backend about the updated permissions:
-Visit `https://<your-system-domain>/db/api/` to use the OpenAPI interface for this.
+   Visit `https://<your-system-domain>/db/api/` to use the OpenAPI interface for this.
 3. There in `Servers` select `/db deployed`.
 4. Click on `Authorize` enter valid user credentials and click `Login`.
-5. Make a request to the `POST /rules/{db}/reload` endpoint, where `{db}` is the active database, e.g. `app`. If successful, the response will show the newly fetched rules.
+5. Make a request to the `POST /rules/{db}/reload` endpoint, where `{db}` is the active database, e.g. `app`. If
+   successful, the response will show the newly fetched rules.
 6. In case some users might have **gained** access to documents to which they did not have access before,
-also trigger the `POST /{db}/clear_local` endpoint, where `{db}` again is the active database.
-The `/{db}/clear_local` endpoint will ensure that each client re-checks whether new objects are available for synchronization. 
-This should also be used in case an existing user has gotten a new, more powerful role.
-In case a user lost permissions for objects that were already synced, this users local DB will automatically be destroyed and the user has to synchronize all data again.
+   also trigger the `POST /{db}/clear_local` endpoint, where `{db}` again is the active database.
+   The `/{db}/clear_local` endpoint will ensure that each client re-checks whether new objects are available for
+   synchronization.
+   This should also be used in case an existing user has gotten a new, more powerful role.
+   In case a user lost permissions for objects that were already synced, this users local DB will automatically be
+   destroyed and the user has to synchronize all data again.
 
 The roles assigned to users are specified in the user documents in the `_users` database of CouchDB.
 
-## Permissions in development
-When trying to test out things with the permissions, the [DemoPermissionGeneratorService](../../Injectable/DemoPermissionGeneratorService.html) can be modified to change the permission object which is created in the demo data.
+### Permissions in development
+
+When trying to test out things with the permissions,
+the [DemoPermissionGeneratorService](../../Injectable/DemoPermissionGeneratorService.html) can be modified to change the
+permission object which is created in the demo data.
 These changes should not be committed however, as this demo data is also used in the publicly available demo.
 
 The demo data comes with two user: `demo` and `demo-admin`.

From fae1596654cf4230b806b3a444a4865bbd8a37d2 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian.leidig@gmail.com>
Date: Thu, 3 Nov 2022 20:06:30 +0100
Subject: [PATCH 3/3] fix(ui): properly position help icon for tooltips next to
 form fields (#1511)

Co-authored-by: Simon <simon@aam-digital.com>
---
 src/app/core/config/config-fix.ts             |  3 ++-
 .../entity-form/entity-form.component.html    | 23 ++++++++++---------
 .../entity-form/entity-form.component.scss    |  9 ++++++++
 .../entity-form/entity-form.stories.ts        |  1 +
 4 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/app/core/config/config-fix.ts b/src/app/core/config/config-fix.ts
index 0ed8cae851..80546d9b0d 100644
--- a/src/app/core/config/config-fix.ts
+++ b/src/app/core/config/config-fix.ts
@@ -958,7 +958,8 @@ export const defaultJsonConfig = {
         "name": "motherTongue",
         "schema": {
           dataType: "string",
-          label: $localize`:Label for the mother tongue of a child:Mother Tongue`
+          label: $localize`:Label for the mother tongue of a child:Mother Tongue`,
+          description: $localize`:Tooltip description for the mother tongue of a child:The primary language spoken at home`,
         }
       },
       {
diff --git a/src/app/core/entity-components/entity-form/entity-form/entity-form.component.html b/src/app/core/entity-components/entity-form/entity-form/entity-form.component.html
index 4a76ed2868..40cec98c9e 100644
--- a/src/app/core/entity-components/entity-form/entity-form/entity-form.component.html
+++ b/src/app/core/entity-components/entity-form/entity-form/entity-form.component.html
@@ -39,17 +39,17 @@
   <form class="columns-wrapper">
     <div *ngFor="let col of _columns; let i=index" class="column-group">
       <h2 *ngIf="columnHeaders && columnHeaders[i]">{{columnHeaders[i]}}</h2>
-      <div
-        *ngFor="let row of col"
-        [appDynamicComponent]="{
-          component: row.edit,
-          config: {
-            formFieldConfig: row,
-            propertySchema: entity.getSchema().get(row.id),
-            formControl: form.get(row.id)
-          }
-        }"
-      >
+      <div *ngFor="let row of col">
+        <div [class.field-with-tooltip-suffix]="row.tooltip">
+          <ng-container [appDynamicComponent]="{
+        component: row.edit,
+        config: {
+        formFieldConfig: row,
+        propertySchema: entity.getSchema().get(row.id),
+        formControl: form.get(row.id)
+        }
+        }"></ng-container>
+        </div>
         <fa-icon
           (click)="tooltipElement.show()"
           #tooltipElement="matTooltip"
@@ -57,6 +57,7 @@ <h2 *ngIf="columnHeaders && columnHeaders[i]">{{columnHeaders[i]}}</h2>
           matSuffix
           icon="question-circle"
           [matTooltip]="row.tooltip"
+          class="tooltip-suffix"
         ></fa-icon>
       </div>
 
diff --git a/src/app/core/entity-components/entity-form/entity-form/entity-form.component.scss b/src/app/core/entity-components/entity-form/entity-form/entity-form.component.scss
index c79619a5d3..e4ebbe0e4b 100644
--- a/src/app/core/entity-components/entity-form/entity-form/entity-form.component.scss
+++ b/src/app/core/entity-components/entity-form/entity-form/entity-form.component.scss
@@ -39,3 +39,12 @@ $max-screen-width: $min-block-width + $margin-main-view-right + $margin-main-vie
   margin-bottom: 20px !important;
   font-family: sans-serif;
 }
+
+.field-with-tooltip-suffix {
+  width: calc(100% - 24px);
+  display: inline-block;
+}
+
+.tooltip-suffix {
+  margin: 4px;
+}
diff --git a/src/app/core/entity-components/entity-form/entity-form/entity-form.stories.ts b/src/app/core/entity-components/entity-form/entity-form/entity-form.stories.ts
index d29783309c..9faecce86f 100644
--- a/src/app/core/entity-components/entity-form/entity-form/entity-form.stories.ts
+++ b/src/app/core/entity-components/entity-form/entity-form/entity-form.stories.ts
@@ -49,6 +49,7 @@ const cols = [
     {
       id: "projectNumber",
       edit: "EditNumber",
+      tooltip: "some extra explanation",
     },
     {
       edit: "EditLongText",