From 8f26728a29e4be25a8f3c6a98be295c5a5d8e688 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Fri, 30 Aug 2024 10:54:24 -0700 Subject: [PATCH 001/105] update command keys (#2271) --- .../shared_chat_search/FunctionalWrapper.tsx | 12 +++--- web/src/components/icons/icons.tsx | 42 +++++++++++++++++++ web/src/lib/browserUtilities.tsx | 5 ++- 3 files changed, 51 insertions(+), 8 deletions(-) diff --git a/web/src/app/chat/shared_chat_search/FunctionalWrapper.tsx b/web/src/app/chat/shared_chat_search/FunctionalWrapper.tsx index 4ef22ef4e60..e66bc32aa4b 100644 --- a/web/src/app/chat/shared_chat_search/FunctionalWrapper.tsx +++ b/web/src/app/chat/shared_chat_search/FunctionalWrapper.tsx @@ -53,10 +53,10 @@ const ToggleSwitch = () => { onClick={() => handleTabChange("search")} > -

+

Search - {commandSymbol}S -

+
{commandSymbol}S
+
); diff --git a/web/src/components/icons/icons.tsx b/web/src/components/icons/icons.tsx index fe33d4e9c15..377307caef6 100644 --- a/web/src/components/icons/icons.tsx +++ b/web/src/components/icons/icons.tsx @@ -2754,3 +2754,45 @@ export const CameraIcon = ({ ); }; + +export const MacIcon = ({ + size = 16, + className = "my-auto flex flex-shrink-0 ", +}: IconProps) => { + return ( + + + + ); +}; + +export const WindowsIcon = ({ + size = 16, + className = "my-auto flex flex-shrink-0 ", +}: IconProps) => { + return ( + + + + ); +}; diff --git a/web/src/lib/browserUtilities.tsx b/web/src/lib/browserUtilities.tsx index 445ed649507..6646db9b5cc 100644 --- a/web/src/lib/browserUtilities.tsx +++ b/web/src/lib/browserUtilities.tsx @@ -1,5 +1,6 @@ "use client"; +import { MacIcon, WindowsIcon } from "@/components/icons/icons"; import { useState, useEffect } from "react"; type OperatingSystem = "Windows" | "Mac" | "Other"; @@ -23,9 +24,9 @@ const KeyboardSymbol = () => { const os = useOperatingSystem(); if (os === "Windows") { - return "⊞"; + return ; } else { - return "⌘"; + return ; } }; From 183569061b150993eb03ac4bc6abee0493124d53 Mon Sep 17 00:00:00 2001 From: pablodanswer Date: Fri, 30 Aug 2024 11:47:52 -0700 Subject: [PATCH 002/105] Minor search UX improvements + Critical connector fixes (#2259) --- backend/danswer/server/documents/cc_pair.py | 2 +- backend/danswer/server/documents/connector.py | 1 + web/src/app/admin/add-connector/page.tsx | 2 +- .../[connector]/AddConnectorPage.tsx | 2 +- .../pages/ConnectorInput/NumberInput.tsx | 14 +- .../admin/embeddings/RerankingFormPage.tsx | 14 +- web/src/app/admin/embeddings/interfaces.ts | 2 +- .../pages/AdvancedEmbeddingFormPage.tsx | 12 +- .../embeddings/pages/EmbeddingFormPage.tsx | 14 +- .../status/CCPairIndexingStatusTable.tsx | 2 +- web/src/app/chat/ChatBanner.tsx | 27 ---- web/src/components/IsPublicGroupSelector.tsx | 124 +++++++++--------- web/src/components/admin/connectors/Field.tsx | 33 ++++- web/src/components/chat_search/Header.tsx | 5 +- .../components/search/filtering/Filters.tsx | 26 ++-- .../components/search/filtering/TagFilter.tsx | 2 +- web/src/components/user/UserProvider.tsx | 9 +- 17 files changed, 164 insertions(+), 127 deletions(-) diff --git a/backend/danswer/server/documents/cc_pair.py b/backend/danswer/server/documents/cc_pair.py index 69ae9916348..37c7cbfd0b1 100644 --- a/backend/danswer/server/documents/cc_pair.py +++ b/backend/danswer/server/documents/cc_pair.py @@ -170,7 +170,7 @@ def associate_credential_to_connector( connector_id=connector_id, credential_id=credential_id, cc_pair_name=metadata.name, - is_public=metadata.is_public or True, + is_public=True if metadata.is_public is None else metadata.is_public, groups=metadata.groups, ) diff --git a/backend/danswer/server/documents/connector.py b/backend/danswer/server/documents/connector.py index 8d6b0ffc773..a742e246491 100644 --- a/backend/danswer/server/documents/connector.py +++ b/backend/danswer/server/documents/connector.py @@ -552,6 +552,7 @@ def create_connector_from_model( try: _validate_connector_allowed(connector_data.source) connector_base = _check_connector_permissions(connector_data, user) + return create_connector( db_session=db_session, connector_data=connector_base, diff --git a/web/src/app/admin/add-connector/page.tsx b/web/src/app/admin/add-connector/page.tsx index bf7032b5f90..8d73131e69a 100644 --- a/web/src/app/admin/add-connector/page.tsx +++ b/web/src/app/admin/add-connector/page.tsx @@ -112,7 +112,7 @@ export default function Page() { value={searchTerm} onChange={(e) => setSearchTerm(e.target.value)} onKeyDown={handleKeyPress} - className="flex mt-2 max-w-sm h-9 w-full rounded-md border-2 border border-input bg-transparent px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring" + className="ml-1 w-96 h-9 flex-none rounded-md border border-border bg-background-50 px-3 py-1 text-sm shadow-sm transition-colors placeholder:text-muted-foreground focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-ring" /> {Object.entries(categorizedSources) diff --git a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx index dd8d19ca720..dd359bda9a1 100644 --- a/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx +++ b/web/src/app/admin/connectors/[connector]/AddConnectorPage.tsx @@ -44,7 +44,6 @@ import { IsPublicGroupSelectorFormType, } from "@/components/IsPublicGroupSelector"; import { usePaidEnterpriseFeaturesEnabled } from "@/components/settings/usePaidEnterpriseFeaturesEnabled"; -import { AdminBooleanFormField } from "@/components/credentials/CredentialFields"; export type AdvancedConfigFinal = { pruneFreq: number | null; @@ -489,6 +488,7 @@ export default function AddConnector({ }} > {(formikProps) => { + console.log(formikProps.values); setFormValues(formikProps.values); handleFormStatusChange( formikProps.isValid && isFormSubmittable(formikProps.values) diff --git a/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx b/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx index 5a9f5041b5d..a62864495ef 100644 --- a/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx +++ b/web/src/app/admin/connectors/[connector]/pages/ConnectorInput/NumberInput.tsx @@ -1,5 +1,5 @@ import { SubLabel } from "@/components/admin/connectors/Field"; -import { Field } from "formik"; +import { Field, useFormikContext } from "formik"; export default function NumberInput({ label, @@ -8,6 +8,7 @@ export default function NumberInput({ description, name, showNeverIfZero, + onChange, }: { value?: number; label: string; @@ -15,7 +16,10 @@ export default function NumberInput({ optional?: boolean; description?: string; showNeverIfZero?: boolean; + onChange?: (value: number) => void; }) { + const { setFieldValue } = useFormikContext(); + return (