[ACA-1913] Share update rules (#741)

* can share include repository property rule

* context and viewer custom share action rule

* test

* e2e - get shared link before toggle share button action
This commit is contained in:
Cilibiu Bogdan
2018-10-19 21:37:17 +03:00
committed by Denys Vuika
parent e305aed375
commit 940b44663a
2 changed files with 22 additions and 14 deletions

View File

@@ -130,9 +130,9 @@ describe('Unshare a file', () => {
await toolbar.openMoreMenu();
await toolbar.menu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -171,9 +171,9 @@ describe('Unshare a file', () => {
await dataTable.rightClickOnItem(file4);
await contextMenu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -261,9 +261,9 @@ describe('Unshare a file', () => {
await toolbar.openMoreMenu();
await toolbar.menu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -302,9 +302,9 @@ describe('Unshare a file', () => {
await dataTable.rightClickOnItem(file4);
await contextMenu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -384,9 +384,9 @@ describe('Unshare a file', () => {
await toolbar.openMoreMenu();
await toolbar.menu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -425,9 +425,9 @@ describe('Unshare a file', () => {
await dataTable.rightClickOnItem(file4);
await contextMenu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -507,9 +507,9 @@ describe('Unshare a file', () => {
await toolbar.openMoreMenu();
await toolbar.menu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -547,9 +547,9 @@ describe('Unshare a file', () => {
await dataTable.rightClickOnItem(file4);
await contextMenu.clickMenuItem('Shared link settings');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -635,9 +635,9 @@ describe('Unshare a file', () => {
await toolbar.openMoreMenu();
await toolbar.menu.clickMenuItem('Share');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');
@@ -676,9 +676,9 @@ describe('Unshare a file', () => {
await dataTable.rightClickOnItem(file4);
await contextMenu.clickMenuItem('Share');
await shareDialog.waitForDialogToOpen();
const url = await shareDialog.getLinkUrl();
await shareDialog.clickShareToggle();
const url = await shareDialog.getLinkUrl();
await confirmDialog.clickButton('Remove');
await confirmDialog.waitForDialogToClose();
expect(await shareDialog.isDialogOpen()).toBe(false, 'Share dialog open');

View File

@@ -54,6 +54,14 @@
}
]
},
{
"id": "app.toolbar.canShare",
"type": "core.every",
"parameters": [
{ "type": "rule", "value": "app.selection.file.canShare" },
{ "type": "rule", "value": "repository.isQuickShareEnabled" }
]
},
{
"id": "app.toolbar.favorite.canAdd",
"type": "core.every",
@@ -424,7 +432,7 @@
"order": 600,
"component": "app.shared-link.toggleSharedLink",
"rules": {
"visible": "app.selection.file.canShare"
"visible": "app.toolbar.canShare"
}
},
{
@@ -521,7 +529,7 @@
"order": 400,
"component": "app.shared-link.toggleSharedLink",
"rules": {
"visible": "app.selection.file.canShare"
"visible": "app.toolbar.canShare"
}
},
{
@@ -678,7 +686,7 @@
"click": "SHARE_NODE"
},
"rules": {
"visible": "app.selection.file.canShare"
"visible": "app.toolbar.canShare"
}
},
{
@@ -735,7 +743,7 @@
"order": 300,
"component": "app.shared-link.toggleSharedLink",
"rules": {
"visible": "app.selection.file.canShare"
"visible": "app.toolbar.canShare"
}
},
{