From 737e37170d963b7200cdaeec46ecc225388f4bc4 Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 5 Feb 2025 11:32:03 -0800
Subject: [PATCH 1/2] minor updates

---
 backend/onyx/db/document_set.py               |  2 +-
 .../groups/[groupId]/AddConnectorForm.tsx     |  4 +-
 .../admin/groups/[groupId]/GroupDisplay.tsx   | 55 ++++++++++++-------
 web/src/components/ui/button.tsx              | 16 ++++--
 4 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/backend/onyx/db/document_set.py b/backend/onyx/db/document_set.py
index 0a5397eb8..0229682fd 100644
--- a/backend/onyx/db/document_set.py
+++ b/backend/onyx/db/document_set.py
@@ -198,7 +198,7 @@ def _check_if_cc_pairs_are_owned_by_groups(
             ids=missing_cc_pair_ids,
         )
         for cc_pair in cc_pairs:
-            if cc_pair.access_type != AccessType.PUBLIC:
+            if cc_pair.access_type == AccessType.PRIVATE:
                 raise ValueError(
                     f"Connector Credential Pair with ID: '{cc_pair.id}'"
                     " is not owned by the specified groups"
diff --git a/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx b/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx
index c002bbc89..fa6afac67 100644
--- a/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx
+++ b/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx
@@ -74,8 +74,8 @@ export const AddConnectorForm: React.FC<AddConnectorFormProps> = ({
                     .map((userGroupCCPair) => userGroupCCPair.id)
                     .includes(ccPair.cc_pair_id)
               )
-              // remove public docs, since they don't make sense as part of a group
-              .filter((ccPair) => !(ccPair.access_type === "public"))
+              // remove public and synced docs, since they don't make sense as part of a group
+              .filter((ccPair) => ccPair.access_type === "private")
               .map((ccPair) => {
                 return {
                   name: ccPair.name?.toString() || "",
diff --git a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx
index 9193ae1fb..878eb0f63 100644
--- a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx
+++ b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx
@@ -32,6 +32,12 @@ import {
   TableHeader,
   TableRow,
 } from "@/components/ui/table";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/components/ui/tooltip";
 import { Button } from "@/components/ui/button";
 import { DeleteButton } from "@/components/DeleteButton";
 import { Bubble } from "@/components/Bubble";
@@ -290,16 +296,21 @@ export const GroupDisplay = ({
         )}
       </div>
 
-      <Button
-        className="mt-3"
-        size="sm"
-        variant="submit"
-        onClick={() => setAddMemberFormVisible(true)}
-        disabled={!userGroup.is_up_to_date}
-      >
-        Add Users
-      </Button>
-
+      <div className="mt-3 w-fit">
+        <Button
+          tooltip={
+            !userGroup.is_up_to_date
+              ? "Cannot update group while sync is occurring"
+              : undefined
+          }
+          size="sm"
+          variant="submit"
+          onClick={() => setAddMemberFormVisible(true)}
+          disabled={!userGroup.is_up_to_date}
+        >
+          Add Users
+        </Button>
+      </div>
       {addMemberFormVisible && (
         <AddMemberForm
           users={users}
@@ -389,15 +400,21 @@ export const GroupDisplay = ({
         )}
       </div>
 
-      <Button
-        className="mt-3"
-        onClick={() => setAddConnectorFormVisible(true)}
-        size="sm"
-        variant="submit"
-        disabled={!userGroup.is_up_to_date}
-      >
-        Add Connectors
-      </Button>
+      <div className="mt-3 w-fit">
+        <Button
+          tooltip={
+            !userGroup.is_up_to_date
+              ? "Cannot update group while sync is occurring"
+              : undefined
+          }
+          onClick={() => setAddConnectorFormVisible(true)}
+          size="sm"
+          variant="submit"
+          disabled={!userGroup.is_up_to_date}
+        >
+          Add Connectors
+        </Button>
+      </div>
 
       {addConnectorFormVisible && (
         <AddConnectorForm
diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsx
index 93fa526ae..e7a53170b 100644
--- a/web/src/components/ui/button.tsx
+++ b/web/src/components/ui/button.tsx
@@ -1,8 +1,10 @@
-import * as React from "react";
-import { Slot } from "@radix-ui/react-slot";
-import { cva, type VariantProps } from "class-variance-authority";
+"use client";
 
+import * as React from "react";
+import * as TooltipPrimitive from "@radix-ui/react-tooltip";
+import { Slot } from "@radix-ui/react-slot";
 import { cn } from "@/lib/utils";
+import { cva, type VariantProps } from "class-variance-authority";
 
 const buttonVariants = cva(
   "inline-flex cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded text-sm font-medium ring-offset-white transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300",
@@ -116,10 +118,12 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 
     if (tooltip) {
       return (
-        <div className="relative group">
+        <div className="group relative inline-block">
           {button}
-          <div className="absolute bottom-full left-1/2 transform -translate-x-1/2 mb-2 px-2 py-1 bg-neutral-800 text-white text-sm rounded-sm opacity-0 group-hover:opacity-100 transition-opacity whitespace-nowrap">
-            {tooltip}
+          <div className="absolute z-50 invisible group-hover:visible opacity-0 group-hover:opacity-100 transition-opacity duration-300 bottom-full left-1/2 transform -translate-x-1/2 mb-2 w-auto">
+            <div className="bg-neutral-800 text-white text-xs rounded py-1 px-2 shadow-md">
+              {tooltip}
+            </div>
           </div>
         </div>
       );

From 477f8eeb682dba875af873079de8dc8b4b034ecf Mon Sep 17 00:00:00 2001
From: pablodanswer <pablo@danswer.ai>
Date: Wed, 5 Feb 2025 11:37:35 -0800
Subject: [PATCH 2/2] minor update

---
 .../admin/groups/[groupId]/GroupDisplay.tsx   | 76 +++++++++++--------
 web/src/components/ui/button.tsx              | 14 ++--
 2 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx
index 878eb0f63..41d3c6c40 100644
--- a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx
+++ b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx
@@ -296,21 +296,29 @@ export const GroupDisplay = ({
         )}
       </div>
 
-      <div className="mt-3 w-fit">
-        <Button
-          tooltip={
-            !userGroup.is_up_to_date
-              ? "Cannot update group while sync is occurring"
-              : undefined
-          }
-          size="sm"
-          variant="submit"
-          onClick={() => setAddMemberFormVisible(true)}
-          disabled={!userGroup.is_up_to_date}
-        >
-          Add Users
-        </Button>
-      </div>
+      <TooltipProvider>
+        <Tooltip delayDuration={0}>
+          <TooltipTrigger asChild>
+            <Button
+              size="sm"
+              className={userGroup.is_up_to_date ? "" : "opacity-50"}
+              variant="submit"
+              onClick={() => {
+                if (userGroup.is_up_to_date) {
+                  setAddMemberFormVisible(true);
+                }
+              }}
+            >
+              Add Users
+            </Button>
+          </TooltipTrigger>
+          {!userGroup.is_up_to_date && (
+            <TooltipContent>
+              <p>Cannot update group while sync is occurring</p>
+            </TooltipContent>
+          )}
+        </Tooltip>
+      </TooltipProvider>
       {addMemberFormVisible && (
         <AddMemberForm
           users={users}
@@ -400,21 +408,29 @@ export const GroupDisplay = ({
         )}
       </div>
 
-      <div className="mt-3 w-fit">
-        <Button
-          tooltip={
-            !userGroup.is_up_to_date
-              ? "Cannot update group while sync is occurring"
-              : undefined
-          }
-          onClick={() => setAddConnectorFormVisible(true)}
-          size="sm"
-          variant="submit"
-          disabled={!userGroup.is_up_to_date}
-        >
-          Add Connectors
-        </Button>
-      </div>
+      <TooltipProvider>
+        <Tooltip delayDuration={0}>
+          <TooltipTrigger asChild>
+            <Button
+              size="sm"
+              className={userGroup.is_up_to_date ? "" : "opacity-50"}
+              variant="submit"
+              onClick={() => {
+                if (userGroup.is_up_to_date) {
+                  setAddConnectorFormVisible(true);
+                }
+              }}
+            >
+              Add Connectors
+            </Button>
+          </TooltipTrigger>
+          {!userGroup.is_up_to_date && (
+            <TooltipContent>
+              <p>Cannot update group while sync is occurring</p>
+            </TooltipContent>
+          )}
+        </Tooltip>
+      </TooltipProvider>
 
       {addConnectorFormVisible && (
         <AddConnectorForm
diff --git a/web/src/components/ui/button.tsx b/web/src/components/ui/button.tsx
index e7a53170b..637165d63 100644
--- a/web/src/components/ui/button.tsx
+++ b/web/src/components/ui/button.tsx
@@ -1,11 +1,9 @@
-"use client";
-
 import * as React from "react";
-import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 import { Slot } from "@radix-ui/react-slot";
-import { cn } from "@/lib/utils";
 import { cva, type VariantProps } from "class-variance-authority";
 
+import { cn } from "@/lib/utils";
+
 const buttonVariants = cva(
   "inline-flex cursor-pointer items-center justify-center gap-2 whitespace-nowrap rounded text-sm font-medium ring-offset-white transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-neutral-950 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 dark:ring-offset-neutral-950 dark:focus-visible:ring-neutral-300",
   {
@@ -118,12 +116,10 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
 
     if (tooltip) {
       return (
-        <div className="group relative inline-block">
+        <div className="relative group">
           {button}
-          <div className="absolute z-50 invisible group-hover:visible opacity-0 group-hover:opacity-100 transition-opacity duration-300 bottom-full left-1/2 transform -translate-x-1/2 mb-2 w-auto">
-            <div className="bg-neutral-800 text-white text-xs rounded py-1 px-2 shadow-md">
-              {tooltip}
-            </div>
+          <div className="absolute bottom-full left-1/2 transform -translate-x-1/2 mb-2 px-2 py-1 bg-neutral-800 text-white text-sm rounded opacity-0 group-hover:opacity-100 transition-opacity whitespace-nowrap">
+            {tooltip}
           </div>
         </div>
       );