Merge branch 'master' into pr-osparc-login-director-v2

Author: GitHK

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Literal
 
 from models_library.api_schemas_webserver import WEBSERVER_RPC_NAMESPACE
 from models_library.api_schemas_webserver.functions import (
@@ -18,6 +19,7 @@
 )
 from models_library.functions import (
     FunctionClass,
+    FunctionGroupAccessRights,
     FunctionJobStatus,
     FunctionOutputs,
     FunctionUserAccessRights,
@@ -418,6 +420,7 @@ async def update_function_job_status(
     product_name: ProductName,
     function_job_id: FunctionJobID,
     job_status: FunctionJobStatus,
+    check_write_permissions: bool = True,
 ) -> FunctionJobStatus:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
@@ -426,6 +429,7 @@ async def update_function_job_status(
         job_status=job_status,
         user_id=user_id,
         product_name=product_name,
+        check_write_permissions=check_write_permissions,
     )
     return TypeAdapter(FunctionJobStatus).validate_python(result)
 
@@ -438,6 +442,7 @@ async def update_function_job_outputs(
     product_name: ProductName,
     function_job_id: FunctionJobID,
     outputs: FunctionOutputs,
+    check_write_permissions: bool = True,
 ) -> FunctionOutputs:
     result = await rabbitmq_rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
@@ -446,6 +451,7 @@ async def update_function_job_outputs(
         outputs=outputs,
         user_id=user_id,
         product_name=product_name,
+        check_write_permissions=check_write_permissions,
     )
     return TypeAdapter(FunctionOutputs).validate_python(result)
 
@@ -578,3 +584,37 @@ async def get_functions_user_api_access_rights(
         product_name=product_name,
     )
     return TypeAdapter(FunctionUserApiAccessRights).validate_python(result)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def set_group_permissions(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    user_id: UserID,
+    product_name: ProductName,
+    object_type: Literal["function", "function_job", "function_job_collection"],
+    object_ids: list[FunctionID | FunctionJobID | FunctionJobCollectionID],
+    permission_group_id: int,
+    read: bool | None = None,
+    write: bool | None = None,
+    execute: bool | None = None,
+) -> list[
+    tuple[
+        FunctionID | FunctionJobID | FunctionJobCollectionID, FunctionGroupAccessRights
+    ]
+]:
+    result = await rabbitmq_rpc_client.request(
+        WEBSERVER_RPC_NAMESPACE,
+        TypeAdapter(RPCMethodName).validate_python("set_group_permissions"),
+        user_id=user_id,
+        product_name=product_name,
+        object_type=object_type,
+        object_ids=object_ids,
+        permission_group_id=permission_group_id,
+        read=read,
+        write=write,
+        execute=execute,
+    )
+    return TypeAdapter(
+        list[tuple[FunctionID | FunctionJobID, FunctionGroupAccessRights]]
+    ).validate_python(result)

services/api-server/src/simcore_service_api_server/_service_function_jobs.py

@@ -203,6 +203,7 @@ async def inspect_function_job(
             user_id=self.user_id,
             product_name=self.product_name,
             job_status=new_job_status,
+            check_write_permissions=False,
         )
 
     async def create_function_job_inputs(  # pylint: disable=no-self-use
@@ -529,4 +530,5 @@ async def function_job_outputs(
             user_id=user_id,
             product_name=product_name,
             outputs=new_outputs,
+            check_write_permissions=False,
         )

services/api-server/src/simcore_service_api_server/api/routes/functions_routes.py

@@ -474,7 +474,7 @@ async def _run_single_function(function_inputs: FunctionInputs) -> FunctionJobID
             for function_inputs in function_inputs_list
         ],
         reraise=False,
-        limit=10,
+        limit=1,
     )
 
     # Check if any tasks raised exceptions and raise the first one found

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -587,13 +587,15 @@ async def update_function_job_status(
         user_id: UserID,
         product_name: ProductName,
         job_status: FunctionJobStatus,
+        check_write_permissions: bool = True,
     ) -> FunctionJobStatus:
         return await functions_rpc_interface.update_function_job_status(
             self._client,
             function_job_id=function_job_id,
             user_id=user_id,
             product_name=product_name,
             job_status=job_status,
+            check_write_permissions=check_write_permissions,
         )
 
     async def update_function_job_outputs(
@@ -603,13 +605,15 @@ async def update_function_job_outputs(
         user_id: UserID,
         product_name: ProductName,
         outputs: FunctionOutputs,
+        check_write_permissions: bool = True,
     ) -> FunctionOutputs:
         return await functions_rpc_interface.update_function_job_outputs(
             self._client,
             function_job_id=function_job_id,
             user_id=user_id,
             product_name=product_name,
             outputs=outputs,
+            check_write_permissions=check_write_permissions,
         )
 
     async def find_cached_function_jobs(

services/static-webserver/client/source/class/osparc/dashboard/ResourceBrowserBase.js

@@ -121,14 +121,20 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
 
       const walletsEnabled = osparc.desktop.credits.Utils.areWalletsEnabled();
       if (walletsEnabled) {
-        osparc.store.Study.getInstance().getWallet(studyId)
-          .then(wallet => {
+        Promise.all([
+          osparc.store.Study.getInstance().getWallet(studyId),
+          osparc.store.Study.getInstance().getOne(studyId),
+        ]).then(([wallet, latestStudyData]) => {
+            const currentUserGroupIds = osparc.study.Utils.state.getCurrentGroupIds(latestStudyData["state"]);
             if (
               isStudyCreation ||
               wallet === null ||
-              osparc.desktop.credits.Utils.getWallet(wallet["walletId"]) === null
+              (osparc.desktop.credits.Utils.getWallet(wallet["walletId"]) === null && currentUserGroupIds.length === 0)
             ) {
-              // pop up study options if the study was just created or if it has no wallet assigned or user has no access to it
+              // pop up StudyOptions if:
+              // - the study was just created
+              // - it has no wallet assigned
+              // - I do not have access to it and the project is not being used
               const resourceSelector = new osparc.study.StudyOptions(studyId);
               if (isStudyCreation) {
                 resourceSelector.getChildControl("open-button").setLabel(qx.locale.Manager.tr("New"));
@@ -157,7 +163,28 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
                 }
               });
             } else {
-              openStudy();
+              const found = osparc.store.Store.getInstance().getWallets().find(w => w.getWalletId() === wallet["walletId"]);
+              if (found) {
+                // I have access to the wallet
+                if (osparc.store.Store.getInstance().getContextWallet() !== found) {
+                  // switch to that wallet and inform the user that the context wallet has changed
+                  const text = qx.locale.Manager.tr("Switched to Credit Account") + " '" + found.getName() + "'";
+                  osparc.FlashMessenger.logAs(text);
+                }
+                osparc.store.Store.getInstance().setActiveWallet(found);
+                openStudy();
+              } else {
+                // I do not have access to the wallet or it's being used
+                // cancel and explain the user why
+                const isRTCEnabled = osparc.utils.DisabledPlugins.isRTCEnabled();
+                const msg = isRTCEnabled ?
+                  qx.locale.Manager.tr("You can't join the project because you don't have access to the Credit Account associated with it. Please contact the project owner.") :
+                  qx.locale.Manager.tr("You can't join the project because it's already open by another user.");
+                osparc.FlashMessenger.logAs(msg, "ERROR");
+                if (cancelCB) {
+                  cancelCB();
+                }
+              }
             }
           });
       } else {
@@ -196,7 +223,22 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
         osparc.utils.Utils.addBorderRightRadius(rButton);
       }
       return rButton;
-    }
+    },
+
+    getOpenText: function(resourceData) {
+      const studyAlias = osparc.product.Utils.getStudyAlias({firstUpperCase: true});
+      let openText = qx.locale.Manager.tr("New") + " " + studyAlias;
+      if (resourceData["resourceType"] === "study") {
+        // if it's in use call it join
+        const isRTCEnabled = osparc.utils.DisabledPlugins.isRTCEnabled();
+        if (osparc.study.Utils.state.getCurrentGroupIds(resourceData["state"]).length && isRTCEnabled) {
+          openText = qx.locale.Manager.tr("Join");
+        } else {
+          openText = qx.locale.Manager.tr("Open");
+        }
+      }
+      return openText;
+    },
   },
 
   members: {
@@ -899,8 +941,7 @@ qx.Class.define("osparc.dashboard.ResourceBrowserBase", {
     },
 
     _getOpenMenuButton: function(resourceData) {
-      const studyAlias = osparc.product.Utils.getStudyAlias({firstUpperCase: true});
-      const openText = (resourceData["resourceType"] === "study") ? this.tr("Open") : this.tr("New") + " " + studyAlias;
+      const openText = osparc.dashboard.ResourceBrowserBase.getOpenText(resourceData);
       const openButton = new qx.ui.menu.Button(openText);
       openButton["openResourceButton"] = true;
       openButton.addListener("execute", () => {

services/static-webserver/client/source/class/osparc/dashboard/ResourceDetails.js

@@ -157,7 +157,14 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         maxHeight: 40
       });
       return toolbar;
-    }
+    },
+
+    disableIfInUse: function(resourceData, widget) {
+      if (resourceData["resourceType"] === "study") {
+        // disable if it's being used
+        widget.setEnabled(!osparc.study.Utils.state.getCurrentGroupIds(resourceData["state"]).length);
+      }
+    },
   },
 
   properties: {
@@ -225,8 +232,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         toolbar.add(serviceVersionSelector);
       }
 
