Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor misc docset updates #3912

Merged
merged 2 commits into from
Feb 6, 2025
Merged

Minor misc docset updates #3912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
737e371
minor updates
pablonyx Feb 5, 2025
477f8ee
minor update
pablonyx Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/onyx/db/document_set.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() || "",
Expand Down
71 changes: 52 additions & 19 deletions web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -290,16 +296,29 @@ export const GroupDisplay = ({
)}
</div>

<Button
className="mt-3"
size="sm"
variant="submit"
onClick={() => setAddMemberFormVisible(true)}
disabled={!userGroup.is_up_to_date}
>
Add Users
</Button>

<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}
Expand Down Expand Up @@ -389,15 +408,29 @@ export const GroupDisplay = ({
)}
</div>

<Button
className="mt-3"
onClick={() => setAddConnectorFormVisible(true)}
size="sm"
variant="submit"
disabled={!userGroup.is_up_to_date}
>
Add Connectors
</Button>
<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
Expand Down
2 changes: 1 addition & 1 deletion web/src/components/ui/button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
return (
<div className="relative group">
{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">
<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>
Expand Down
Loading