Merge branch 'master' into 1973-add-celery-worker-to-api-server

Author: bisgaard-itis

.env-devel

@@ -141,6 +141,7 @@ DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=adminadmin
 FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
 
 WEBSERVER_LICENSES={}
+WEBSERVER_FOGBUGZ={}
 LICENSES_ITIS_VIP_SYNCER_ENABLED=false
 LICENSES_ITIS_VIP_SYNCER_PERIODICITY=1D00:00:00
 LICENSES_ITIS_VIP_API_URL=https://replace-with-itis-api/{category}

packages/postgres-database/src/simcore_postgres_database/migration/versions/ec4f62595e0c_add_support_fogbugz_fields.py

@@ -0,0 +1,38 @@
+"""add support fogbugz fields
+
+Revision ID: ec4f62595e0c
+Revises: b566f1b29012
+Create Date: 2025-08-26 13:06:10.879081+00:00
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "ec4f62595e0c"
+down_revision = "b566f1b29012"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column(
+        "products",
+        sa.Column("support_assigned_fogbugz_person_id", sa.BigInteger(), nullable=True),
+    )
+    op.add_column(
+        "products",
+        sa.Column(
+            "support_assigned_fogbugz_project_id", sa.BigInteger(), nullable=True
+        ),
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_column("products", "support_assigned_fogbugz_project_id")
+    op.drop_column("products", "support_assigned_fogbugz_person_id")
+    # ### end Alembic commands ###

packages/postgres-database/src/simcore_postgres_database/models/products.py

@@ -282,5 +282,19 @@ class ProductLoginSettingsDict(TypedDict, total=False):
         nullable=True,
         doc="Group associated to this product support",
     ),
+    sa.Column(
+        "support_assigned_fogbugz_person_id",
+        sa.BigInteger,
+        unique=False,
+        nullable=True,
+        doc="Fogbugz person ID to assign support case",
+    ),
+    sa.Column(
+        "support_assigned_fogbugz_project_id",
+        sa.BigInteger,
+        unique=False,
+        nullable=True,
+        doc="Fogbugz project ID to assign support case",
+    ),
     sa.PrimaryKeyConstraint("name", name="products_pk"),
 )

services/docker-compose.yml

@@ -784,6 +784,7 @@ services:
       INVITATIONS_USERNAME: ${INVITATIONS_USERNAME}
 
       WEBSERVER_LICENSES: ${WEBSERVER_LICENSES}
+      WEBSERVER_FOGBUGZ: ${WEBSERVER_FOGBUGZ}
       LICENSES_ITIS_VIP_SYNCER_ENABLED: ${LICENSES_ITIS_VIP_SYNCER_ENABLED}
       LICENSES_ITIS_VIP_SYNCER_PERIODICITY: ${LICENSES_ITIS_VIP_SYNCER_PERIODICITY}
       LICENSES_ITIS_VIP_API_URL: ${LICENSES_ITIS_VIP_API_URL}
@@ -1007,6 +1008,7 @@ services:
       WEBSERVER_GROUPS: ${WB_DB_EL_GROUPS}
       WEBSERVER_INVITATIONS: ${WB_DB_EL_INVITATIONS}
       WEBSERVER_LICENSES: "null"
+      WEBSERVER_FOGBUGZ: "null"
       WEBSERVER_LOGIN: ${WB_DB_EL_LOGIN}
       WEBSERVER_PAYMENTS: ${WB_DB_EL_PAYMENTS}
       WEBSERVER_NOTIFICATIONS: ${WB_DB_EL_NOTIFICATIONS}
@@ -1125,6 +1127,7 @@ services:
       WEBSERVER_HOST: ${WEBSERVER_HOST}
       WEBSERVER_INVITATIONS: ${WB_GC_INVITATIONS}
       WEBSERVER_LICENSES: "null"
+      WEBSERVER_FOGBUGZ: "null"
       WEBSERVER_LOGIN: ${WB_GC_LOGIN}
       WEBSERVER_LOGLEVEL: ${WB_GC_LOGLEVEL}
       WEBSERVER_NOTIFICATIONS: ${WB_GC_NOTIFICATIONS}
@@ -1204,6 +1207,7 @@ services:
       WEBSERVER_GROUPS: 0
       WEBSERVER_INVITATIONS: "null"
       WEBSERVER_LICENSES: "null"
+      WEBSERVER_FOGBUGZ: "null"
       WEBSERVER_LOGIN: "null"
       WEBSERVER_NOTIFICATIONS: 0
       WEBSERVER_PAYMENTS: "null"

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

@@ -177,9 +177,18 @@ qx.Class.define("osparc.dashboard.SearchBarFilterExtended", {
 
       const contextDropDown = this.getChildControl("context-drop-down");
       this.getChildControl("my-projects-button");
-      this.getChildControl("templates-button");
-      this.getChildControl("public-projects-button");
-      this.getChildControl("functions-button");
+      if (osparc.product.Utils.showTemplates()) {
+        this.getChildControl("templates-button");
+      }
+      if (osparc.product.Utils.showPublicProjects()) {
+        this.getChildControl("public-projects-button");
+      }
+      if (osparc.product.Utils.showFunctions()) {
+        this.getChildControl("functions-button");
+      }
+      if (contextDropDown.getChildren().length === 1) {
+        contextDropDown.hide();
+      }
       contextDropDown.addListener("changeSelection", e => {
         const selection = e.getData();
         if (selection.length) {

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

@@ -34,38 +34,21 @@ qx.Class.define("osparc.dashboard.SortedByMenuButton", {
     this.setMenu(sortedByMenu);
 
     const options = this.self().getSortByOptions();
-
     options.forEach((option, idx) => {
-      const btn = new qx.ui.menu.Button();
-      btn.btnId = option.id;
-      btn.set({
-        label: option.label,
-        icon: null
-      });
+      const btn = new qx.ui.menu.Button(option.label);
+      btn.field = option.id;
       // Sort by last modified date
       if (idx === options.length -1) {
-        this.__menuButton = btn;
+        this.__selectedMenuButton = btn;
         btn.setIcon("@FontAwesome5Solid/arrow-down/14");
       }
       sortedByMenu.add(btn);
 
-      btn.addListener("execute", () => {
-        this.__buttonExecuted(btn)
-      });
+      btn.addListener("execute", () => this.__buttonExecuted(btn));
     });
-
-    this.addListener("changeSort", e => {
-      const sort = e.getData();
-      this.__handelSortEvent(sort)
-    }, this);
   },
 
   statics: {
-    DefaultSorting: {
-      field: "last_change_date",
-      direction: "desc"
-    },
-
     getSortByOptions: function() {
       return [{
         id: "name",
@@ -96,45 +79,40 @@ qx.Class.define("osparc.dashboard.SortedByMenuButton", {
       },
       nullable: false,
       event: "changeSort",
-      apply: "__applySort"
+      apply: "__handelSortEvent",
     }
   },
 
   members: {
-    __menuButton: null,
+    __selectedMenuButton: null,
+
     __buttonExecuted: function(btn) {
-      if (this.__menuButton) {
-        this.__menuButton.setIcon(null);
+      if (this.__selectedMenuButton) {
+        this.__selectedMenuButton.setIcon(null);
       }
-      this.__menuButton = btn;
+      this.__selectedMenuButton = btn;
       this.set({
         label: btn.getLabel(),
         icon: "@FontAwesome5Solid/chevron-down/10"
       });
 
-      const data = {
-        "id": btn.btnId,
-      };
-      this.__handelSort(data.id);
-    },
-
-    __handelSort: function(field) {
+      const field = btn.field;
       if (field === this.getSort().field) {
         const { direction } = this.getSort();
         this.setSort({
           field,
           direction: !direction
-        })
-        return;
+        });
+      } else {
+        this.setSort({
+          field,
+          direction: true
+        });
       }
-      this.setSort({
-        field,
-        direction: true
-      })
     },
 
     __handelSortEvent: function({field, direction}) {
-      this.__menuButton.setIcon(direction ? "@FontAwesome5Solid/arrow-down/14" : "@FontAwesome5Solid/arrow-up/14")
+      this.__selectedMenuButton.setIcon(direction ? "@FontAwesome5Solid/arrow-down/14" : "@FontAwesome5Solid/arrow-up/14")
       this.setIcon(direction ? "@FontAwesome5Solid/arrow-down/14" : "@FontAwesome5Solid/arrow-up/14")
       const sort = {
         field: field,
@@ -143,8 +121,15 @@ qx.Class.define("osparc.dashboard.SortedByMenuButton", {
       this.fireDataEvent("sortByChanged", sort);
     },
 
-    __applySort: function(value, old) {
+    hideOptionButton: function(field) {
+      const btn = this.getMenu().getChildren().find(btn => btn.field === field);
+      if (btn) {
+        btn.exclude();
+      }
+    },
 
-    }
+    showAllOptions: function() {
+      this.getMenu().getChildren().forEach(btn => btn.show());
+    },
   }
 });

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

@@ -806,6 +806,12 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           currentParams[key] = value;
         }
       });
+      if ([
+        osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS,
+        osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS,
+      ].includes(this.getCurrentContext())) {
+        currentParams.orderBy = osparc.store.Functions.curateOrderBy(currentParams.orderBy);
+      }
 
       // check the entries in currentParams are the same as the reqParams
       let sameContext = true;
@@ -890,7 +896,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
           break;
         case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
         case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS:
-          delete requestParams.orderBy; // functions do not support ordering yet
           requestParams.includeExtras = "true";
           break;
         case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_PROJECTS: {
@@ -972,7 +977,6 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
     },
 
     invalidateFunctions: function() {
-      osparc.store.Functions.invalidateFunctions();
       this.__resetStudiesList();
       if (this._resourcesContainer.getFlatList()) {
         this._resourcesContainer.getFlatList().nextRequest = null;
@@ -1360,8 +1364,8 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
       this._searchBarFilter.setEnabled(true);
       // workspaces will exclude it
       this._toolbar.show();
-      // functions will exclude it
-      this.__sortByButton.show();
+      // functions will hide some option
+      this.__sortByButton.showAllOptions();
 
       switch (this.getCurrentContext()) {
         case osparc.dashboard.StudyBrowser.CONTEXT.PROJECTS:
@@ -1413,8 +1417,9 @@ qx.Class.define("osparc.dashboard.StudyBrowser", {
             this._searchBarFilter.resetFilters();
           }
           this._searchBarFilter.getChildControl("text-field").setPlaceholder("Search in Functions");
-          // functions can't be sorted yet
-          this.__sortByButton.exclude();
+          // functions don't support all options yet
+          this.__sortByButton.hideOptionButton("name");
+          this.__sortByButton.hideOptionButton("prj_owner");
           this._loadingResourcesBtn.setFetching(false);
           this.invalidateFunctions();
           this.__reloadStudies();

services/static-webserver/client/source/class/osparc/data/Resources.js

@@ -634,11 +634,11 @@ qx.Class.define("osparc.data.Resources", {
           },
           getPage: {
             method: "GET",
-            url: statics.API + "/functions?include_extras=true&offset={offset}&limit={limit}"
+            url: statics.API + "/functions?include_extras=true&offset={offset}&limit={limit}&order_by={orderBy}"
           },
           getPageSearch: {
             method: "GET",
-            url: statics.API + "/functions?include_extras=true&offset={offset}&limit={limit}&search={text}"
+            url: statics.API + "/functions?include_extras=true&offset={offset}&limit={limit}&search={text}&order_by={orderBy}"
           },
           create: {
             method: "POST",

services/static-webserver/client/source/class/osparc/navigation/NavigationBar.js

@@ -378,11 +378,11 @@ qx.Class.define("osparc.navigation.NavigationBar", {
       // quick starts and manuals
       osparc.store.Support.addQuickStartToMenu(menu);
       osparc.store.Support.addGuidedToursToMenu(menu);
-      osparc.store.Support.addManualButtonsToMenu(menu, menuButton);
+      osparc.store.Support.addManualsToMenu(menu);
       menu.addSeparator();
 
       // feedback
-      osparc.store.Support.addSupportButtonsToMenu(menu, menuButton);
+      osparc.store.Support.addSupportButtonsToMenu(menu);
       osparc.store.Support.addReleaseNotesToMenu(menu);
 
       return menuButton;

services/static-webserver/client/source/class/osparc/navigation/UserMenu.js

@@ -215,7 +215,7 @@ qx.Class.define("osparc.navigation.UserMenu", {
       // quick starts and manuals
       osparc.store.Support.addQuickStartToMenu(this);
       osparc.store.Support.addGuidedToursToMenu(this);
-      osparc.store.Support.addManualButtonsToMenu(this);
+      osparc.store.Support.addManualsToMenu(this);
       this.addSeparator();
 
       // feedbacks