refactor(ui): simplify implementation of github provider using PAT (#…

…1963) * refactor(ui): implify implementation of github provider using PAT * update * remove useless component * format * [autofix.ci] apply automated fixes * justify size * [autofix.ci] apply automated fixes * restructure-repository-providers * consolidate layouts * adjust ux * update ux * fix spacing * update * fix ui * update * update * update --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Meng Zhang <[email protected]>
TabbyML · Apr 25, 2024 · 2615fbf · 2615fbf
1 parent eb942ae
commit 2615fbf
Show file tree

Hide file tree

Showing 34 changed files with 589 additions and 1,222 deletions.
diff --git a/ee/tabby-ui/app/(dashboard)/components/sidebar.tsx b/ee/tabby-ui/app/(dashboard)/components/sidebar.tsx
@@ -94,8 +94,8 @@ export default function Sidebar({ children, className }: SidebarProps) {
                       </>
                     }
                   >
-                    <SidebarButton href="/settings/git">
-                      Git Providers
+                    <SidebarButton href="/settings/repository/git">
+                      Repository Providers
                     </SidebarButton>
                     <SidebarButton href="/settings/sso">SSO</SidebarButton>
                     <SidebarButton href="/settings/mail">
@@ -135,9 +135,12 @@ const linkVariants = cva(
 function SidebarButton({ href, children }: SidebarButtonProps) {
   const pathname = usePathname()
   const isSelected = React.useMemo(() => {
-    return href === '/'
-      ? href === pathname
-      : shouldPathnameHighlight(pathname, href)
+    if (href === '/') return href === pathname
+    if (href.startsWith('/settings/repository/github')) {
+      return pathname.startsWith('/settings/repository/')
+    }
+
+    return shouldPathnameHighlight(pathname, href)
   }, [pathname, href])
 
   const state = isSelected ? 'selected' : 'not-selected'

diff --git a/ee/tabby-ui/app/(dashboard)/settings/(integrations)/git/components/header.tsx b/ee/tabby-ui/app/(dashboard)/settings/(integrations)/git/components/header.tsx
diff --git a/ee/tabby-ui/app/(dashboard)/settings/(integrations)/git/page.tsx b/ee/tabby-ui/app/(dashboard)/settings/(integrations)/git/page.tsx
diff --git a/ee/tabby-ui/app/(dashboard)/settings/(integrations)/gitops/components/basic-info-form.tsx b/ee/tabby-ui/app/(dashboard)/settings/(integrations)/gitops/components/basic-info-form.tsx
diff --git a/ee/tabby-ui/app/(dashboard)/settings/(integrations)/gitops/components/header.tsx b/ee/tabby-ui/app/(dashboard)/settings/(integrations)/gitops/components/header.tsx
diff --git a/...y-ui/app/(dashboard)/settings/(integrations)/gitops/components/oauth-application-form.tsx b/...y-ui/app/(dashboard)/settings/(integrations)/gitops/components/oauth-application-form.tsx