Skip to content
Merged
Show file tree
Hide file tree
Changes from 63 commits
Commits
Show all changes
77 commits
Select commit Hold shift + click to select a range
eb700be
add timeout to make sure the node is saved before starting it
odeimaiz Jul 24, 2025
7cbed89
remove intervals
odeimaiz Jul 24, 2025
18d423a
updateStudyDocument with data and remove restartAutoSaveTimer
odeimaiz Jul 24, 2025
c7b1efe
listenToStudyChanges
odeimaiz Jul 24, 2025
13ec4e5
Merge branch 'master' into feature/event-driven-patches
odeimaiz Jul 24, 2025
889afcb
Merge branch 'feature/event-driven-patches' of github.com:odeimaiz/os…
odeimaiz Jul 24, 2025
dfc7a78
listenToChanges Node
odeimaiz Jul 24, 2025
ac4c7e6
minor
odeimaiz Jul 24, 2025
2fb6663
listenToChanges Node
odeimaiz Jul 24, 2025
0dd19a0
don't duplicate
odeimaiz Jul 24, 2025
d4d0fca
comment
odeimaiz Jul 24, 2025
c84ee62
unused
odeimaiz Jul 24, 2025
e220eac
serialize nodeUI
odeimaiz Jul 24, 2025
d4b0756
bring back old way
odeimaiz Jul 24, 2025
f65be44
minor
odeimaiz Jul 24, 2025
ec4b52b
marker and position
odeimaiz Jul 24, 2025
f71c76c
eventDrivenPatch
odeimaiz Jul 24, 2025
4d3e3ef
minor
odeimaiz Jul 24, 2025
6d7dbb3
minor
odeimaiz Jul 24, 2025
3586b91
fixes
odeimaiz Jul 24, 2025
e1f2e9c
Merge branch 'master' into feature/event-driven-patches
odeimaiz Jul 24, 2025
d40ea33
Merge branch 'feature/event-driven-patches' of github.com:odeimaiz/os…
odeimaiz Jul 24, 2025
fb8dfff
minor
odeimaiz Jul 24, 2025
8a221f1
multi move
odeimaiz Jul 24, 2025
72db3f8
marker under control
odeimaiz Jul 24, 2025
505baec
minor
odeimaiz Jul 24, 2025
ba8df3e
minor
odeimaiz Jul 24, 2025
9533368
unused
odeimaiz Jul 25, 2025
c877e74
IgnoreChangesProps
odeimaiz Jul 25, 2025
8c31960
refactor
odeimaiz Jul 25, 2025
e53d908
more refactor
odeimaiz Jul 25, 2025
59c25df
ListenChangesProps
odeimaiz Jul 25, 2025
7718fb1
ListenChangesProps
odeimaiz Jul 25, 2025
962bc7d
refactor
odeimaiz Jul 25, 2025
44131ab
minor
odeimaiz Jul 25, 2025
41e0b1a
isRTCEnabled
odeimaiz Jul 25, 2025
2d0d539
fix
odeimaiz Jul 25, 2025
233d5f4
minor
odeimaiz Jul 25, 2025
a3ab0e8
remove clean from serialize
odeimaiz Jul 25, 2025
486f563
minor
odeimaiz Jul 25, 2025
6fbb97d
inputs
odeimaiz Jul 25, 2025
3d82744
listen to inputs changes
odeimaiz Jul 25, 2025
e308bbb
unitChanged event
odeimaiz Jul 25, 2025
308df6b
inputsUnits
odeimaiz Jul 25, 2025
93f7a85
deprecate inputAccess
odeimaiz Jul 25, 2025
f6e1805
inputNodes
odeimaiz Jul 25, 2025
df3814c
inputsRequired
odeimaiz Jul 25, 2025
97a3df9
inputsRequired minor
odeimaiz Jul 25, 2025
18a9131
better
odeimaiz Jul 25, 2025
269bc25
progress
odeimaiz Jul 25, 2025
9562f76
refactor
odeimaiz Jul 25, 2025
253a67c
outputs
odeimaiz Jul 25, 2025
3cd2584
don't fire twice
odeimaiz Jul 25, 2025
f3fcab7
type is immutable
odeimaiz Jul 25, 2025
a17fdbb
minor
odeimaiz Jul 25, 2025
e299116
listenToChanges studyUI
odeimaiz Jul 25, 2025
d060ac5
minor
odeimaiz Jul 25, 2025
a003be2
Merge branch 'master' into feature/event-driven-patches
odeimaiz Jul 26, 2025
cd09172
Merge branch 'feature/event-driven-patches' of github.com:odeimaiz/os…
odeimaiz Jul 26, 2025
8b45ad4
rename and refactor
odeimaiz Jul 26, 2025
e50485d
changeData
odeimaiz Jul 26, 2025
d555f7b
undoings
odeimaiz Jul 26, 2025
5d321bd
minor
odeimaiz Jul 26, 2025
bfeaabe
comment
odeimaiz Jul 26, 2025
7d93215
throttling patch
odeimaiz Jul 26, 2025
e6e3840
it is needed
odeimaiz Jul 26, 2025
bcb62ec
listen to annotationChanged
odeimaiz Jul 26, 2025
29cb7ec
setSavePending
odeimaiz Jul 26, 2025
db78411
simpler
odeimaiz Jul 26, 2025
c861ddb
minor
odeimaiz Jul 26, 2025
95dfa66
minor
odeimaiz Jul 26, 2025
81c3722
annotations
odeimaiz Jul 26, 2025
5aa8152
changeSlideshow
odeimaiz Jul 26, 2025
3eb1d70
fix
odeimaiz Jul 26, 2025
6dc88fd
not needed
odeimaiz Jul 26, 2025
c402938
THROTTLE_PATCH_TIME down to 500ms
odeimaiz Jul 26, 2025
16db815
minor
odeimaiz Jul 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,7 @@ qx.Class.define("osparc.dashboard.CardBase", {

this.setBlocked(projectLocked ? "IN_USE" : false);
if (projectLocked) {
this.__showBlockedCardFromStatus("IN_USE", state["shareState"]);
this.__showBlockedCardFromStatus("IN_USE", state);
}

if (pipelineState) {
Expand Down Expand Up @@ -896,20 +896,20 @@ qx.Class.define("osparc.dashboard.CardBase", {
avatarGroup.setUserGroupIds(currentUserGroupIds);
},

__showBlockedCardFromStatus: function(reason, shareState) {
__showBlockedCardFromStatus: function(reason, state) {
switch (reason) {
case "IN_USE":
this.__blockedInUse(shareState);
this.__blockedInUse(state);
break;
case "IN_DEBT":
this.__blockedInDebt();
break;
}
},

__blockedInUse: function(shareState) {
const status = shareState["status"];
const currentUserGroupIds = shareState["currentUserGroupids"];
__blockedInUse: function(state) {
const projectStatus = osparc.study.Utils.state.getProjectStatus(state);
const currentUserGroupIds = osparc.study.Utils.state.getCurrentGroupIds(state);
const usersStore = osparc.store.Users.getInstance();
const userPromises = currentUserGroupIds.map(userGroupId => usersStore.getUser(userGroupId));
const usernames = [];
Expand All @@ -925,7 +925,7 @@ qx.Class.define("osparc.dashboard.CardBase", {
console.error("Failed to fetch user data for avatars:", error);
})
.finally(() => {
switch (status) {
switch (projectStatus) {
case "CLOSING":
image = "@FontAwesome5Solid/key/";
toolTip += this.tr("Closing...");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,9 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
this.__resourceModel["resourceType"] = resourceData["resourceType"];
this.__addPages();
}
if (resourceData["functionClass"] === osparc.data.model.Function.FUNCTION_CLASS.PROJECT) {
if (latestResourceData["functionClass"] === osparc.data.model.Function.FUNCTION_CLASS.PROJECT) {
// this is only required for functions that have a template linked
osparc.store.Templates.fetchTemplate(resourceData["templateId"])
osparc.store.Templates.fetchTemplate(latestResourceData["templateId"])
.then(templateData => {
// prefetch function's underlying template's services metadata
osparc.store.Services.getStudyServicesMetadata(templateData)
Expand Down
Loading
Loading