[full-ci] More app top bar fixes

changelog/unreleased/enhancement-add-app-top-bar-component

@@ -4,3 +4,4 @@ We've added a app top bar component for consistency,
 which will be used by the apps: preview, text-editor and pdf-viewer.
 
 https://github.com/owncloud/web/pull/7217
+https://github.com/owncloud/web/pull/7362

packages/web-app-external/src/App.vue

@@ -36,8 +36,6 @@
 import { mapGetters } from 'vuex'
 import ErrorScreen from './components/ErrorScreen.vue'
 import LoadingScreen from './components/LoadingScreen.vue'
-import { DavProperties } from 'web-pkg/src/constants'
-import { buildResource } from 'files/src/helpers/resources'
 import { computed, unref } from '@vue/composition-api'
 import { queryItemAsString, useAppDefaults, useRouteQuery } from 'web-pkg/src/composables'
 import { defineComponent } from '@vue/runtime-core'
@@ -92,7 +90,7 @@ export default defineComponent({
     this.loading = true
     try {
       const filePath = this.currentFileContext.path
-      const fileId = this.fileId || (await this.getFileInfoResource(filePath)).fileId
+      const fileId = this.fileId || (await this.getFileResource(filePath)).fileId
 
       // fetch iframe params for app and file
       const configUrl = this.configuration.server
@@ -135,12 +133,6 @@ export default defineComponent({
       this.loading = false
       this.loadingError = true
     }
-  },
-  methods: {
-    async getFileInfoResource(path) {
-      const file = await this.getFileInfo(path, DavProperties.Default)
-      return buildResource(file)
-    }
   }
 })
 </script>

packages/web-app-files/src/components/FilesList/ContextActions.vue

@@ -26,7 +26,7 @@ import SetSpaceImage from '../../mixins/spaces/actions/setImage'
 import SetSpaceReadme from '../../mixins/spaces/actions/setReadme'
 import SpaceNavigate from '../../mixins/spaces/actions/navigate'
 import { PropType } from '@vue/composition-api'
-import { Resource } from '../../helpers/resource'
+import { Resource } from 'web-client'
 
 export default {
   name: 'ContextActions',

packages/web-app-files/src/components/FilesList/ResourceTable.vue

@@ -185,7 +185,8 @@ import {
 } from 'web-pkg/src/composables'
 import Rename from '../../mixins/actions/rename'
 import { defineComponent, PropType } from '@vue/composition-api'
-import { extractDomSelector, Resource } from '../../helpers/resource'
+import { extractDomSelector } from '../../helpers/resource'
+import { Resource } from 'web-client'
 import { ShareTypes } from '../../helpers/share'
 import { createLocationSpaces } from '../../router'
 

packages/web-app-files/src/components/Search/List.vue

@@ -63,7 +63,7 @@ import MixinFileActions from '../../mixins/fileActions'
 import MixinFilesListFilter from '../../mixins/filesListFilter'
 import MixinFilesListScrolling from '../../mixins/filesListScrolling'
 import { searchLimit } from '../../search/sdk/list'
-import { Resource } from '../../helpers/resource'
+import { Resource } from 'web-client'
 import { useStore } from 'web-pkg/src/composables'
 
 const visibilityObserver = new VisibilityObserver()

packages/web-app-files/src/components/Shares/SharedWithMeSection.vue

@@ -98,7 +98,7 @@ import MixinDeclineShare from '../../mixins/actions/declineShare'
 import MixinFilesListFilter from '../../mixins/filesListFilter'
 import MixinMountSideBar from '../../mixins/sidebar/mountSideBar'
 import { useResourcesViewDefaults } from '../../composables'
-import { Resource } from '../../helpers/resource'
+import { Resource } from 'web-client'
 import { useCapabilityShareJailEnabled, useStore } from 'web-pkg/src/composables'
 import { createLocationSpaces } from '../../router'
 import ListInfo from '../../components/FilesList/ListInfo.vue'

packages/web-app-files/src/components/TrashBin.vue

@@ -64,7 +64,7 @@ import ContextActions from './FilesList/ContextActions.vue'
 import { useResourcesViewDefaults } from '../composables'
 import { bus } from 'web-pkg/src/instance'
 import { defineComponent } from '@vue/composition-api'
-import { Resource } from '../helpers/resource'
+import { Resource } from 'web-client'
 
 export default defineComponent({
   name: 'TrashBin',

packages/web-app-files/src/composables/resourcesViewDefaults/useResourcesViewDefaults.ts

@@ -14,7 +14,7 @@ import { useSort, SortDir } from '../sort/'
 import { useMutationSubscription, useRouteQuery, useStore } from 'web-pkg/src/composables'
 import { determineSortFields } from '../../helpers/ui/resourceTable'
 import { Task } from 'vue-concurrency'
-import { Resource } from '../../helpers/resource'
+import { Resource } from 'web-client'
 
 interface ResourcesViewDefaultsOptions<T, U extends any[]> {
   loadResourcesTask?: Task<T, U>

packages/web-app-files/src/composables/upload/useUploadHelpers.ts

@@ -1,7 +1,7 @@
 import { Route } from 'vue-router'
 import { UppyResource } from 'web-runtime/src/composables/upload'
 import { buildWebDavFilesPath, buildWebDavSpacesPath } from '../../helpers/resources'
-import { User } from '../../helpers/user'
+import { User, Graph } from 'web-client'
 import {
   useCapabilityShareJailEnabled,
   useClientService,
@@ -15,7 +15,6 @@ import { SHARE_JAIL_ID } from '../../services/folder'
 import * as uuid from 'uuid'
 import path from 'path'
 import { useGraphClient } from 'web-client/src/composables'
-import { Graph } from 'web-client'
 
 interface UploadHelpersResult {
   inputFilesToUppyFiles(inputFileOptions): UppyResource[]

packages/web-app-files/src/fileSideBars.ts

@@ -10,8 +10,7 @@ import { isLocationSpacesActive, isLocationTrashActive, isLocationPublicActive }
 import { spaceRoleEditor, spaceRoleManager } from './helpers/share'
 import { Panel } from '../../web-pkg/src/components/sidebar'
 
-import { Resource } from './helpers/resource'
-import { User } from './helpers/user'
+import { Resource, User } from 'web-client'
 import Router from 'vue-router'
 
 function $gettext(msg: string): string {

packages/web-app-files/src/helpers/resource/copyMove.ts

@@ -1,4 +1,5 @@
-import { Resource, extractNameWithoutExtension } from './index'
+import { Resource } from 'web-client'
+import { extractNameWithoutExtension } from './index'
 import { join } from 'path'
 import { buildResource } from '../resources'
 import { DavProperties } from 'web-pkg/src/constants'

packages/web-app-files/src/helpers/resource/resource.ts

@@ -1,59 +1,6 @@
-import { User } from '../user'
+import { Resource } from 'web-client'
 import fileExtensions from '../extensions/fileExtensions'
 
-// TODO: find a good location for the Resource interface. Needed in other repos as well, so it needs to be deployed to npm.
-// TODO: add more fields to the resource interface. Extend into different resource types: FileResource, FolderResource, ShareResource, IncomingShareResource, OutgoingShareResource, ...
-export interface Resource {
-  id: number | string
-  fileId?: string
-  storageId?: string
-  name?: string
-  path: string
-  webDavPath?: string
-  downloadURL?: string
-  type?: string
-  status?: number
-  spaceRoles?: any[]
-  mimeType?: string
-  isFolder?: boolean
-  sdate?: string
-  mdate?: string
-  indicators?: any[]
-  size?: number
-  permissions?: number
-  starred?: boolean
-  etag?: string
-  sharePermissions?: number
-  shareTypes?: number[]
-  privateLink?: string
-
-  canCreate?(): boolean
-  canUpload?(): boolean
-  canDownload?(): boolean
-  canShare?(): boolean
-  canRename?(): boolean
-  canBeDeleted?(): boolean
-  canBeRestored?(): boolean
-
-  isReceivedShare?(): boolean
-  isMounted?(): boolean
-
-  getDomSelector?(): string
-
-  resourceOwner?: User
-  owner?: User[]
-  ownerDisplayName?: string
-  ownerId?: string
-  sharedWith?: string
-  shareOwner?: string
-  shareOwnerDisplayname?: string
-
-  extension?: string
-  share?: any
-
-  ddate?: string
-}
-
 export const extractStorageId = (id?: string): string => {
   if (!id || typeof id !== 'string') {
     return ''

packages/web-app-files/src/helpers/resource/sameResource.ts

@@ -1,4 +1,4 @@
-import { Resource } from './resource'
+import { Resource } from 'web-client'
 
 export const isSameResource = (r1: Resource, r2: Resource): boolean => {
   if (!r1 || !r2) return false

packages/web-app-files/src/helpers/resources.ts

@@ -15,13 +15,8 @@ import {
   spaceRoleManager,
   spaceRoleViewer
 } from './share'
-import {
-  extractDomSelector,
-  extractExtensionFromFile,
-  extractStorageId,
-  Resource
-} from './resource'
-import { User } from './user'
+import { extractDomSelector, extractExtensionFromFile, extractStorageId } from './resource'
+import { User, Resource } from 'web-client'
 import { SHARE_JAIL_ID } from '../services/folder'
 
 export function renameResource(resource, newName, newPath) {
@@ -71,7 +66,7 @@ export function buildResource(resource): Resource {
       ? resource.fileInfo[DavProperty.ContentSize]
       : resource.fileInfo[DavProperty.ContentLength],
     indicators: [],
-    permissions: resource.fileInfo[DavProperty.Permissions] || '',
+    permissions: (resource.fileInfo[DavProperty.Permissions] as string) || '',
     starred: resource.fileInfo[DavProperty.IsFavorite] !== '0',
     etag: resource.fileInfo[DavProperty.ETag],
     sharePermissions: resource.fileInfo[DavProperty.SharePermissions],

packages/web-app-files/src/helpers/share/share.ts

@@ -1,4 +1,4 @@
-import type { User } from '../user'
+import type { User } from 'web-client'
 import type { ShareRole } from './role'
 import type { SharePermission } from './permission'
 

packages/web-app-files/src/helpers/user/index.ts

@@ -1,2 +1 @@
 export * from './avatarUrl'
-export * from './types'

packages/web-app-files/src/views/Favorites.vue

@@ -67,7 +67,7 @@ import ContextActions from '../components/FilesList/ContextActions.vue'
 import { createLocationSpaces } from '../router'
 import { useResourcesViewDefaults } from '../composables'
 import { defineComponent } from '@vue/composition-api'
-import { Resource } from '../helpers/resource'
+import { Resource } from 'web-client'
 import { useStore } from 'web-pkg/src/composables'
 
 const visibilityObserver = new VisibilityObserver()

packages/web-app-files/src/views/Personal.vue

@@ -101,7 +101,8 @@ import ContextActions from '../components/FilesList/ContextActions.vue'
 import { createLocationSpaces } from '../router'
 import { useResourcesViewDefaults } from '../composables'
 import { defineComponent, unref, computed } from '@vue/composition-api'
-import { Resource, move } from '../helpers/resource'
+import { move } from '../helpers/resource'
+import { Resource } from 'web-client'
 import { useGraphClient } from 'web-client/src/composables'
 import { useCapabilityShareJailEnabled, useRouteParam } from 'web-pkg/src/composables'
 import KeyboardActions from '../components/FilesList/KeyboardActions.vue'

packages/web-app-files/src/views/PublicFiles.vue

@@ -89,7 +89,8 @@ import Pagination from '../components/FilesList/Pagination.vue'
 import ContextActions from '../components/FilesList/ContextActions.vue'
 import { breadcrumbsFromPath, concatBreadcrumbs } from '../helpers/breadcrumbs'
 import { defineComponent } from '@vue/composition-api'
-import { Resource, move } from '../helpers/resource'
+import { move } from '../helpers/resource'
+import { Resource } from 'web-client'
 import { usePublicLinkPassword, useStore } from 'web-pkg/src/composables'
 import KeyboardActions from '../components/FilesList/KeyboardActions.vue'
 

packages/web-app-files/src/views/shares/SharedResource.vue

@@ -104,7 +104,8 @@ import { createLocationSpaces } from '../../router'
 import { useResourcesViewDefaults } from '../../composables'
 import { defineComponent, unref } from '@vue/composition-api'
 import { fetchResources } from '../../services/folder'
-import { Resource, move } from '../../helpers/resource'
+import { move } from '../../helpers/resource'
+import { Resource } from 'web-client'
 import { breadcrumbsFromPath, concatBreadcrumbs } from '../../helpers/breadcrumbs'
 import { useRouteParam, useRouteQuery } from 'web-pkg/src/composables'
 import KeyboardActions from '../../components/FilesList/KeyboardActions.vue'

packages/web-app-files/src/views/shares/SharedViaLink.vue

@@ -70,7 +70,7 @@ import ContextActions from '../../components/FilesList/ContextActions.vue'
 import { createLocationSpaces } from '../../router'
 import { useResourcesViewDefaults } from '../../composables'
 import { defineComponent } from '@vue/composition-api'
-import { Resource } from '../../helpers/resource'
+import { Resource } from 'web-client'
 import { shareQuickLinkHelp } from '../../helpers/contextualHelpers'
 import { useStore } from 'web-pkg/src/composables'
 

packages/web-app-files/src/views/shares/SharedWithMe.vue

@@ -56,7 +56,7 @@ import AppBar from '../../components/AppBar/AppBar.vue'
 import SharedWithMeSection from '../../components/Shares/SharedWithMeSection.vue'
 import { ShareStatus } from '../../helpers/share'
 import { computed, defineComponent, unref } from '@vue/composition-api'
-import { Resource } from '../../helpers/resource'
+import { Resource } from 'web-client'
 
 export default defineComponent({
   components: {

packages/web-app-files/src/views/shares/SharedWithOthers.vue

@@ -71,7 +71,7 @@ import ContextActions from '../../components/FilesList/ContextActions.vue'
 import { createLocationSpaces } from '../../router'
 import { useResourcesViewDefaults } from '../../composables'
 import { defineComponent } from '@vue/composition-api'
-import { Resource } from '../../helpers/resource'
+import { Resource } from 'web-client'
 import { useStore } from 'web-pkg/src/composables'
 
 const visibilityObserver = new VisibilityObserver()

packages/web-app-files/tests/unit/composables/sort/useSort.spec.ts

@@ -1,7 +1,7 @@
 import { ref, readonly } from '@vue/composition-api'
 import { createWrapper } from './spec'
 import { SortDir, SortOptions, useSort } from '../../../../src/composables'
-import { Resource } from '../../../../src/helpers/resource'
+import { Resource } from 'web-client/src/helpers/resource'
 
 describe('useSort', () => {
   it('should be valid', () => {

packages/web-app-files/tests/unit/helpers/resource/resource.spec.ts

@@ -1,9 +1,9 @@
 import {
   extractDomSelector,
   extractExtensionFromFile,
-  extractNameWithoutExtension,
-  Resource
+  extractNameWithoutExtension
 } from '../../../../src/helpers/resource'
+import { Resource } from 'web-client'
 
 const resourceWithoutExtension = {
   name: 'file'

packages/web-app-pdf-viewer/src/App.vue

@@ -1,21 +1,21 @@
 <template>
   <main>
+    <app-top-bar :resource="resource" @close="closeApp" />
     <loading-screen v-if="loading" />
     <error-screen v-else-if="loadingError" />
     <div v-else class="oc-height-1-1">
-      <app-top-bar :resource="resource" @close="closeApp" />
-      <object class="pdf-viewer oc-width-1-1" :data="blobUrl" type="application/pdf" />
+      <object class="pdf-viewer oc-width-1-1" :data="url" type="application/pdf" />
     </div>
   </main>
 </template>
-<script>
+<script lang="ts">
 import { useAppDefaults } from 'web-pkg/src/composables'
 import AppTopBar from 'web-pkg/src/components/AppTopBar.vue'
 import ErrorScreen from './components/ErrorScreen.vue'
 import LoadingScreen from './components/LoadingScreen.vue'
-import { buildResource } from 'files/src/helpers/resources'
+import { defineComponent } from '@vue/runtime-core'
 
-export default {
+export default defineComponent({
   name: 'PDFViewer',
   components: {
     ErrorScreen,
@@ -33,8 +33,8 @@ export default {
     loading: true,
     loadingError: false,
     filePath: '',
-    blobUrl: '',
-    resource: {}
+    url: '',
+    resource: null
   }),
   created() {
     this.loadPdf(this.currentFileContext)
@@ -46,10 +46,10 @@ export default {
     async loadPdf(fileContext) {
       try {
         this.loading = true
-        const response = await this.getFileContents(fileContext.path, { responseType: 'blob' })
-        this.blobUrl = URL.createObjectURL(response.body)
-        const fileInfo = await this.getFileInfo(fileContext.path, {})
-        this.resource = buildResource(fileInfo)
+        this.resource = await this.getFileResource(fileContext.path)
+        this.url = await this.getUrlForResource(this.resource, {
+          disposition: 'inline'
+        })
       } catch (e) {
         this.loadingError = true
         console.error('Error fetching pdf', e)
@@ -58,10 +58,10 @@ export default {
       }
     },
     unloadPdf() {
-      URL.revokeObjectURL(this.blobUrl)
+      this.revokeUrl(this.url)
     }
   }
-}
+})
 </script>
 <style scoped>
 .pdf-viewer {