Merge pull request #1191 from owncloud/update-web-1.0.1

Update web to 1.0.1
2026-01-06 04:09:40 -06:00 · 2021-01-13 12:54:19 +01:00
parent 8462799667 32b1597ca5
commit 638b7a1c9f
18 changed files with 106 additions and 93 deletions
--- a/accounts/pkg/assets/embed.go
+++ b/accounts/pkg/assets/embed.go
--- a/accounts/ui/components/accounts/AccountsListRow.vue
+++ b/accounts/ui/components/accounts/AccountsListRow.vue
@@ -92,7 +92,7 @@ export default {
  },

  computed: {
-    ...mapGetters(['user', 'configuration']),
+    ...mapGetters(['user', 'getServerForJsClient']),
    ...mapState('Accounts', ['roles', 'selectedAccounts']),

    selectAccountLabel () {
@@ -114,7 +114,7 @@ export default {
      injectAuthToken(this.user.token)

      const response = await RoleService_AssignRoleToUser({
-        $domain: this.configuration.server,
+        $domain: this.getServerForJsClient,
        body: {
          account_uuid: this.account.id,
          role_id: roleId
@@ -139,7 +139,7 @@ export default {
      injectAuthToken(this.user.token)

      const response = await RoleService_ListRoleAssignments({
-        $domain: this.configuration.server,
+        $domain: this.getServerForJsClient,
        body: {
          account_uuid: this.account.id
        }
--- a/accounts/ui/store/index.js
+++ b/accounts/ui/store/index.js
@@ -31,7 +31,8 @@ const getters = {
    })
  },
  areAllAccountsSelected: state => state.accounts.length === state.selectedAccounts.length,
-  isAnyAccountSelected: state => state.selectedAccounts.length > 0
+  isAnyAccountSelected: state => state.selectedAccounts.length > 0,
+  getServerForJsClient: (state, getters, rootState, rootGetters) => rootGetters.configuration.server.replace(/\/$/, '')
 }

 const mutations = {
@@ -94,11 +95,11 @@ const actions = {
    }
  },

-  async fetchAccounts ({ commit, rootGetters }) {
+  async fetchAccounts ({ commit, getters, rootGetters }) {
    injectAuthToken(rootGetters.user.token)
    try {
      const response = await AccountsService_ListAccounts({
-        $domain: rootGetters.configuration.server,
+        $domain: getters.getServerForJsClient,
        body: {}
      })
      if (response.status === 201) {
@@ -111,11 +112,11 @@ const actions = {
    commit('SET_FAILED', true)
  },

-  async fetchRoles ({ commit, rootGetters }) {
+  async fetchRoles ({ commit, getters, rootGetters }) {
    injectAuthToken(rootGetters.user.token)
    try {
      const response = await RoleService_ListRoles({
-        $domain: rootGetters.configuration.server,
+        $domain: getters.getServerForJsClient,
        body: {}
      })
      if (response.status === 201) {
@@ -132,7 +133,7 @@ const actions = {
    getters.areAllAccountsSelected ? commit('RESET_ACCOUNTS_SELECTION') : commit('SET_SELECTED_ACCOUNTS', [...state.accounts])
  },

-  async setAccountActivated ({ commit, dispatch, state, rootGetters }, activated) {
+  async setAccountActivated ({ commit, dispatch, state, getters, rootGetters }, activated) {
    const failedAccounts = []
    injectAuthToken(rootGetters.user.token)

@@ -143,7 +144,7 @@ const actions = {

      try {
        const response = await AccountsService_UpdateAccount({
-          $domain: rootGetters.configuration.server,
+          $domain: getters.getServerForJsClient,
          body: {
            account: {
              id: account.id,
@@ -181,12 +182,13 @@ const actions = {
    commit('RESET_ACCOUNTS_SELECTION')
    return Promise.resolve(true)
  },
-  async createNewAccount ({ rootGetters, commit, dispatch }, account) {
+
+  async createNewAccount ({ getters, rootGetters, commit, dispatch }, account) {
    injectAuthToken(rootGetters.user.token)

    try {
      const response = await AccountsService_CreateAccount({
-        $domain: rootGetters.configuration.server,
+        $domain: getters.getServerForJsClient,
        body: {
          account: {
            on_premises_sam_account_name: account.username,
@@ -214,7 +216,7 @@ const actions = {
    return Promise.resolve(false)
  },

-  async deleteAccounts ({ rootGetters, state, commit, dispatch }) {
+  async deleteAccounts ({ getters, rootGetters, state, commit, dispatch }) {
    const failedAccounts = []

    injectAuthToken(rootGetters.user.token)
@@ -222,7 +224,7 @@ const actions = {
    for (const account of state.selectedAccounts) {
      try {
        const response = await AccountsService_DeleteAccount({
-          $domain: rootGetters.configuration.server,
+          $domain: getters.getServerForJsClient,
          body: {
            id: account.id
          }
--- a/changelog/unreleased/update-web-1.0.1.md
+++ b/changelog/unreleased/update-web-1.0.1.md
@@ -0,0 +1,8 @@
+Change: Update ownCloud Web to v1.0.1
+
+Tags: web
+
+We updated ownCloud Web to v1.0.1. Please refer to the changelog (linked) for details on the web release.
+
+https://github.com/owncloud/ocis/pull/1191
+https://github.com/owncloud/web/releases/tag/v1.0.1
--- a/glauth/go.sum
+++ b/glauth/go.sum
@@ -224,6 +224,7 @@ github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e h1:khITGSnfDXtByQsLe
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
--- a/konnectd/go.sum
+++ b/konnectd/go.sum
@@ -213,6 +213,7 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
--- a/ocis/go.sum
+++ b/ocis/go.sum
@@ -309,6 +309,7 @@ github.com/cs3org/reva v0.0.2-0.20200115110931-4c7513415ec5/go.mod h1:Hk3eCcdhtv
 github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCdBp4=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
 github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8=
 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
--- a/onlyoffice/go.sum
+++ b/onlyoffice/go.sum
@@ -214,6 +214,7 @@ github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600 h1:4CKU+R4UNvILzsPrc
 github.com/cs3org/reva v1.4.1-0.20201130061320-ac85e68e0600/go.mod h1:MTBlfobTE8W2hgXQ9+r+75jpJa1TxD04IZm5TpS9H48=
 github.com/cs3org/reva v1.4.1-0.20201203135805-655c9babdc3f/go.mod h1:3Bz9oExBSgKjDspq3pBso31HlLSD98SlcURV54N3yPs=
 github.com/cs3org/reva v1.4.1-0.20201209113234-e791b5599a89/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
--- a/settings/go.sum
+++ b/settings/go.sum
@@ -199,6 +199,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
--- a/settings/pkg/assets/embed.go
+++ b/settings/pkg/assets/embed.go
--- a/settings/ui/store/index.js
+++ b/settings/ui/store/index.js
@@ -25,7 +25,8 @@ const getters = {
      .sort((b1, b2) => {
        return b1.name.localeCompare(b2.name)
      })
-  }
+  },
+  getServerForJsClient: (state, getters, rootState, rootGetters) => rootGetters.configuration.server.replace(/\/$/, '')
 }

 const mutations = {
@@ -51,11 +52,11 @@ const actions = {
    commit('SET_INITIALIZED', true)
  },

-  async fetchBundles ({ commit, dispatch, rootGetters }) {
+  async fetchBundles ({ commit, dispatch, getters, rootGetters }) {
    injectAuthToken(rootGetters)
    try {
      const response = await BundleService_ListBundles({
-        $domain: rootGetters.configuration.server,
+        $domain: getters.getServerForJsClient,
        body: {}
      })
      if (response.status === 201) {
@@ -96,7 +97,7 @@ const actions = {
    injectAuthToken(rootGetters)
    try {
      const response = await ValueService_SaveValue({
-        $domain: rootGetters.configuration.server,
+        $domain: getters.getServerForJsClient,
        body: {
          value: payload
        }
--- a/store/go.sum
+++ b/store/go.sum
@@ -230,6 +230,7 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8=
 github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=
 github.com/cznic/mathutil v0.0.0-20181122101859-297441e03548 h1:iwZdTE0PVqJCos1vaoKsclOGD3ADKpshg3SRtYBbwso=
--- a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt
+++ b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt
@@ -189,10 +189,6 @@ webUIPreview/imageMediaViewer.feature:33
 # https://github.com/owncloud/web/issues/4296 media viewer does not display jpeg file
 webUIPreview/imageMediaViewer.feature:15
 #
-#
-webUIPreview/imageMediaViewer.feature:100
-webUIPreview/imageMediaViewer.feature:114
-#
 # webUI-Private-Links
 webUIPrivateLinks/accessingPrivateLinks.feature:8
 webUIPrivateLinks/accessingPrivateLinks.feature:16
@@ -422,8 +418,3 @@ webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:122
 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:298
 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:275
 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:212
-#
-# https://github.com/owncloud/ocis/issues/1197 Investigate why some imageMediaViewer web UI tests fail when run in OCIS CI
-webUIPreview/imageMediaViewer.feature:100
-webUIPreview/imageMediaViewer.feature:114
-webUISharingInternalUsers/shareWithUsers.feature:585
--- a/thumbnails/go.sum
+++ b/thumbnails/go.sum
@@ -207,6 +207,7 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
--- a/web/Makefile
+++ b/web/Makefile
@@ -3,7 +3,7 @@ NAME := web
 IMPORT := github.com/owncloud/ocis/$(NAME)
 BIN := bin
 DIST := dist
-WEB_ASSETS_VERSION = v1.0.0-beta4
+WEB_ASSETS_VERSION = v1.0.1

 ifeq ($(OS), Windows_NT)
 	EXECUTABLE := $(NAME).exe
--- a/web/go.sum
+++ b/web/go.sum
@@ -202,6 +202,8 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825 h1:U6pAVGTjesstz+EXd8+YpIG1xwKH1ovOXdWrMCvnopw=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
--- a/web/pkg/assets/embed.go
+++ b/web/pkg/assets/embed.go
--- a/webdav/go.sum
+++ b/webdav/go.sum
@@ -207,6 +207,7 @@ github.com/cs3org/reva v1.1.0/go.mod h1:fBzTrNuAKdQ62ybjpdu8nyhBin90/3/3s6DGQDCd
 github.com/cs3org/reva v1.2.2-0.20200924071957-e6676516e61e/go.mod h1:DOV5SjpOBKN+aWfOHLdA4KiLQkpyC786PQaXEdRAZ0M=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1 h1:bTNyWMz+9x4JddkxUeuYkmCGL6tbLkUunbmW3Q0Nah8=
 github.com/cs3org/reva v1.4.1-0.20201216095137-5207197217f1/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
+github.com/cs3org/reva v1.4.1-0.20210111080247-f2b63bfd6825/go.mod h1:abC1Lo0ZKwkKloomTPZWunV/lUJvewkty1pI41zn2Ic=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=