Merge remote-tracking branch 'origin/main' into feat/support-agent-sandbox

# Conflicts:
#	web/eslint-suppressions.json

web/app/components/tools/edit-custom-collection-modal/index.spec.tsx

@@ -168,6 +168,7 @@ describe('EditCustomCollectionModal', () => {
       const schemaInput = screen.getByPlaceholderText('tools.createTool.schemaPlaceHolder')
       fireEvent.change(schemaInput, { target: { value: '{}' } })
 
+      // Wait for parseParamsSchema to be called and state to be updated
       await waitFor(() => {
         expect(parseParamsSchemaMock).toHaveBeenCalledWith('{}')
       })
@@ -184,13 +185,13 @@ describe('EditCustomCollectionModal', () => {
           provider: 'provider',
           schema: '{}',
           schema_type: 'openapi',
-          credentials: {
-            auth_type: 'none',
-          },
           icon: {
             content: '🕵️',
             background: '#FEF7C3',
           },
+          credentials: {
+            auth_type: 'none',
+          },
           labels: [],
         }))
         expect(toastNotifySpy).not.toHaveBeenCalled()