Skip to content

Commit 2cadfc2

Browse files
TheodoreSpeaksTheodoreSpeaks
committed
Merge remote-tracking branch 'origin/staging' into fix/code-mount-table-column-names
# Conflicts: # apps/sim/lib/copilot/tools/handlers/function-execute.test.ts
2 parents 3f2e51a + fcfa41c commit 2cadfc2

92 files changed

Lines changed: 20031 additions & 617 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎apps/docs/content/docs/en/integrations/google_groups.mdx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ Update the settings for a Google Group including access permissions, moderation,
352352
| `description` | string | No | The group description \(max 4096 characters\) |
353353
| `whoCanJoin` | string | No | Who can join: ANYONE_CAN_JOIN, ALL_IN_DOMAIN_CAN_JOIN, INVITED_CAN_JOIN, CAN_REQUEST_TO_JOIN |
354354
| `whoCanViewMembership` | string | No | Who can view membership: ALL_IN_DOMAIN_CAN_VIEW, ALL_MEMBERS_CAN_VIEW, ALL_MANAGERS_CAN_VIEW |
355-
| `whoCanViewGroup` | string | No | Who can view group messages: ANYONE_CAN_VIEW, ALL_IN_DOMAIN_CAN_VIEW, ALL_MEMBERS_CAN_VIEW, ALL_MANAGERS_CAN_VIEW |
355+
| `whoCanViewGroup` | string | No | Who can view group messages: ANYONE_CAN_VIEW, ALL_IN_DOMAIN_CAN_VIEW, ALL_MEMBERS_CAN_VIEW, ALL_MANAGERS_CAN_VIEW, ALL_OWNERS_CAN_VIEW |
356356
| `whoCanPostMessage` | string | No | Who can post: NONE_CAN_POST, ALL_MANAGERS_CAN_POST, ALL_MEMBERS_CAN_POST, ALL_OWNERS_CAN_POST, ALL_IN_DOMAIN_CAN_POST, ANYONE_CAN_POST |
357357
| `allowExternalMembers` | string | No | Whether external users can be members: true or false |
358358
| `allowWebPosting` | string | No | Whether web posting is allowed: true or false |
@@ -373,7 +373,7 @@ Update the settings for a Google Group including access permissions, moderation,
373373
| `whoCanContactOwner` | string | No | Who can contact owner: ALL_IN_DOMAIN_CAN_CONTACT, ALL_MANAGERS_CAN_CONTACT, ALL_MEMBERS_CAN_CONTACT, ANYONE_CAN_CONTACT |
374374
| `favoriteRepliesOnTop` | string | No | Whether favorite replies appear at top: true or false |
375375
| `whoCanApproveMembers` | string | No | Who can approve members: ALL_OWNERS_CAN_APPROVE, ALL_MANAGERS_CAN_APPROVE, ALL_MEMBERS_CAN_APPROVE, NONE_CAN_APPROVE |
376-
| `whoCanBanUsers` | string | No | Who can ban users: OWNERS_ONLY, OWNERS_AND_MANAGERS, NONE |
376+
| `whoCanBanUsers` | string | No | Who can ban users: ALL_MEMBERS, OWNERS_AND_MANAGERS, OWNERS_ONLY, NONE |
377377
| `whoCanModerateMembers` | string | No | Who can manage members: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE |
378378
| `whoCanModerateContent` | string | No | Who can moderate content: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE |
379379
| `whoCanAssistContent` | string | No | Who can assist with content metadata: OWNERS_ONLY, OWNERS_AND_MANAGERS, ALL_MEMBERS, NONE |

‎apps/docs/content/docs/en/integrations/google_maps.mdx‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,43 @@ Search for places using a text query
326326
| ↳ `businessStatus` | string | Business status |
327327
| `nextPageToken` | string | Token for fetching the next page of results |
328328

