Cleanup

Author: farmaazon

app/common/src/services/Backend.ts

@@ -1866,10 +1866,13 @@ export default abstract class Backend {
     body: UploadFileEndRequestBody,
     abort?: AbortSignal,
   ): Promise<UploadedAsset>
+  /**
+   * Upload set of Images, resoliving any possible conflicts. The sum of file sizes may not
+   * exceed could message limit.
+   */
   abstract uploadImage(
     parentDirectoryId: DirectoryId,
-    file: Blob,
-    filename: string,
+    files: { data: Blob; name: string }[],
   ): Promise<UploadedImages>
   /** Change the name of a file. */
   abstract updateFile(fileId: FileId, body: UpdateFileRequestBody, title: string): Promise<void>

app/gui/src/dashboard/layouts/AssetContextMenu.tsx

@@ -78,7 +78,7 @@ export const AssetContextMenu = React.forwardRef(function AssetContextMenu(
   const copyAssets = useMutationCallback(copyAssetsMutationOptions(backend))
   const downloadAssets = useMutationCallback(downloadAssetsMutationOptions(backend))
   const self = permissions.tryFindSelfPermission(user, asset.permissions)
-  const encodedEnsoPath = asset.ensoPath ? encodeURI(asset.ensoPath) : undefined
+  const encodedEnsoPath = encodeURI(asset.ensoPath)
   const copyMutation = useCopy()
   const uploadFileToCloud = useUploadFileToCloud()
   const uploadFileToLocal = useUploadFileToLocal(category)
@@ -116,12 +116,7 @@ export const AssetContextMenu = React.forwardRef(function AssetContextMenu(
   })
 
   const canPaste =
-    (
-      !pasteDataParent ||
-      !pasteData ||
-      !isCloud ||
-      (pasteDataParent.ensoPath != null && permissions.isTeamPath(pasteDataParent.ensoPath))
-    ) ?
+    !pasteDataParent || !pasteData || !isCloud || permissions.isTeamPath(pasteDataParent.ensoPath) ?
       true
     : pasteData.data.assets.every((pasteAsset) => {
         const otherAsset = getAsset(pasteAsset.id)
@@ -395,15 +390,14 @@ export const AssetContextMenu = React.forwardRef(function AssetContextMenu(
             },
           },
         !isCloud &&
-          encodedEnsoPath != null &&
           systemApi && {
             action: 'openInFileBrowser',
             doAction: () => {
               void goToDrive()
               systemApi.showItemInFolder(encodedEnsoPath)
             },
           },
-        encodedEnsoPath != null && {
+        {
           action: 'copyAsPath',
           doAction: () => {
             void goToDrive()

app/gui/src/dashboard/pages/dashboard/components/AssetRow.tsx

@@ -230,7 +230,7 @@ export const AssetRow = React.memo(function AssetRow(props: AssetRowProps) {
           // Assume the parent is the root directory.
           return true
         }
-        if (parent.ensoPath != null && isTeamPath(parent.ensoPath)) {
+        if (isTeamPath(parent.ensoPath)) {
           return true
         }
         // Assume user path; check permissions

app/gui/src/dashboard/services/LocalBackend.ts

@@ -719,12 +719,15 @@ export default class LocalBackend extends Backend {
     return Promise.resolve(file)
   }
 
+  /**
+   * Upload set of Images, resoliving any possible conflicts. The sum of file sizes may not
+   * exceed could message limit.
+   */
   override uploadImage(
     _parentDirectoryId: backend.DirectoryId,
-    _file: Blob,
-    _filename: string,
+    _files: { data: Blob; name: string }[],
   ): Promise<backend.UploadedImages> {
-    throw Error('Not implemented')
+    this.invalidOperation()
   }
 
   /** Change the name of a file. */

app/gui/src/dashboard/services/RemoteBackend.ts

@@ -342,11 +342,11 @@ export default class RemoteBackend extends Backend {
     query: backend.ListDirectoryRequestParams,
     title: string,
   ): Promise<backend.ListDirectoryResponseBody> {
-    if (query.recentProjects && query.from) {
+    if (query.recentProjects === true && query.from) {
       return { assets: [], paginationToken: null }
     }
     const paramsString = new URLSearchParams(
-      query.recentProjects ?
+      query.recentProjects === true ?
         [['recent_projects', String(true)]]
       : [
           ...(query.parentId != null ? [['parent_id', query.parentId]] : []),
@@ -935,11 +935,20 @@ export default class RemoteBackend extends Backend {
     }
   }
 
-  override async uploadImage(parentDirectoryId: backend.DirectoryId, file: Blob, filename: string) {
+  /**
+   * Upload set of Images, resoliving any possible conflicts. The sum of file sizes may not
+   * exceed could message limit.
+   */
+  override async uploadImage(
+    parentDirectoryId: backend.DirectoryId,
+    files: { data: Blob; name: string }[],
+  ) {
     const path = remoteBackendPaths.UPLOAD_IMAGE_PATH
     const query = new URLSearchParams({ parentDirectoryId })
     const data = new FormData()
-    data.append('image', file, filename)
+    for (const file of files) {
+      data.append('image', file.data, file.name)
+    }
     const response = await this.postFormData<backend.UploadedImages>(`${path}?${query}`, data)
     if (!response.ok) {
       return this.throw(response, 'uploadImageBackendError')

app/gui/src/project-view/providers/asyncResources/upload.ts

@@ -149,8 +149,7 @@ export function useResourceUpload(
       const contents = await data.data
       const uploadResult = await uploadImageMutation.mutateAsync([
         imagesDir,
-        contents,
-        data.filename,
+        [{ data: contents, name: data.filename }],
       ])
 
       return Ok({