Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🎨 [Frontend] Improve blocked card's UX #6207

Merged
merged 39 commits into from
Aug 21, 2024
Merged
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
34cf072
minor
odeimaiz Aug 19, 2024
3002f73
locked -> blocked
odeimaiz Aug 19, 2024
df5f6f7
it's not Boolean anymore
odeimaiz Aug 19, 2024
342d544
block card
odeimaiz Aug 19, 2024
8af9637
Merge branch 'master' into enh/blocked-studies
odeimaiz Aug 19, 2024
548afad
Merge branch 'enh/blocked-studies' of github.com:odeimaiz/osparc-simc…
odeimaiz Aug 19, 2024
df0a470
remove dummy
odeimaiz Aug 19, 2024
d01851b
open Study Details in some blocked scenarios
odeimaiz Aug 19, 2024
24f5107
minor
odeimaiz Aug 19, 2024
cd7c584
minor
odeimaiz Aug 19, 2024
c91816b
refactor
odeimaiz Aug 19, 2024
5436c42
minor
odeimaiz Aug 19, 2024
259e96f
minor
odeimaiz Aug 19, 2024
6295c79
atomic operations
odeimaiz Aug 19, 2024
206f1c8
minor
odeimaiz Aug 19, 2024
9ad9198
enable menu button
odeimaiz Aug 19, 2024
f6bc4ab
evaluateMenuButtons
odeimaiz Aug 19, 2024
d2d74c4
Merge branch 'master' into enh/blocked-studies
odeimaiz Aug 20, 2024
67dfed3
__getBlockedState
odeimaiz Aug 20, 2024
a4a6131
Merge branch 'enh/blocked-studies' of github.com:odeimaiz/osparc-simc…
odeimaiz Aug 20, 2024
29e1231
refactoring
odeimaiz Aug 20, 2024
7693f7a
minor
odeimaiz Aug 20, 2024
a1f018d
minor
odeimaiz Aug 20, 2024
85b3cdf
minor
odeimaiz Aug 20, 2024
7d305af
minor
odeimaiz Aug 20, 2024
a3911c9
minor
odeimaiz Aug 20, 2024
352d82e
__infoPage
odeimaiz Aug 20, 2024
c588d35
minor
odeimaiz Aug 20, 2024
a3c5767
Increase Maintenance notice
odeimaiz Aug 21, 2024
3f11ed1
comments
odeimaiz Aug 21, 2024
6bf8533
more checks
odeimaiz Aug 21, 2024
535f236
list billableServices in finally
odeimaiz Aug 21, 2024
dad25dd
increase tooltip's showTimeout number
odeimaiz Aug 21, 2024
38d9241
Disable some pages
odeimaiz Aug 21, 2024
890c134
cleanup
odeimaiz Aug 21, 2024
6eed267
catch error
odeimaiz Aug 21, 2024
6239444
canMoveToFolder
odeimaiz Aug 21, 2024
8fb5a57
tooltip timeouts
odeimaiz Aug 21, 2024
f33f4e6
Merge branch 'master' into enh/blocked-studies
odeimaiz Aug 21, 2024
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
Prev Previous commit
Next Next commit
refactoring
  • Loading branch information
odeimaiz committed Aug 20, 2024
commit 29e1231bae0f1dcd878ab3d1786f3e42d8ca5cd6
Original file line number Diff line number Diff line change
@@ -762,26 +762,27 @@ qx.Class.define("osparc.dashboard.CardBase", {
evaluateMenuButtons: function() {
if (this.getMenu()) {
const menuButtons = this.getMenu().getChildren();
const blocked = this.getBlocked();
const resourceData = this.getResourceData();

const openButton = menuButtons.find(menuBtn => "openResourceButton" in menuBtn);
if (openButton) {
openButton.setEnabled([false].includes(blocked));
openButton.setEnabled(osparc.study.Utils.canBeOpened(resourceData));
}
const duplicateButton = menuButtons.find(menuBtn => "duplicateButton" in menuBtn);
if (duplicateButton) {
duplicateButton.setEnabled(["UNKNOWN_SERVICES", false].includes(blocked));
duplicateButton.setEnabled(osparc.study.Utils.canBeDuplicated(resourceData));
}
const exportCMISButton = menuButtons.find(menuBtn => "exportCMISButton" in menuBtn);
if (exportCMISButton) {
exportCMISButton.setEnabled(["UNKNOWN_SERVICES", false].includes(blocked));
exportCMISButton.setEnabled(osparc.study.Utils.canBeExported(resourceData));
}
const studyFilesButton = menuButtons.find(menuBtn => "studyFilesButton" in menuBtn);
if (studyFilesButton) {
studyFilesButton.setEnabled(["UNKNOWN_SERVICES", false].includes(blocked));
studyFilesButton.setEnabled(osparc.study.Utils.canCheckFiles(resourceData));
}
const deleteButton = menuButtons.find(menuBtn => "deleteButton" in menuBtn);
if (deleteButton) {
deleteButton.setEnabled(["UNKNOWN_SERVICES", false].includes(blocked));
deleteButton.setEnabled(osparc.study.Utils.canBeDeleted(resourceData));
}
}
},
Original file line number Diff line number Diff line change
@@ -245,23 +245,28 @@ qx.Class.define("osparc.study.Utils", {
},

canBeOpened: function(studyData) {

const blocked = this.__getBlockedState(studyData);
return [false].includes(blocked);
},

canBeDuplicated: function(studyData) {

const blocked = this.__getBlockedState(studyData);
return ["UNKNOWN_SERVICES", false].includes(blocked);
},

canBeExported: function(studyData) {

const blocked = this.__getBlockedState(studyData);
return ["UNKNOWN_SERVICES", false].includes(blocked);
},

canCheckFiles: function(studyData) {

const blocked = this.__getBlockedState(studyData);
return ["UNKNOWN_SERVICES", false].includes(blocked);
},

canBeDeleted: function(studyData) {

const blocked = this.__getBlockedState(studyData);
return ["UNKNOWN_SERVICES", false].includes(blocked);
},

mustache: {
Loading