Merge branch 'master' into feature/listenToProjectDocumentWS

Author: odeimaiz

packages/models-library/src/models_library/api_schemas_webserver/functions.py

@@ -1,7 +1,7 @@
 import datetime
 from typing import Annotated, TypeAlias
 
-from pydantic import Field
+from pydantic import Field, HttpUrl
 
 from ..functions import (
     Function,
@@ -116,6 +116,10 @@
 
 class RegisteredSolverFunctionGet(RegisteredSolverFunction, OutputSchema):
     uid: Annotated[FunctionID, Field(alias="uuid")]
+    created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
+    modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
+    access_rights: FunctionAccessRights | None = None
+    thumbnail: HttpUrl | None = None
 
 
 class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):
@@ -124,7 +128,7 @@ class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):
     created_at: Annotated[datetime.datetime, Field(alias="creationDate")]
     modified_at: Annotated[datetime.datetime, Field(alias="lastChangeDate")]
     access_rights: FunctionAccessRights | None = None
-    thumbnail: str | None = None
+    thumbnail: HttpUrl | None = None
 
 
 class SolverFunctionToRegister(SolverFunction, InputSchema): ...

services/static-webserver/client/source/class/osparc/conversation/Conversation.js

@@ -64,6 +64,7 @@ qx.Class.define("osparc.conversation.Conversation", {
     __messages: null,
     __nextRequestParams: null,
     __messagesTitle: null,
+    __messageScroll: null,
     __messagesList: null,
     __loadMoreMessages: null,
 
@@ -147,10 +148,15 @@ qx.Class.define("osparc.conversation.Conversation", {
       this.__messagesTitle = new qx.ui.basic.Label();
       this._add(this.__messagesTitle);
 
+      // add spacer to keep the messages list at the bottom
+      this._add(new qx.ui.core.Spacer(), {
+        flex: 100 // high number to keep even a one message list at the bottom
+      });
+
       this.__messagesList = new qx.ui.container.Composite(new qx.ui.layout.VBox(5)).set({
         alignY: "middle"
       });
-      const scrollView = new qx.ui.container.Scroll();
+      const scrollView = this.__messageScroll = new qx.ui.container.Scroll();
       scrollView.add(this.__messagesList);
       this._add(scrollView, {
         flex: 1
@@ -197,7 +203,8 @@ qx.Class.define("osparc.conversation.Conversation", {
 
     __reloadMessages: function(removeMessages = true) {
       if (this.getConversationId() === null) {
-        this.__messagesTitle.setValue(this.tr("No messages yet"));
+        // temporary conversation page
+        this.__messagesTitle.setValue(this.tr("No Messages yet"));
         this.__messagesList.hide();
         this.__loadMoreMessages.hide();
         return;
@@ -226,7 +233,9 @@ qx.Class.define("osparc.conversation.Conversation", {
 
     __updateMessagesNumber: function() {
       const nMessages = this.__messages.filter(msg => msg["type"] === "MESSAGE").length;
-      if (nMessages === 1) {
+      if (nMessages === 0) {
+        this.__messagesTitle.setValue(this.tr("No Messages yet"));
+      } else if (nMessages === 1) {
         this.__messagesTitle.setValue(this.tr("1 Message"));
       } else if (nMessages > 1) {
         this.__messagesTitle.setValue(nMessages + this.tr(" Messages"));
@@ -243,9 +252,9 @@ qx.Class.define("osparc.conversation.Conversation", {
         return;
       }
 
-      // determine insertion index for most‐recent‐first order
+      // determine insertion index for latest‐first order
       const newTime = new Date(message["created"]);
-      let insertAt = this.__messages.findIndex(m => new Date(m["created"]) < newTime);
+      let insertAt = this.__messages.findIndex(m => new Date(m["created"]) > newTime);
       if (insertAt === -1) {
         insertAt = this.__messages.length;
       }
@@ -270,6 +279,12 @@ qx.Class.define("osparc.conversation.Conversation", {
         this.__messagesList.addAt(control, insertAt);
       }
 
+      // scroll to bottom
+      // add timeout to ensure the scroll happens after the UI is updated
+      setTimeout(() => {
+        this.__messageScroll.scrollToY(this.__messageScroll.getChildControl("pane").getScrollMaxY());
+      }, 50);
+
       this.__updateMessagesNumber();
     },
 

services/static-webserver/client/source/class/osparc/study/Conversations.js

@@ -221,6 +221,12 @@ qx.Class.define("osparc.study.Conversations", {
 
     __addToPages: function(conversationPage) {
       const conversationsLayout = this.getChildControl("conversations-layout");
+      if (conversationsLayout.getChildren().length === 1) {
+        // remove the temporary conversation page
+        if (conversationsLayout.getChildren()[0].getConversationId() === null) {
+          conversationsLayout.remove(conversationsLayout.getChildren()[0]);
+        }
+      }
       conversationsLayout.add(conversationPage);
 
       if (this.__newConversationButton === null) {
@@ -246,8 +252,11 @@ qx.Class.define("osparc.study.Conversations", {
         conversationsLayout.getChildControl("bar").add(newConversationButton);
       }
       // remove and add to move to last position
-      conversationsLayout.getChildControl("bar").remove(this.__newConversationButton);
-      conversationsLayout.getChildControl("bar").add(this.__newConversationButton);
+      const bar = conversationsLayout.getChildControl("bar");
+      if (bar.indexOf(this.__newConversationButton) > -1) {
+        bar.remove(this.__newConversationButton);
+      }
+      bar.add(this.__newConversationButton);
     },
 
     __removeConversationPage: function(conversationId, changeSelection = false) {

services/static-webserver/client/source/class/osparc/workbench/Annotation.js

@@ -277,7 +277,7 @@ qx.Class.define("osparc.workbench.Annotation", {
         type: this.getType(),
         attributes: this.getAttributes(),
         color: this.getColor(), // TYPES.NOTE and TYPES.CONVERSATION do not need a color but backend expects it
-      }
+      };
       return serializeData;
     }
   }

services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml

@@ -16078,6 +16078,9 @@ components:
         thumbnail:
           anyOf:
           - type: string
+            maxLength: 2083
+            minLength: 1
+            format: uri
           - type: 'null'
           title: Thumbnail
       type: object
@@ -16131,14 +16134,14 @@ components:
           type: string
           format: uuid
           title: Uuid
-        createdAt:
+        creationDate:
           type: string
           format: date-time
-          title: Createdat
-        modifiedAt:
+          title: Creationdate
+        lastChangeDate:
           type: string
           format: date-time
-          title: Modifiedat
+          title: Lastchangedate
         solverKey:
           type: string
           pattern: ^simcore/services/((comp|dynamic|frontend))/([a-z0-9][a-z0-9_.-]*/)*([a-z0-9-_]+[a-z0-9])$
@@ -16147,14 +16150,26 @@ components:
           type: string
           pattern: ^(0|[1-9]\d*)(\.(0|[1-9]\d*)){2}(-(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*)(\.(0|[1-9]\d*|\d*[-a-zA-Z][-\da-zA-Z]*))*)?(\+[-\da-zA-Z]+(\.[-\da-zA-Z-]+)*)?$
           title: Solverversion
+        accessRights:
+          anyOf:
+          - $ref: '#/components/schemas/FunctionAccessRights'
+          - type: 'null'
+        thumbnail:
+          anyOf:
+          - type: string
+            maxLength: 2083
+            minLength: 1
+            format: uri
+          - type: 'null'
+          title: Thumbnail
       type: object
       required:
       - inputSchema
       - outputSchema
       - defaultInputs
       - uuid
-      - createdAt
-      - modifiedAt
+      - creationDate
+      - lastChangeDate
       - solverKey
       - solverVersion
       title: RegisteredSolverFunctionGet