From f3c6e58755f969aa8c876f56c2b3ce5736b5797c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Og=C3=B3rek?= <kamil.ogorek@gmail.com>
Date: Wed, 27 Nov 2024 17:46:03 +0100
Subject: [PATCH 1/5] ref: Remove experts page and setup permanent redirects
 (#30693)

* ref: Remove experts page and setup permanent redirects

* layout

---------

Co-authored-by: Francesco Sansalvadore <f.sansalvadore@gmail.com>
---
 apps/www/data/Footer.ts                       |   4 -
 apps/www/lib/redirects.js                     |  10 +
 apps/www/pages/partners/[slug].tsx            |  14 +-
 apps/www/pages/partners/experts/[slug].tsx    | 257 ------------------
 apps/www/pages/partners/experts/index.tsx     | 117 --------
 apps/www/pages/partners/index.tsx             |  39 +--
 .../pages/partners/integrations/[slug].tsx    |   2 +-
 .../www/pages/partners/integrations/index.tsx |  23 --
 8 files changed, 17 insertions(+), 449 deletions(-)
 delete mode 100644 apps/www/pages/partners/experts/[slug].tsx
 delete mode 100644 apps/www/pages/partners/experts/index.tsx

diff --git a/apps/www/data/Footer.ts b/apps/www/data/Footer.ts
index 960c62865e64f..088cb91b8a9d5 100644
--- a/apps/www/data/Footer.ts
+++ b/apps/www/data/Footer.ts
@@ -57,10 +57,6 @@ const footerData = [
         text: 'Integrations',
         url: '/partners/integrations',
       },
-      {
-        text: 'Experts',
-        url: '/partners/experts',
-      },
       {
         text: 'Brand Assets / Logos',
         url: '/brand-assets',
diff --git a/apps/www/lib/redirects.js b/apps/www/lib/redirects.js
index 178f7945320b0..7fe17daad1e4f 100644
--- a/apps/www/lib/redirects.js
+++ b/apps/www/lib/redirects.js
@@ -2834,6 +2834,16 @@ module.exports = [
     source: '/docs/guides/database/connecting-to-postgres/serverless-drivers',
     destination: '/docs/guides/database/connecting-to-postgres',
   },
+  {
+    permanent: true,
+    source: '/partners/experts',
+    destination: '/partners',
+  },
+  {
+    permanent: true,
+    source: '/partners/experts/:path*',
+    destination: '/partners',
+  },
 
   // marketing
 
diff --git a/apps/www/pages/partners/[slug].tsx b/apps/www/pages/partners/[slug].tsx
index f1ae62b2a49c2..60e532b0ab15b 100644
--- a/apps/www/pages/partners/[slug].tsx
+++ b/apps/www/pages/partners/[slug].tsx
@@ -36,26 +36,16 @@ export const getStaticProps: GetStaticProps = async ({ params }) => {
     .eq('slug', params!.slug as string)
     .single()
 
-  if (!partner || process.env.npm_lifecycle_event === 'build') {
+  if (!partner || partner.type === 'expert' || process.env.npm_lifecycle_event === 'build') {
     return {
       notFound: true,
     }
   }
 
-  let redirectUrl: string
-  switch (partner.type) {
-    case 'technology':
-      redirectUrl = `/partners/integrations/${partner.slug}`
-      break
-    case 'expert':
-      redirectUrl = `/partners/experts/${partner.slug}`
-      break
-  }
-
   return {
     redirect: {
       permanent: false,
-      destination: redirectUrl,
+      destination: `/partners/integrations/${partner.slug}`,
     },
   }
 }
diff --git a/apps/www/pages/partners/experts/[slug].tsx b/apps/www/pages/partners/experts/[slug].tsx
deleted file mode 100644
index c8f3eb41644db..0000000000000
--- a/apps/www/pages/partners/experts/[slug].tsx
+++ /dev/null
@@ -1,257 +0,0 @@
-import { ChevronLeft, ExternalLink } from 'lucide-react'
-import { GetStaticPaths, GetStaticProps } from 'next'
-import { MDXRemote, MDXRemoteSerializeResult } from 'next-mdx-remote'
-import { serialize } from 'next-mdx-remote/serialize'
-import { NextSeo } from 'next-seo'
-import Image from 'next/image'
-import Link from 'next/link'
-import 'swiper/css'
-import { Swiper, SwiperSlide } from 'swiper/react'
-import DefaultLayout from '~/components/Layouts/Default'
-import SectionContainer from '~/components/Layouts/SectionContainer'
-import supabase from '~/lib/supabaseMisc'
-import type { Partner } from '~/types/partners'
-import Error404 from '../../404'
-
-function Partner({
-  partner,
-  overview,
-}: {
-  partner: Partner
-  overview: MDXRemoteSerializeResult<Record<string, unknown>, Record<string, unknown>>
-}) {
-  if (!partner) return <Error404 />
-  return (
-    <>
-      <NextSeo
-        title={`${partner.title} | Works With Supabase`}
-        description={partner.description}
-        openGraph={{
-          title: `${partner.title} | Works With Supabase`,
-          description: partner.description,
-          url: `https://supabase.com/partners/experts/${partner.slug}`,
-          images: [
-            {
-              url: partner.images ? partner.images[0] : partner.logo,
-            },
-          ],
-        }}
-      />
-
-      <DefaultLayout>
-        <SectionContainer>
-          <div className="col-span-12 mx-auto mb-2 max-w-5xl space-y-12 lg:col-span-2">
-            {/* Back button */}
-            <Link
-              href="/partners/experts"
-              className="text-foreground hover:text-foreground-lighter flex cursor-pointer items-center transition-colors"
-            >
-              <ChevronLeft style={{ padding: 0 }} />
-              Back
-            </Link>
-
-            <div className="flex items-center space-x-4">
-              <Image
-                layout="fixed"
-                width={56}
-                height={56}
-                className="bg-surface2100 flex-shrink-f0 h-14 w-14 rounded-full"
-                src={partner.logo}
-                alt={partner.title}
-              />
-              <h1 className="h1" style={{ marginBottom: 0 }}>
-                {partner.title}
-              </h1>
-            </div>
-
-            <div
-              className="bg-surface-100 py-6"
-              style={{ marginLeft: 'calc(50% - 50vw)', marginRight: 'calc(50% - 50vw)' }}
-            >
-              <Swiper
-                initialSlide={0}
-                spaceBetween={0}
-                slidesPerView={4}
-                speed={300}
-                // slidesOffsetBefore={300}
-                centerInsufficientSlides={true}
-                breakpoints={{
-                  320: {
-                    slidesPerView: 1,
-                  },
-                  720: {
-                    slidesPerView: 2,
-                  },
-                  920: {
-                    slidesPerView: 3,
-                  },
-                  1024: {
-                    slidesPerView: 4,
-                  },
-                  1208: {
-                    slidesPerView: 5,
-                  },
-                }}
-              >
-                {partner.images?.map((image: any, i: number) => {
-                  return (
-                    <SwiperSlide key={i}>
-                      <div className="relative ml-3 mr-3 block cursor-move overflow-hidden rounded-md">
-                        <Image
-                          layout="responsive"
-                          objectFit="contain"
-                          width={1460}
-                          height={960}
-                          src={image}
-                          alt={partner.title}
-                        />
-                      </div>
-                    </SwiperSlide>
-                  )
-                })}
-              </Swiper>
-            </div>
-
-            <div className="grid gap-3 space-y-16 lg:grid-cols-4 lg:space-y-0 lg:space-x-3">
-              <div className="lg:col-span-3">
-                <h2
-                  className="text-foreground"
-                  style={{ fontSize: '1.5rem', marginBottom: '1rem' }}
-                >
-                  Overview
-                </h2>
-
-                {partner.video && (
-                  <div
-                    className="bg-foreground-lighter relative w-full rounded-md shadow-lg"
-                    style={{ padding: '56.25% 0 0 0', marginBottom: '1rem' }}
-                  >
-                    <iframe
-                      title="Demo video showcasing Supabase"
-                      className="absolute h-full w-full rounded-md"
-                      src={`https://www.youtube-nocookie.com/embed/${partner.video}?autoplay=0&loop=0&controls=1&modestbranding=1&rel=0&disablekb=1`}
-                      style={{ top: 0, left: 0 }}
-                      frameBorder="0"
-                      allow="autoplay; modestbranding; encrypted-media"
-                    />
-                  </div>
-                )}
-
-                <div className="prose">
-                  <MDXRemote {...overview} />
-                </div>
-              </div>
-
-              <div>
-                <h2
-                  className="text-foreground"
-                  style={{ fontSize: '1.5rem', marginBottom: '1rem' }}
-                >
-                  Details
-                </h2>
-
-                <div className="text-foreground divide-y">
-                  {partner.type === 'technology' && (
-                    <div className="flex items-center justify-between py-2">
-                      <span className="text-foreground-lighter">Developer</span>
-                      <span className="text-foreground">{partner.developer}</span>
-                    </div>
-                  )}
-
-                  <div className="flex items-center justify-between py-2">
-                    <span className="text-lighter">Category</span>
-                    <Link
-                      href={`/partners/experts#${partner.category.toLowerCase()}`}
-                      className="text-brand hover:underline transition-colors"
-                    >
-                      {partner.category}
-                    </Link>
-                  </div>
-
-                  <div className="flex items-center justify-between py-2">
-                    <span className="text-foreground-lighter">Website</span>
-                    <a
-                      href={partner.website}
-                      target="_blank"
-                      rel="noreferrer"
-                      className="text-brand hover:underline transition-colors"
-                    >
-                      {new URL(partner.website).host}
-                    </a>
-                  </div>
-
-                  {partner.type === 'technology' && partner.docs && (
-                    <div className="flex items-center justify-between py-2">
-                      <span className="text-foreground-lighter">Documentation</span>
-                      <a
-                        href={partner.docs}
-                        target="_blank"
-                        rel="noreferrer"
-                        className="text-brand hover:underline transition-colors"
-                      >
-                        <span className="flex items-center space-x-1">
-                          <span>Learn</span>
-                          <ExternalLink size="18" />
-                        </span>
-                      </a>
-                    </div>
-                  )}
-                </div>
-              </div>
-            </div>
-          </div>
-        </SectionContainer>
-      </DefaultLayout>
-    </>
-  )
-}
-
-// This function gets called at build time
-export const getStaticPaths: GetStaticPaths = async () => {
-  const { data: slugs } = await supabase
-    .from('partners')
-    .select('slug')
-    .eq('approved', true)
-    .eq('type', 'expert')
-
-  const paths: {
-    params: { slug: string }
-    locale?: string | undefined
-  }[] =
-    slugs?.map(({ slug }) => ({
-      params: {
-        slug,
-      },
-    })) ?? []
-
-  return {
-    paths,
-    fallback: 'blocking',
-  }
-}
-
-// This also gets called at build time
-export const getStaticProps: GetStaticProps = async ({ params }) => {
-  let { data: partner } = await supabase
-    .from('partners')
-    .select('*')
-    .eq('approved', true)
-    .eq('slug', params!.slug as string)
-    .single()
-
-  if (!partner) {
-    return {
-      notFound: true,
-    }
-  }
-
-  // Parse markdown
-  const overview = await serialize(partner.overview)
-
-  return {
-    props: { partner, overview },
-    revalidate: 1800, // 30 minutes
-  }
-}
-
-export default Partner
diff --git a/apps/www/pages/partners/experts/index.tsx b/apps/www/pages/partners/experts/index.tsx
deleted file mode 100644
index 5dfb258fbd7f7..0000000000000
--- a/apps/www/pages/partners/experts/index.tsx
+++ /dev/null
@@ -1,117 +0,0 @@
-import { NextSeo } from 'next-seo'
-import { useRouter } from 'next/router'
-import DefaultLayout from '~/components/Layouts/Default'
-import SectionContainer from '~/components/Layouts/SectionContainer'
-import PartnerLinkBox from '~/components/Partners/PartnerLinkBox'
-import supabase from '~/lib/supabaseMisc'
-import type { Partner } from '~/types/partners'
-import TileGrid from '../../../components/Partners/TileGrid'
-
-export async function getStaticProps() {
-  const { data: partners } = await supabase
-    .from('partners')
-    .select('*')
-    .eq('approved', true)
-    .eq('type', 'expert')
-    .order('category')
-    .order('title')
-
-  return {
-    props: {
-      partners,
-    },
-    revalidate: 1800, // 30 minutes
-  }
-}
-
-interface Props {
-  partners: Partner[]
-}
-
-function ExpertPartnersPage(props: Props) {
-  const partners = props.partners ?? []
-  const router = useRouter()
-
-  const meta_title = 'Find an expert'
-  const meta_description = `Find an expert to help build your next idea.`
-
-  return (
-    <>
-      <NextSeo
-        title={meta_title}
-        description={meta_description}
-        openGraph={{
-          title: meta_title,
-          description: meta_description,
-          url: `https://supabase.com/partners/experts`,
-          images: [
-            {
-              url: `https://supabase.com${router.basePath}/images/product/database/database-og.jpg`, // TODO
-            },
-          ],
-        }}
-      />
-      <DefaultLayout className="bg-alternative">
-        <SectionContainer className="space-y-12">
-          <div>
-            <h1 className="h1">{meta_title}</h1>
-            <p className="text-foreground-lighter text-xl">{meta_description}</p>
-          </div>
-          <div className="grid space-y-12 md:gap-8 lg:grid-cols-12 lg:gap-16 lg:space-y-0 xl:gap-16">
-            <div className="lg:col-span-4 xl:col-span-3">
-              {/* Horizontal link menu */}
-              <div className="space-y-6">
-                {/* Search Bar */}
-                <div className="space-y-4">
-                  <div className="text-foreground-light mb-2 text-sm">Explore more</div>
-                  <div className="grid grid-cols-2 gap-4 lg:grid-cols-1">
-                    <PartnerLinkBox
-                      title="Integrations"
-                      color="blue"
-                      description="Extend and automate your workflow by using integrations for your favorite tools."
-                      href={`/partners/integrations`}
-                      icon={
-                        <svg
-                          xmlns="http://www.w3.org/2000/svg"
-                          className="h-6 w-6"
-                          fill="none"
-                          viewBox="0 0 24 24"
-                          stroke="currentColor"
-                          strokeWidth="1"
-                        >
-                          <path
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z"
-                          />
-                        </svg>
-                      }
-                    />
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div className="lg:col-span-8 xl:col-span-9">
-              <div className="pb-8 mb-8 border-b">
-                <p className="text-foreground-lighter text-sm bg-surface-100 w-full rounded border p-4 shadow">
-                  We are no longer accepting applications for new experts at the moment.
-                </p>
-              </div>
-
-              {/* Partner Tiles */}
-              <div className="grid">
-                {partners.length ? (
-                  <TileGrid partners={partners} hideCategories={true} />
-                ) : (
-                  <p className="h2">No Partners Found</p>
-                )}
-              </div>
-            </div>
-          </div>
-        </SectionContainer>
-      </DefaultLayout>
-    </>
-  )
-}
-
-export default ExpertPartnersPage
diff --git a/apps/www/pages/partners/index.tsx b/apps/www/pages/partners/index.tsx
index 9dc842d1c9073..56be04814df2a 100644
--- a/apps/www/pages/partners/index.tsx
+++ b/apps/www/pages/partners/index.tsx
@@ -97,12 +97,12 @@ const Partners = () => {
           <div className="absolute inset-0 z-[1] bg-[linear-gradient(to_top,hsl(var(--background-alternative-default))_40%,hsl(var(--background-default))_90%)]" />
         </div>
         <SectionContainer>
-          <div className="grid grid-cols-1 lg:grid-cols-5 gap-8 lg:gap-4">
-            <div className="col-span-1 lg:col-span-2">
+          <div className="grid grid-cols-1 md:grid-cols-4 gap-8">
+            <div className="col-span-1 md:col-span-2">
               <h2 className="text-2xl sm:text-3xl xl:text-4xl tracking-[-.5px]">
                 Explore our marketplace
               </h2>
-              <p className="text-foreground-lighter text-xs sm:text-sm lg:text-base py-3 lg:max-w-md">
+              <p className="text-foreground-lighter text-sm sm:text-sm md:text-base py-3 md:max-w-md">
                 Discover how technology and consulting partners are already working with Supabase.
               </p>
               <TextLink
@@ -110,38 +110,7 @@ const Partners = () => {
                 label="View docs"
               />
             </div>
-            <div className="col-span-1 lg:col-span-3 w-full max-w-4xl grid gap-8 rounded md:grid-cols-2">
-              <Panel
-                hasShimmer
-                hasActiveOnHover
-                innerClassName="px-8 py-6 group flex flex-col gap-4"
-              >
-                <div className="bg-surface-200 mb-4 text-foreground flex h-12 w-12 items-center justify-center rounded-md border transition-all group-hover:scale-105">
-                  <svg
-                    xmlns="http://www.w3.org/2000/svg"
-                    className="h-6 w-6"
-                    fill="none"
-                    viewBox="0 0 24 24"
-                    stroke="currentColor"
-                    strokeWidth="1"
-                  >
-                    <path
-                      strokeLinecap="round"
-                      strokeLinejoin="round"
-                      d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
-                    />
-                  </svg>
-                </div>
-
-                <div>
-                  <h3 className="text-foreground text-lg">Experts</h3>
-                  <p className="text-foreground-lighter text-sm">
-                    Find an expert to help build your next idea.
-                  </p>
-                </div>
-
-                <Link href="/partners/experts" className="absolute inset-0" />
-              </Panel>
+            <div className="col-span-1 md:col-span-2 w-full max-w-4xl grid gap-8 rounded">
               <Panel
                 hasInnerShimmer={false}
                 hasActiveOnHover={true}
diff --git a/apps/www/pages/partners/integrations/[slug].tsx b/apps/www/pages/partners/integrations/[slug].tsx
index a65f36eda860a..4305346dc308f 100644
--- a/apps/www/pages/partners/integrations/[slug].tsx
+++ b/apps/www/pages/partners/integrations/[slug].tsx
@@ -326,7 +326,7 @@ export const getStaticProps: GetStaticProps = async ({ params }) => {
     .eq('slug', params!.slug as string)
     .single()
 
-  if (!partner) {
+  if (!partner || partner.type === 'expert') {
     return {
       notFound: true,
     }
diff --git a/apps/www/pages/partners/integrations/index.tsx b/apps/www/pages/partners/integrations/index.tsx
index 0682d88ede6ce..1cc9b5c59be33 100644
--- a/apps/www/pages/partners/integrations/index.tsx
+++ b/apps/www/pages/partners/integrations/index.tsx
@@ -148,29 +148,6 @@ function IntegrationPartnersPage(props: Props) {
                 <div className="space-y-4">
                   <div className="text-foreground-lighter mb-2 text-sm">Explore more</div>
                   <div className="grid grid-cols-2 gap-8 lg:grid-cols-1">
-                    <PartnerLinkBox
-                      title="Experts"
-                      color="blue"
-                      description="Explore our certified Supabase agency experts that build with Supabase"
-                      href={`/partners/experts`}
-                      icon={
-                        <svg
-                          xmlns="http://www.w3.org/2000/svg"
-                          className="h-6 w-6"
-                          fill="none"
-                          viewBox="0 0 24 24"
-                          stroke="currentColor"
-                          strokeWidth="1"
-                        >
-                          <path
-                            strokeLinecap="round"
-                            strokeLinejoin="round"
-                            d="M21 13.255A23.931 23.931 0 0112 15c-3.183 0-6.22-.62-9-1.745M16 6V4a2 2 0 00-2-2h-4a2 2 0 00-2 2v2m4 6h.01M5 20h14a2 2 0 002-2V8a2 2 0 00-2-2H5a2 2 0 00-2 2v10a2 2 0 002 2z"
-                          />
-                        </svg>
-                      }
-                    />
-
                     <PartnerLinkBox
                       href={`/partners/integrations#become-a-partner`}
                       title="Become a partner"

From 34154590310fba69ce3134d4a6fdbeadbbe06ecd Mon Sep 17 00:00:00 2001
From: Jan Tennert <jan.m.tennert@gmail.com>
Date: Wed, 27 Nov 2024 18:01:31 +0100
Subject: [PATCH 2/5] docs: Kotlin documentation improvements (#30676)

* Add note about the minimum Android SDK version and add missing Kotlin snippets

* Prettier
---
 apps/docs/content/guides/auth/auth-anonymous.mdx    |  4 ++--
 .../content/guides/auth/debugging/error-codes.mdx   | 13 ++++++-------
 apps/docs/content/guides/auth/phone-login.mdx       |  9 +++++++++
 apps/docs/docs/ref/kotlin/installing.mdx            |  2 ++
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/apps/docs/content/guides/auth/auth-anonymous.mdx b/apps/docs/content/guides/auth/auth-anonymous.mdx
index cf0ee68c4c79b..4ccb77a318177 100644
--- a/apps/docs/content/guides/auth/auth-anonymous.mdx
+++ b/apps/docs/content/guides/auth/auth-anonymous.mdx
@@ -148,10 +148,10 @@ try await supabase.auth.updateUser(
 </TabPanel>
 <TabPanel id="kotlin" label="Kotlin">
 
-You can use the [`modifyUser()`](/docs/reference/kotlin/auth-updateuser) method to link an email or phone identity to the anonymous user.
+You can use the [`updateUser()`](/docs/reference/kotlin/auth-updateuser) method to link an email or phone identity to the anonymous user.
 
 ```kotlin
-supabase.auth.modifyUser {
+supabase.auth.updateUser {
     email = "example@email.com"
 }
 ```
diff --git a/apps/docs/content/guides/auth/debugging/error-codes.mdx b/apps/docs/content/guides/auth/debugging/error-codes.mdx
index 92392b22fc0e7..1116fbd4778fb 100644
--- a/apps/docs/content/guides/auth/debugging/error-codes.mdx
+++ b/apps/docs/content/guides/auth/debugging/error-codes.mdx
@@ -59,16 +59,15 @@ Errors originating from the server API classed as `AuthApiError` always have a `
 
 </TabPanel>
 <TabPanel id="kotlin" label="Kotlin">
-All errors originating from the `supabase.auth` namespace of the JavaScript client library will be wrapped by the `AuthError` class.
+All exceptions originating from the `supabase.auth` namespace of the Kotlin client library will be a subclass of `RestException`.
 
-Error objects are split in a few classes:
+Rest exceptions are split into a few classes:
 
-- `AuthApiError` -- errors which originate from the Supabase Auth API.
-  - Use `isAuthApiError` instead of `instanceof` checks to see if an error you caught is of this type.
-- `CustomAuthError` -- errors which generally originate from state in the client library.
-  - Use the `name` property on the error to identify the class of error received.
+- `AuthRestException` -- exceptions which originate from the Supabase Auth API and have a `errorCode` property that can be used to identify the error returned by the server.
+- `AuthWeakPasswordException` -- an `AuthRestException` which indicates that the password is too weak.
+- `AuthSessionMissingException` -- an `AuthRestException` which indicates that the session is missing, if the user was logged out or deleted.
 
-Errors originating from the server API classed as `AuthApiError` always have a `code` property that can be used to identify the error returned by the server. The `status` property is also present, encoding the HTTP status code received in the response.
+All instances and subclasses of a `AuthRestException` have a `errorCode` property that can be used to identify the error returned by the server.
 
 </TabPanel>
 
diff --git a/apps/docs/content/guides/auth/phone-login.mdx b/apps/docs/content/guides/auth/phone-login.mdx
index b42005f47c106..aa006d73d048a 100644
--- a/apps/docs/content/guides/auth/phone-login.mdx
+++ b/apps/docs/content/guides/auth/phone-login.mdx
@@ -215,6 +215,15 @@ try await supabase.auth.updateUser(
 )
 ```
 
+</TabPanel>
+<TabPanel id="kotlin" label="Kotlin">
+
+```kotlin
+supabase.auth.updateUser {
+    phone = "123456789"
+}
+```
+
 </TabPanel>
 <TabPanel id="python" label="Python">
 
diff --git a/apps/docs/docs/ref/kotlin/installing.mdx b/apps/docs/docs/ref/kotlin/installing.mdx
index c3eb71b2374a6..93a918c49ffc1 100644
--- a/apps/docs/docs/ref/kotlin/installing.mdx
+++ b/apps/docs/docs/ref/kotlin/installing.mdx
@@ -30,6 +30,8 @@ custom_edit_url: https://github.com/supabase/supabase/edit/master/web/spec/supab
 
         Checkout the different READMEs for information about supported Kotlin targets.
 
+        *Note that the minimum Android SDK version is 26. For lower versions, you need to enable [core library desugaring](https://developer.android.com/studio/write/java8-support#library-desugaring).*
+
     </RefSubLayout.Details>
     <RefSubLayout.Examples>
         <Tabs

From 2195581a0f4528c359925bb76c9c3471638645c4 Mon Sep 17 00:00:00 2001
From: Oliver Rice <github@oliverrice.com>
Date: Wed, 27 Nov 2024 11:59:38 -0600
Subject: [PATCH 3/5] Remove the `queue_` prefix from queues API endpoints
 (#30695)

remove the queue_ prefix from queues API endpoints
---
 ...tabase-queues-toggle-postgrest-mutation.ts | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts b/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts
index 5265c2527abd8..6db06636e5d54 100644
--- a/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts
+++ b/apps/studio/data/database-queues/database-queues-toggle-postgrest-mutation.ts
@@ -19,7 +19,7 @@ const EXPOSE_QUEUES_TO_POSTGREST_SQL = minify(/* SQL */ `
 create schema if not exists ${QUEUES_SCHEMA};
 grant usage on schema ${QUEUES_SCHEMA} to postgres, anon, authenticated, service_role;
 
-create or replace function ${QUEUES_SCHEMA}.queue_pop(
+create or replace function ${QUEUES_SCHEMA}.pop(
     queue_name text
 )
   returns setof pgmq.message_record
@@ -35,10 +35,10 @@ begin
 end;
 $$;
 
-comment on function ${QUEUES_SCHEMA}.queue_pop(queue_name text) is 'Retrieves and locks the next message from the specified queue.';
+comment on function ${QUEUES_SCHEMA}.pop(queue_name text) is 'Retrieves and locks the next message from the specified queue.';
 
 
-create or replace function ${QUEUES_SCHEMA}.queue_send(
+create or replace function ${QUEUES_SCHEMA}.send(
     queue_name text,
     message jsonb,
     sleep_seconds integer default 0  -- renamed from 'delay'
@@ -58,10 +58,10 @@ begin
 end;
 $$;
 
-comment on function ${QUEUES_SCHEMA}.queue_send(queue_name text, message jsonb, sleep_seconds integer) is 'Sends a message to the specified queue, optionally delaying its availability by a number of seconds.';
+comment on function ${QUEUES_SCHEMA}.send(queue_name text, message jsonb, sleep_seconds integer) is 'Sends a message to the specified queue, optionally delaying its availability by a number of seconds.';
 
 
-create or replace function ${QUEUES_SCHEMA}.queue_send_batch(
+create or replace function ${QUEUES_SCHEMA}.send_batch(
     queue_name text,
     messages jsonb[],
     sleep_seconds integer default 0  -- renamed from 'delay'
@@ -81,10 +81,10 @@ begin
 end;
 $$;
 
-comment on function ${QUEUES_SCHEMA}.queue_send_batch(queue_name text, messages jsonb[], sleep_seconds integer) is 'Sends a batch of messages to the specified queue, optionally delaying their availability by a number of seconds.';
+comment on function ${QUEUES_SCHEMA}.send_batch(queue_name text, messages jsonb[], sleep_seconds integer) is 'Sends a batch of messages to the specified queue, optionally delaying their availability by a number of seconds.';
 
 
-create or replace function ${QUEUES_SCHEMA}.queue_archive(
+create or replace function ${QUEUES_SCHEMA}.archive(
     queue_name text,
     message_id bigint
 )
@@ -101,10 +101,10 @@ begin
 end;
 $$;
 
-comment on function ${QUEUES_SCHEMA}.queue_archive(queue_name text, message_id bigint) is 'Archives a message by moving it from the queue to a permanent archive.';
+comment on function ${QUEUES_SCHEMA}.archive(queue_name text, message_id bigint) is 'Archives a message by moving it from the queue to a permanent archive.';
 
 
-create or replace function ${QUEUES_SCHEMA}.queue_archive(
+create or replace function ${QUEUES_SCHEMA}.archive(
     queue_name text,
     message_id bigint
 )
@@ -121,10 +121,10 @@ begin
 end;
 $$;
 
-comment on function ${QUEUES_SCHEMA}.queue_archive(queue_name text, message_id bigint) is 'Archives a message by moving it from the queue to a permanent archive.';
+comment on function ${QUEUES_SCHEMA}.archive(queue_name text, message_id bigint) is 'Archives a message by moving it from the queue to a permanent archive.';
 
 
-create or replace function ${QUEUES_SCHEMA}.queue_delete(
+create or replace function ${QUEUES_SCHEMA}.delete(
     queue_name text,
     message_id bigint
 )
@@ -141,9 +141,9 @@ begin
 end;
 $$;
 
-comment on function ${QUEUES_SCHEMA}.queue_delete(queue_name text, message_id bigint) is 'Permanently deletes a message from the specified queue.';
+comment on function ${QUEUES_SCHEMA}.delete(queue_name text, message_id bigint) is 'Permanently deletes a message from the specified queue.';
 
-create or replace function ${QUEUES_SCHEMA}.queue_read(
+create or replace function ${QUEUES_SCHEMA}.read(
     queue_name text,
     sleep_seconds integer,
     n integer
@@ -163,25 +163,25 @@ begin
 end;
 $$;
 
-comment on function ${QUEUES_SCHEMA}.queue_read(queue_name text, sleep_seconds integer, n integer) is 'Reads up to "n" messages from the specified queue with an optional "sleep_seconds" (visibility timeout).';
+comment on function ${QUEUES_SCHEMA}.read(queue_name text, sleep_seconds integer, n integer) is 'Reads up to "n" messages from the specified queue with an optional "sleep_seconds" (visibility timeout).';
 
 -- Grant execute permissions on wrapper functions to roles
-grant execute on function ${QUEUES_SCHEMA}.queue_pop(text) to postgres, service_role, anon, authenticated;
+grant execute on function ${QUEUES_SCHEMA}.pop(text) to postgres, service_role, anon, authenticated;
 grant execute on function pgmq.pop(text) to postgres, service_role, anon, authenticated;
 
-grant execute on function ${QUEUES_SCHEMA}.queue_send(text, jsonb, integer) to postgres, service_role, anon, authenticated;
+grant execute on function ${QUEUES_SCHEMA}.send(text, jsonb, integer) to postgres, service_role, anon, authenticated;
 grant execute on function pgmq.send(text, jsonb, integer) to postgres, service_role, anon, authenticated;
 
-grant execute on function ${QUEUES_SCHEMA}.queue_send_batch(text, jsonb[], integer) to postgres, service_role, anon, authenticated;
+grant execute on function ${QUEUES_SCHEMA}.send_batch(text, jsonb[], integer) to postgres, service_role, anon, authenticated;
 grant execute on function pgmq.send_batch(text, jsonb[], integer) to postgres, service_role, anon, authenticated;
 
-grant execute on function ${QUEUES_SCHEMA}.queue_archive(text, bigint) to postgres, service_role, anon, authenticated;
+grant execute on function ${QUEUES_SCHEMA}.archive(text, bigint) to postgres, service_role, anon, authenticated;
 grant execute on function pgmq.archive(text, bigint) to postgres, service_role, anon, authenticated;
 
-grant execute on function ${QUEUES_SCHEMA}.queue_delete(text, bigint) to postgres, service_role, anon, authenticated;
+grant execute on function ${QUEUES_SCHEMA}.delete(text, bigint) to postgres, service_role, anon, authenticated;
 grant execute on function pgmq.delete(text, bigint) to postgres, service_role, anon, authenticated;
 
-grant execute on function ${QUEUES_SCHEMA}.queue_read(text, integer, integer) to postgres, service_role, anon, authenticated;
+grant execute on function ${QUEUES_SCHEMA}.read(text, integer, integer) to postgres, service_role, anon, authenticated;
 grant execute on function pgmq.read(text, integer, integer) to postgres, service_role, anon, authenticated;
 
 -- For the service role, we want full access
@@ -196,12 +196,12 @@ grant usage on schema pgmq to postgres, anon, authenticated, service_role;
 
 const HIDE_QUEUES_FROM_POSTGREST_SQL = minify(/* SQL */ `
   drop function if exists 
-    ${QUEUES_SCHEMA}.queue_pop(queue_name text),
-    ${QUEUES_SCHEMA}.queue_send(queue_name text, message jsonb, sleep_seconds integer),
-    ${QUEUES_SCHEMA}.queue_send_batch(queue_name text, message jsonb[], sleep_seconds integer),
-    ${QUEUES_SCHEMA}.queue_archive(queue_name text, message_id bigint),
-    ${QUEUES_SCHEMA}.queue_delete(queue_name text, message_id bigint),
-    ${QUEUES_SCHEMA}.queue_read(queue_name text, sleep integer, n integer)
+    ${QUEUES_SCHEMA}.pop(queue_name text),
+    ${QUEUES_SCHEMA}.send(queue_name text, message jsonb, sleep_seconds integer),
+    ${QUEUES_SCHEMA}.send_batch(queue_name text, message jsonb[], sleep_seconds integer),
+    ${QUEUES_SCHEMA}.archive(queue_name text, message_id bigint),
+    ${QUEUES_SCHEMA}.delete(queue_name text, message_id bigint),
+    ${QUEUES_SCHEMA}.read(queue_name text, sleep integer, n integer)
   ;
 
   -- Revoke execute permissions on inner pgmq functions to roles (inverse of enabling)

From 492c81c9c898b6e185b0942574b932821339b07a Mon Sep 17 00:00:00 2001
From: Ivan Vasilov <vasilov.ivan@gmail.com>
Date: Wed, 27 Nov 2024 21:46:03 +0100
Subject: [PATCH 4/5] feat: Cron tab for previous runs (#30690)

* Redo cron ui to use a data table

* Add component for form header

* Add next run column

* add cron jobs page

* Load jobs from url, add runs footer, link to logs

* Type issue

* Fix height of tab area

* Use nuqs with history

* improve pgcron logs, add severity filters

* Check for v1.5 to see if seconds are supported

* fix cron jobs logs table name

* Add type to the table

* Move expression warning to own function

* Fit to new layout

* Types

* Fix long code blocks

* Revert some of the changes.

* Use job name as a tab name. Other minor fixes.

* Use Infinite query for the cron runs.

* Revert some extra changes. Will be added to another PR.

* Rename pg functions

---------

Co-authored-by: Terry Sutton <saltcod@gmail.com>
Co-authored-by: Jordi Enric <jordi.err@gmail.com>
---
 .../Integrations/CronJobs/CronJobCard.tsx     |   8 +-
 .../CronJobs/CronJobs.constants.tsx           |   4 +-
 .../Integrations/CronJobs/CronJobs.utils.ts   |  29 ++
 .../CronJobs/CronJobsEmptyState.tsx           |  14 +
 .../Integrations/CronJobs/CronJobsTab.tsx     |   6 +-
 .../Integrations/CronJobs/PreviousRunsTab.tsx | 283 ++++++++++++++++++
 .../Landing/Integrations.constants.tsx        |  14 +-
 .../interfaces/Settings/Logs/LogSelection.tsx |   2 +
 .../interfaces/Settings/Logs/LogTable.tsx     |   3 +
 .../Settings/Logs/Logs.constants.ts           |   8 +-
 .../interfaces/Settings/Logs/Logs.types.ts    |   2 +-
 .../interfaces/Settings/Logs/Logs.utils.ts    |  19 +-
 .../layouts/LogsLayout/LogsSidebarMenuV2.tsx  |   4 +-
 .../database-cron-jobs-runs-infinite-query.ts |  84 ++++++
 apps/studio/data/database-cron-jobs/keys.ts   |   7 +
 apps/studio/hooks/analytics/useLogsQuery.tsx  |   8 -
 .../pages/project/[ref]/logs/cron-logs.tsx    |   4 +-
 .../pages/project/[ref]/logs/pgcron-logs.tsx  |  24 ++
 package.json                                  |  16 +-
 19 files changed, 493 insertions(+), 46 deletions(-)
 create mode 100644 apps/studio/components/interfaces/Integrations/CronJobs/CronJobsEmptyState.tsx
 create mode 100644 apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx
 create mode 100644 apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts
 create mode 100644 apps/studio/pages/project/[ref]/logs/pgcron-logs.tsx

diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobCard.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobCard.tsx
index fd09c29cd3c73..d8bbd50102bc8 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobCard.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobCard.tsx
@@ -27,10 +27,6 @@ interface CronJobCardProps {
   onDeleteCronJob: (job: CronJob) => void
 }
 
-const generateJobDetailsSQL = (jobId: number) => {
-  return `select * from cron.job_run_details where jobid = '${jobId}' order by start_time desc limit 10`
-}
-
 export const CronJobCard = ({ job, onEditCronJob, onDeleteCronJob }: CronJobCardProps) => {
   const [toggleConfirmationModalShown, showToggleConfirmationModal] = useState(false)
   const { ref } = useParams()
@@ -81,9 +77,7 @@ export const CronJobCard = ({ job, onEditCronJob, onDeleteCronJob }: CronJobCard
                     Edit cron job
                   </DropdownMenuItem>
                   <DropdownMenuItem asChild>
-                    <Link
-                      href={`/project/${ref}/sql/new?content=${encodeURIComponent(generateJobDetailsSQL(job.jobid))}`}
-                    >
+                    <Link href={`/project/${ref}/integrations/cron-jobs/cron-jobs/${job.jobname}`}>
                       View previous runs
                     </Link>
                   </DropdownMenuItem>
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsx
index ec4039916f021..470a2c97d4a32 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.constants.tsx
@@ -18,8 +18,8 @@ export const CRONJOB_DEFINITIONS = [
   {
     value: 'sql_function',
     icon: <ScrollText strokeWidth={1} />,
-    label: 'Postgres SQL Function',
-    description: 'Choose a Postgres SQL functions to run.',
+    label: 'Database function',
+    description: 'Choose a database function to run.',
   },
 
   {
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.ts b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.ts
index af9f02fa5285d..8ad110fa62cfc 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.ts
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobs.utils.ts
@@ -111,7 +111,36 @@ export const parseCronJobCommand = (originalCommand: string): CronJobType => {
   return DEFAULT_CRONJOB_COMMAND
 }
 
+export function calculateDuration(start: string, end: string): string {
+  const startTime = new Date(start).getTime()
+  const endTime = new Date(end).getTime()
+  const duration = endTime - startTime
+  return isNaN(duration) ? 'Invalid Date' : `${duration} ms`
+}
+
+export function formatDate(dateString: string): string {
+  const date = new Date(dateString)
+  if (isNaN(date.getTime())) {
+    return 'Invalid Date'
+  }
+  const options: Intl.DateTimeFormatOptions = {
+    year: 'numeric',
+    month: 'short', // Use 'long' for full month name
+    day: '2-digit',
+    hour: '2-digit',
+    minute: '2-digit',
+    second: '2-digit',
+    hour12: false, // Use 12-hour format if preferred
+    timeZoneName: 'short', // Optional: to include timezone
+  }
+  return date.toLocaleString(undefined, options)
+}
+
 // detect seconds like "10 seconds" or normal cron syntax like "*/5 * * * *"
 export const secondsPattern = /^\d+\s+seconds$/
 export const cronPattern =
   /^(\*|(\d+|\*\/\d+)|\d+\/\d+|\d+-\d+|\d+(,\d+)*)(\s+(\*|(\d+|\*\/\d+)|\d+\/\d+|\d+-\d+|\d+(,\d+)*)){4}$/
+
+export function isSecondsFormat(schedule: string): boolean {
+  return secondsPattern.test(schedule.trim())
+}
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsEmptyState.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsEmptyState.tsx
new file mode 100644
index 0000000000000..9abe797ab7d5e
--- /dev/null
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsEmptyState.tsx
@@ -0,0 +1,14 @@
+export default function CronJobsEmptyState({ page }: { page: string }) {
+  return (
+    <div className="  text-center h-full w-full items-center justify-center rounded-md px-4 py-12  ">
+      <p className="text-sm text-foreground">
+        {page === 'jobs' ? 'No cron jobs created yet' : 'No runs for this cron job yet'}
+      </p>
+      <p className="text-sm text-foreground-lighter">
+        {page === 'jobs'
+          ? 'Create one by clicking "Create a new cron job"'
+          : 'Check the schedule of your cron jobs to see when they run'}
+      </p>
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
index 8f89f3668b6a6..8136e14a377ea 100644
--- a/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/CronJobsTab.tsx
@@ -26,7 +26,6 @@ export const CronjobsTab = () => {
     projectRef: project?.ref,
     connectionString: project?.connectionString,
   })
-
   if (isLoading)
     return (
       <div className="p-10">
@@ -95,9 +94,14 @@ export const CronjobsTab = () => {
                   Your search for "{searchQuery}" did not return any results
                 </p>
               </div>
+            ) : isLoading ? (
+              <div className="p-10">
+                <GenericSkeletonLoader />
+              </div>
             ) : (
               filteredCronJobs.map((job) => (
                 <CronJobCard
+                  key={job.jobid}
                   job={job}
                   onEditCronJob={(job) => setCreateCronJobSheetShown(job)}
                   onDeleteCronJob={(job) => setCronJobForDeletion(job)}
diff --git a/apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx b/apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx
new file mode 100644
index 0000000000000..1beebad7e4d6c
--- /dev/null
+++ b/apps/studio/components/interfaces/Integrations/CronJobs/PreviousRunsTab.tsx
@@ -0,0 +1,283 @@
+import { toString as CronToString } from 'cronstrue'
+import { List } from 'lucide-react'
+import Link from 'next/link'
+import { UIEvent, useCallback, useMemo } from 'react'
+import DataGrid, { Column, Row } from 'react-data-grid'
+
+import { useParams } from 'common'
+import { useProjectContext } from 'components/layouts/ProjectLayout/ProjectContext'
+import { useCronJobsQuery } from 'data/database-cron-jobs/database-cron-jobs-query'
+import {
+  CronJobRun,
+  useCronJobRunsInfiniteQuery,
+} from 'data/database-cron-jobs/database-cron-jobs-runs-infinite-query'
+import {
+  Badge,
+  Button,
+  cn,
+  LoadingLine,
+  SimpleCodeBlock,
+  Tooltip_Shadcn_,
+  TooltipContent_Shadcn_,
+  TooltipTrigger_Shadcn_,
+} from 'ui'
+import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
+import { calculateDuration, formatDate, isSecondsFormat } from './CronJobs.utils'
+import CronJobsEmptyState from './CronJobsEmptyState'
+
+const cronJobColumns = [
+  {
+    id: 'runid',
+    name: 'RunID',
+    minWidth: 60,
+    value: (row: CronJobRun) => (
+      <div className="flex items-center gap-1.5">
+        <h3 className="text-xs">{row.runid}</h3>
+      </div>
+    ),
+  },
+  {
+    id: 'message',
+    name: 'Message',
+    minWidth: 200,
+    value: (row: CronJobRun) => (
+      <div className="flex items-center gap-1.5">
+        <Tooltip_Shadcn_>
+          <TooltipTrigger_Shadcn_ asChild>
+            <span className="text-xs cursor-pointer truncate max-w-[300px]">
+              {row.return_message}
+            </span>
+          </TooltipTrigger_Shadcn_>
+          <TooltipContent_Shadcn_ side="bottom" align="center" className="max-w-[300px] text-wrap">
+            <SimpleCodeBlock
+              showCopy={true}
+              className="sql"
+              parentClassName="!p-0 [&>div>span]:text-xs"
+            >
+              {row.return_message}
+            </SimpleCodeBlock>
+          </TooltipContent_Shadcn_>
+        </Tooltip_Shadcn_>
+      </div>
+    ),
+  },
+
+  {
+    id: 'status',
+    name: 'Status',
+    minWidth: 75,
+    value: (row: CronJobRun) => (
+      <Badge variant={row.status === 'succeeded' ? 'success' : 'warning'}>{row.status}</Badge>
+    ),
+  },
+  {
+    id: 'start_time',
+    name: 'Start Time',
+    minWidth: 120,
+    value: (row: CronJobRun) => <div className="text-xs">{formatDate(row.start_time)}</div>,
+  },
+  {
+    id: 'end_time',
+    name: 'End Time',
+    minWidth: 120,
+    value: (row: CronJobRun) => <div className="text-xs">{formatDate(row.end_time)}</div>,
+  },
+
+  {
+    id: 'duration',
+    name: 'Duration',
+    minWidth: 100,
+    value: (row: CronJobRun) => (
+      <div className="text-xs">{calculateDuration(row.start_time, row.end_time)}</div>
+    ),
+  },
+]
+
+const columns = cronJobColumns.map((col) => {
+  const result: Column<CronJobRun> = {
+    key: col.id,
+    name: col.name,
+    resizable: true,
+    minWidth: col.minWidth ?? 120,
+    headerCellClass: 'first:pl-6 cursor-pointer',
+    renderHeaderCell: () => {
+      return (
+        <div className="flex items-center justify-between font-mono font-normal text-xs w-full">
+          <div className="flex items-center gap-x-2">
+            <p className="!text-foreground">{col.name}</p>
+          </div>
+        </div>
+      )
+    },
+    renderCell: (props) => {
+      const value = col.value(props.row)
+
+      return (
+        <div
+          className={cn(
+            'w-full flex flex-col justify-center font-mono text-xs',
+            typeof value === 'number' ? 'text-right' : ''
+          )}
+        >
+          <span>{value}</span>
+        </div>
+      )
+    },
+  }
+  return result
+})
+
+function isAtBottom({ currentTarget }: UIEvent<HTMLDivElement>): boolean {
+  return currentTarget.scrollTop + 10 >= currentTarget.scrollHeight - currentTarget.clientHeight
+}
+
+export const PreviousRunsTab = () => {
+  const { childId: jobName } = useParams()
+  const { project } = useProjectContext()
+
+  const { data: cronJobs, isLoading: isLoadingCronJobs } = useCronJobsQuery({
+    projectRef: project?.ref,
+    connectionString: project?.connectionString,
+  })
+
+  const currentJobState = cronJobs?.find((job) => job.jobname === jobName)
+
+  const {
+    data,
+    isLoading: isLoadingCronJobRuns,
+    fetchNextPage,
+    isFetching,
+  } = useCronJobRunsInfiniteQuery(
+    {
+      projectRef: project?.ref,
+      connectionString: project?.connectionString,
+      jobId: Number(currentJobState?.jobid),
+    },
+    { enabled: !!currentJobState?.jobid, staleTime: 30 }
+  )
+
+  const handleScroll = useCallback(
+    (event: UIEvent<HTMLDivElement>) => {
+      if (isLoadingCronJobRuns || !isAtBottom(event)) return
+      // the cancelRefetch is to prevent the query from being refetched when the user scrolls back up and down again,
+      // resulting in multiple fetchNextPage calls
+      fetchNextPage({ cancelRefetch: false })
+    },
+    [fetchNextPage, isLoadingCronJobRuns]
+  )
+
+  const cronJobRuns = useMemo(() => data?.pages.flatMap((p) => p) || [], [data?.pages])
+
+  return (
+    <div className="h-full flex flex-col">
+      <div className="mt-4 h-full">
+        <LoadingLine loading={isFetching} />
+        <DataGrid
+          className="flex-grow h-full"
+          rowHeight={44}
+          headerRowHeight={36}
+          onScroll={handleScroll}
+          columns={columns}
+          rows={cronJobRuns ?? []}
+          rowClass={() => {
+            const isSelected = false
+            return cn([
+              `${isSelected ? 'bg-surface-300 dark:bg-surface-300' : 'bg-200'}  `,
+              `${isSelected ? '[&>div:first-child]:border-l-4 border-l-secondary [&>div]:border-l-foreground' : ''}`,
+              '[&>.rdg-cell]:border-box [&>.rdg-cell]:outline-none [&>.rdg-cell]:shadow-none',
+              '[&>.rdg-cell:first-child>div]:ml-4',
+            ])
+          }}
+          renderers={{
+            renderRow(_idx, props) {
+              return <Row key={props.row.job_pid} {...props} />
+            },
+            noRowsFallback: isLoadingCronJobRuns ? (
+              <div className="absolute top-14 px-6 w-full">
+                <GenericSkeletonLoader />
+              </div>
+            ) : (
+              <div className="flex items-center justify-center w-full col-span-6">
+                <CronJobsEmptyState page="runs" />
+              </div>
+            ),
+          }}
+        />
+      </div>
+
+      <div className="px-6 py-6 flex gap-12 border-t">
+        {isLoadingCronJobs ? (
+          <GenericSkeletonLoader />
+        ) : (
+          <>
+            <div className="grid gap-2 w-56">
+              <h3 className="text-sm">Schedule</h3>
+              <p className="text-xs text-foreground-light">
+                {currentJobState?.schedule ? (
+                  <>
+                    <span className="font-mono text-lg">{currentJobState.schedule}</span>
+                    <p>
+                      {isSecondsFormat(currentJobState.schedule)
+                        ? ''
+                        : CronToString(currentJobState.schedule.toLowerCase())}
+                    </p>
+                  </>
+                ) : (
+                  <span>Loading schedule...</span>
+                )}
+              </p>
+            </div>
+
+            <div className="grid gap-2">
+              <h3 className="text-sm">Command</h3>
+              <Tooltip_Shadcn_>
+                <TooltipTrigger_Shadcn_ className=" text-left p-0! cursor-pointer truncate max-w-[300px] h-12 relative">
+                  <SimpleCodeBlock
+                    showCopy={false}
+                    className="sql"
+                    parentClassName=" [&>div>span]:text-xs bg-alternative-200 !p-2 rounded-md"
+                  >
+                    {currentJobState?.command}
+                  </SimpleCodeBlock>
+                  <div className="bottom-0 left-0 right-0 h-8 bg-gradient-to-t from-background-200 to-transparent absolute " />
+                </TooltipTrigger_Shadcn_>
+                <TooltipContent_Shadcn_
+                  side="bottom"
+                  align="center"
+                  className="max-w-[400px] text-wrap"
+                >
+                  <SimpleCodeBlock
+                    showCopy={false}
+                    className="sql"
+                    parentClassName=" [&>div>span]:text-xs bg-alternative-200 !p-2 rounded-md"
+                  >
+                    {currentJobState?.command}
+                  </SimpleCodeBlock>
+                </TooltipContent_Shadcn_>
+              </Tooltip_Shadcn_>
+              {/* <div className="text-xs text-foreground-light">
+                <SimpleCodeBlock
+                  showCopy={false}
+                  className="sql"
+                  parentClassName=" [&>div>span]:text-xs bg-alternative-200 !p-2 rounded-md"
+                >
+                  {currentJobState?.command}
+                </SimpleCodeBlock>
+              </div> */}
+            </div>
+
+            <div className="grid gap-2">
+              <h3 className="text-sm">Explore</h3>
+              <Button asChild type="outline" icon={<List strokeWidth={1.5} size="14" />}>
+                {/* [Terry] need to link to the exact jobid, but not currently supported */}
+                <Link target="_blank" href={`/project/${project?.ref}/logs/pgcron-logs/`}>
+                  View logs
+                </Link>
+              </Button>
+            </div>
+          </>
+        )}
+      </div>
+    </div>
+  )
+}
diff --git a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
index 1bcaf7b433112..cad9403f5ea95 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/Integrations.constants.tsx
@@ -1,4 +1,4 @@
-import { Clock5, Layers, Vault, Webhook } from 'lucide-react'
+import { Clock5, Layers, Timer, Vault, Webhook } from 'lucide-react'
 import Image from 'next/image'
 import { ComponentType, ReactNode } from 'react'
 
@@ -131,9 +131,21 @@ const supabaseIntegrations: IntegrationDefinition[] = [
       {
         route: 'cron-jobs',
         label: 'Cron Jobs',
+        hasChild: true,
+        childIcon: (
+          <Timer size={12} strokeWidth={1.5} className={cn('text-foreground w-full h-full')} />
+        ),
       },
     ],
     navigate: (id: string, pageId: string = 'overview', childId: string | undefined) => {
+      if (childId) {
+        return dynamic(
+          () => import('../CronJobs/PreviousRunsTab').then((mod) => mod.PreviousRunsTab),
+          {
+            loading: Loading,
+          }
+        )
+      }
       switch (pageId) {
         case 'overview':
           return dynamic(
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx b/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx
index fb62e0e536040..1913b4ba78ae5 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogSelection.tsx
@@ -42,6 +42,8 @@ const LogSelection = ({ log, onClose, queryType, isLoading, error }: LogSelectio
 
       case 'database':
         return <DatabasePostgresSelectionRender log={log} />
+      case 'pg_cron':
+        return <DatabasePostgresSelectionRender log={log} />
 
       case 'fn_edge':
         return <FunctionInvocationSelectionRender log={log} />
diff --git a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
index ba438fac150cd..f83f79c0f8d6e 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogTable.tsx
@@ -173,6 +173,9 @@ const LogTable = ({
       case 'auth':
         columns = AuthColumnRenderer
         break
+      case 'pg_cron':
+        columns = DatabasePostgresColumnRender
+        break
 
       default:
         if (firstRow && isDefaultLogPreviewFormat(firstRow)) {
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.constants.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.constants.ts
index 2da4d33575241..4af99e34e515c 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.constants.ts
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.constants.ts
@@ -260,7 +260,7 @@ from edge_logs f
   cross join unnest(m.request) as r
   cross join unnest(m.response) as res
   cross join unnest(res.headers) as h
-where starts_with(r.path, '/storage/v1/object') 
+where starts_with(r.path, '/storage/v1/object')
   and r.method = 'GET'
   and h.cf_cache_status in ('MISS', 'NONE/UNKNOWN', 'EXPIRED', 'BYPASS', 'DYNAMIC')
 group by path, search
@@ -363,7 +363,7 @@ export enum LogsTableName {
   POSTGREST = 'postgrest_logs',
   SUPAVISOR = 'supavisor_logs',
   WAREHOUSE = 'warehouse_logs',
-  CRON_JOBS = 'cron_job_run_details',
+  PG_CRON = 'pg_cron_logs',
 }
 
 export const LOGS_TABLES = {
@@ -377,7 +377,7 @@ export const LOGS_TABLES = {
   postgrest: LogsTableName.POSTGREST,
   supavisor: LogsTableName.SUPAVISOR,
   warehouse: LogsTableName.WAREHOUSE,
-  cron: LogsTableName.CRON_JOBS,
+  pg_cron: LogsTableName.POSTGRES,
 }
 
 export const LOGS_SOURCE_DESCRIPTION = {
@@ -391,7 +391,7 @@ export const LOGS_SOURCE_DESCRIPTION = {
   [LogsTableName.POSTGREST]: 'RESTful API web server logs',
   [LogsTableName.SUPAVISOR]: 'Cloud-native Postgres connection pooler logs',
   [LogsTableName.WAREHOUSE]: 'Logs obtained from a data warehouse collection',
-  [LogsTableName.CRON_JOBS]: 'Logs obtained from cron job runs',
+  [LogsTableName.PG_CRON]: 'Postgres logs from pg_cron cron jobs',
 }
 
 export const genQueryParams = (params: { [k: string]: string }) => {
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.types.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.types.ts
index 3ba1eef4fb849..565c00e41b1a2 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.types.ts
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.types.ts
@@ -88,7 +88,7 @@ export type QueryType =
   | 'supavisor'
   | 'postgrest'
   | 'warehouse'
-  | 'cron'
+  | 'pg_cron'
 
 export type Mode = 'simple' | 'custom'
 
diff --git a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts
index 6a4c84ec55c89..7367bf296ee6b 100644
--- a/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts
+++ b/apps/studio/components/interfaces/Settings/Logs/Logs.utils.ts
@@ -145,8 +145,8 @@ export const genDefaultQuery = (table: LogsTableName, filters: Filters, limit: n
       if (IS_PLATFORM === false) {
         return `
 -- local dev edge_logs query
-select id, edge_logs.timestamp, event_message, request.method, request.path, response.status_code 
-from edge_logs 
+select id, edge_logs.timestamp, event_message, request.method, request.path, response.status_code
+from edge_logs
 ${joins}
 ${where}
 ${orderBy}
@@ -212,8 +212,19 @@ limit ${limit}
   limit ${limit}
   `
 
-    case 'cron_job_run_details':
-      return `select status, start_time, end_time, jobid from ${table} ${where} ${orderBy} limit ${limit}`
+    case 'pg_cron_logs':
+      const baseWhere = `where (parsed.application_name = 'pg_cron' OR event_message LIKE '%cron job%')`
+
+      const pgCronWhere = where ? `${baseWhere} AND ${where.substring(6)}` : baseWhere
+
+      return `select identifier, postgres_logs.timestamp, id, event_message, parsed.error_severity, parsed.query
+from postgres_logs
+  cross join unnest(metadata) as m
+  cross join unnest(m.parsed) as parsed
+${pgCronWhere}
+${orderBy}
+limit ${limit}
+`
   }
 }
 
diff --git a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
index 0eda209a2300f..d24b38bfa3f98 100644
--- a/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
+++ b/apps/studio/components/layouts/LogsLayout/LogsSidebarMenuV2.tsx
@@ -166,8 +166,8 @@ export function LogsSidebarMenuV2() {
     },
     {
       name: 'Cron Jobs',
-      key: 'cron-logs',
-      url: `/project/${ref}/logs/cron-logs`,
+      key: 'pg_cron',
+      url: `/project/${ref}/logs/pgcron-logs`,
       items: [],
     },
   ]
diff --git a/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts b/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts
new file mode 100644
index 0000000000000..d52865cf607d5
--- /dev/null
+++ b/apps/studio/data/database-cron-jobs/database-cron-jobs-runs-infinite-query.ts
@@ -0,0 +1,84 @@
+import { UseInfiniteQueryOptions, useInfiniteQuery } from '@tanstack/react-query'
+import { last } from 'lodash'
+
+import { executeSql } from 'data/sql/execute-sql-query'
+import { ResponseError } from 'types'
+import { databaseCronJobsKeys } from './keys'
+
+export type DatabaseCronJobRunsVariables = {
+  projectRef?: string
+  connectionString?: string
+  jobId: number
+}
+
+export type CronJobRun = {
+  jobid: number
+  runid: number
+  job_pid: number
+  database: string
+  username: string
+  command: string
+  status: 'succeeded' | 'failed'
+  return_message: string
+  start_time: string
+  end_time: string
+}
+
+export const CRON_JOB_RUNS_PAGE_SIZE = 30
+
+export async function getDatabaseCronJobRuns({
+  projectRef,
+  connectionString,
+  jobId,
+  afterTimestamp,
+}: DatabaseCronJobRunsVariables & { afterTimestamp: string }) {
+  if (!projectRef) throw new Error('Project ref is required')
+
+  let query = `
+    SELECT * FROM cron.job_run_details 
+    WHERE 
+      jobid = '${jobId}' 
+      ${afterTimestamp ? `AND start_time < '${afterTimestamp}'` : ''}
+    ORDER BY start_time DESC
+    LIMIT ${CRON_JOB_RUNS_PAGE_SIZE}`
+
+  const { result } = await executeSql({
+    projectRef,
+    connectionString,
+    sql: query,
+  })
+  return result
+}
+
+export type DatabaseCronJobData = CronJobRun[]
+export type DatabaseCronJobError = ResponseError
+
+export const useCronJobRunsInfiniteQuery = <TData = DatabaseCronJobData>(
+  { projectRef, connectionString, jobId }: DatabaseCronJobRunsVariables,
+  {
+    enabled = true,
+    ...options
+  }: UseInfiniteQueryOptions<DatabaseCronJobData, DatabaseCronJobError, TData> = {}
+) =>
+  useInfiniteQuery<DatabaseCronJobData, DatabaseCronJobError, TData>(
+    databaseCronJobsKeys.runsInfinite(projectRef, jobId, { status }),
+    ({ pageParam }) => {
+      return getDatabaseCronJobRuns({
+        projectRef,
+        connectionString,
+        jobId,
+        afterTimestamp: pageParam,
+      })
+    },
+    {
+      staleTime: 0,
+      enabled: enabled && typeof projectRef !== 'undefined',
+
+      getNextPageParam(lastPage) {
+        const hasNextPage = lastPage.length <= CRON_JOB_RUNS_PAGE_SIZE
+        if (!hasNextPage) return undefined
+        return last(lastPage)?.start_time
+      },
+      ...options,
+    }
+  )
diff --git a/apps/studio/data/database-cron-jobs/keys.ts b/apps/studio/data/database-cron-jobs/keys.ts
index 5df1b7ec631d1..f132226a3d81e 100644
--- a/apps/studio/data/database-cron-jobs/keys.ts
+++ b/apps/studio/data/database-cron-jobs/keys.ts
@@ -3,5 +3,12 @@ export const databaseCronJobsKeys = {
   delete: () => ['cron-jobs', 'delete'] as const,
   alter: () => ['cronjobs', 'alter'] as const,
   list: (projectRef: string | undefined) => ['projects', projectRef, 'cron-jobs'] as const,
+  runsInfinite: (projectRef: string | undefined, jobId: number, options?: object) => [
+    'projects',
+    projectRef,
+    'cron-jobs',
+    jobId,
+    options,
+  ],
   timezone: (projectRef: string | undefined) => ['database-cron-timezone', projectRef] as const,
 }
diff --git a/apps/studio/hooks/analytics/useLogsQuery.tsx b/apps/studio/hooks/analytics/useLogsQuery.tsx
index 9f3bf306dbefc..0452722bb385a 100644
--- a/apps/studio/hooks/analytics/useLogsQuery.tsx
+++ b/apps/studio/hooks/analytics/useLogsQuery.tsx
@@ -55,7 +55,6 @@ const useLogsQuery = (
 
   const usesWith = checkForWithClause(params.sql || '')
   const usesILIKE = checkForILIKEClause(params.sql || '')
-  const usesWildcard = checkForWildcard(params.sql || '')
 
   const {
     data,
@@ -94,13 +93,6 @@ const useLogsQuery = (
         docs: 'https://supabase.com/docs/guides/platform/advanced-log-filtering#the-ilike-and-similar-to-keywords-are-not-supported',
       }
     }
-    if (usesWildcard) {
-      error = {
-        message:
-          'Wildcard (*) queries are not supported. Please remove the wildcard and try again.',
-        docs: 'https://supabase.com/docs/guides/platform/advanced-log-filtering#the-wildcard-operator--to-select-columns-is-not-supported',
-      }
-    }
   }
   const changeQuery = (newQuery = '') => {
     setParams((prev) => ({ ...prev, sql: newQuery }))
diff --git a/apps/studio/pages/project/[ref]/logs/cron-logs.tsx b/apps/studio/pages/project/[ref]/logs/cron-logs.tsx
index cb80975342b26..d6a549a139455 100644
--- a/apps/studio/pages/project/[ref]/logs/cron-logs.tsx
+++ b/apps/studio/pages/project/[ref]/logs/cron-logs.tsx
@@ -15,8 +15,8 @@ export const LogPage: NextPageWithLayout = () => {
     <LogsPreviewer
       projectRef={ref as string}
       condensedLayout={true}
-      tableName={LogsTableName.CRON_JOBS}
-      queryType={'cron'}
+      tableName={LogsTableName.PG_CRON}
+      queryType={'pg_cron'}
     />
   )
 }
diff --git a/apps/studio/pages/project/[ref]/logs/pgcron-logs.tsx b/apps/studio/pages/project/[ref]/logs/pgcron-logs.tsx
new file mode 100644
index 0000000000000..25ba5c01e3561
--- /dev/null
+++ b/apps/studio/pages/project/[ref]/logs/pgcron-logs.tsx
@@ -0,0 +1,24 @@
+import { useRouter } from 'next/router'
+
+import { LogsTableName } from 'components/interfaces/Settings/Logs/Logs.constants'
+import LogsPreviewer from 'components/interfaces/Settings/Logs/LogsPreviewer'
+import LogsLayout from 'components/layouts/LogsLayout/LogsLayout'
+import type { NextPageWithLayout } from 'types'
+
+export const LogPage: NextPageWithLayout = () => {
+  const router = useRouter()
+  const { ref } = router.query
+
+  return (
+    <LogsPreviewer
+      condensedLayout
+      queryType="pg_cron"
+      projectRef={ref as string}
+      tableName={LogsTableName.PG_CRON}
+    />
+  )
+}
+
+LogPage.getLayout = (page) => <LogsLayout title="PgCron Logs">{page}</LogsLayout>
+
+export default LogPage
diff --git a/package.json b/package.json
index e9361b696573a..82a14eb66570a 100644
--- a/package.json
+++ b/package.json
@@ -5,12 +5,7 @@
   "author": "Supabase, Inc.",
   "license": "Apache-2.0",
   "private": true,
-  "workspaces": [
-    "apps/*",
-    "tests",
-    "playwright-tests",
-    "packages/*"
-  ],
+  "workspaces": ["apps/*", "tests", "playwright-tests", "packages/*"],
   "scripts": {
     "build": "turbo run build",
     "build:studio": "turbo run build --filter=studio",
@@ -58,13 +53,6 @@
     "npm": "^10.0.0",
     "node": "^20.0.0"
   },
-  "keywords": [
-    "postgres",
-    "firebase",
-    "storage",
-    "functions",
-    "database",
-    "auth"
-  ],
+  "keywords": ["postgres", "firebase", "storage", "functions", "database", "auth"],
   "packageManager": "npm@10.7.0"
 }

From 489e0e134e22b1c5c242402faf9c15d149501a8e Mon Sep 17 00:00:00 2001
From: Jonathan Summers-Muir <MildTomato@users.noreply.github.com>
Date: Thu, 28 Nov 2024 04:48:57 +0800
Subject: [PATCH 5/5] Update AvailableIntegrations.tsx (#30688)

---
 .../Integrations/Landing/AvailableIntegrations.tsx | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx b/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx
index 8a391518a38f9..c0a2d721bcd33 100644
--- a/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx
+++ b/apps/studio/components/interfaces/Integrations/Landing/AvailableIntegrations.tsx
@@ -40,7 +40,7 @@ export const AvailableIntegrations = () => {
         value={selectedCategory}
         onValueChange={(value) => setSelectedCategory(value as IntegrationCategory)}
       >
-        <TabsList_Shadcn_ className="px-10">
+        <TabsList_Shadcn_ className="px-10 gap-5">
           <Input
             value={search}
             onChange={(e) => setSearch(e.target.value)}
@@ -55,15 +55,9 @@ export const AvailableIntegrations = () => {
             className="pl-7 rounded-none !border-0 border-transparent bg-transparent !shadow-none !ring-0 !ring-offset-0"
             placeholder="Search..."
           />
-          <TabsTrigger_Shadcn_ value="all" className="px-4">
-            All Integrations
-          </TabsTrigger_Shadcn_>
-          <TabsTrigger_Shadcn_ value="wrapper" className="px-4">
-            Foreign Data Wrappers
-          </TabsTrigger_Shadcn_>
-          <TabsTrigger_Shadcn_ value="postgres_extension" className="px-4">
-            Postgres Extensions
-          </TabsTrigger_Shadcn_>
+          <TabsTrigger_Shadcn_ value="all">All Integrations</TabsTrigger_Shadcn_>
+          <TabsTrigger_Shadcn_ value="wrapper">Foreign Data Wrappers</TabsTrigger_Shadcn_>
+          <TabsTrigger_Shadcn_ value="postgres_extension">Postgres Extensions</TabsTrigger_Shadcn_>
         </TabsList_Shadcn_>
       </Tabs_Shadcn_>
       <div className="p-10 py-8 flex flex-col gap-y-5">