Merge pull request #1583 from memphisdev/minor-bug-fix

Minor bug fix
superstreamlabs · Jan 1, 2024 · 374a133 · 374a133
2 parents 33e975c + bd616c7
commit 374a133
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/ui_src/src/assets/images/timeFill.svg b/ui_src/src/assets/images/timeFill.svg
diff --git a/ui_src/src/domain/stationOverview/stationObservabilty/components/functionCard/style.scss b/ui_src/src/domain/stationOverview/stationObservabilty/components/functionCard/style.scss
@@ -83,15 +83,27 @@
         font-weight: 600;
         line-height: normal;
         display: flex;
-        gap: 6px;
-        align-items: center;
-        padding-left: 7px;
-        span {
+        flex-direction: column;
+
+        .function-name {
+            display: flex;
+            align-items: center;
+            gap: 6px;
             width: 95px;
+        }
+        span {
             text-overflow: ellipsis;
             overflow: hidden;
             white-space: nowrap;
         }
+        .processing {
+            display: flex;
+            justify-content: center;
+            text-align: center;
+            color: #737373 !important;
+            font-size: 10px;
+            margin-top: 5px;
+        }
         .deactivated {
             color: #737373 !important;
         }

diff --git a/ui_src/src/domain/users/index.js b/ui_src/src/domain/users/index.js
@@ -22,13 +22,6 @@ import { ReactComponent as DeleteWrapperIcon } from 'assets/images/deleteWrapper
 import { ReactComponent as MailIcon } from 'assets/images/mailIcon.svg';
 import { ReactComponent as DeleteIcon } from 'assets/images/deleteIcon.svg';
 import { ReactComponent as SearchIcon } from 'assets/images/searchIcon.svg';
-import { LOCAL_STORAGE_USER_PASS_BASED_AUTH } from 'const/localStorageConsts';
-import { isCloud, parsingDate } from 'services/valueConvertor';
-import { ReactComponent as AddUserIcon } from 'assets/images/addUserIcon.svg';
-import { ReactComponent as DeleteWrapperIcon } from 'assets/images/deleteWrapperIcon.svg';
-import { ReactComponent as MailIcon } from 'assets/images/mailIcon.svg';
-import { ReactComponent as DeleteIcon } from 'assets/images/deleteIcon.svg';
-import { ReactComponent as SearchIcon } from 'assets/images/searchIcon.svg';
 import { FaArrowCircleUp } from 'react-icons/fa';
 import SegmentButton from 'components/segmentButton';
 import { ApiEndpoints } from 'const/apiEndpoints';
@@ -310,7 +303,7 @@ function Users() {
             render: (text, record) => (
                 <div className="user-name">
                     <div className="user-avatar">
-                        <img src={getAvatarSrc(record.avatar_id)} width={25} height={25} alt="avatar" />
+                        <img src={getAvatarSrc(record.avatar_id, record?.full_name)} width={25} height={25} alt="avatar" />
                     </div>
                     <p>{text}</p>
                 </div>
@@ -367,12 +360,12 @@ function Users() {
             )
         },
         {
-            title: 'Creation date',
-            key: 'created_at',
-            dataIndex: 'created_at',
-            render: (created_at) => (
+            title: 'Last login',
+            key: 'last_login',
+            dataIndex: 'last_login',
+            render: (last_login) => (
                 <div className="created-column">
-                    <p>{parsingDate(created_at)}</p>
+                    <p>{parsingDate(last_login)}</p>
                 </div>
             )
         },