diff --git a/dev/docker/oc10.web.config.json b/dev/docker/oc10.web.config.json index 7e5874139ce..74159323c36 100644 --- a/dev/docker/oc10.web.config.json +++ b/dev/docker/oc10.web.config.json @@ -14,7 +14,12 @@ ], "options": { "disablePreviews": true, - "displayResourcesLazy": false + "displayResourcesLazy": false, + "sidebar": { + "shares": { + "showAllOnLoad": true + } + } }, "applications": [ { diff --git a/dev/docker/ocis.web.config.json b/dev/docker/ocis.web.config.json index 1ec9b4d0de7..46f29d2d070 100644 --- a/dev/docker/ocis.web.config.json +++ b/dev/docker/ocis.web.config.json @@ -11,7 +11,12 @@ }, "options": { "disablePreviews": true, - "displayResourcesLazy": false + "displayResourcesLazy": false, + "sidebar": { + "shares": { + "showAllOnLoad": true + } + } }, "apps": [ "files", diff --git a/tests/acceptance/features/webUIFilesList/fileList.feature b/tests/acceptance/features/webUIFilesList/fileList.feature index 24d8b0b6fdf..f77533e169e 100644 --- a/tests/acceptance/features/webUIFilesList/fileList.feature +++ b/tests/acceptance/features/webUIFilesList/fileList.feature @@ -25,9 +25,9 @@ Feature: User can view files inside a folder Then there should be no resources listed on the webUI - Scenario: All files list displays public link quick action + Scenario: All files list displays quicklink quick action When the user browses to the files page - Then quick action "public link" should be displayed on the webUI + Then quick action "quicklink" should be displayed on the webUI And the sidebar should match the default baseline Scenario: files are not selected when the user logs in diff --git a/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature b/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature index df14c9806e6..61c1717c4e0 100644 --- a/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature +++ b/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature @@ -179,7 +179,7 @@ Feature: Create public link shares | uid_owner | Alice | | permissions | read | | path | /simple-folder | - | name | Quick action link | + | name | Quicklink | And the following success message should be displayed on the webUI """ Quicklink copied into your clipboard diff --git a/tests/acceptance/stepDefinitions/publicLinkContext.js b/tests/acceptance/stepDefinitions/publicLinkContext.js index 5e39a27d3af..72a69e1524a 100644 --- a/tests/acceptance/stepDefinitions/publicLinkContext.js +++ b/tests/acceptance/stepDefinitions/publicLinkContext.js @@ -306,6 +306,6 @@ Then( When( 'the user creates a public link via quick action for resource {string} using the webUI', function (resource) { - return client.page.FilesPageElement.filesList().useQuickAction(resource, 'public link') + return client.page.FilesPageElement.filesList().useQuickAction(resource, 'quicklink') } ) diff --git a/tests/drone/config-oc10-integration-app-oauth.json b/tests/drone/config-oc10-integration-app-oauth.json index ebbdef476f5..aedf035a6ee 100644 --- a/tests/drone/config-oc10-integration-app-oauth.json +++ b/tests/drone/config-oc10-integration-app-oauth.json @@ -15,7 +15,12 @@ ], "options": { "disablePreviews": true, - "displayResourcesLazy": false + "displayResourcesLazy": false, + "sidebar": { + "shares": { + "showAllOnLoad": true + } + } }, "applications": [ { diff --git a/tests/drone/config-oc10-oauth.json b/tests/drone/config-oc10-oauth.json index 283c47abac8..0b31295d186 100644 --- a/tests/drone/config-oc10-oauth.json +++ b/tests/drone/config-oc10-oauth.json @@ -8,7 +8,12 @@ "authUrl": "http://owncloud/index.php/apps/oauth2/authorize" }, "options": { - "displayResourcesLazy": false + "displayResourcesLazy": false, + "sidebar": { + "shares": { + "showAllOnLoad": true + } + } }, "apps": [ "files", diff --git a/tests/drone/config-oc10-openid.json b/tests/drone/config-oc10-openid.json index fc8a6458127..06dd85e7d3f 100644 --- a/tests/drone/config-oc10-openid.json +++ b/tests/drone/config-oc10-openid.json @@ -10,7 +10,12 @@ "scope": "openid profile email" }, "options": { - "displayResourcesLazy": false + "displayResourcesLazy": false, + "sidebar": { + "shares": { + "showAllOnLoad": true + } + } }, "apps": [ "files", diff --git a/tests/drone/config-ocis.json b/tests/drone/config-ocis.json index 006c3c247af..aa427496855 100644 --- a/tests/drone/config-ocis.json +++ b/tests/drone/config-ocis.json @@ -11,7 +11,12 @@ }, "options": { "disablePreviews": true, - "displayResourcesLazy": false + "displayResourcesLazy": false, + "sidebar": { + "shares": { + "showAllOnLoad": true + } + } }, "apps": [ "files", diff --git a/yarn.lock b/yarn.lock index a38066ed745..5ad5b910ccd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2279,17 +2279,7 @@ __metadata: languageName: node linkType: hard -"@types/glob@npm:^7.1.1": - version: 7.1.3 - resolution: "@types/glob@npm:7.1.3" - dependencies: - "@types/minimatch": "*" - "@types/node": "*" - checksum: e0eef12285f548f15d887145590594a04ccce7f7e645fb047cbac18cb093f25d507ffbcc725312294c224bb78cf980fce33e5807de8d6f8a868b4186253499d4 - languageName: node - linkType: hard - -"@types/glob@npm:^7.1.3, @types/glob@npm:^7.2.0": +"@types/glob@npm:^7.1.1, @types/glob@npm:^7.1.3, @types/glob@npm:^7.2.0": version: 7.2.0 resolution: "@types/glob@npm:7.2.0" dependencies: @@ -6640,21 +6630,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": - version: 7.1.7 - resolution: "glob@npm:7.1.7" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^3.0.4 - once: ^1.3.0 - path-is-absolute: ^1.0.0 - checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8 - languageName: node - linkType: hard - -"glob@npm:^7.2.0": +"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.0 resolution: "glob@npm:7.2.0" dependencies: