Skip to content

Commit 135dcbb

Browse files
authored
Merge branch 'master' into enh/mandatory-company
2 parents 53adc91 + 1713021 commit 135dcbb

File tree

37 files changed

+869
-229
lines changed

37 files changed

+869
-229
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
"""Add product owners email col
2+
3+
Revision ID: 1bc517536e0a
4+
Revises: 5f88b513cd4c
5+
Create Date: 2025-01-29 10:05:58.254306+00:00
6+
7+
"""
8+
import sqlalchemy as sa
9+
from alembic import op
10+
11+
# revision identifiers, used by Alembic.
12+
revision = "1bc517536e0a"
13+
down_revision = "5f88b513cd4c"
14+
branch_labels = None
15+
depends_on = None
16+
17+
18+
def upgrade():
19+
# ### commands auto generated by Alembic - please adjust! ###
20+
op.add_column(
21+
"products", sa.Column("product_owners_email", sa.String(), nullable=True)
22+
)
23+
# ### end Alembic commands ###
24+
25+
26+
def downgrade():
27+
# ### commands auto generated by Alembic - please adjust! ###
28+
op.drop_column("products", "product_owners_email")
29+
# ### end Alembic commands ###

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,12 @@ class ProductLoginSettingsDict(TypedDict, total=False):
154154
doc="Support email for this product"
155155
'Therefore smtp_sender = f"{display_name} support <{support_email}>"',
156156
),
157+
sa.Column(
158+
"product_owners_email",
159+
sa.String,
160+
nullable=True,
161+
doc="Alternative support email directed to POs only (e.g. for account request, sales, etc)",
162+
),
157163
sa.Column(
158164
"twilio_messaging_sid",
159165
sa.String,

packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,12 @@ def random_product(
227227
"short_name": suffix[:4],
228228
"host_regex": r"[a-zA-Z0-9]+\.com",
229229
"support_email": f"support@{suffix}.io",
230-
"twilio_messaging_sid": fake.random_element(elements=(None, fake.uuid4()[:34])),
230+
"product_owners_email": fake.random_element(
231+
elements=[f"product-onwers@{suffix}.io", None]
232+
),
233+
"twilio_messaging_sid": fake.random_element(
234+
elements=(None, f"{fake.uuid4()}"[:34])
235+
),
231236
"vendor": Vendor(
232237
name=fake.company(),
233238
copyright=fake.company_suffix(),

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ qx.Class.define("osparc.dashboard.Dashboard", {
3838
construct: function() {
3939
this.base(arguments);
4040

41-
osparc.utils.Utils.setIdToWidget(this.getChildControl("bar"), "dashboardTabs");
42-
osparc.utils.Utils.setIdToWidget(this, "dashboard");
41+
this.getChildControl("bar").set({
42+
visibility: "excluded",
43+
});
4344

4445
this.set({
4546
contentPadding: this.self().PADDING,
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
/* ************************************************************************
2+
3+
osparc - the simcore frontend
4+
5+
https://osparc.io
6+
7+
Copyright:
8+
2025 IT'IS Foundation, https://itis.swiss
9+
10+
License:
11+
MIT: https://opensource.org/licenses/MIT
12+
13+
Authors:
14+
* Odei Maiz (odeimaiz)
15+
16+
************************************************************************ */
17+
18+
qx.Class.define("osparc.dashboard.NewPlusButton", {
19+
extend: qx.ui.form.MenuButton,
20+
21+
construct: function() {
22+
this.base(arguments);
23+
24+
this.set({
25+
appearance: "strong-button",
26+
icon: osparc.dashboard.CardBase.NEW_ICON + "20",
27+
label: this.tr("New"),
28+
font: "text-16",
29+
gap: 15,
30+
padding: 15,
31+
paddingRight: 20,
32+
allowGrowX: false,
33+
});
34+
35+
osparc.utils.Utils.setIdToWidget(this, "newPlusBtn");
36+
37+
this.setMenu(new osparc.dashboard.NewPlusMenu());
38+
},
39+
});

0 commit comments

Comments
 (0)