329+
### `google_maps_pollen`
330+
331+
Get a daily pollen forecast (grass, tree, weed) for a location
332+
333+
#### Input
334+
335+
| Parameter | Type | Required | Description |
336+
| --------- | ---- | -------- | ----------- |
337+
| `apiKey` | string | Yes | Google Maps API key with Pollen API enabled |
338+
| `lat` | number | Yes | Latitude coordinate |
339+
| `lng` | number | Yes | Longitude coordinate |
340+
| `days` | number | No | Number of forecast days to return \(1-5, defaults to 1\) |
341+
| `languageCode` | string | No | Language code for the response \(e.g., "en", "es"\) |
342+
| `plantsDescription` | boolean | No | Include detailed plant descriptions \(defaults to true\) |
343+
| `pricing` | per_request | No | No description |
344+
| `rateLimit` | string | No | No description |
345+
346+
#### Output
347+
348+
| Parameter | Type | Description |
349+
| --------- | ---- | ----------- |
350+
| `regionCode` | string | Region code \(ISO 3166-1 alpha-2\) for the location |
351+
| `dailyInfo` | array | Daily pollen forecast entries |
352+
| ↳ `date` | object | Calendar date of the forecast entry |
353+
| ↳ `pollenTypeInfo` | array | Pollen type indices \(grass, tree, weed\) |
354+
| ↳ `code` | string | Pollen type code \(GRASS, TREE, WEED\) |
355+
| ↳ `displayName` | string | Display name |
356+
| ↳ `inSeason` | boolean | Whether the pollen type is in season |
357+
| ↳ `indexInfo` | object | Universal Pollen Index \(UPI\) info |
358+
| ↳ `healthRecommendations` | array | Health recommendations |
359+
| ↳ `plantInfo` | array | Per-plant forecast with descriptions |
360+
| ↳ `code` | string | Plant code \(e.g., BIRCH, RAGWEED\) |
361+
| ↳ `displayName` | string | Display name |
362+
| ↳ `inSeason` | boolean | Whether the plant is in season |
363+
| ↳ `indexInfo` | object | Universal Pollen Index \(UPI\) info |
364+
| ↳ `plantDescription` | object | Plant details \(type, family, season, cross-reactions\) |
365+
329366
### `google_maps_reverse_geocode`
330367

331368
Convert geographic coordinates (latitude and longitude) into a human-readable address
@@ -379,6 +416,36 @@ Snap GPS coordinates to the nearest road segment
379416
| ↳ `placeId` | string | Place ID for this road segment |
380417
| `warningMessage` | string | Warning message if any \(e.g., if points could not be snapped\) |
381418

419+
### `google_maps_solar`
420+
421+
Get solar potential and panel insights for the building nearest a location
422+
423+
#### Input
424+
425+
| Parameter | Type | Required | Description |
426+
| --------- | ---- | -------- | ----------- |
427+
| `apiKey` | string | Yes | Google Maps API key with Solar API enabled |
428+
| `lat` | number | Yes | Latitude coordinate |
429+
| `lng` | number | Yes | Longitude coordinate |
430+
| `requiredQuality` | string | No | Minimum imagery quality to accept \(HIGH, MEDIUM, or BASE\) |
431+
| `pricing` | per_request | No | No description |
432+
| `rateLimit` | string | No | No description |
433+
434+
#### Output
435+
436+
| Parameter | Type | Description |
437+
| --------- | ---- | ----------- |
438+
| `name` | string | Resource name of the building \(e.g., "buildings/ChIJ..."\) |
439+
| `center` | object | Center coordinate of the building |
440+
| ↳ `lat` | number | Latitude |
441+
| ↳ `lng` | number | Longitude |
442+
| `imageryDate` | object | Date the underlying imagery was captured |
443+
| `imageryQuality` | string | Quality of the imagery used \(HIGH, MEDIUM, BASE\) |
444+
| `regionCode` | string | Region code \(ISO 3166-1 alpha-2\) for the building |
445+
| `postalCode` | string | Postal code of the building |
446+
| `administrativeArea` | string | Administrative area \(e.g., state or province\) |
447+
| `solarPotential` | object | Solar potential: max panel count/area, sunshine hours, carbon offset, panel specs, and configs |
448+
382449
### `google_maps_speed_limits`
383450

