Merge remote-tracking branch 'origin/main'

csharp/App/Backend/Database/Read.cs

@@ -19,6 +19,12 @@ public static partial class Db
             .FirstOrDefault(i => i.Id == id);
     }
     
+    public static UserAction? GetActionById(Int64? id)
+    {
+        return UserActions
+            .FirstOrDefault(i => i.Id == id);
+    }
+    
     public static User? GetUserById(Int64? id)
     {
         return Users

typescript/frontend-marios2/src/content/dashboards/SalidomoInstallations/Installation.tsx

@@ -276,27 +276,30 @@ function Installation(props: singleInstallationProps) {
             />
           </div>
         </div>
-        {loading && currentTab != 'information' && currentTab != 'overview' && (
+        {loading &&
-          <Container
+          currentTab != 'information' &&
-            maxWidth="xl"
+          currentTab != 'overview' &&
-            sx={{
+          currentTab != 'log' && (
-              display: 'flex',
+            <Container
-              flexDirection: 'column',
+              maxWidth="xl"
-              justifyContent: 'center',
+              sx={{
-              alignItems: 'center',
+                display: 'flex',
-              height: '70vh'
+                flexDirection: 'column',
-            }}
+                justifyContent: 'center',
-          >
+                alignItems: 'center',
-            <CircularProgress size={60} style={{ color: '#ffc04d' }} />
+                height: '70vh'
-            <Typography
+              }}
-              variant="body2"
-              style={{ color: 'black', fontWeight: 'bold' }}
-              mt={2}
             >
-              Connecting to the device...
+              <CircularProgress size={60} style={{ color: '#ffc04d' }} />
-            </Typography>
+              <Typography
-          </Container>
+                variant="body2"
-        )}
+                style={{ color: 'black', fontWeight: 'bold' }}
+                mt={2}
+              >
+                Connecting to the device...
+              </Typography>
+            </Container>
+          )}
 
         <Card variant="outlined">
           <Grid

typescript/frontend-marios2/src/content/dashboards/SalidomoInstallations/index.tsx

@@ -14,7 +14,7 @@ function SalidomoInstallationTabs() {
   const location = useLocation();
   const context = useContext(UserContext);
   const { currentUser } = context;
-  const tabList = ['batteryview', 'information'];
+  const tabList = ['batteryview', 'information', 'overview', 'log'];
 
   const [currentTab, setCurrentTab] = useState<string>(undefined);
   const [fetchedInstallations, setFetchedInstallations] =