Merge remote-tracking branch 'origin/main' into r0.9

TabbyML · Feb 27, 2024 · 1742c13 · 1742c13
2 parents 76b565b + 11ad5a0
commit 1742c13
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 11 deletions.
diff --git a/ee/tabby-ui/app/(dashboard)/profile/components/profile-card.tsx b/ee/tabby-ui/app/(dashboard)/profile/components/profile-card.tsx
@@ -23,7 +23,7 @@ const ProfileCard: React.FC<ProfileCardProps> = ({
   return (
     <div
       className={cn(
-        'flex flex-col gap-8 rounded-lg border p-6 pb-0',
+        'flex w-full flex-col gap-8 rounded-lg border p-6 pb-0 xl:w-[800px]',
         className
       )}
       {...props}

diff --git a/ee/tabby-ui/app/(dashboard)/profile/components/profile.tsx b/ee/tabby-ui/app/(dashboard)/profile/components/profile.tsx
@@ -9,20 +9,20 @@ import { ProfileCard } from './profile-card'
 
 export default function Profile() {
   return (
-    <div className="flex flex-col gap-6">
+    <div className="flex flex-col items-center gap-6">
       <ProfileCard
-        title="Your Avatar"
-        description="This is your avatar image on Tabby"
-        footer="Square image recommended."
+        title="Your Email"
+        description="This will be the email you use to log in and receive notifications."
+        footer="The feature to change your email address will be available in a future release."
       >
-        <Avatar />
+        <Email />
       </ProfileCard>
       <ProfileCard
-        title="Your Email"
-        description="This is the email associated with your Tabby account"
-        footer="Your email"
+        title="Your Avatar"
+        description="This is your avatar image."
+        footer="The avatar customization feature will be available in a future release."
       >
-        <Email />
+        <Avatar />
       </ProfileCard>
       <ProfileCard title="Change Password" footerClassname="pb-0">
         <ChangePassword />

diff --git a/ee/tabby-ui/app/(dashboard)/settings/subscription/components/license-table.tsx b/ee/tabby-ui/app/(dashboard)/settings/subscription/components/license-table.tsx
@@ -2,7 +2,7 @@
 
 import { ReactNode } from 'react'
 
-import { IconCheck } from '@/components/ui/icons'
+import { IconCheck, IconInfoCircled } from '@/components/ui/icons'
 import {
   Table,
   TableBody,
@@ -11,6 +11,12 @@ import {
   TableHeader,
   TableRow
 } from '@/components/ui/table'
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger
+} from '@/components/ui/tooltip'
 
 export const LicenseTable = () => {
   return (
@@ -98,6 +104,32 @@ interface Feature {
   enterprise: ReactNode | String
 }
 
+const FeatureTooltip = ({ children }: { children: ReactNode }) => (
+  <TooltipProvider>
+    <Tooltip>
+      <TooltipTrigger>
+        <IconInfoCircled />
+      </TooltipTrigger>
+      <TooltipContent>
+        <p className="max-w-[320px]">{children}</p>
+      </TooltipContent>
+    </Tooltip>
+  </TooltipProvider>
+)
+
+const FeatureWithTooltip = ({
+  name,
+  children
+}: {
+  name: string
+  children: ReactNode
+}) => (
+  <span className="flex gap-1">
+    {name}
+    <FeatureTooltip>{children}</FeatureTooltip>
+  </span>
+)
+
 interface FeatureGroup {
   name: String
   features: Feature[]
@@ -128,6 +160,36 @@ const FEATURES: FeatureGroup[] = [
         team: checked,
         enterprise: checked
       },
+      {
+        name: (
+          <FeatureWithTooltip name="Bring your own LLM">
+            Tabby builds on top of open technologies, allowing customers to
+            bring their own LLM models.
+          </FeatureWithTooltip>
+        ),
+        community: checked,
+        team: checked,
+        enterprise: checked
+      },
+      {
+        name: (
+          <FeatureWithTooltip name="Git Providers">
+            Tabby can retrieve the codebase context to enhance responses.
+            Underlying Tabby pulls context from git providers with a code search
+            index. This method enables Tabby to utilize the team&apos;s past
+            practices at scale.
+          </FeatureWithTooltip>
+        ),
+        community: checked,
+        team: checked,
+        enterprise: checked
+      },
+      {
+        name: 'Admin Controls',
+        community: dashed,
+        team: checked,
+        enterprise: checked
+      },
       {
         name: 'Toggle IDE / Extensions telemetry',
         community: dashed,