384451
Get speed limits for road segments. Requires either path coordinates or placeIds.

‎apps/docs/content/docs/en/integrations/google_search.mdx‎

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,17 @@ Search the web with the Custom Search API
3939
| --------- | ---- | -------- | ----------- |
4040
| `query` | string | Yes | The search query to execute |
4141
| `searchEngineId` | string | Yes | Custom Search Engine ID |
42-
| `num` | string | No | Number of results to return \(default: 10, max: 10\) |
42+
| `num` | string | No | Number of results to return \(1-10, default 10\) |
43+
| `start` | number | No | Index of the first result \(1-based, for pagination; start + num must be <= 100\) |
44+
| `dateRestrict` | string | No | Restrict results by recency: d\[n\] days, w\[n\] weeks, m\[n\] months, y\[n\] years |
45+
| `fileType` | string | No | Restrict to a file extension \(e.g., pdf, doc\) |
46+
| `safe` | string | No | SafeSearch level: "active" or "off" \(default off\) |
47+
| `searchType` | string | No | Set to "image" to perform an image search |
48+
| `siteSearch` | string | No | A site to include or exclude from results |
49+
| `siteSearchFilter` | string | No | Whether to include \("i"\) or exclude \("e"\) the siteSearch site |
50+
| `lr` | string | No | Restrict to a language, e.g. "lang_en" |
51+
| `gl` | string | No | Two-letter country code to boost geographically relevant results |
52+
| `sort` | string | No | Sort expression, e.g. "date" |
4353
| `apiKey` | string | Yes | Google API key |
4454

4555
#### Output
@@ -48,14 +58,29 @@ Search the web with the Custom Search API
4858
| --------- | ---- | ----------- |
4959
| `items` | array | Array of search results from Google |
5060
| ↳ `title` | string | Title of the search result |
61+
| ↳ `htmlTitle` | string | Title of the search result with HTML markup |
5162
| ↳ `link` | string | URL of the search result |
52-
| ↳ `snippet` | string | Snippet or description of the search result |
5363
| ↳ `displayLink` | string | Display URL \(abbreviated form\) |
64+
| ↳ `snippet` | string | Snippet or description of the search result |
65+
| ↳ `htmlSnippet` | string | Snippet of the search result with HTML markup |
66+
| ↳ `formattedUrl` | string | Display URL shown beneath the result |
67+
| ↳ `mime` | string | MIME type of the result |
68+
| ↳ `fileFormat` | string | File format of the result |
69+
| ↳ `cacheId` | string | ID of Google's cached version |
5470
| ↳ `pagemap` | object | PageMap information for the result \(structured data\) |
71+
| ↳ `image` | object | Image metadata \(present when searchType is image\) |
72+
| ↳ `contextLink` | string | URL of the page hosting the image |
73+
| ↳ `height` | number | Image height in pixels |
74+
| ↳ `width` | number | Image width in pixels |
75+
| ↳ `byteSize` | number | Image file size in bytes |
76+
| ↳ `thumbnailLink` | string | Thumbnail image URL |
77+
| ↳ `thumbnailHeight` | number | Thumbnail height in pixels |
78+
| ↳ `thumbnailWidth` | number | Thumbnail width in pixels |
5579
| `searchInformation` | object | Information about the search query and results |
5680
| ↳ `totalResults` | string | Total number of search results available |
5781
| ↳ `searchTime` | number | Time taken to perform the search in seconds |
5882
| ↳ `formattedSearchTime` | string | Formatted search time for display |
5983
| ↳ `formattedTotalResults` | string | Formatted total results count for display |
84+
| `nextPageStartIndex` | number | Start index for the next page of results \(null if no further results\) |
6085

6186

