From 17cc262f5ddd0621ea9c9bc818a1b459c38b16ca Mon Sep 17 00:00:00 2001 From: Chris Weaver <25087905+Weves@users.noreply.github.com> Date: Thu, 21 Mar 2024 13:51:38 -0700 Subject: [PATCH] Private personas doc sets (#52) Private Personas and Document Sets --------- Co-authored-by: Yuhong Sun --- backend/danswer/background/update.py | 4 +- backend/danswer/db/models.py | 1 + backend/ee/danswer/db/document_set.py | 123 ++++++++++++++++++ backend/ee/danswer/db/models.py | 96 -------------- backend/ee/danswer/db/persona.py | 32 +++++ backend/ee/danswer/db/saml.py | 2 +- backend/ee/danswer/db/user_group.py | 6 +- .../ee/danswer/server/user_group/models.py | 37 ++++-- backend/scripts/dev_run_background_jobs.py | 10 +- web/src/app/admin/documents/sets/hooks.tsx | 1 + .../ee/admin/groups/UserGroupCreationForm.tsx | 3 +- .../app/ee/admin/groups/UserGroupsTable.tsx | 3 +- .../groups/[groupId]/AddConnectorForm.tsx | 3 +- .../admin/groups/[groupId]/AddMemberForm.tsx | 3 +- .../admin/groups/[groupId]/GroupDisplay.tsx | 55 +++++++- web/src/app/ee/admin/groups/[groupId]/hook.ts | 2 +- web/src/app/ee/admin/groups/hooks.ts | 14 -- web/src/app/ee/admin/groups/page.tsx | 7 +- web/src/app/ee/admin/groups/types.ts | 11 -- 19 files changed, 257 insertions(+), 156 deletions(-) create mode 100644 backend/ee/danswer/db/document_set.py delete mode 100644 backend/ee/danswer/db/models.py create mode 100644 backend/ee/danswer/db/persona.py delete mode 100644 web/src/app/ee/admin/groups/hooks.ts diff --git a/backend/danswer/background/update.py b/backend/danswer/background/update.py index ce814e6ac..93ab45909 100755 --- a/backend/danswer/background/update.py +++ b/backend/danswer/background/update.py @@ -311,14 +311,14 @@ def kickoff_indexing_jobs( run_indexing_entrypoint, attempt.id, global_version.get_is_ee_version(), - pure=False + pure=False, ) else: run = client.submit( run_indexing_entrypoint, attempt.id, global_version.get_is_ee_version(), - pure=False + pure=False, ) if run: diff --git a/backend/danswer/db/models.py b/backend/danswer/db/models.py index 244a4c364..bf3142d5c 100644 --- a/backend/danswer/db/models.py +++ b/backend/danswer/db/models.py @@ -1129,6 +1129,7 @@ class PGFileStore(Base): lobj_oid: Mapped[int] = mapped_column(Integer, nullable=False) + """ ************************************************************************ Enterprise Edition Models diff --git a/backend/ee/danswer/db/document_set.py b/backend/ee/danswer/db/document_set.py new file mode 100644 index 000000000..bcbd06874 --- /dev/null +++ b/backend/ee/danswer/db/document_set.py @@ -0,0 +1,123 @@ +from uuid import UUID + +from sqlalchemy.orm import Session + +from danswer.db.models import ConnectorCredentialPair +from danswer.db.models import DocumentSet +from danswer.db.models import DocumentSet__ConnectorCredentialPair +from danswer.db.models import DocumentSet__User +from danswer.db.models import DocumentSet__UserGroup +from danswer.db.models import User__UserGroup +from danswer.db.models import UserGroup + + +def make_doc_set_private( + document_set_id: int, + user_ids: list[UUID] | None, + group_ids: list[int] | None, + db_session: Session, +) -> None: + db_session.query(DocumentSet__User).filter( + DocumentSet__User.document_set_id == document_set_id + ).delete(synchronize_session="fetch") + db_session.query(DocumentSet__UserGroup).filter( + DocumentSet__UserGroup.document_set_id == document_set_id + ).delete(synchronize_session="fetch") + + if user_ids: + for user_uuid in user_ids: + db_session.add( + DocumentSet__User(document_set_id=document_set_id, user_id=user_uuid) + ) + + if group_ids: + for group_id in group_ids: + db_session.add( + DocumentSet__UserGroup( + document_set_id=document_set_id, user_group_id=group_id + ) + ) + + +def delete_document_set_privacy__no_commit( + document_set_id: int, db_session: Session +) -> None: + db_session.query(DocumentSet__User).filter( + DocumentSet__User.document_set_id == document_set_id + ).delete(synchronize_session="fetch") + + db_session.query(DocumentSet__UserGroup).filter( + DocumentSet__UserGroup.document_set_id == document_set_id + ).delete(synchronize_session="fetch") + + +def fetch_document_sets( + user_id: UUID | None, + db_session: Session, + include_outdated: bool = True, # Parameter only for versioned implementation, unused +) -> list[tuple[DocumentSet, list[ConnectorCredentialPair]]]: + assert user_id is not None + + # Public document sets + public_document_sets = ( + db_session.query(DocumentSet) + .filter(DocumentSet.is_public == True) # noqa + .all() + ) + + # Document sets via shared user relationships + shared_document_sets = ( + db_session.query(DocumentSet) + .join(DocumentSet__User, DocumentSet.id == DocumentSet__User.document_set_id) + .filter(DocumentSet__User.user_id == user_id) + .all() + ) + + # Document sets via groups + # First, find the user groups the user belongs to + user_groups = ( + db_session.query(UserGroup) + .join(User__UserGroup, UserGroup.id == User__UserGroup.user_group_id) + .filter(User__UserGroup.user_id == user_id) + .all() + ) + + group_document_sets = [] + for group in user_groups: + group_document_sets.extend( + db_session.query(DocumentSet) + .join( + DocumentSet__UserGroup, + DocumentSet.id == DocumentSet__UserGroup.document_set_id, + ) + .filter(DocumentSet__UserGroup.user_group_id == group.id) + .all() + ) + + # Combine and deduplicate document sets from all sources + all_document_sets = list( + set(public_document_sets + shared_document_sets + group_document_sets) + ) + + document_set_with_cc_pairs: list[ + tuple[DocumentSet, list[ConnectorCredentialPair]] + ] = [] + + for document_set in all_document_sets: + # Fetch the associated ConnectorCredentialPairs + cc_pairs = ( + db_session.query(ConnectorCredentialPair) + .join( + DocumentSet__ConnectorCredentialPair, + ConnectorCredentialPair.id + == DocumentSet__ConnectorCredentialPair.connector_credential_pair_id, + ) + .filter( + DocumentSet__ConnectorCredentialPair.document_set_id == document_set.id, + ) + .all() + ) + + document_set_with_cc_pairs.append((document_set, cc_pairs)) # type: ignore + + return document_set_with_cc_pairs diff --git a/backend/ee/danswer/db/models.py b/backend/ee/danswer/db/models.py deleted file mode 100644 index f01b42895..000000000 --- a/backend/ee/danswer/db/models.py +++ /dev/null @@ -1,96 +0,0 @@ -import datetime -from uuid import UUID - -from sqlalchemy import Boolean -from sqlalchemy import DateTime -from sqlalchemy import ForeignKey -from sqlalchemy import func -from sqlalchemy import String -from sqlalchemy import Text -from sqlalchemy.orm import Mapped -from sqlalchemy.orm import mapped_column -from sqlalchemy.orm import relationship - -from danswer.db.models import Base -from danswer.db.models import ConnectorCredentialPair -from danswer.db.models import User - - -class SamlAccount(Base): - __tablename__ = "saml" - - id: Mapped[int] = mapped_column(primary_key=True) - user_id: Mapped[int] = mapped_column(ForeignKey("user.id"), unique=True) - encrypted_cookie: Mapped[str] = mapped_column(Text, unique=True) - expires_at: Mapped[datetime.datetime] = mapped_column(DateTime(timezone=True)) - updated_at: Mapped[datetime.datetime] = mapped_column( - DateTime(timezone=True), server_default=func.now(), onupdate=func.now() - ) - - user: Mapped[User] = relationship("User") - - -"""Tables related to RBAC""" - - -class User__UserGroup(Base): - __tablename__ = "user__user_group" - - user_group_id: Mapped[int] = mapped_column( - ForeignKey("user_group.id"), primary_key=True - ) - user_id: Mapped[UUID] = mapped_column(ForeignKey("user.id"), primary_key=True) - - -class UserGroup__ConnectorCredentialPair(Base): - __tablename__ = "user_group__connector_credential_pair" - - user_group_id: Mapped[int] = mapped_column( - ForeignKey("user_group.id"), primary_key=True - ) - cc_pair_id: Mapped[int] = mapped_column( - ForeignKey("connector_credential_pair.id"), primary_key=True - ) - # if `True`, then is part of the current state of the UserGroup - # if `False`, then is a part of the prior state of the UserGroup - # rows with `is_current=False` should be deleted when the UserGroup - # is updated and should not exist for a given UserGroup if - # `UserGroup.is_up_to_date == True` - is_current: Mapped[bool] = mapped_column( - Boolean, - default=True, - primary_key=True, - ) - - cc_pair: Mapped[ConnectorCredentialPair] = relationship( - "ConnectorCredentialPair", - ) - - -class UserGroup(Base): - __tablename__ = "user_group" - - id: Mapped[int] = mapped_column(primary_key=True) - name: Mapped[str] = mapped_column(String, unique=True) - # whether or not changes to the UserGroup have been propogated to Vespa - is_up_to_date: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False) - # tell the sync job to clean up the group - is_up_for_deletion: Mapped[bool] = mapped_column( - Boolean, nullable=False, default=False - ) - - users: Mapped[list[User]] = relationship( - "User", - secondary=User__UserGroup.__table__, - ) - cc_pairs: Mapped[list[ConnectorCredentialPair]] = relationship( - "ConnectorCredentialPair", - secondary=UserGroup__ConnectorCredentialPair.__table__, - viewonly=True, - ) - cc_pair_relationships: Mapped[ - list[UserGroup__ConnectorCredentialPair] - ] = relationship( - "UserGroup__ConnectorCredentialPair", - viewonly=True, - ) diff --git a/backend/ee/danswer/db/persona.py b/backend/ee/danswer/db/persona.py new file mode 100644 index 000000000..a7e257278 --- /dev/null +++ b/backend/ee/danswer/db/persona.py @@ -0,0 +1,32 @@ +from uuid import UUID + +from sqlalchemy.orm import Session + +from danswer.db.models import Persona__User +from danswer.db.models import Persona__UserGroup + + +def make_persona_private( + persona_id: int, + user_ids: list[UUID] | None, + group_ids: list[int] | None, + db_session: Session, +) -> None: + db_session.query(Persona__User).filter( + Persona__User.persona_id == persona_id + ).delete(synchronize_session="fetch") + db_session.query(Persona__UserGroup).filter( + Persona__UserGroup.persona_id == persona_id + ).delete(synchronize_session="fetch") + + if user_ids: + for user_uuid in user_ids: + db_session.add(Persona__User(persona_id=persona_id, user_id=user_uuid)) + + if group_ids: + for group_id in group_ids: + db_session.add( + Persona__UserGroup(persona_id=persona_id, user_group_id=group_id) + ) + + db_session.commit() diff --git a/backend/ee/danswer/db/saml.py b/backend/ee/danswer/db/saml.py index d9949f4ee..6689a7a7e 100644 --- a/backend/ee/danswer/db/saml.py +++ b/backend/ee/danswer/db/saml.py @@ -8,8 +8,8 @@ from sqlalchemy import select from sqlalchemy.orm import Session from danswer.configs.app_configs import SESSION_EXPIRE_TIME_SECONDS +from danswer.db.models import SamlAccount from danswer.db.models import User -from ee.danswer.db.models import SamlAccount def upsert_saml_account( diff --git a/backend/ee/danswer/db/user_group.py b/backend/ee/danswer/db/user_group.py index c41fc0d90..dba2ea5c8 100644 --- a/backend/ee/danswer/db/user_group.py +++ b/backend/ee/danswer/db/user_group.py @@ -10,10 +10,10 @@ from danswer.db.models import ConnectorCredentialPair from danswer.db.models import Document from danswer.db.models import DocumentByConnectorCredentialPair from danswer.db.models import User +from danswer.db.models import User__UserGroup +from danswer.db.models import UserGroup +from danswer.db.models import UserGroup__ConnectorCredentialPair from danswer.server.documents.models import ConnectorCredentialPairIdentifier -from ee.danswer.db.models import User__UserGroup -from ee.danswer.db.models import UserGroup -from ee.danswer.db.models import UserGroup__ConnectorCredentialPair from ee.danswer.server.user_group.models import UserGroupCreate from ee.danswer.server.user_group.models import UserGroupUpdate diff --git a/backend/ee/danswer/server/user_group/models.py b/backend/ee/danswer/server/user_group/models.py index 6dbf7964f..c67f9ea83 100644 --- a/backend/ee/danswer/server/user_group/models.py +++ b/backend/ee/danswer/server/user_group/models.py @@ -1,14 +1,14 @@ from uuid import UUID from pydantic import BaseModel -from danswer.server.documents.models import ( - ConnectorCredentialPairDescriptor, - ConnectorSnapshot, - CredentialSnapshot, -) -from danswer.server.manage.models import UserInfo -from ee.danswer.db.models import UserGroup as UserGroupModel +from danswer.db.models import UserGroup as UserGroupModel +from danswer.server.documents.models import ConnectorCredentialPairDescriptor +from danswer.server.documents.models import ConnectorSnapshot +from danswer.server.documents.models import CredentialSnapshot +from danswer.server.features.document_set.models import DocumentSet +from danswer.server.features.persona.models import PersonaSnapshot +from danswer.server.manage.models import UserInfo class UserGroup(BaseModel): @@ -16,14 +16,16 @@ class UserGroup(BaseModel): name: str users: list[UserInfo] cc_pairs: list[ConnectorCredentialPairDescriptor] + document_sets: list[DocumentSet] + personas: list[PersonaSnapshot] is_up_to_date: bool is_up_for_deletion: bool @classmethod - def from_model(cls, document_set_model: UserGroupModel) -> "UserGroup": + def from_model(cls, user_group_model: UserGroupModel) -> "UserGroup": return cls( - id=document_set_model.id, - name=document_set_model.name, + id=user_group_model.id, + name=user_group_model.name, users=[ UserInfo( id=str(user.id), @@ -33,7 +35,7 @@ class UserGroup(BaseModel): is_verified=user.is_verified, role=user.role, ) - for user in document_set_model.users + for user in user_group_model.users ], cc_pairs=[ ConnectorCredentialPairDescriptor( @@ -46,11 +48,18 @@ class UserGroup(BaseModel): cc_pair_relationship.cc_pair.credential ), ) - for cc_pair_relationship in document_set_model.cc_pair_relationships + for cc_pair_relationship in user_group_model.cc_pair_relationships if cc_pair_relationship.is_current ], - is_up_to_date=document_set_model.is_up_to_date, - is_up_for_deletion=document_set_model.is_up_for_deletion, + document_sets=[ + DocumentSet.from_model(ds) for ds in user_group_model.document_sets + ], + personas=[ + PersonaSnapshot.from_model(persona) + for persona in user_group_model.personas + ], + is_up_to_date=user_group_model.is_up_to_date, + is_up_for_deletion=user_group_model.is_up_for_deletion, ) diff --git a/backend/scripts/dev_run_background_jobs.py b/backend/scripts/dev_run_background_jobs.py index c9b91b00c..fbd322619 100644 --- a/backend/scripts/dev_run_background_jobs.py +++ b/backend/scripts/dev_run_background_jobs.py @@ -21,7 +21,7 @@ def run_jobs(exclude_indexing: bool) -> None: cmd_worker = [ "celery", "-A", - "danswer.background.celery", + "ee.danswer.background.celery", "worker", "--pool=threads", "--autoscale=3,10", @@ -29,7 +29,13 @@ def run_jobs(exclude_indexing: bool) -> None: "--concurrency=1", ] - cmd_beat = ["celery", "-A", "danswer.background.celery", "beat", "--loglevel=INFO"] + cmd_beat = [ + "celery", + "-A", + "ee.danswer.background.celery", + "beat", + "--loglevel=INFO", + ] worker_process = subprocess.Popen( cmd_worker, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True diff --git a/web/src/app/admin/documents/sets/hooks.tsx b/web/src/app/admin/documents/sets/hooks.tsx index fe7969ace..fd91b286b 100644 --- a/web/src/app/admin/documents/sets/hooks.tsx +++ b/web/src/app/admin/documents/sets/hooks.tsx @@ -1,3 +1,4 @@ +import { EE_ENABLED } from "@/lib/constants"; import { errorHandlingFetcher } from "@/lib/fetcher"; import { DocumentSet } from "@/lib/types"; import useSWR, { mutate } from "swr"; diff --git a/web/src/app/ee/admin/groups/UserGroupCreationForm.tsx b/web/src/app/ee/admin/groups/UserGroupCreationForm.tsx index edbc83027..dcc3422c4 100644 --- a/web/src/app/ee/admin/groups/UserGroupCreationForm.tsx +++ b/web/src/app/ee/admin/groups/UserGroupCreationForm.tsx @@ -1,11 +1,10 @@ import { Form, Formik } from "formik"; import * as Yup from "yup"; import { PopupSpec } from "@/components/admin/connectors/Popup"; -import { ConnectorIndexingStatus, User } from "@/lib/types"; +import { ConnectorIndexingStatus, User, UserGroup } from "@/lib/types"; import { TextFormField } from "@/components/admin/connectors/Field"; import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle"; import { createUserGroup } from "./lib"; -import { UserGroup } from "./types"; import { UserEditor } from "./UserEditor"; import { ConnectorEditor } from "./ConnectorEditor"; import { Modal } from "@/components/Modal"; diff --git a/web/src/app/ee/admin/groups/UserGroupsTable.tsx b/web/src/app/ee/admin/groups/UserGroupsTable.tsx index 3666b3c52..0c433d4ea 100644 --- a/web/src/app/ee/admin/groups/UserGroupsTable.tsx +++ b/web/src/app/ee/admin/groups/UserGroupsTable.tsx @@ -8,7 +8,6 @@ import { TableBody, TableCell, } from "@tremor/react"; -import { UserGroup } from "./types"; import { PopupSpec } from "@/components/admin/connectors/Popup"; import { LoadingAnimation } from "@/components/Loading"; import { BasicTable } from "@/components/admin/connectors/BasicTable"; @@ -17,7 +16,7 @@ import { TrashIcon } from "@/components/icons/icons"; import { deleteUserGroup } from "./lib"; import { useRouter } from "next/navigation"; import { FiEdit, FiUser } from "react-icons/fi"; -import { User } from "@/lib/types"; +import { User, UserGroup } from "@/lib/types"; import Link from "next/link"; import { DeleteButton } from "@/components/DeleteButton"; diff --git a/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx b/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx index 69ee7cccd..3968fb3d4 100644 --- a/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx +++ b/web/src/app/ee/admin/groups/[groupId]/AddConnectorForm.tsx @@ -5,9 +5,8 @@ import { UsersIcon } from "@/components/icons/icons"; import { useState } from "react"; import { FiPlus, FiX } from "react-icons/fi"; import { updateUserGroup } from "./lib"; -import { UserGroup } from "../types"; import { PopupSpec } from "@/components/admin/connectors/Popup"; -import { Connector, ConnectorIndexingStatus } from "@/lib/types"; +import { Connector, ConnectorIndexingStatus, UserGroup } from "@/lib/types"; import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle"; interface AddConnectorFormProps { diff --git a/web/src/app/ee/admin/groups/[groupId]/AddMemberForm.tsx b/web/src/app/ee/admin/groups/[groupId]/AddMemberForm.tsx index 8c06f194b..fd8e5064f 100644 --- a/web/src/app/ee/admin/groups/[groupId]/AddMemberForm.tsx +++ b/web/src/app/ee/admin/groups/[groupId]/AddMemberForm.tsx @@ -1,8 +1,7 @@ import { Modal } from "@/components/Modal"; import { updateUserGroup } from "./lib"; -import { UserGroup } from "../types"; import { PopupSpec } from "@/components/admin/connectors/Popup"; -import { User } from "@/lib/types"; +import { User, UserGroup } from "@/lib/types"; import { UserEditor } from "../UserEditor"; import { useState } from "react"; diff --git a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx index 735977037..bb3b9f525 100644 --- a/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx +++ b/web/src/app/ee/admin/groups/[groupId]/GroupDisplay.tsx @@ -2,12 +2,11 @@ import { usePopup } from "@/components/admin/connectors/Popup"; import { useState } from "react"; -import { UserGroup } from "../types"; import { ConnectorTitle } from "@/components/admin/connectors/ConnectorTitle"; import { AddMemberForm } from "./AddMemberForm"; import { updateUserGroup } from "./lib"; import { LoadingAnimation } from "@/components/Loading"; -import { ConnectorIndexingStatus, User } from "@/lib/types"; +import { ConnectorIndexingStatus, User, UserGroup } from "@/lib/types"; import { AddConnectorForm } from "./AddConnectorForm"; import { Table, @@ -21,6 +20,8 @@ import { Text, } from "@tremor/react"; import { DeleteButton } from "@/components/DeleteButton"; +import { Bubble } from "@/components/Bubble"; +import { BookmarkIcon, RobotIcon } from "@/components/icons/icons"; interface GroupDisplayProps { users: User[]; @@ -250,6 +251,56 @@ export const GroupDisplay = ({ setPopup={setPopup} /> )} + + + +

Document Sets

+ +
+ {userGroup.document_sets.length > 0 ? ( +
+ {userGroup.document_sets.map((documentSet) => { + return ( + +
+ + {documentSet.name} +
+ + ); + })} +
+ ) : ( + <> + No document sets in this group... + + )} +
+ + + +

Personas

+ +
+ {userGroup.document_sets.length > 0 ? ( +
+ {userGroup.personas.map((persona) => { + return ( + +
+ + {persona.name} +
+ + ); + })} +
+ ) : ( + <> + No Personas in this group... + + )} +
); }; diff --git a/web/src/app/ee/admin/groups/[groupId]/hook.ts b/web/src/app/ee/admin/groups/[groupId]/hook.ts index f3faefb88..6ec9ba39a 100644 --- a/web/src/app/ee/admin/groups/[groupId]/hook.ts +++ b/web/src/app/ee/admin/groups/[groupId]/hook.ts @@ -1,4 +1,4 @@ -import { useUserGroups } from "../hooks"; +import { useUserGroups } from "@/lib/hooks"; export const useSpecificUserGroup = (groupId: string) => { const { data, isLoading, error, refreshUserGroups } = useUserGroups(); diff --git a/web/src/app/ee/admin/groups/hooks.ts b/web/src/app/ee/admin/groups/hooks.ts deleted file mode 100644 index 1aec6a07e..000000000 --- a/web/src/app/ee/admin/groups/hooks.ts +++ /dev/null @@ -1,14 +0,0 @@ -import useSWR, { mutate } from "swr"; -import { UserGroup } from "./types"; -import { errorHandlingFetcher } from "@/lib/fetcher"; - -const USER_GROUP_URL = "/api/manage/admin/user-group"; - -export const useUserGroups = () => { - const swrResponse = useSWR(USER_GROUP_URL, errorHandlingFetcher); - - return { - ...swrResponse, - refreshUserGroups: () => mutate(USER_GROUP_URL), - }; -}; diff --git a/web/src/app/ee/admin/groups/page.tsx b/web/src/app/ee/admin/groups/page.tsx index fe5128f59..6b8cd07f1 100644 --- a/web/src/app/ee/admin/groups/page.tsx +++ b/web/src/app/ee/admin/groups/page.tsx @@ -6,8 +6,11 @@ import { UserGroupCreationForm } from "./UserGroupCreationForm"; import { usePopup } from "@/components/admin/connectors/Popup"; import { useState } from "react"; import { ThreeDotsLoader } from "@/components/Loading"; -import { useConnectorCredentialIndexingStatus, useUsers } from "@/lib/hooks"; -import { useUserGroups } from "./hooks"; +import { + useConnectorCredentialIndexingStatus, + useUserGroups, + useUsers, +} from "@/lib/hooks"; import { AdminPageTitle } from "@/components/admin/Title"; import { Button, Divider } from "@tremor/react"; diff --git a/web/src/app/ee/admin/groups/types.ts b/web/src/app/ee/admin/groups/types.ts index 5c8761d32..d17271eb1 100644 --- a/web/src/app/ee/admin/groups/types.ts +++ b/web/src/app/ee/admin/groups/types.ts @@ -1,19 +1,8 @@ -import { CCPairDescriptor, User } from "@/lib/types"; - export interface UserGroupUpdate { user_ids: string[]; cc_pair_ids: number[]; } -export interface UserGroup { - id: number; - name: string; - users: User[]; - cc_pairs: CCPairDescriptor[]; - is_up_to_date: boolean; - is_up_for_deletion: boolean; -} - export interface UserGroupCreation { name: string; user_ids: string[];