[Assitants] Community | User tabs #773

mishig25 · 2024-02-04T18:21:49Z

Have a tab/picker between "community" or "my" assistants

Scenario 1: I'm not logged in

Scenario 2: I'm logged in as "mishig" & I go to "?assistants"

Scenario 3: I'm logged in as "mishig" & I go to "?assistants?user=victor"

Scenario 4: I'm logged in as "mishig" & I go to "?assistants?user=mishig"

gary149 · 2024-02-05T08:14:59Z

src/routes/assistants/+page.server.ts

@@ -34,5 +43,7 @@ export const load = async ({ url }) => {
 		assistants: JSON.parse(JSON.stringify(assistants)) as Array<Assistant>,
 		numTotalItems,
 		numItemsPerPage: NUM_PER_PAGE,
+		createdByUser: createdByName,
+		createdByMe: createdByName === (locals.user?.username ?? locals.user?.name),


No need for this I think, just compare the requested username with the current username in the page directly to see it's the same?

handled in 6913adc

src/routes/assistants/+page.svelte

gary149 · 2024-02-05T08:15:58Z

src/routes/assistants/+page.svelte

@@ -13,6 +14,7 @@
 	import Pagination from "$lib/components/Pagination.svelte";

 	export let data: PageData;
+	export let user: LayoutData["user"];


user is already in Pagedata (data.user)?

handled in f978c9d

gary149 · 2024-02-05T08:16:38Z

src/routes/assistants/+page.svelte

@@ -90,6 +122,32 @@
 				<CarbonAdd />Create New assistant
 			</a>
 		</div>
+		{#if user?.username}
+			<div class="mt-10 flex gap-x-2">
+				{#if data.createdByUser && !data.createdByMe}


Something like this instead? createdByUser === data.user.username

handled in 6913adc

mishig25 · 2024-02-05T10:33:06Z

Updated behaviour.

for the info, I'm logged in as user "mishig"

Screen.Recording.2024-02-05.at.11.11.10.AM.mov

note: when I open "?user=victor". This is what I see. Once I click to "My assistants", "Victor's assissntas" are gone & turns into "Community"

Screen.Recording.2024-02-05.at.11.11.44.AM.mov

gary149 · 2024-02-05T11:08:35Z

src/routes/assistants/+page.server.ts


 	// fetch the top assistants sorted by user count from biggest to smallest, filter out all assistants with only 1 users. filter by model too if modelId is provided
 	const filter: Filter<Assistant> = {
 		userCount: { $gt: 1 },
 		modelId: modelId ?? { $exists: true },
 		featured: true,
+		createdByName: createdByName ?? undefined,


it's doesn't seems to work.

this specific filter ?

Co-authored-by: Victor Muštar <victor.mustar@gmail.com>

This reverts commit fc8a2fc.

mishig25 · 2024-02-05T22:31:18Z

src/routes/assistants/+page.svelte

@@ -25,6 +27,19 @@
 		}
 		goto(newUrl);
 	};
+
+	function getHref(keysAdd: { key: string; val: string }[], keysDelete?: string[]) {


todo: should take the url as argument like in 8cd7b98

(not for myself. in subseq PR, I should refactor getHref as a utility function that can be used in different components)

handled in 291a9be & 941380b

mishig25 · 2024-02-07T11:16:32Z

if this pr is taking long time, maybe we can just cherry-pick & merge 9a21527 to main ?

nsarrazin · 2024-02-07T11:24:28Z

What's the blocker for the PR? 👀

gary149 · 2024-02-07T16:54:52Z

What's the blocker for the PR? 👀

I've updated it a bit, it should be ready now.

mishig25 · 2024-02-07T21:53:00Z

Right now when you are on some user's or your assistant (i.e. the url has ?user=xyz) & choose a model from dropdown, it removes user from searchQuery. Should the user persist in searchQuery in this case or not?

mishig25 · 2024-02-07T22:50:36Z

Updates:

Refactored getHref utility func [Assitants] Community | User tabs #773 (comment)
Regarding this comment, made this commit b7ede7f which preserves the user as model id changes

mishig25 · 2024-02-07T22:50:59Z

Please let me know if there's anything else

mishig25 · 2024-02-08T10:12:52Z

Commit c41f235

Before; it was showing single "Community" btn for non-logged in users

After c41f235; non-logged in users won't see "Community" btn. Only logged-in users would see "Community" btn AND "their name" btn

coyotte508 · 2024-02-20T11:43:42Z

src/lib/utils/getHref.ts

@@ -0,0 +1,41 @@
+export function getHref(


IMO easier to understand like this:

/** * Util to edit a URL's search params * * Returns the new URL */ export function editSearchParams( url: URL | string, modifications: { /** New search params added */ add?: Record<string, string | undefined | null>; /** Remove search params */ remove?: string[]; /** Remove all existing search params except those */ keepOnly?: string[]; } ): string {

* [Assistants] Add pagination * [Assitants] Community | User tabs * format * minimize diff * Update src/routes/assistants/+page.svelte Co-authored-by: Victor Muštar <victor.mustar@gmail.com> * use data.user * rm unused import * Use a href & simplify overall * lint * it will never be a button * statements need to be reactive * format * set filter differntly * Revert "set filter differntly" This reverts commit fc8a2fc. * use inline * avoid ugly image change * fix query * ui update * update link to profiles * link to HF profile * dark mode * Update +page.svelte * refactor getHref to be more descriptive * Preserve `user` searchQuery when chaning model ids * `getHref` utility * dont show single "Community" btn for non-logged in users * fix iterator --------- Co-authored-by: Victor Muštar <victor.mustar@gmail.com>

mishig25 marked this pull request as draft February 4, 2024 18:26

gary149 reviewed Feb 5, 2024

View reviewed changes

Base automatically changed from assistnats_pagination to main February 5, 2024 09:15

mishig25 force-pushed the assistants_by_me branch from 6dad2a6 to bca0292 Compare February 5, 2024 09:17

mishig25 marked this pull request as ready for review February 5, 2024 10:33

mishig25 requested review from gary149 and nsarrazin February 5, 2024 10:35

gary149 reviewed Feb 5, 2024

View reviewed changes

mishig25 requested a review from gary149 February 5, 2024 12:51

mishig25 and others added 15 commits February 5, 2024 18:04

[Assistants] Add pagination

00e40a0

[Assitants] Community | User tabs

378ebdb

format

7d776c4

minimize diff

b9e363a

Update src/routes/assistants/+page.svelte

910018c

Co-authored-by: Victor Muštar <victor.mustar@gmail.com>

use data.user

535736e

rm unused import

7fc6c3c

Use a href & simplify overall

810b983

lint

a33cc20

it will never be a button

3f67ec7

statements need to be reactive

e8b8547

format

21cf1a8

set filter differntly

6edf4a7

Revert "set filter differntly"

f7f644f

This reverts commit fc8a2fc.

use inline

02ac4da

gary149 force-pushed the assistants_by_me branch from 13dfcc3 to 02ac4da Compare February 5, 2024 17:04

avoid ugly image change

9a21527

mishig25 commented Feb 5, 2024

View reviewed changes

gary149 added 7 commits February 7, 2024 17:07

fix query

936ad88

ui update

8e668fb

update link to profiles

7c0559f

link to HF profile

5bac0ea

dark mode

ca63172

Merge branch 'main' into assistants_by_me

743c9e1

Update +page.svelte

fec1561

nsarrazin added the assistants Related to the assistants feature label Feb 7, 2024

mishig25 added 2 commits February 7, 2024 23:42

refactor getHref to be more descriptive

291a9be

Preserve user searchQuery when chaning model ids

b7ede7f

mishig25 force-pushed the assistants_by_me branch from 5ca2a8f to b7ede7f Compare February 7, 2024 22:44

getHref utility

941380b

gary149 approved these changes Feb 8, 2024

View reviewed changes

mishig25 added 2 commits February 8, 2024 11:00

dont show single "Community" btn for non-logged in users

c41f235

fix iterator

d1c8c35

mishig25 merged commit 08e8583 into main Feb 8, 2024
3 checks passed

mishig25 deleted the assistants_by_me branch February 8, 2024 10:13

mishig25 mentioned this pull request Feb 8, 2024

[Assistants] update page & visiblity logic #802

Merged

coyotte508 reviewed Feb 20, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Assitants] Community | User tabs #773

[Assitants] Community | User tabs #773

mishig25 commented Feb 4, 2024 •

edited

Loading

gary149 Feb 5, 2024

mishig25 Feb 5, 2024

gary149 Feb 5, 2024

mishig25 Feb 5, 2024

gary149 Feb 5, 2024

mishig25 Feb 5, 2024

mishig25 commented Feb 5, 2024 •

edited

Loading

gary149 Feb 5, 2024

mishig25 Feb 5, 2024

mishig25 Feb 5, 2024

mishig25 Feb 5, 2024 •

edited

Loading

mishig25 Feb 7, 2024

mishig25 commented Feb 7, 2024

nsarrazin commented Feb 7, 2024

gary149 commented Feb 7, 2024 •

edited

Loading

mishig25 commented Feb 7, 2024

mishig25 commented Feb 7, 2024

mishig25 commented Feb 7, 2024

mishig25 commented Feb 8, 2024

coyotte508 Feb 20, 2024 •

edited

Loading

[Assitants] Community | User tabs #773

[Assitants] Community | User tabs #773

Conversation

mishig25 commented Feb 4, 2024 • edited Loading

Have a tab/picker between "community" or "my" assistants

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mishig25 commented Feb 5, 2024 • edited Loading

Updated behaviour.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mishig25 Feb 5, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mishig25 commented Feb 7, 2024

nsarrazin commented Feb 7, 2024

gary149 commented Feb 7, 2024 • edited Loading

mishig25 commented Feb 7, 2024

mishig25 commented Feb 7, 2024

mishig25 commented Feb 7, 2024

mishig25 commented Feb 8, 2024

coyotte508 Feb 20, 2024 • edited Loading

Choose a reason for hiding this comment

mishig25 commented Feb 4, 2024 •

edited

Loading

mishig25 commented Feb 5, 2024 •

edited

Loading

mishig25 Feb 5, 2024 •

edited

Loading

gary149 commented Feb 7, 2024 •

edited

Loading

coyotte508 Feb 20, 2024 •

edited

Loading