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.

Sign up for GitHub

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: Ask for confirmation before demoting an Organization to Viewer #3961

Merged
merged 10 commits into from
Mar 13, 2023
Merged

✨ Frontend: Ask for confirmation before demoting an Organization to Viewer #3961

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4825296
confirmDemoteOrgnaization preference
odeimaiz Mar 10, 2023
25f2633
Merge branch 'master' into feature/confirm-demote
odeimaiz Mar 10, 2023
2f19662
getConfirmDemoteOrgnaization
odeimaiz Mar 10, 2023
eea54a1
Merge branch 'feature/confirm-demote' of github.com:odeimaiz/osparc-s…
odeimaiz Mar 10, 2023
917f7c8
ask for confirmation
odeimaiz Mar 10, 2023
8e78cf7
OM todo
odeimaiz Mar 10, 2023
a0501a9
Merge branch 'master' into feature/confirm-demote
odeimaiz Mar 13, 2023
59ddfa4
Merge branch 'feature/confirm-demote' of github.com:odeimaiz/osparc-s…
odeimaiz Mar 13, 2023
dae24c6
update text
odeimaiz Mar 13, 2023
1164c3d
message only for organizations
odeimaiz Mar 13, 2023
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
2 changes: 1 addition & 1 deletion services/static-webserver/client/source/class/osparc/component/share/Collaborators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ qx.Class.define("osparc.component.share.Collaborators", {
});
item.addListener("demoteToCollaborator", e => {
const orgMember = e.getData();
this._demoteToCollaborator(orgMember);
this._demoteToCollaborator(orgMember, item);
});
item.addListener("removeMember", e => {
const orgMember = e.getData();
Expand Down
33 changes: 26 additions & 7 deletions services/static-webserver/client/source/class/osparc/component/share/CollaboratorsStudy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,13 +228,32 @@ qx.Class.define("osparc.component.share.CollaboratorsStudy", {
},

_demoteToViewer: function(collaborator, item) {
this.__make(
collaborator["gid"],
this.self().getViewerAccessRight(),
this.tr("Collaborator successfully made Viewer"),
this.tr("Something went wrong making Collaborator Viewer"),
item
);
const demoteToViewer = (collab, itm) => {
this.__make(
collab["gid"],
this.self().getViewerAccessRight(),
this.tr("Collaborator successfully made Viewer"),
this.tr("Something went wrong making Collaborator Viewer"),
itm
);
};
const preferencesSettings = osparc.desktop.preferences.Preferences.getInstance();
if (preferencesSettings.getConfirmDemoteOrgnaization()) {
const msg = this.tr("Demoting an Organization to Viewer, will make all its members Viewers");
const win = new osparc.ui.window.Confirmation(msg).set({
confirmAction: "delete",
confirmText: this.tr("Demote")
});
win.center();
win.open();
win.addListener("close", () => {
if (win.getConfirmed()) {
demoteToViewer(collaborator, item);
}
}, this);
} else {
demoteToViewer(collaborator, item);
}
},

_demoteToCollaborator: function(collaborator, item) {
Expand Down
7 changes: 7 additions & 0 deletions services/static-webserver/client/source/class/osparc/desktop/preferences/Preferences.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ qx.Class.define("osparc.desktop.preferences.Preferences", {
event: "changeConfirmDeleteStudy"
},

confirmDemoteOrgnaization: {
nullable: false,
init: true,
check: "Boolean",
event: "changeConfirmDemoteOrgnaization"
},

confirmDeleteNode: {
nullable: false,
init: true,
Expand Down
5 changes: 5 additions & 0 deletions ...tatic-webserver/client/source/class/osparc/desktop/preferences/pages/ConfirmationsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ qx.Class.define("osparc.desktop.preferences.pages.ConfirmationsPage", {
}, this);
box.add(cbConfirmDeleteStudy);

const cbConfirmDemoteOrgnaization = new qx.ui.form.CheckBox(this.tr("Demote Organization collaboration"));
preferencesSettings.bind("confirmDemoteOrgnaization", cbConfirmDemoteOrgnaization, "value");
cbConfirmDemoteOrgnaization.bind("value", preferencesSettings, "confirmDemoteOrgnaization");
box.add(cbConfirmDemoteOrgnaization);

if (!(osparc.product.Utils.isProduct("tis") || osparc.product.Utils.isProduct("s4llite"))) {
const cbConfirmDeleteNode = new qx.ui.form.CheckBox(this.tr("Delete a Node"));
preferencesSettings.bind("confirmDeleteNode", cbConfirmDeleteNode, "value");
Expand Down