feat: stop force redirect to create collection form

app/collections/controllers/show_collections_controller.ts

@@ -19,10 +19,6 @@ export default class ShowCollectionsController {
 			this.linkService.getFavoriteLinksForAuthenticatedUser(),
 		]);
 
-		if (collections.length === 0) {
-			return response.redirectToNamedRoute('collection.create-form');
-		}
-
 		const activeCollection = collections.find(
 			(c) => c.id === activeCollectionId
 		);

inertia/components/dashboard/link/list/link_list.tsx

@@ -1,5 +1,5 @@
 import { DisplayPreferences } from '#shared/types/index';
-import { SimpleGrid, Stack, StyleProp, useCombobox } from '@mantine/core';
+import { SimpleGrid, Stack, StyleProp } from '@mantine/core';
 import { LinkItem } from '~/components/dashboard/link/item/link_item';
 import { NoLink } from '~/components/dashboard/link/no_link/no_link';
 import { useActiveCollection } from '~/hooks/collections/use_active_collection';
@@ -15,13 +15,9 @@ export function LinkList({ hideMenu = false }: LinkListProps) {
 	const favoriteLinks = useFavoriteLinks();
 	const { displayPreferences } = useDisplayPreferences();
 
-	const combobox = useCombobox({
-		onDropdownClose: () => combobox.resetSelectedOption(),
-	});
-
 	const links = activeCollection?.links || favoriteLinks;
 
-	if (activeCollection?.links.length === 0) {
+	if (links.length === 0) {
 		return <NoLink hideMenu={hideMenu} />;
 	}
 

inertia/components/dashboard/link/no_link/no_link.tsx

@@ -12,21 +12,27 @@ interface NoLinkProps extends LinkListProps {}
 export function NoLink({ hideMenu }: NoLinkProps) {
 	const { t } = useTranslation('common');
 	const activeCollection = useActiveCollection();
+	const isFavorite = !activeCollection?.id;
+
+	const noLinkForCollection = t(
+		'home:no-link',
+		{ name: activeCollection?.name ?? '' } as any,
+		{
+			interpolation: { escapeValue: false },
+		}
+	);
+
+	const noLinkForFavorite = t('home:no-link-favorite');
+
 	return (
 		<Box className={styles.noCollection} p="xl">
 			<Text
 				className={styles.text}
 				dangerouslySetInnerHTML={{
-					__html: t(
+					__html: isFavorite ? noLinkForFavorite : noLinkForCollection,
-						'home:no-link',
-						{ name: activeCollection?.name ?? '' } as any,
-						{
-							interpolation: { escapeValue: false },
-						}
-					),
 				}}
 			/>
-			{!hideMenu && (
+			{!hideMenu && !isFavorite && (
 				<Anchor
 					component={Link}
 					href={appendCollectionId(

inertia/i18n/locales/en/home.json

@@ -1,5 +1,6 @@
 {
-  "select-collection": "Please select a collection",
+	"select-collection": "Please select a collection",
-  "or-create-one": "or create one",
+	"or-create-one": "or create one",
-  "no-link": "No link for <b>{{name}}</b>"
+	"no-link": "No link for <b>{{name}}</b>",
+	"no-link-favorite": "No favorite link"
 }

inertia/i18n/locales/fr/home.json

@@ -1,5 +1,6 @@
 {
-  "select-collection": "Veuillez sélectionner une collection",
+	"select-collection": "Veuillez sélectionner une collection",
-  "or-create-one": "ou en créer une",
+	"or-create-one": "ou en créer une",
-  "no-link": "Aucun lien pour <b>{{name}}</b>"
+	"no-link": "Aucun lien pour <b>{{name}}</b>",
+	"no-link-favorite": "Aucun lien dans les favoris"
 }

inertia/pages/dashboard.tsx

@@ -39,24 +39,27 @@ export default function Dashboard() {
 						disabled
 					/>
 				</Tooltip>
-				{!isFavorite && (
+				<Group>
-					<Group>
+					{!isFavorite &&
-						{activeCollection?.visibility === Visibility.PUBLIC && (
+						activeCollection?.visibility === Visibility.PUBLIC && (
-							<SharedCollectionCopyLink />
+							<>
+								<SharedCollectionCopyLink />
+								<Divider orientation="vertical" />
+							</>
 						)}
 
-						<Divider orientation="vertical" />
+					<Button
-						<Button
+						variant="outline"
-							variant="outline"
+						component={Link}
-							component={Link}
+						href={appendCollectionId(
-							href={appendCollectionId(
+							route('collection.create-form').path,
-								route('collection.create-form').path,
+							activeCollection?.id
-								activeCollection?.id
+						)}
-							)}
+						size="xs"
-							size="xs"
+					>
-						>
+						{t('collection.create')}
-							{t('collection.create')}
+					</Button>
-						</Button>
+					{!isFavorite && (
 						<Button
 							variant="outline"
 							component={Link}
@@ -68,21 +71,25 @@ export default function Dashboard() {
 						>
 							{t('collection.edit')}
 						</Button>
+					)}
 
-						<Divider orientation="vertical" />
+					{!isFavorite && (
-						<Button
+						<>
-							variant="light"
+							<Divider orientation="vertical" />
-							component={Link}
+							<Button
-							href={appendCollectionId(
+								variant="light"
-								route('link.create-form').path,
+								component={Link}
-								activeCollection?.id
+								href={appendCollectionId(
-							)}
+									route('link.create-form').path,
-							size="xs"
+									activeCollection?.id
-						>
+								)}
-							{t('link.create')}
+								size="xs"
-						</Button>
+							>
-					</Group>
+								{t('link.create')}
-				)}
+							</Button>
+						</>
+					)}
+				</Group>
 			</Group>
 			{displayPreferences.collectionListDisplay === 'inline' && !isMobile && (
 				<InlineCollectionList />