Jobs

Author: Sg312

apps/sim/app/workspace/[workspaceId]/schedules/components/schedules-view.tsx

@@ -138,6 +138,7 @@ export function SchedulesView() {
     const ws: WorkspaceScheduleData[] = []
     const j: WorkspaceScheduleData[] = []
     for (const item of allItems) {
+      if (item.status === 'completed') continue
       if (item.sourceType === 'job') j.push(item)
       else ws.push(item)
     }

apps/sim/hooks/queries/schedules.ts

@@ -14,7 +14,7 @@ export const scheduleKeys = {
 
 export interface ScheduleData {
   id: string
-  status: 'active' | 'disabled'
+  status: 'active' | 'disabled' | 'completed'
   cronExpression: string | null
   nextRunAt: string | null
   lastRanAt: string | null
@@ -37,7 +37,7 @@ export interface WorkspaceScheduleData extends ScheduleData {
 
 export interface ScheduleInfo {
   id: string
-  status: 'active' | 'disabled'
+  status: 'active' | 'disabled' | 'completed'
   scheduleTiming: string
   nextRunAt: string | null
   lastRanAt: string | null

apps/sim/lib/copilot/vfs/workspace-vfs.ts

@@ -1,7 +1,6 @@
 import { db } from '@sim/db'
 import {
   a2aAgent,
-  account,
   chat as chatTable,
   copilotChats,
   document,
@@ -45,7 +44,10 @@ import {
   serializeWorkflowMeta,
 } from '@/lib/copilot/vfs/serializers'
 import { type WorkspaceMdData, buildWorkspaceMd } from '@/lib/copilot/workspace-context'
-import { getAccessibleEnvCredentials } from '@/lib/credentials/environment'
+import {
+  getAccessibleEnvCredentials,
+  getAccessibleOAuthCredentials,
+} from '@/lib/credentials/environment'
 import { getPersonalAndWorkspaceEnv } from '@/lib/environment/utils'
 import { getKnowledgeBases } from '@/lib/knowledge/service'
 import { listTables } from '@/lib/table/service'
@@ -1017,25 +1019,27 @@ export class WorkspaceVFS {
     userId: string
   ): Promise<WorkspaceMdData['credentials']> {
     try {
-      const [envCredentials, apiKeyRows, envData, oauthAccounts] = await Promise.all([
+      const [envCredentials, oauthCredentials, apiKeyRows, envData] = await Promise.all([
         getAccessibleEnvCredentials(workspaceId, userId),
+        getAccessibleOAuthCredentials(workspaceId, userId),
         listApiKeys(workspaceId),
         getPersonalAndWorkspaceEnv(userId, workspaceId),
-        db
-          .select({ providerId: account.providerId })
-          .from(account)
-          .where(eq(account.userId, userId)),
       ])
 
       this.files.set(
         'environment/credentials.json',
-        serializeCredentials(
-          envCredentials.map((c) => ({
+        serializeCredentials([
+          ...envCredentials.map((c) => ({
             providerId: c.envKey,
             scope: c.type === 'env_workspace' ? 'workspace' : 'personal',
             createdAt: c.updatedAt,
-          }))
-        )
+          })),
+          ...oauthCredentials.map((c) => ({
+            providerId: c.providerId,
+            scope: null,
+            createdAt: c.updatedAt,
+          })),
+        ])
       )
 
       this.files.set('environment/api-keys.json', serializeApiKeys(apiKeyRows))
@@ -1048,7 +1052,7 @@ export class WorkspaceVFS {
       )
 
       const envKeys = envCredentials.map((c) => c.envKey)
-      const oauthProviders = oauthAccounts.map((a) => a.providerId)
+      const oauthProviders = oauthCredentials.map((c) => c.providerId)
       const allProviders = [...new Set([...oauthProviders, ...envKeys])]
       return allProviders.map((key) => ({ providerId: key }))
     } catch (err) {

apps/sim/lib/copilot/workspace-context.ts

@@ -1,7 +1,8 @@
 import { db } from '@sim/db'
-import { account, copilotChats, knowledgeBase, mcpServers, userTableDefinitions, userTableRows, workflow, workspace, workflowSchedule } from '@sim/db/schema'
+import { copilotChats, knowledgeBase, mcpServers, userTableDefinitions, userTableRows, workflow, workspace, workflowSchedule } from '@sim/db/schema'
 import { createLogger } from '@sim/logger'
 import { and, count, desc, eq, isNull } from 'drizzle-orm'
+import { getAccessibleOAuthCredentials } from '@/lib/credentials/environment'
 import { listWorkspaceFiles } from '@/lib/uploads/contexts/workspace'
 import { listCustomTools } from '@/lib/workflows/custom-tools/operations'
 import { listSkills } from '@/lib/workflows/skills/operations'
@@ -205,13 +206,7 @@ export async function generateWorkspaceContext(
 
         listWorkspaceFiles(workspaceId),
 
-        db
-          .select({
-            providerId: account.providerId,
-            scope: account.scope,
-          })
-          .from(account)
-          .where(eq(account.userId, userId)),
+        getAccessibleOAuthCredentials(workspaceId, userId),
 
         db
           .select({

apps/sim/lib/credentials/environment.ts

@@ -358,3 +358,41 @@ export async function getAccessibleEnvCredentials(
       updatedAt: row.updatedAt,
     }))
 }
+
+export interface AccessibleOAuthCredential {
+  providerId: string
+  displayName: string
+  updatedAt: Date
+}
+
+export async function getAccessibleOAuthCredentials(
+  workspaceId: string,
+  userId: string
+): Promise<AccessibleOAuthCredential[]> {
+  const rows = await db
+    .select({
+      providerId: credential.providerId,
+      displayName: credential.displayName,
+      updatedAt: credential.updatedAt,
+    })
+    .from(credential)
+    .innerJoin(
+      credentialMember,
+      and(
+        eq(credentialMember.credentialId, credential.id),
+        eq(credentialMember.userId, userId),
+        eq(credentialMember.status, 'active')
+      )
+    )
+    .where(
+      and(eq(credential.workspaceId, workspaceId), eq(credential.type, 'oauth'))
+    )
+
+  return rows
+    .filter((row): row is AccessibleOAuthCredential => Boolean(row.providerId))
+    .map((row) => ({
+      providerId: row.providerId!,
+      displayName: row.displayName,
+      updatedAt: row.updatedAt,
+    }))
+}