Merge remote-tracking branch 'refs/remotes/origin/main' into feat/flex-commitments

Flix6x · Flix6x · commit 0fa0f4c7ef54 · 2025-10-31T23:03:22.000+01:00
# Conflicts:
#	.github/workflows/lint-and-test.yml
diff --git a/.github/workflows/lint-and-test.yml b/.github/workflows/lint-and-test.yml
@@ -38,7 +38,7 @@ jobs:
           git fetch --prune --unshallow
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*
       - name: Upgrade pip
-        # pinned due to https://github.com/pypa/pip/issues/13636
+        # Pin due to https://github.com/pypa/pip/issues/13636
         run: |
           pip3 install --upgrade "pip==25.2"
       - name: "Caching for dependencies (.txt) - restore existing or ensure new cache will be made"
diff --git a/documentation/changelog.rst b/documentation/changelog.rst
@@ -36,6 +36,7 @@ Bugfixes
 * Fix account and assets/owned_by pages rendering, giving them asset icons [see `PR #1772 <https://github.com/FlexMeasures/flexmeasures/pull/1772>`_]
 * Allow consultants to view client users [see `PR #1755 <https://www.github.com/FlexMeasures/flexmeasures/pull/1755>`_]
 * Fixed bug where removed flexmodel fields didn't show up under the flexoption dropdown, except after a page refresh. [see `PR #1775 <https://www.github.com/FlexMeasures/flexmeasures/pull/1775>`_]
+* Fix bug in displaying user audit log (incl. expanding its API schema) [see `PR #1779 <https://github.com/FlexMeasures/flexmeasures/pull/1779>`_]
 
 
 v0.29.0 | October 14, 2025
diff --git a/flexmeasures/api/v3_0/users.py b/flexmeasures/api/v3_0/users.py
@@ -51,14 +51,16 @@ class AuthRequestSchema(Schema):
     )
 
 
-class UserPaginationSchema(PaginationSchema):
+class UserAuditlogSchema(PaginationSchema):
     sort_by = fields.Str(
         required=False,
-        validate=validate.OneOf(["username", "email", "lastLogin", "lastSeen"]),
+        validate=validate.OneOf(
+            ["username", "email", "event_datetime", "lastLogin", "lastSeen"]
+        ),
     )
 
 
-class UserAPIQuerySchema(UserPaginationSchema):
+class UserAPIQuerySchema(PaginationSchema):
     sort_by = fields.Str(
         required=False,
         validate=validate.OneOf(["username", "email", "lastLogin", "lastSeen"]),
@@ -532,7 +534,7 @@ def reset_user_password(self, id: int, user: UserModel):
         pass_ctx_to_loader=True,
         ctx_loader=AuditLog.user_table_acl,
     )
-    @use_kwargs(UserPaginationSchema, location="query")
+    @use_kwargs(UserAuditlogSchema, location="query")
     @as_json
     def auditlog(
         self,
@@ -564,7 +566,7 @@ def auditlog(
               description: ID of the user to get the audit log for.
             - in: query
               name: kwargs
-              schema: UserPaginationSchema
+              schema: UserAuditlogSchema
           security:
             - ApiKeyAuth: []
           responses:
diff --git a/flexmeasures/ui/templates/accounts/account.html b/flexmeasures/ui/templates/accounts/account.html
@@ -323,7 +323,7 @@ <h5 class="modal-title pe-2">Create User</h5>
             <label for="email" class="form-label">Email</label>
             <input type="email" class="form-control" id="email" name="email" required>
             <small class="text-muted">
-              Your email will be used as the initial password. The user can change it after logging in.
+              The user will receive an email with a URL for setting an initial password.
             </small>
           </div>
 
diff --git a/flexmeasures/ui/templates/assets/asset_context.html b/flexmeasures/ui/templates/assets/asset_context.html
@@ -1069,4 +1069,4 @@ <h5 class="modal-title pe-2">Edit {{ asset.name }}'s flex-context</h5>
     // ============== Page Events ============== //
 </script>
 
-{% endblock %}
+{% endblock %}
diff --git a/flexmeasures/ui/templates/users/user_audit_log.html b/flexmeasures/ui/templates/users/user_audit_log.html
@@ -61,12 +61,16 @@ <h3>History of actions for user <a href="/users/{{ user.id }}">{{ user.username
                     callback({"data": clean_response, "recordsTotal": response["num-records"], "recordsFiltered": response["filtered-records"]});
                 },
                 error: function (request, status, error) {
-                    console.log("Error: ", error)
+                    const response = JSON.parse(request.responseText);  // TODO: show all errors with message. not just 422
+                    const toastMessage = request.status === 422
+                        ? "Error calling the audit log endpoint."
+                        + JSON.stringify(response.message) : "Something went wrong!";
+                    showToast(toastMessage, "error");
                 }
             });
         }
     });
 });
 </script>
 
-{% endblock %}
+{% endblock %}
