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

Jump to bottom

fix(frontend): onboarding bug #2655

Merged
merged 1 commit into from
Jun 10, 2024
Merged

fix(frontend): onboarding bug #2655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions frontend/app/search/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { UploadDocumentModal } from "@/lib/components/UploadDocumentModal/Upload
import { MessageInfoBox } from "@/lib/components/ui/MessageInfoBox/MessageInfoBox";
import QuivrButton from "@/lib/components/ui/QuivrButton/QuivrButton";
import { SearchBar } from "@/lib/components/ui/SearchBar/SearchBar";
import { useOnboardingContext } from "@/lib/context/OnboardingProvider/hooks/useOnboardingContext";
import { useSupabase } from "@/lib/context/SupabaseProvider";
import { useUserSettingsContext } from "@/lib/context/UserSettingsProvider/hooks/useUserSettingsContext";
import { useUserData } from "@/lib/hooks/useUserData";
Expand All @@ -27,6 +28,7 @@ const Search = (): JSX.Element => {
useBrainCreationContext();
const { userIdentityData } = useUserData();
const { isDarkMode } = useUserSettingsContext();
const { isBrainCreated } = useOnboardingContext();

useEffect(() => {
if (userIdentityData) {
Expand Down Expand Up @@ -84,6 +86,7 @@ const Search = (): JSX.Element => {
</div>
{!isBrainCreationModalOpened &&
!userIdentityData?.onboarded &&
!isBrainCreated &&
!!isUserDataFetched && (
<div className={styles.onboarding_overlay}>
<div className={styles.main_message_wrapper}>
Expand Down
7 changes: 6 additions & 1 deletion frontend/lib/components/AddBrainModal/components/BrainRecapStep/BrainRecapStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import QuivrButton from "@/lib/components/ui/QuivrButton/QuivrButton";
import { TextAreaInput } from "@/lib/components/ui/TextAreaInput/TextAreaInput";
import { TextInput } from "@/lib/components/ui/TextInput/TextInput";
import { useKnowledgeToFeedContext } from "@/lib/context/KnowledgeToFeedProvider/hooks/useKnowledgeToFeedContext";
import { useOnboardingContext } from "@/lib/context/OnboardingProvider/hooks/useOnboardingContext";
import { useUserData } from "@/lib/hooks/useUserData";

import { BrainRecapCard } from "./BrainRecapCard/BrainRecapCard";
Expand All @@ -24,6 +25,7 @@ export const BrainRecapStep = (): JSX.Element => {
const { updateUserIdentity } = useUserApi();
const { userIdentityData } = useUserData();
const { openedConnections } = useFromConnectionsContext();
const { setIsBrainCreated } = useOnboardingContext();

const feed = async (): Promise<void> => {
if (!userIdentityData?.onboarded) {
Expand Down Expand Up @@ -120,9 +122,12 @@ export const BrainRecapStep = (): JSX.Element => {
iconName="add"
onClick={async () => {
await feed();
setIsBrainCreated(true);
}}
disabled={
knowledgeToFeed.length === 0 && !userIdentityData?.onboarded
knowledgeToFeed.length === 0 &&
!userIdentityData?.onboarded &&
!openedConnections.length
}
isLoading={creating}
important={true}
Expand Down
4 changes: 4 additions & 0 deletions frontend/lib/components/AddBrainModal/components/FeedBrainStep/FeedBrainStep.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
padding-inline: Spacings.$spacing08;
height: 100%;

.tutorial {
padding-bottom: Spacings.$spacing05;
}

.feed_brain {
display: flex;
flex-direction: column;
Expand Down
12 changes: 7 additions & 5 deletions frontend/lib/components/AddBrainModal/components/FeedBrainStep/FeedBrainStep.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,13 @@ export const FeedBrainStep = (): JSX.Element => {
const renderFeedBrain = () => (
<>
{!userIdentityData?.onboarded && (
<MessageInfoBox type="tutorial">
<span>
Upload documents or add URLs to add knowledges to your brain.
</span>
</MessageInfoBox>
<div className={styles.tutorial}>
<MessageInfoBox type="tutorial">
<span>
Upload documents or add URLs to add knowledges to your brain.
</span>
</MessageInfoBox>
</div>
)}
<div className={styles.feed_brain}>
<span className={styles.title}>Feed your brain</span>
Expand Down
5 changes: 5 additions & 0 deletions frontend/lib/context/OnboardingProvider/Onboarding-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import { useUserData } from "@/lib/hooks/useUserData";
export type OnboardingContextType = {
isOnboardingModalOpened: boolean;
setIsOnboardingModalOpened: React.Dispatch<React.SetStateAction<boolean>>;
isBrainCreated: boolean;
setIsBrainCreated: React.Dispatch<React.SetStateAction<boolean>>;
};

export const OnboardingContext = createContext<
Expand All @@ -17,6 +19,7 @@ export const OnboardingProvider = ({
children: React.ReactNode;
}): JSX.Element => {
const [isOnboardingModalOpened, setIsOnboardingModalOpened] = useState(false);
const [isBrainCreated, setIsBrainCreated] = useState(false);
const { userIdentityData } = useUserData();

useEffect(() => {
Expand All @@ -30,6 +33,8 @@ export const OnboardingProvider = ({
value={{
isOnboardingModalOpened,
setIsOnboardingModalOpened,
isBrainCreated,
setIsBrainCreated,
}}
>
{children}
Expand Down