fix(sim-links): keep slashes in typed values, show most-used as one page, format migration meta

Author: waleedlatif1

apps/docs/content/docs/search/sim-links.mdx

@@ -5,7 +5,7 @@ description: Short sim/ links that take everyone in your organization to the rig
 
 Sim Links are short, memorable names for the pages your team opens often, like `sim/handbook` for the employee handbook or `sim/okta` for your sign-in portal. Anyone in the organization can open them, with or without a Search seat. They work like go links in other tools.
 
-Open **Sim Links** in the organization sidebar to see every link in your organization, with who created it, how often it's opened, and when it last changed. Search by name, destination, or description, and select **Most used** to see the links your team relies on most.
+Open **Sim Links** in the organization sidebar to see every link in your organization, with who created it, how often it's opened, and when it last changed. Search by name, destination, or description, and select **Most used** to see the 50 links your team opens most.
 
 ## Open a link
 

apps/sim/app/sim/[[...path]]/page.tsx

@@ -23,11 +23,13 @@ interface SimLinkPageProps {
 
 /**
  * The typed `sim/<name>/<values…>` path as plain text. Next passes catch-all segments still
- * percent-encoded (it already rejects malformed escapes with a 400), and a browser site-search
- * shortcut encodes `/` inside a single segment.
+ * percent-encoded (it already rejects malformed escapes with a 400). A browser site-search
+ * shortcut sends `sim jira/123` as one segment with its `/` encoded, so only a lone segment is
+ * split; separately typed values keep any `/` they contain.
  */
 function decodeSimLinkPath(path: string[]): string[] {
-  return path.flatMap((segment) => decodeURIComponent(segment).split('/')).filter(Boolean)
+  const segments = path.map(decodeURIComponent)
+  return segments.length === 1 ? segments[0].split('/').filter(Boolean) : segments
 }
 
 /**

apps/sim/lib/api/contracts/sim-links.ts

@@ -34,11 +34,16 @@ export const listSimLinksContract = defineRouteContract({
   method: 'GET',
   path: '/api/organizations/[id]/sim-links',
   params,
-  query: z.object({
-    search: z.string().max(200).optional(),
-    cursor: z.string().min(1).max(128).optional(),
-    sort: z.enum(SIM_LINK_SORTS).optional(),
-  }),
+  query: z
+    .object({
+      search: z.string().max(200).optional(),
+      cursor: z.string().min(1).max(128).optional(),
+      sort: z.enum(SIM_LINK_SORTS).optional(),
+    })
+    .refine((query) => !(query.sort === 'popular' && query.cursor), {
+      path: ['cursor'],
+      message: 'The most-used view is a single page',
+    }),
   response: {
     mode: 'json',
     schema: z.object({ links: z.array(simLinkSchema), nextCursor: z.string().nullable() }),

apps/sim/lib/sim-links/repository.ts

@@ -2,8 +2,7 @@ import { db } from '@sim/db'
 import { simLink, user } from '@sim/db/schema'
 import { generateId } from '@sim/utils/id'
 import { escapeLikePattern } from '@sim/utils/string'
-import { and, asc, desc, eq, gt, ilike, lt, or, type SQL, sql } from 'drizzle-orm'
-import { OrchestrationError } from '@/lib/core/orchestration/types'
+import { and, asc, desc, eq, gt, ilike, or, type SQL, sql } from 'drizzle-orm'
 import type { DbOrTx, DbTransaction } from '@/lib/db/types'
 import {
   normalizeSimLinkName,
@@ -73,30 +72,9 @@ function toRecord({
 }
 
 /**
- * A keyset position: the last row's normalized name, preceded by its visit count when sorting
- * by use. Normalized names never contain `:`, so the first one separates the two.
- */
-function cursorOf(sort: SimLinkSort, row: SimLinkRecord): string {
-  return sort === 'popular' ? `${row.visitCount}:${row.normalizedName}` : row.normalizedName
-}
-
-function afterCursor(sort: SimLinkSort, cursor: string): SQL | undefined {
-  if (sort === 'name') return gt(simLink.normalizedName, cursor)
-  const separator = cursor.indexOf(':')
-  const visits = Number(cursor.slice(0, separator))
-  if (separator < 1 || !Number.isSafeInteger(visits)) {
-    throw new OrchestrationError('validation', 'Invalid cursor')
-  }
-  const name = cursor.slice(separator + 1)
-  return or(
-    lt(simLink.visitCount, visits),
-    and(eq(simLink.visitCount, visits), gt(simLink.normalizedName, name))
-  )
-}
-
-/**
- * One page of the links `viewer` may browse, by name or by most visited. Unlisted links are
- * listed only to their creator and organization admins.
+ * The links `viewer` may browse: pages by name, or the most visited as a single page, since a
+ * cursor over live visit counts would skip links that gain visits between pages. Unlisted links
+ * are listed only to their creator and organization admins.
  */
 export async function listSimLinks(
   organizationId: string,
@@ -119,18 +97,23 @@ export async function listSimLinks(
       )
     )
   }
-  if (cursor) conditions.push(afterCursor(sort, cursor))
-  const order =
-    sort === 'popular'
-      ? [desc(simLink.visitCount), asc(simLink.normalizedName)]
-      : [asc(simLink.normalizedName)]
+  if (sort === 'popular') {
+    const rows = await selectRecords(db)
+      .where(and(...conditions))
+      .orderBy(desc(simLink.visitCount), asc(simLink.normalizedName))
+      .limit(PAGE_SIZE)
+    return { links: rows.map(toRecord), nextCursor: null }
+  }
+  if (cursor) conditions.push(gt(simLink.normalizedName, cursor))
   const rows = await selectRecords(db)
     .where(and(...conditions))
-    .orderBy(...order)
+    .orderBy(asc(simLink.normalizedName))
     .limit(PAGE_SIZE + 1)
   const links = rows.slice(0, PAGE_SIZE).map(toRecord)
-  const last = links.at(-1)
-  return { links, nextCursor: rows.length > PAGE_SIZE && last ? cursorOf(sort, last) : null }
+  return {
+    links,
+    nextCursor: rows.length > PAGE_SIZE ? (links.at(-1)?.normalizedName ?? null) : null,
+  }
 }
 
 export async function getSimLink(

apps/sim/scripts/test-sim-links-e2e.ts

@@ -218,6 +218,11 @@ async function run() {
       (await open(member, 'jira%2F123')).location,
       'https://jira.example.com/browse/PROD-123'
     )
+    await create(owner, { name: 'go', url: 'https://redirect.example.com/?to={*}' })
+    assert.equal(
+      (await open(member, 'go/https%3A%2F%2Fexample.com%2Fa')).location,
+      'https://redirect.example.com/?to=https%3A%2F%2Fexample.com%2Fa'
+    )
     assert.equal((await open(member, 'jira')).location, 'https://jira.example.com/')
     const hostile = new URL((await open(member, 'jira/%2F%2Fevil.example.org')).location ?? '')
     assert.equal(hostile.origin, 'https://jira.example.com')
@@ -326,7 +331,7 @@ async function run() {
     )
     assert.equal(visits.get('jira'), 4, 'Each jira redirect counts once')
     assert.equal(visits.get('gh'), 0, 'A link opened without its values is not a visit')
-    await api(member, '?sort=popular&cursor=not-a-cursor', { expected: 400 })
+    await api(member, '?sort=popular&cursor=jira', { expected: 400 })
   })
 
   await check('deleting a link stops it resolving and every change is audited', async () => {