chore(credentials): cleanup pass on the batch-2 changes

Author: waleedlatif1

apps/sim/app/workspace/[workspaceId]/integrations/[block]/integration-block-detail.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { type ReactNode, useEffect, useMemo, useRef, useState } from 'react'
+import { type ReactNode, useEffect, useRef, useState } from 'react'
 import { Chip, ChipDropdown, ChipLink, cn } from '@sim/emcn'
 import { ArrowLeft, Plus } from '@sim/emcn/icons'
 import { useRouter } from 'next/navigation'
@@ -174,9 +174,9 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
   const oauthAvailable = Boolean(oauthService) && (availability?.oauthAvailable ?? true)
   const [oauthOpen, setOAuthOpen] = useState(false)
   const [personalTokenOpen, setPersonalTokenOpen] = useState(false)
+  const isGitLab = integration.slug === 'gitlab'
   const personalTokenAvailable =
-    integration.slug === 'gitlab' &&
-    (availability?.state === 'ready' || availability?.state === 'limited')
+    isGitLab && (availability?.state === 'ready' || availability?.state === 'limited')
 
   const { data: credentials = [], isPending: credentialsLoading } = useWorkspaceCredentials({
     workspaceId,
@@ -190,22 +190,21 @@ function IntegrationBlockDetailContent({ integration, workspaceId }: Integration
    * credential lists on every product it powers. Comparing resolved
    * `providerId`s instead hides it from all of them.
    */
-  const connectedCredentials = useMemo(() => {
-    const serviceCredentials = oauthService
-      ? credentials.filter(
-          (c) =>
-            (c.type === 'oauth' || c.type === 'service_account') &&
-            c.providerId &&
-            credentialProviderMatchesService(c.providerId, oauthService)
-        )
-      : []
-    if (integration.slug !== 'gitlab') return serviceCredentials
-    // GitLab also has personal tokens, which Copilot acts with on the person's behalf.
-    return [
-      ...credentials.filter((c) => c.type === 'personal_token' && c.providerId === 'gitlab'),
-      ...serviceCredentials,
-    ]
-  }, [credentials, oauthService, integration.slug])
+  const serviceCredentials = oauthService
+    ? credentials.filter(
+        (c) =>
+          (c.type === 'oauth' || c.type === 'service_account') &&
+          c.providerId &&
+          credentialProviderMatchesService(c.providerId, oauthService)
+      )
+    : []
+  // GitLab also has personal tokens, which Copilot acts with on the person's behalf.
+  const connectedCredentials = isGitLab
+    ? [
+        ...credentials.filter((c) => c.type === 'personal_token' && c.providerId === 'gitlab'),
+        ...serviceCredentials,
+      ]
+    : serviceCredentials
   const [serviceAccountOpen, setServiceAccountOpen] = useState(false)
   const serviceAccountTarget = useServiceAccountConnectTarget({
     serviceAccountProviderId: oauthService?.serviceAccountProviderId,

apps/sim/blocks/utils.ts

@@ -147,8 +147,7 @@ export function withSavedCredential(
       `Block "${legacy.type}": unused selector twins ${unusedSelectorKeys.join(', ')}`
     )
   }
-  // The picker sits right under the operation picker, the first thing a user
-  // sets; a block without one keeps it where its secret was.
+  // Under the operation picker because that is the first field a user sets.
   const operationAt = subBlocks.findIndex(
     (subBlock) => subBlock.id === 'operation' && !isTriggerModeSubBlock(subBlock)
   )

apps/sim/tools/whatsapp/utils.ts

@@ -15,7 +15,7 @@ export function buildMessagesUrl(phoneNumberId: string | undefined): string {
 
 /** Build the media upload endpoint for a given business phone number ID. */
 export function buildMediaUploadUrl(phoneNumberId: string): string {
-  return `https://graph.facebook.com/${WHATSAPP_GRAPH_VERSION}/${encodeURIComponent(phoneNumberId.trim())}/media`
+  return `https://graph.facebook.com/${WHATSAPP_GRAPH_VERSION}/${safeUrlPathSegment(phoneNumberId.trim(), 'phoneNumberId')}/media`
 }
 
 /** Build the media metadata endpoint for a media ID, optionally scoped to a phone number. */

apps/sim/tools/whatsapp/whatsapp.test.ts

@@ -26,7 +26,7 @@ describe('WhatsApp request URL and headers', () => {
   it.each(['../../999/register#', '..', '123/subscribed_apps?'])(
     'refuses a phone number ID that would leave its path segment (%s)',
     (phoneNumberId) => {
-      expect(() => sendMessageTool.request.url({ ...auth, phoneNumberId })).toThrow()
+      expect(() => sendMessageTool.request.url({ ...auth, phoneNumberId })).toThrow(/phoneNumberId/)
     }
   )
 })