Skip to content

Commit a021023

Browse files
committed
fix onedrive
1 parent e256261 commit a021023

File tree

1 file changed

+40
-18
lines changed

1 file changed

+40
-18
lines changed

apps/sim/blocks/blocks/onedrive.ts

Lines changed: 40 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
177177
condition: { field: 'operation', value: 'create_folder' },
178178
},
179179
{
180-
id: 'folderSelector',
180+
id: 'createFolderParentSelector',
181181
title: 'Select Parent Folder',
182182
type: 'file-selector',
183-
canonicalParamId: 'folderId',
183+
canonicalParamId: 'createFolderParentId',
184184
serviceId: 'onedrive',
185185
requiredScopes: [
186186
'openid',
@@ -198,10 +198,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
198198
},
199199
// Manual Folder ID input (advanced mode)
200200
{
201-
id: 'manualFolderId',
201+
id: 'createFolderManualParentId',
202202
title: 'Parent Folder ID',
203203
type: 'short-input',
204-
canonicalParamId: 'folderId',
204+
canonicalParamId: 'createFolderParentId',
205205
placeholder: 'Enter parent folder ID (leave empty for root folder)',
206206
dependsOn: ['credential'],
207207
mode: 'advanced',
@@ -255,10 +255,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
255255
},
256256
// Download File Fields - File Selector (basic mode)
257257
{
258-
id: 'fileSelector',
258+
id: 'downloadFileSelector',
259259
title: 'Select File',
260260
type: 'file-selector',
261-
canonicalParamId: 'fileId',
261+
canonicalParamId: 'downloadFileId',
262262
serviceId: 'onedrive',
263263
requiredScopes: [
264264
'openid',
@@ -277,10 +277,10 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
277277
},
278278
// Manual File ID input (advanced mode)
279279
{
280-
id: 'manualFileId',
280+
id: 'downloadManualFileId',
281281
title: 'File ID',
282282
type: 'short-input',
283-
canonicalParamId: 'fileId',
283+
canonicalParamId: 'downloadFileId',
284284
placeholder: 'Enter file ID',
285285
mode: 'advanced',
286286
condition: { field: 'operation', value: 'download' },
@@ -356,10 +356,13 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
356356
params: (params) => {
357357
const {
358358
credential,
359-
folderSelector,
360-
manualFolderId,
361-
fileSelector,
362-
manualFileId,
359+
// Folder canonical params (per-operation)
360+
uploadFolderId,
361+
createFolderParentId,
362+
listFolderId,
363+
// File canonical params (per-operation)
364+
downloadFileId,
365+
deleteFileId,
363366
mimeType,
364367
values,
365368
downloadFileName,
@@ -376,11 +379,31 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
376379
// Normalize file input from both basic (file-upload) and advanced (short-input) modes
377380
const normalizedFile = normalizeFileInput(file || fileReference, { single: true })
378381

379-
// Resolve folder ID from selector (basic) or manual input (advanced)
380-
const resolvedFolderId = folderSelector || manualFolderId || undefined
382+
// Resolve folderId based on operation
383+
let resolvedFolderId: string | undefined
384+
switch (params.operation) {
385+
case 'create_file':
386+
case 'upload':
387+
resolvedFolderId = uploadFolderId?.trim() || undefined
388+
break
389+
case 'create_folder':
390+
resolvedFolderId = createFolderParentId?.trim() || undefined
391+
break
392+
case 'list':
393+
resolvedFolderId = listFolderId?.trim() || undefined
394+
break
395+
}
381396

382-
// Resolve file ID from selector (basic) or manual input (advanced)
383-
const resolvedFileId = fileSelector || manualFileId || undefined
397+
// Resolve fileId based on operation
398+
let resolvedFileId: string | undefined
399+
switch (params.operation) {
400+
case 'download':
401+
resolvedFileId = downloadFileId?.trim() || undefined
402+
break
403+
case 'delete':
404+
resolvedFileId = deleteFileId?.trim() || undefined
405+
break
406+
}
384407

385408
return {
386409
credential,
@@ -402,12 +425,11 @@ export const OneDriveBlock: BlockConfig<OneDriveResponse> = {
402425
// Upload and Create operation inputs
403426
fileName: { type: 'string', description: 'File name' },
404427
file: { type: 'json', description: 'File to upload (UserFile object)' },
405-
fileReference: { type: 'json', description: 'File reference from previous block' },
406428
content: { type: 'string', description: 'Text content to upload' },
407429
mimeType: { type: 'string', description: 'MIME type of file to create' },
408430
values: { type: 'json', description: 'Cell values for new Excel as JSON' },
409431
// Folder canonical params (per-operation)
410-
uploadFolderId: { type: 'string', description: 'Parent folder for upload/create' },
432+
uploadFolderId: { type: 'string', description: 'Parent folder for upload/create file' },
411433
createFolderParentId: { type: 'string', description: 'Parent folder for create folder' },
412434
listFolderId: { type: 'string', description: 'Folder to list files from' },
413435
// File canonical params (per-operation)

0 commit comments

Comments
 (0)