[full-ci] Bump web to v5.7.0-rc.3 (#4140)

* Bump web to v5.7.0-rc.4

* Switch default value for resharing in capabilities to true

* Fix access token usage in settings ui

.drone.env

@@ -3,5 +3,5 @@ CORE_COMMITID=f1e0bf08b898c7300d4b294c8371f4025d9d99b8
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=06c1383810b710925149b3b51f426315cca8ed67
+WEB_COMMITID=e85420c0e3f9e165832474331ff5797e471d2bc7
 WEB_BRANCH=master

.drone.star

@@ -1615,7 +1615,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
  user = "0:0"
  environment = {
  "OCIS_URL": OCIS_URL,
- "FRONTEND_ENABLE_RESHARING": "true",
  "GATEWAY_GRPC_ADDR": "0.0.0.0:9142", # cs3api-validator needs the cs3api gatway exposed
  "STORAGE_USERS_DRIVER": "%s" % (storage),
  "STORAGE_USERS_DRIVER_LOCAL_ROOT": "/srv/app/tmp/ocis/local/root",
@@ -1683,7 +1682,6 @@ def ocisServer(storage, accounts_hash_difficulty = 4, volumes = [], depends_on =
  "OCIS_RUN_SERVICES": "app-registry,app-provider,auth-basic,auth-bearer,auth-machine,frontend,gateway,graph,graph-explorer,groups,nats,notifications,ocdav,ocs,proxy,search,settings,sharing,storage-system,storage-publiclink,storage-shares,storage-users,store,thumbnails,users,web,webdav",
  "OCIS_LOG_LEVEL": "info",
  "OCIS_URL": OCIS_URL,
- "FRONTEND_ENABLE_RESHARING": "true",
  "OCIS_BASE_DATA_PATH": "/mnt/data/ocis",
  "OCIS_CONFIG_DIR": "/etc/ocis",
  "PROXY_ENABLE_BASIC_AUTH": "true",
@@ -2301,7 +2299,6 @@ def parallelAcceptance(env):
  "OCIS_SKELETON_STRATEGY": "copy",
  "SEND_SCENARIO_LINE_REFERENCES": "true",
  "UPLOAD_DELETE_WAIT_TIME": "1",
- "FRONTEND_ENABLE_RESHARING": "true",
  }
  environment.update(env)
 

changelog/unreleased/update-web-beta.5.md

@@ -0,0 +1,30 @@
+Enhancement: Update ownCloud Web to v5.7.0-rc.4
+
+Tags: web
+
+We updated ownCloud Web to v5.7.0-rc.4. Please refer to the changelog (linked) for details on the web release.
+
+* Bugfix [owncloud/web#7230](https://github.com/owncloud/web/pull/7230): Context menu misplaced when triggered by keyboard navigation
+* Bugfix [owncloud/web#7214](https://github.com/owncloud/web/pull/7214): Prevent error when pasting with empty clipboard
+* Bugfix [owncloud/web#7173](https://github.com/owncloud/web/pull/7173): Re-introduce dynamic app name in document title
+* Bugfix [owncloud/web#7166](https://github.com/owncloud/web/pull/7166): External apps fixes
+* Bugfix [owncloud/web#4677](https://github.com/owncloud/web/issues/4677): Logout deleted user on page reload
+* Bugfix [owncloud/web#7216](https://github.com/owncloud/web/pull/7216): Filename hovers over the image in the preview app
+* Bugfix [owncloud/web#7228](https://github.com/owncloud/web/pull/7228): Shared with others page apps not working with oc10 as backend
+* Bugfix [owncloud/web#7197](https://github.com/owncloud/web/pull/7197): Create space and access user management permission
+* Bugfix [owncloud/web#6921](https://github.com/owncloud/web/pull/6921): Space sidebar sharing indicators
+* Bugfix [owncloud/web#7030](https://github.com/owncloud/web/issues/7030): Access token renewal
+* Enhancement [owncloud/web#7217](https://github.com/owncloud/web/pull/7217): Add app top bar component
+* Enhancement [owncloud/web#7030](https://github.com/owncloud/web/issues/7030): Loading context blocks application bootstrap
+* Enhancement [owncloud/web#7206](https://github.com/owncloud/web/pull/7206): Add change own password dialog to the account info page
+* Enhancement [owncloud/web#7086](https://github.com/owncloud/web/pull/7086): Re-sharing for ocis
+* Enhancement [owncloud/web#7201](https://github.com/owncloud/web/pull/7201): Added a toolbar to pdf-viewer app
+* Enhancement [owncloud/web#7139](https://github.com/owncloud/web/pull/7139): Reposition notifications
+* Enhancement [owncloud/web#7030](https://github.com/owncloud/web/issues/7030): Resolve bookmarked public links with password protection
+* Enhancement [owncloud/web#7038](https://github.com/owncloud/web/issues/7038): Improve performance of share indicators
+* Enhancement [owncloud/web#6661](https://github.com/owncloud/web/issues/6661): Option to block file extensions from text-editor app
+* Enhancement [owncloud/web#7139](https://github.com/owncloud/web/pull/7139): Update ODS to v14.0.0-alpha.4
+* Enhancement [owncloud/web#7176](https://github.com/owncloud/web/pull/7176): Introduce group assignments
+
+https://github.com/owncloud/ocis/pull/4140
+https://github.com/owncloud/web/releases/tag/v5.7.0-rc.4

services/frontend/pkg/config/defaults/defaultconfig.go

@@ -38,7 +38,7 @@ func DefaultConfig() *config.Config {
  UploadMaxChunkSize: 1e+8,
  UploadHTTPMethodOverride: "",
  DefaultUploadProtocol: "tus",
- EnableResharing: false,
+ EnableResharing: true,
  Checksums: config.Checksums{
  SupportedTypes: []string{"sha1", "md5", "adler32"},
  PreferredUploadType: "",

services/settings/ui/store/index.js

@@ -115,7 +115,7 @@ export default {
 function injectAuthToken (rootGetters) {
  axios.interceptors.request.use(config => {
  if (typeof config.headers.Authorization === 'undefined') {
- const token = rootGetters.user.token
+ const token = rootGetters['runtime/auth/accessToken']
  if (token) {
  config.headers.Authorization = `Bearer ${token}`
  }

services/web/Makefile

@@ -1,6 +1,6 @@
 SHELL := bash
 NAME := web
-WEB_ASSETS_VERSION = v5.7.0-rc.1
+WEB_ASSETS_VERSION = v5.7.0-rc.4
 
 include ../../.make/recursion.mk
 

tests/acceptance/expected-failures-webUI-on-OCIS-storage.md

@@ -45,8 +45,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 - [webUISharingInternalUsers/shareWithUsers.feature:276](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L276)
 - [webUISharingInternalUsers/shareWithUsers.feature:277](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L277)
 - [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:140](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L140)
-- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:187](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L196)
-- [webUISharingPermissionsUsers/sharePermissionsUsers.feature:200](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L209)
 - [webUISharingPermissionsUsers/sharePermissionsUsers.feature:214](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPermissionsUsers/sharePermissionsUsers.feature#L223)
 - [webUIResharing2/reshareUsers.feature:41](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L41)
 - [webUIResharing2/reshareUsers.feature:69](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing2/reshareUsers.feature#L69)
@@ -129,7 +127,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
 - [webUIPrivateLinks/accessingPrivateLinks.feature:17](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L17)
 - [webUIPrivateLinks/accessingPrivateLinks.feature:25](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L25)
 - [webUIPrivateLinks/accessingPrivateLinks.feature:35](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L35)
-- [webUIPrivateLinks/accessingPrivateLinks.feature:45](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPrivateLinks/accessingPrivateLinks.feature#L45)
 
 ### [various sharing settings cannot be set](https://github.com/owncloud/ocis/issues/1328)
 - [webUIRestrictSharing/disableSharing.feature:16](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/disableSharing.feature#L16)

tests/config/drone/ocis-config.json

@@ -10,6 +10,8 @@
  "scope": "openid profile email"
  },
  "options": {
+ "topCenterNotifications": true,
+ "disablePreviews": true,
  "displayResourcesLazy": false,
  "sidebar": {
  "shares": {