Merge branch 'main' into chore-update-renku-action-v1.12.1

SwissDataScienceCenter · Aug 27, 2024 · 3db26eb · 3db26eb
2 parents bb13111 + fce2c93
commit 3db26eb
Show file tree

Hide file tree

Showing 3 changed files with 226 additions and 56 deletions.
diff --git a/client/src/components/Logs.tsx b/client/src/components/Logs.tsx
@@ -375,6 +375,16 @@ const EnvironmentLogsPresent = ({
     annotations
   ) as NotebookAnnotations;
 
+  const modalTitle = !cleanAnnotations.renkuVersion && (
+    <div className="fs-5 fw-normal">
+      <small>
+        {cleanAnnotations["namespace"]}/{cleanAnnotations["projectName"]} [
+        {cleanAnnotations["branch"]}@
+        {cleanAnnotations["commit-sha"].substring(0, 8)}]
+      </small>
+    </div>
+  );
+
   return (
     <Modal
       isOpen={!!logs.show}
@@ -391,13 +401,7 @@ const EnvironmentLogsPresent = ({
         }}
       >
         <div>Logs</div>
-        <div className="fs-5 fw-normal">
-          <small>
-            {cleanAnnotations["namespace"]}/{cleanAnnotations["projectName"]} [
-            {cleanAnnotations["branch"]}@
-            {cleanAnnotations["commit-sha"].substring(0, 8)}]
-          </small>
-        </div>
+        {modalTitle}
       </ModalHeader>
       <ModalBody>
         <div className="mx-2">