‎apps/docs/content/docs/en/integrations/google_sheets.mdx‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,68 @@ Copy a sheet from one spreadsheet to another
320320
| `destinationSpreadsheetId` | string | The ID of the destination spreadsheet |
321321
| `destinationSpreadsheetUrl` | string | URL to the destination spreadsheet |
322322

323+
### `google_sheets_delete_rows`
324+
325+
Delete rows from a sheet in a Google Sheets spreadsheet
326+
327+
#### Input
328+
329+
| Parameter | Type | Required | Description |
330+
| --------- | ---- | -------- | ----------- |
331+
| `spreadsheetId` | string | Yes | Google Sheets spreadsheet ID |
332+
| `sheetId` | number | Yes | The numeric ID of the sheet/tab \(not the sheet name\). Use Get Spreadsheet to find sheet IDs. |
333+
| `startIndex` | number | Yes | The start row index \(0-based, inclusive\) of the rows to delete |
334+
| `endIndex` | number | Yes | The end row index \(0-based, exclusive\) of the rows to delete |
335+
336+
#### Output
337+
338+
| Parameter | Type | Description |
339+
| --------- | ---- | ----------- |
340+
| `spreadsheetId` | string | Google Sheets spreadsheet ID |
341+
| `sheetId` | number | The numeric ID of the sheet |
342+
| `deletedRowRange` | string | Description of the deleted row range |
343+
| `metadata` | json | Spreadsheet metadata including ID and URL |
344+
| ↳ `spreadsheetId` | string | Google Sheets spreadsheet ID |
345+
| ↳ `spreadsheetUrl` | string | Spreadsheet URL |
346+
347+
### `google_sheets_delete_sheet`
348+
349+
Delete a sheet/tab from a Google Sheets spreadsheet
350+
351+
#### Input
352+
353+
| Parameter | Type | Required | Description |
354+
| --------- | ---- | -------- | ----------- |
355+
| `spreadsheetId` | string | Yes | Google Sheets spreadsheet ID |
356+
| `sheetId` | number | Yes | The numeric ID of the sheet/tab to delete \(not the sheet name\). Use Get Spreadsheet to find sheet IDs. |
357+
358+
#### Output
359+
360+
| Parameter | Type | Description |
361+
| --------- | ---- | ----------- |
362+
| `spreadsheetId` | string | Google Sheets spreadsheet ID |
363+
| `deletedSheetId` | number | The numeric ID of the deleted sheet |
364+
| `metadata` | json | Spreadsheet metadata including ID and URL |
365+
| ↳ `spreadsheetId` | string | Google Sheets spreadsheet ID |
366+
| ↳ `spreadsheetUrl` | string | Spreadsheet URL |
367+
368+
### `google_sheets_delete_spreadsheet`
369+
370+
Permanently delete a Google Sheets spreadsheet using the Google Drive API
371+
372+
#### Input
373+
374+
| Parameter | Type | Required | Description |
375+
| --------- | ---- | -------- | ----------- |
376+
| `spreadsheetId` | string | Yes | The ID of the Google Sheets spreadsheet to delete |
377+
378+
#### Output
379+
380+
| Parameter | Type | Description |
381+
| --------- | ---- | ----------- |
382+
| `spreadsheetId` | string | The ID of the deleted spreadsheet |
383+
| `deleted` | boolean | Whether the spreadsheet was successfully deleted |
384+
323385

324386

325387
## Triggers

‎apps/docs/content/docs/en/integrations/google_slides.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ Generate a thumbnail image of a specific slide in a Google Slides presentation
193193
| `presentationId` | string | Yes | Google Slides presentation ID |
194194
| `pageObjectId` | string | Yes | The object ID of the slide/page to get a thumbnail for |
195195
| `thumbnailSize` | string | No | The size of the thumbnail: SMALL \(200px\), MEDIUM \(800px\), or LARGE \(1600px\). Defaults to MEDIUM. |
196-
| `mimeType` | string | No | The MIME type of the thumbnail image: PNG or GIF. Defaults to PNG. |
196+
| `mimeType` | string | No | The MIME type of the thumbnail image: PNG. Defaults to PNG. |
197197

