Merge branch 'master' of https://github.com/memphisdev/memphis into R…

…ND-397-update-rest-modal

ui_src/jsconfig.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "baseUrl": "src"
+  },
+  "include": [
+    "src"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
+}

ui_src/src/domain/stationOverview/stationObservabilty/components/functionCard/style.scss

@@ -83,27 +83,15 @@
         font-weight: 600;
         line-height: normal;
         display: flex;
-        flex-direction: column;
-
-        .function-name {
-            display: flex;
-            align-items: center;
-            gap: 6px;
-            width: 95px;
-        }
+        gap: 6px;
+        align-items: center;
+        padding-left: 7px;
         span {
+            width: 95px;
             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;
         }

ui_src/src/domain/users/index.js

@@ -22,6 +22,13 @@ 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';
@@ -303,7 +310,7 @@ function Users() {
             render: (text, record) => (
                 <div className="user-name">
                     <div className="user-avatar">
-                        <img src={getAvatarSrc(record.avatar_id, record?.full_name)} width={25} height={25} alt="avatar" />
+                        <img src={getAvatarSrc(record.avatar_id)} width={25} height={25} alt="avatar" />
                     </div>
                     <p>{text}</p>
                 </div>
@@ -360,12 +367,12 @@ function Users() {
             )
         },
         {
-            title: 'Last login',
-            key: 'last_login',
-            dataIndex: 'last_login',
-            render: (last_login) => (
+            title: 'Creation date',
+            key: 'created_at',
+            dataIndex: 'created_at',
+            render: (created_at) => (
                 <div className="created-column">
-                    <p>{parsingDate(last_login)}</p>
+                    <p>{parsingDate(created_at)}</p>
                 </div>
             )
         },

ui_static_files/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
-    "main.css": "/static/css/main.bd6c4f78.css",
-    "main.js": "/static/js/main.526f7521.js",
+    "main.css": "/static/css/main.f2c7724a.css",
+    "main.js": "/static/js/main.f0586790.js",
     "static/js/617.a5f8c4fc.chunk.js": "/static/js/617.a5f8c4fc.chunk.js",
     "static/js/2542.27de8743.chunk.js": "/static/js/2542.27de8743.chunk.js",
     "static/js/1737.e134cfd4.chunk.js": "/static/js/1737.e134cfd4.chunk.js",
@@ -314,7 +314,6 @@
     "static/media/arrowBackIcon.svg": "/static/media/arrowBackIcon.1289affd6cc44720027524db1863a3a8.svg",
     "static/media/cloudTeaser.svg": "/static/media/cloudTeaser.66f36b017135e9a0e865558676883b7f.svg",
     "static/media/TimeFill.svg": "/static/media/TimeFill.bec2989f51458fe251e269295380f4ea.svg",
-    "static/media/addUserIcon.svg": "/static/media/addUserIcon.db68a5ce64cc9eb38d66fd25774c79c9.svg",
     "static/media/overviewIcon.svg": "/static/media/overviewIcon.5a0fa6784283dc830b1c5cadf668de93.svg",
     "static/media/refresh.svg": "/static/media/refresh.ba93d46f83e615f1174f50004368da8d.svg",
     "static/media/filter.svg": "/static/media/filter.3b6b26fd269d36c655ebed0d85b3754e.svg",
@@ -338,7 +337,7 @@
     "static/media/closeNotification.svg": "/static/media/closeNotification.7551e8366682f9c6585bb1a694c4112a.svg"
   },
   "entrypoints": [
-    "static/css/main.bd6c4f78.css",
-    "static/js/main.526f7521.js"
+    "static/css/main.f2c7724a.css",
+    "static/js/main.f0586790.js"
   ]
 }

ui_static_files/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.526f7521.js"></script><link href="/static/css/main.bd6c4f78.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Memphis.dev console is designed to simplify your work and give you a graphical user interface for controlling your stations, security, integrations, and observing your data and other vital metrics"/><link rel="manifest" href="/manifest.json"/><title>Memphis.dev Console</title><link rel="apple-touch-icon" sizes="57x57" href="/img/favicon/apple-icon-57x57.png"><link rel="apple-touch-icon" sizes="60x60" href="/img/favicon/apple-icon-60x60.png"><link rel="apple-touch-icon" sizes="72x72" href="/img/favicon/apple-icon-72x72.png"><link rel="apple-touch-icon" sizes="76x76" href="/img/favicon/apple-icon-76x76.png"><link rel="apple-touch-icon" sizes="114x114" href="/img/favicon/apple-icon-114x114.png"><link rel="apple-touch-icon" sizes="120x120" href="/img/favicon/apple-icon-120x120.png"><link rel="apple-touch-icon" sizes="144x144" href="/img/favicon/apple-icon-144x144.png"><link rel="apple-touch-icon" sizes="152x152" href="/img/favicon/apple-icon-152x152.png"><link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-icon-180x180.png"><link rel="icon" type="image/png" sizes="192x192" href="/img/favicon/android-icon-192x192.png"><link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png"><link rel="icon" type="image/png" sizes="96x96" href="/img/favicon/favicon-96x96.png"><link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png"><meta name="msapplication-TileColor" content="#ffffff"><meta name="msapplication-TileImage" content="/img/favicon/ms-icon-144x144.png"><meta name="theme-color" content="#ffffff"><script defer="defer" src="/static/js/main.f0586790.js"></script><link href="/static/css/main.f2c7724a.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>