diff --git a/backend/danswer/auth/users.py b/backend/danswer/auth/users.py index 97508f8aa..dff6a6036 100644 --- a/backend/danswer/auth/users.py +++ b/backend/danswer/auth/users.py @@ -69,7 +69,7 @@ logger = setup_logger() def validate_curator_request(groups: list | None, is_public: bool) -> None: if is_public: - detail = "User does not have permission to create public credentials" + detail = "Curators cannot create public objects" logger.error(detail) raise HTTPException( status_code=401, diff --git a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx index 0d99eda08..e6e99174a 100644 --- a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx +++ b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx @@ -486,27 +486,10 @@ export default function AddConnector({ /> {isPaidEnterpriseFeaturesEnabled && ( <> - - {formikProps.values.groups.length > 0 ? ( - - ) : ( - { - const value = e.target.checked; - formikProps.setFieldValue("is_public", value); - if (value) { - formikProps.setFieldValue("groups", []); - } - }} - label={"Documents are Public?"} - name={"is_public"} - /> - )} + )} diff --git a/web/src/app/ee/admin/groups/UserGroupsTable.tsx b/web/src/app/ee/admin/groups/UserGroupsTable.tsx index 9a5201020..49a84104a 100644 --- a/web/src/app/ee/admin/groups/UserGroupsTable.tsx +++ b/web/src/app/ee/admin/groups/UserGroupsTable.tsx @@ -74,11 +74,13 @@ export const UserGroupsTable = ({ - -

{userGroup.name}

+ + + {userGroup.name} +
diff --git a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx index 680685858..cde36c9e5 100644 --- a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx +++ b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx @@ -392,7 +392,7 @@ export const GroupDisplay = ({ -

Personas

+

Assistants

{userGroup.document_sets.length > 0 ? ( @@ -410,7 +410,7 @@ export const GroupDisplay = ({
) : ( <> - No Personas in this group... + No Assistants in this group... )} diff --git a/web/src/components/IsPublicGroupSelector.tsx b/web/src/components/IsPublicGroupSelector.tsx index 38cc86bbe..63d47e506 100644 --- a/web/src/components/IsPublicGroupSelector.tsx +++ b/web/src/components/IsPublicGroupSelector.tsx @@ -28,6 +28,9 @@ export const IsPublicGroupSelector = ({ useEffect(() => { if (user && userGroups) { const isUserAdmin = user.role === UserRole.ADMIN; + if (!isUserAdmin) { + formikProps.setFieldValue("is_public", false); + } if (userGroups.length === 1 && !isUserAdmin) { formikProps.setFieldValue("groups", [userGroups[0].id]); setShouldHideContent(true);