198198
#### Output
199199

‎apps/sim/app/api/tools/supabase/storage-upload/route.ts‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,13 @@ export const POST = withRouteHandler(async (request: NextRequest) => {
174174
'Content-Type': uploadContentType,
175175
}
176176

177+
if (validatedData.cacheControl) {
178+
const cacheControl = validatedData.cacheControl.trim()
179+
headers['cache-control'] = /^\d+$/.test(cacheControl)
180+
? `max-age=${cacheControl}`
181+
: cacheControl
182+
}
183+
177184
if (validatedData.upsert) {
178185
headers['x-upsert'] = 'true'
179186
}

‎apps/sim/app/workspace/[workspaceId]/components/resource/components/resource-options/resource-options.tsx‎

Lines changed: 65 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ interface ResourceOptionsProps {
8383
filter?: FilterConfig
8484
filterTags?: FilterTag[]
8585
/**
86-
* Supplementary right-aligned slot (pushed opposite the left-aligned
87-
* filter/sort via `justify-between`) for lightweight status content — e.g.
88-
* the knowledge list's connector badges or the table editor's run/stop
89-
* control in embedded mode. Keep it to badges/status widgets; primary
90-
* actions belong in the header's `actions`, not here.
86+
* Lightweight control rendered immediately to the LEFT of the filter/sort
87+
* cluster; the two form one right-aligned group, with or without a search —
88+
* e.g. the knowledge view's connected-source badge or the table editor's
89+
* embedded run/stop control. Keep it to badges/status widgets; primary actions
90+
* belong in the header's `actions`.
9191
*/
9292
aside?: ReactNode
9393
}
@@ -115,64 +115,68 @@ export const ResourceOptions = memo(function ResourceOptions({
115115

116116
return (
117117
<div className={cn('border-[var(--border)] border-b py-2.5', search ? 'px-6' : 'px-4')}>
118-
<div className='flex items-center justify-between'>
118+
<div className='flex items-center'>
119119
{search && <SearchSection search={search} />}
120-
<div className='flex items-center'>
121-
{filterTags?.map((tag) => (
122-
<Chip key={tag.label} rightIcon={X} onClick={tag.onRemove}>
123-
{tag.label}
124-
</Chip>
125-
))}
126-
{isToggleFilter && filter.mode === 'toggle' ? (
127-
<Chip active={filter.active} leftIcon={ListFilter} onClick={filter.onToggle}>
128-
Filter
129-
</Chip>
130-
) : popoverFilter ? (
131-
<PopoverPrimitive.Root
132-
open={openMenu === 'filter'}
133-
onOpenChange={(open) =>
134-
setOpenMenu((current) => (open ? 'filter' : current === 'filter' ? null : current))
135-
}
136-
>
137-
<PopoverPrimitive.Anchor asChild>
138-
<div className='flex items-center'>
139-
<PopoverPrimitive.Trigger asChild>
140-
<Chip active={popoverFilter.active} leftIcon={ListFilter}>
141-
Filter
142-
</Chip>
143-
</PopoverPrimitive.Trigger>
144-
{sort && (
145-
<SortDropdown
146-
config={sort}
147-
open={openMenu === 'sort'}
148-
onOpenChange={(open) =>
149-
setOpenMenu((current) =>
150-
open ? 'sort' : current === 'sort' ? null : current
151-
)
152-
}
153-
/>
154-
)}
155-
</div>
156-
</PopoverPrimitive.Anchor>
157-
<PopoverPrimitive.Portal>
158-
<PopoverPrimitive.Content
159-
align='end'
160-
alignOffset={RESOURCE_MENU_EDGE_OFFSET}
161-
collisionPadding={6}
162-
sideOffset={6}
163-
className={cn(
164-
POPOVER_ANIMATION_CLASSES,
165-
'z-50 w-fit origin-[--radix-popover-content-transform-origin] rounded-xl border border-[var(--border)] bg-[var(--bg)] shadow-sm'
166-
)}
167-
>
168-
{popoverFilter.content}
169-
</PopoverPrimitive.Content>
170-
</PopoverPrimitive.Portal>
171-
</PopoverPrimitive.Root>
172-
) : null}
173-
{sort && (isToggleFilter || !popoverFilter) && <SortDropdown config={sort} />}
120+
<div className='ml-auto flex shrink-0 items-center gap-1.5'>
121+
{aside}
122+
<div className='flex items-center'>
123+
{filterTags?.map((tag) => (
124+
<Chip key={tag.label} rightIcon={X} onClick={tag.onRemove}>
125+
{tag.label}
126+
</Chip>
127+
))}
128+
{isToggleFilter && filter.mode === 'toggle' ? (
129+
<Chip active={filter.active} leftIcon={ListFilter} onClick={filter.onToggle}>
130+
Filter
131+
</Chip>
132+
) : popoverFilter ? (
133+
<PopoverPrimitive.Root
134+
open={openMenu === 'filter'}
135+
onOpenChange={(open) =>
136+
setOpenMenu((current) =>
137+
open ? 'filter' : current === 'filter' ? null : current
138+
)
139+
}
140+
>
141+
<PopoverPrimitive.Anchor asChild>
142+
<div className='flex items-center'>
143+
<PopoverPrimitive.Trigger asChild>
144+
<Chip active={popoverFilter.active} leftIcon={ListFilter}>
145+
Filter
146+
</Chip>
147+
</PopoverPrimitive.Trigger>
148+
{sort && (
149+
<SortDropdown
150+
config={sort}
151+
open={openMenu === 'sort'}
152+
onOpenChange={(open) =>
153+
setOpenMenu((current) =>
154+
open ? 'sort' : current === 'sort' ? null : current
155+
)
156+
}
157+
/>
158+
)}
159+
</div>
160+
</PopoverPrimitive.Anchor>
161+
<PopoverPrimitive.Portal>
162+
<PopoverPrimitive.Content
163+
align='end'
164+
alignOffset={RESOURCE_MENU_EDGE_OFFSET}
165+
collisionPadding={6}
166+
sideOffset={6}
167+
className={cn(
168+
POPOVER_ANIMATION_CLASSES,
169+
'z-50 w-fit origin-[--radix-popover-content-transform-origin] rounded-xl border border-[var(--border)] bg-[var(--bg)] shadow-sm'
170+
)}
171+
>
172+
{popoverFilter.content}
173+
</PopoverPrimitive.Content>
174+
</PopoverPrimitive.Portal>
175+
</PopoverPrimitive.Root>
176+
) : null}
177+
{sort && (isToggleFilter || !popoverFilter) && <SortDropdown config={sort} />}
178+
</div>
174179
</div>
175-
{aside && <div className='flex shrink-0 items-center gap-1.5'>{aside}</div>}
176180
</div>
177181
</div>
178182
)

‎apps/sim/app/workspace/[workspaceId]/knowledge/[id]/components/connector-selector-field/connector-selector-field.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export function ConnectorSelectorField({
3838
const context = useMemo<SelectorContext>(() => {
3939
const ctx: SelectorContext = {}
4040
if (credentialId) ctx.oauthCredential = credentialId
41+
if (field.mimeType) ctx.mimeType = field.mimeType
4142

4243
for (const depFieldId of getDependsOnFields(field.dependsOn)) {
4344
const depField = configFields.find((f) => f.id === depFieldId)
@@ -49,7 +50,7 @@ export function ConnectorSelectorField({
4950
}
5051

5152
return ctx
52-
}, [credentialId, field.dependsOn, sourceConfig, configFields, canonicalModes])
53+
}, [credentialId, field.mimeType, field.dependsOn, sourceConfig, configFields, canonicalModes])
5354

5455
const depsResolved = useMemo(() => {
5556
if (!field.dependsOn) return true

0 commit comments

Comments
 (0)