Minor fixes [SLE-88]

samuelgfeller · Jun 6, 2023 · 4e7d339 · 4e7d339
1 parent 365c5a8
commit 4e7d339
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/public/assets/client/note/client-note.css b/public/assets/client/note/client-note.css
@@ -51,7 +51,6 @@
 
     .textarea-label {
         margin: 0 0 7px 20px;
-        color: black;
         font-weight: normal;
     }
 

diff --git a/public/assets/dashboard/dashboard-main.js b/public/assets/dashboard/dashboard-main.js
@@ -107,7 +107,7 @@ if (userPanel) {
         let userActivityFilterParam = new URLSearchParams();
         const paramsData = userPanel?.querySelectorAll('.filter-chip-active span');
         for (const paramData of paramsData) {
-            // Add [] to param name so that its
+            // Add [] to param name so that it can be read as an array
             userActivityFilterParam.append(paramData.dataset.paramName + '[]', paramData.dataset.paramValue);
             // Add filter id to filterIds param
             userActivityFilterParam.append('filterIds[]', paramData.dataset.filterId);

diff --git a/public/assets/general/general-css/layout.css b/public/assets/general/general-css/layout.css
@@ -72,7 +72,7 @@ especially elements from the layout.html.php */
         color: #9B9B9B;
     }
     footer a:hover{
-        color: black;
+        color: var(--grey-secondary-text-color);
     }
     .footer-icon{
         width: 1em;

diff --git a/public/assets/general/page-component/table/responsive-table.css b/public/assets/general/page-component/table/responsive-table.css
@@ -24,7 +24,6 @@
     .responsive-table th {
         font-weight: 500;
         white-space: nowrap;
-        color: black;
         letter-spacing: 0.03em;
     }
     .responsive-table a{

diff --git a/src/Application/Actions/User/Ajax/ListUserActivityAction.php b/src/Application/Actions/User/Ajax/ListUserActivityAction.php
@@ -34,9 +34,9 @@ public function __construct(
      * @param ResponseInterface $response The response
      * @param array $args
      *
+     * @return ResponseInterface The response
      * @throws \JsonException
      *
-     * @return ResponseInterface The response
      */
     public function __invoke(
         ServerRequestInterface $request,
@@ -49,11 +49,14 @@ public function __invoke(
 
         $userResultDataArray = $this->userActivityFinder->findUserActivityReport($userIds);
 
-        // Filter ids have to be saved too
-        $this->filterSettingSaver->saveFilterSettingForAuthenticatedUser(
-            $queryParams['filterIds'] ?? null,
-            FilterModule::DASHBOARD_USER_ACTIVITY
-        );
+        // Filter ids have to be saved too but only if there are query params
+        // otherwise the saved dashboard filter settings are deleted when loading user read
+        if (isset($queryParams['filterIds'])) {
+            $this->filterSettingSaver->saveFilterSettingForAuthenticatedUser(
+                $queryParams['filterIds'],
+                FilterModule::DASHBOARD_USER_ACTIVITY
+            );
+        }
 
         return $this->responder->respondWithJson($response, $userResultDataArray);
     }

diff --git a/src/Domain/User/Service/UserActivityFinder.php b/src/Domain/User/Service/UserActivityFinder.php
@@ -76,7 +76,7 @@ private function findUserActivitiesGroupedByDate(int|array $userIds): array
             // If there are multiple users, add the user name before time and action name
             if (count($userIds) > 1) {
                 $userRow = $this->userFinderRepository->findUserById($userActivity->userId);
-                $userActivity->timeAndActionName = '<span style="color: black">' . $userRow['first_name'] . ' '
+                $userActivity->timeAndActionName = '<span style="color: var(--black-text-color)">' . $userRow['first_name'] . ' '
                     . $userRow['surname'] . '</span> • ' .
                     $userActivity->timeAndActionName;
             }