-      const studyAlias = osparc.product.Utils.getStudyAlias({firstUpperCase: true});
-      const openText = (this.__resourceData["resourceType"] === "study") ? this.tr("Open") : this.tr("New") + " " + studyAlias;
+      const openText = osparc.dashboard.ResourceBrowserBase.getOpenText(this.__resourceData);
       const openButton = new osparc.ui.form.FetchButton(openText).set({
         enabled: true
       });
@@ -536,6 +542,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
 
         const lazyLoadContent = () => {
           const billingSettings = new osparc.study.BillingSettings(resourceData);
+          this.self().disableIfInUse(resourceData, billingSettings);
           billingSettings.addListener("debtPayed", () => {
             page.payDebtButton.set({
               visibility: osparc.study.Utils.isInDebt(resourceData) ? "visible" : "excluded"
@@ -785,6 +792,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
 
       const lazyLoadContent = () => {
         const servicesUpdate = new osparc.metadata.ServicesInStudyUpdate(resourceData);
+        this.self().disableIfInUse(resourceData, servicesUpdate);
         servicesUpdate.addListener("updateService", e => {
           const updatedData = e.getData();
           this.__fireUpdateEvent(resourceData, updatedData);
@@ -818,6 +826,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
 
       const lazyLoadContent = () => {
         const servicesBootOpts = new osparc.metadata.ServicesInStudyBootOpts(resourceData);
+        this.self().disableIfInUse(resourceData, servicesBootOpts);
         servicesBootOpts.addListener("updateService", e => {
           const updatedData = e.getData();
           this.__fireUpdateEvent(resourceData, updatedData);

services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js

@@ -657,7 +657,7 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       }, this);
 
       workbench.addListener("fileRequested", () => {
-        if (this.getStudy().getUi().getMode() === "workbench") {
+        if (["workbench", "pipeline"].includes(this.getStudy().getUi().getMode())) {
           const tabViewLeftPanel = this.getChildControl("side-panel-left-tabs");
           tabViewLeftPanel.setSelection([this.__storagePage]);
         }

services/static-webserver/client/source/class/osparc/desktop/wallets/WalletListItem.js

@@ -153,7 +153,7 @@ qx.Class.define("osparc.desktop.wallets.WalletListItem", {
             rowSpan: 2
           });
           break;
-        case "favourite-button":
+        case "preferred-button":
           control = new qx.ui.form.Button().set({
             iconPosition: "right",
             width: 110, // make Primary and Secondary buttons same width
@@ -326,8 +326,11 @@ qx.Class.define("osparc.desktop.wallets.WalletListItem", {
     },
 
     __applyPreferredWallet: function(isPreferredWallet) {
-      const favouriteButton = this.getChildControl("favourite-button");
-      favouriteButton.setBackgroundColor("transparent");
+      const favouriteButton = this.getChildControl("preferred-button");
+      favouriteButton.set({
+        backgroundColor: "transparent",
+        width: 60,
+      });
       const favouriteButtonIcon = favouriteButton.getChildControl("icon");
       if (isPreferredWallet) {
         favouriteButton.set({

services/static-webserver/client/source/class/osparc/desktop/wallets/WalletsList.js

@@ -229,8 +229,8 @@ qx.Class.define("osparc.desktop.wallets.WalletsList", {
         flex: 1
       });
       if (showCurrently) {
-        const selectColumn = new qx.ui.basic.Label(this.tr("Currently in use")).set({
-          marginRight: 18
+        const selectColumn = new qx.ui.basic.Label(this.tr("Preferred")).set({
+          marginRight: 8 // align it with the "preferred-button"
         });
         header.add(selectColumn)
       }

services/static-webserver/client/source/class/osparc/file/FilePicker.js

@@ -283,7 +283,7 @@ qx.Class.define("osparc.file.FilePicker", {
         this.__buildInfoLayout();
       } else {
         this.__addProgressBar();
-        if (viewContext === "workbench") {
+        if (["workbench", "pipeline"].includes(viewContext)) {
           this.__buildWorkbenchLayout();
         } else {
           this.setMargin(10);