kyuno/batchCooking
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions 1

feat(recipes): chaque source activée devient sa propre tab

Browse source 
Nouvelle correction demandée sur cette PR : l'onglet générique
« Sources » (avec un <select> interne quand le foyer en a activé
plusieurs) devient une tab à part entière par source activée — au même
niveau que Favoris/Perso/Foyer/Publique, plus transparent qu'un
sélecteur caché dans un sous-menu.

- `RecipeTabs` accepte désormais `sources: SourceView[]` et rend une
  tab par source (icône propre à la source si elle en a une, sinon
  l'icône générique `SourcesIcon` ; libellé = le nom réel de la
  source, pas une clé i18n). Nouveau type `RecipesPageTab` en
  `RecipeTab | "source:<key>"`, avec `sourceTabValue`/
  `parseSourceTabValue`/`isSourceTab` comme seul point d'assemblage/
  lecture de ce format.
- Nouveau hook partagé `useEnabledSources` (déplacé hors de
  `RecipeSourcesPanel`, maintenant utilisé par `RecipesPage` ET
  `RecipePickerDialog` pour construire leurs tabs).
- `RecipeSourcesPanel` simplifié : `sourceKey` devient une prop requise
  (fournie par la tab elle-même) au lieu d'un état interne avec son
  propre sélecteur — plus de `<select>`, plus de message « aucune
  source activée » (une tab qui n'existe pas ne peut plus être
  cliquée). Remonté via `key={sourceKey}` par l'appelant au changement
  de tab, même convention que `RecipePickerDialog`/`CalendarPopover`
  ailleurs dans l'app.
- Un bug distinct trouvé en écrivant ce changement : passer tel quel
  `initialSelection` (dérivé de l'URL) au panneau nouvellement monté
  en changeant directement de tab source à tab source aurait fait
  prévisualiser l'ancien item contre la nouvelle source. Gardé en ne
  transmettant `initialSelection` que lorsqu'il appartient réellement
  à `activeSourceKey`.

Aucun changement backend.

Tests :
- Vérifié manuellement en local (foyer avec TheMealDB activé) :
  tab dédiée dans /recettes et dans le sélecteur du planning, parcours
  d'un item, aperçu unifié, aucune régression console.
- Cypress : `recipe-sources.feature`/`planning.feature` mis à jour
  (« I click the button "Sources" » → « ... "TheMealDB" »), scénario
  « aucune source activée » réécrit pour vérifier l'absence de tab
  plutôt qu'un message dans un onglet qui n'existe plus.
- `pnpm exec tsc -b --force` (web) — propre.
- `pnpm exec biome check` — propre.
- `pnpm --filter web build` — propre.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Nicolas 2026-08-20 20:31:09 +02:00
parent d5172c2c66
commit 4381e63045
9 changed files with 236 additions and 192 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/web/cypress/e2e/planning.feature
View file

@ -21,7 +21,7 @@ Feature: Adding a recipe to the planning
And adding the imported recipe to the planning will succeed
When I visit "/"
And I click the add button for the first empty planning slot
And I click the button "Sources"
And I click the button "TheMealDB"
And I click the source item "Fish Pie"
And I click the link "Importer cette recette"
Then I should see "Cette recette sera automatiquement ajoutée à votre planning une fois importée."

11
apps/web/cypress/e2e/recipe-sources.feature
View file

@ -9,13 +9,12 @@ Feature: Browsing external recipe sources
And the disliked ingredients list is empty
And the planning request returns nothing
Scenario: Prompts to enable a source when the household hasn't enabled any
Scenario: Shows no source tab when the household hasn't enabled any
Given the recipe catalog contains nothing
And the sources reference list has options
And the household's enabled sources are empty
When I visit "/recettes"
And I click the button "Sources"
Then I should see "Aucune source n'est activée"
Then I should not see "TheMealDB"
Scenario: Browses an enabled source, distinguishing already-imported items from new ones
Given the recipe catalog contains nothing
@ -24,7 +23,7 @@ Feature: Browsing external recipe sources
And browsing TheMealDB returns some items
And recipe 2's detail is available
When I visit "/recettes"
And I click the button "Sources"
And I click the button "TheMealDB"
Then I should see the source item "Chicken Handi"
And I should see the source item "Fish Pie"
And the source item "Chicken Handi" should be marked as already imported
@ -40,7 +39,7 @@ Feature: Browsing external recipe sources
And browsing TheMealDB returns some items
And previewing TheMealDB item "9999" is available
When I visit "/recettes"
And I click the button "Sources"
And I click the button "TheMealDB"
And I click the source item "Fish Pie"
Then the URL should include "/recettes/sources/theMealDb/9999"
And the recipe detail panel heading should be "Fish Pie"
@ -65,7 +64,7 @@ Feature: Browsing external recipe sources
And the ingredient and diet catalog is available for import
And importing the previewed item will succeed and return id 99
When I visit "/recettes"
And I click the button "Sources"
And I click the button "TheMealDB"
And I click the source item "Fish Pie"
And I click the link "Importer cette recette"
Then the "recipe-name" field should have the value "Fish Pie"

47
apps/web/src/features/planning/RecipePickerDialog.tsx
View file

@ -17,7 +17,13 @@ import { DietTagSelect } from "../recipes/DietTagSelect";
import { IngredientPicker } from "../recipes/IngredientPicker";
import { RecipeSourcesPanel } from "../recipes/RecipeSourcesPanel";
import { RecipeTable } from "../recipes/RecipeTable";
import { RecipeTabs, type RecipesPageTab } from "../recipes/RecipeTabs";
import {
RecipeTabs,
type RecipesPageTab,
isSourceTab,
parseSourceTabValue,
} from "../recipes/RecipeTabs";
import { useEnabledSources } from "../recipes/useEnabledSources";
import "./recipe-picker-dialog.scss";
/** Debounce for the search field — same value as `RecipesPage`'s. */
@ -48,13 +54,14 @@ export interface PlanningSlot {
* with three extra filters layered on top of the plain name search
* (ingredients / regime / "convient à tout le foyer" toggle, all wired to
* `GET /recipes`'s corresponding query params) since browsing here is
* about finding something to cook, not just looking something up. The
* "Sources" tab is included too (unlike an earlier version of this dialog
* — see `ImportRecipePage`'s `planningSlot`, the review/import flow that
* made including it here worthwhile): picking an already-imported item
* behaves exactly like picking a regular recipe, and picking one that
* isn't imported yet hands off to that review screen, which adds the
* freshly-created recipe straight to this slot once it's saved.
* about finding something to cook, not just looking something up. Each
* household-enabled source's own tab is included too (unlike an earlier
* version of this dialog — see `ImportRecipePage`'s `planningSlot`, the
* review/import flow that made including them here worthwhile): picking
* an already-imported item behaves exactly like picking a regular recipe,
* and picking one that isn't imported yet hands off to that review
* screen, which adds the freshly-created recipe straight to this slot
* once it's saved.
*
* Mounted only while open (see `PlanningPage`, same conditional-mount
* convention as its own `CalendarPopover`) — every piece of local state
@ -81,6 +88,8 @@ export function RecipePickerDialog({
const { t } = useTranslation();
const [activeTab, setActiveTab] = useState<RecipesPageTab>("favoris");
const activeSourceKey = parseSourceTabValue(activeTab);
const enabledSources = useEnabledSources();
const [search, setSearch] = useState("");
const [debouncedSearch, setDebouncedSearch] = useState("");
const [selectedIngredientIds, setSelectedIngredientIds] = useState<number[]>([]);
@ -128,9 +137,11 @@ export function RecipePickerDialog({
}, []);
useEffect(() => {
// The "sources" tab doesn't query the recipe table at all — same guard
// as `RecipesPage`'s own identical effect.
if (activeTab === "sources") return;
// A source's own tab doesn't query the recipe table at all — same
// guard as `RecipesPage`'s own identical effect (the type-guard, not
// just `activeSourceKey !== null`, is what narrows `activeTab` to
// `RecipeTab` below).
if (isSourceTab(activeTab)) return;
let cancelled = false;
setListState({ status: "loading" });
@ -157,7 +168,7 @@ export function RecipePickerDialog({
selectedIngredientIds.includes(ingredient.id),
);
/** Picking an already-imported source item (`RecipeSourcesPanel`'s "sources" tab) — resolved to its full recipe, then treated exactly like picking that same recipe from one of the regular tabs, moving straight to the confirm-portions step below. */
/** Picking an already-imported source item (one of the source tabs' `RecipeSourcesPanel`) — resolved to its full recipe, then treated exactly like picking that same recipe from one of the regular tabs, moving straight to the confirm-portions step below. */
function handleSelectImportedRecipe(recipeId: number) {
setSourceSelectError(false);
apiClient
@ -230,7 +241,7 @@ export function RecipePickerDialog({
return (
<Dialog onClose={onClose} title={t("planning.picker.title")} className="recipe-picker-dialog">
{activeTab !== "sources" && (
{activeSourceKey === null && (
<div className="recipe-picker__filters">
<input
type="search"
@ -295,9 +306,13 @@ export function RecipePickerDialog({
</div>
)}
<RecipeTabs active={activeTab} onChange={setActiveTab} />
<RecipeTabs
active={activeTab}
onChange={setActiveTab}
sources={enabledSources.status === "loaded" ? enabledSources.sources : []}
/>
{activeTab === "sources" ? (
{activeSourceKey !== null ? (
<>
{sourceSelectError && (
<p className="recipes-page__status recipes-page__status--error">
@ -305,6 +320,8 @@ export function RecipePickerDialog({
</p>
)}
<RecipeSourcesPanel
key={activeSourceKey}
sourceKey={activeSourceKey}
planningSlot={slot}
onSelectImportedRecipe={handleSelectImportedRecipe}
/>

148
apps/web/src/features/recipes/RecipeSourcesPanel.tsx
View file

@ -1,7 +1,6 @@
import type { BrowsableSourceItemView, Meal, SourceView, WeekDay } from "@batch-cooking/shared";
import type { BrowsableSourceItemView, Meal, WeekDay } from "@batch-cooking/shared";
import { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { Link } from "react-router-dom";
import { apiClient } from "../../api/client";
import { RecipeDetailPanel, type RecipeDetailState } from "./RecipeDetailPanel";
import { SourceItemTable } from "./SourceItemTable";
@ -16,22 +15,27 @@ export interface SourceItemSelection {
externalId: string;
}
type EnabledSourcesState =
| { status: "loading" }
| { status: "loaded"; sources: SourceView[] }
| { status: "error" };
type BrowseState =
| { status: "loading" }
| { status: "loaded"; items: BrowsableSourceItemView[]; nextCursor: string | null }
| { status: "error" };
/**
* "Sources" tab content of the recipe catalog (`RecipesPage`) — a
* self-contained master-detail pair of its own (source selector + browsable
* list on the left, a preview on the right), independent of `RecipeTable`'s
* own `RecipeTab`-based fetching: it browses a source's *live* catalog
* (`GET /sources/:sourceKey/browse`), not the saved `Recipe` table.
* One household-enabled source's own tab content in the recipe catalog
* (`RecipesPage`/`RecipePickerDialog`) — a master-detail pair of its own
* (browsable list on the left, a preview on the right), independent of
* `RecipeTable`'s own `RecipeTab`-based fetching: it browses this one
* source's *live* catalog (`GET /sources/:sourceKey/browse`), not the
* saved `Recipe` table.
*
* Scoped to exactly one source — every enabled source gets its own tab
* now (`RecipeTabs`), rather than a single generic "Sources" tab
* switching between them internally, so `sourceKey` is a fixed prop, not
* something this component ever changes itself. Callers remount this
* (via a React `key={sourceKey}` on it) when switching which source's tab
* is active, the same "mounted only while relevant" convention as
* `RecipePickerDialog`/`CalendarPopover` elsewhere — simpler than this
* component reacting to its own `sourceKey` prop changing mid-lifetime.
*
* The right-hand preview reuses `RecipeDetailPanel` itself (its
* `"loaded-draft"` state) rather than a separate component — viewing a
@ -43,13 +47,11 @@ type BrowseState =
* recipe (`/recettes/:id`, leaving this tab) — `onSelectImportedRecipe`
* hands back the id instead of this panel navigating anywhere itself, since
* what "viewing" an already-imported item means depends on the caller:
* `RecipesPage` switches its own active tab away from `"sources"` (its
* `RecipeDetailPanel`/`RecipeTable` only render outside that tab, so
* without switching first the URL would change but this panel would keep
* rendering over it) and navigates to the recipe's detail page, while
* `RecipePickerDialog` instead treats it exactly like picking that recipe
* from one of the regular tabs — moving to its own confirm-portions step,
* no navigation at all.
* `RecipesPage` navigates to the recipe's detail page (switching its own
* active tab first — see its own doc comment), while `RecipePickerDialog`
* instead treats it exactly like picking that recipe from one of the
* regular tabs — moving to its own confirm-portions step, no navigation
* at all.
*
* `initialSelection`/`onItemSelected` are how `RecipesPage` keeps a
* not-yet-imported item's preview addressable by URL
@ -60,11 +62,13 @@ type BrowseState =
* no URL of its own to keep in sync.
*/
export function RecipeSourcesPanel({
sourceKey,
onSelectImportedRecipe,
planningSlot,
initialSelection,
onItemSelected,
}: {
sourceKey: string;
onSelectImportedRecipe: (recipeId: number) => void;
/** Forwarded as-is to `RecipeDetailPanel` — see its own doc comment. Only ever set by `RecipePickerDialog`. */
planningSlot?: { date: string; weekDay: WeekDay; meal: Meal };
@ -73,10 +77,6 @@ export function RecipeSourcesPanel({
}) {
const { t } = useTranslation();
const [enabledSources, setEnabledSources] = useState<EnabledSourcesState>({ status: "loading" });
const [selectedSourceKey, setSelectedSourceKey] = useState<string | null>(
initialSelection?.sourceKey ?? null,
);
const [search, setSearch] = useState("");
const [debouncedSearch, setDebouncedSearch] = useState("");
const [browseState, setBrowseState] = useState<BrowseState>({ status: "loading" });
@ -96,52 +96,22 @@ export function RecipeSourcesPanel({
// "needs a fetch" case the effect below must still run for.
const [previewedItem, setPreviewedItem] = useState<SourceItemSelection | null>(null);
// Loaded once — which sources exist, crossed with which the household
// has enabled (`/parametres/foyer`). Defaults the selector to the first
// enabled one, if any — but never overrides a source `initialSelection`
// already picked (the `current ??` below), so a deep link always wins.
useEffect(() => {
let cancelled = false;
Promise.all([apiClient.getSources(), apiClient.getHouseSourceIds()])
.then(([sources, enabledIds]) => {
if (cancelled) return;
const enabled = sources.filter((source) => enabledIds.includes(source.id));
setEnabledSources({ status: "loaded", sources: enabled });
setSelectedSourceKey((current) => current ?? enabled[0]?.key ?? null);
})
.catch(() => {
if (!cancelled) setEnabledSources({ status: "error" });
});
return () => {
cancelled = true;
};
}, []);
// Re-previews whenever `initialSelection` itself changes (a fresh deep
// link, or the browser's back/forward button landing on a different
// item) — not just once on mount. Deliberately doesn't touch
// `browseState`/the source dropdown beyond `selectedSourceKey` above: the
// item list for whichever source this belongs to loads independently
// (see the effect below), on its own schedule. Keyed on the primitive
// fields below, not `initialSelection` itself — a fresh object literal
// from the caller on every render (see `RecipesPage`) would otherwise
// re-run this on every render too.
// item within this same source) — not just once on mount. Keyed on the
// primitive field below, not `initialSelection` itself — a fresh object
// literal from the caller on every render (see `RecipesPage`) would
// otherwise re-run this on every render too.
// biome-ignore lint/correctness/useExhaustiveDependencies: see above.
useEffect(() => {
if (!initialSelection) return;
if (
previewedItem?.sourceKey === initialSelection.sourceKey &&
previewedItem?.externalId === initialSelection.externalId
) {
return;
}
if (previewedItem?.externalId === initialSelection.externalId) return;
let cancelled = false;
setPreviewedItem(initialSelection);
setSelectedSourceKey(initialSelection.sourceKey);
setSelectedExternalId(initialSelection.externalId);
setPreviewState({ status: "loading" });
apiClient
.previewSourceItem(initialSelection.sourceKey, initialSelection.externalId)
.previewSourceItem(sourceKey, initialSelection.externalId)
.then((draft) => {
if (!cancelled) setPreviewState({ status: "loaded-draft", draft });
})
@ -151,27 +121,19 @@ export function RecipeSourcesPanel({
return () => {
cancelled = true;
};
}, [initialSelection?.sourceKey, initialSelection?.externalId]);
}, [initialSelection?.externalId]);
useEffect(() => {
const timeout = window.setTimeout(() => setDebouncedSearch(search), SEARCH_DEBOUNCE_MS);
return () => window.clearTimeout(timeout);
}, [search]);
// Only manages `browseState` — deliberately doesn't reset the current
// item selection/preview when `selectedSourceKey` changes, so that the
// `initialSelection` effect above (which also sets `selectedSourceKey`,
// to reflect a deep link) isn't immediately undone by this one running
// straight after it in the same commit. Switching source via the
// dropdown clears the selection explicitly, in its own `onChange` below,
// where that reset is actually wanted.
useEffect(() => {
if (selectedSourceKey === null) return;
let cancelled = false;
setBrowseState({ status: "loading" });
apiClient
.browseSource(selectedSourceKey, { query: debouncedSearch.trim() || undefined })
.browseSource(sourceKey, { query: debouncedSearch.trim() || undefined })
.then(({ items, nextCursor }) => {
if (!cancelled) setBrowseState({ status: "loaded", items, nextCursor });
})
@ -182,15 +144,15 @@ export function RecipeSourcesPanel({
return () => {
cancelled = true;
};
}, [selectedSourceKey, debouncedSearch]);
}, [sourceKey, debouncedSearch]);
function handleLoadMore() {
if (selectedSourceKey === null || browseState.status !== "loaded" || !browseState.nextCursor) {
if (browseState.status !== "loaded" || !browseState.nextCursor) {
return;
}
const cursor = browseState.nextCursor;
apiClient
.browseSource(selectedSourceKey, { query: debouncedSearch.trim() || undefined, cursor })
.browseSource(sourceKey, { query: debouncedSearch.trim() || undefined, cursor })
.then(({ items, nextCursor }) => {
setBrowseState((prev) =>
prev.status === "loaded"
@ -206,8 +168,7 @@ export function RecipeSourcesPanel({
onSelectImportedRecipe(item.recipeId);
return;
}
if (selectedSourceKey === null) return;
const selection = { sourceKey: selectedSourceKey, externalId: item.externalId };
const selection = { sourceKey, externalId: item.externalId };
setSelectedExternalId(item.externalId);
setPreviewState({ status: "loading" });
// Set before `onItemSelected` so the `initialSelection` effect above
@ -216,51 +177,14 @@ export function RecipeSourcesPanel({
setPreviewedItem(selection);
onItemSelected?.(selection);
apiClient
.previewSourceItem(selectedSourceKey, item.externalId)
.previewSourceItem(sourceKey, item.externalId)
.then((draft) => setPreviewState({ status: "loaded-draft", draft }))
.catch(() => setPreviewState({ status: "error" }));
}
if (enabledSources.status === "loading") {
return <p className="recipes-page__status">{t("recipes.loading")}</p>;
}
if (enabledSources.status === "error") {
return (
<p className="recipes-page__status recipes-page__status--error">{t("common.loadError")}</p>
);
}
if (enabledSources.sources.length === 0) {
return (
<p className="recipes-page__status">
{t("recipes.sources.noneEnabled")}{" "}
<Link to="/parametres/foyer">{t("recipes.sources.noneEnabledLink")}</Link>
</p>
);
}
return (
<>
<div className="recipes-page__header recipes-page__header--sources">
{enabledSources.sources.length > 1 && (
<select
className="source-sources-select"
aria-label={t("recipes.sources.sourceLabel")}
value={selectedSourceKey ?? ""}
onChange={(e) => {
setSelectedSourceKey(e.target.value);
setSelectedExternalId(null);
setPreviewState({ status: "empty" });
setPreviewedItem(null);
onItemSelected?.(null);
}}
>
{enabledSources.sources.map((source) => (
<option key={source.key} value={source.key}>
{source.name}
</option>
))}
</select>
)}
<input
type="search"
className="recipes-page__search"

91
apps/web/src/features/recipes/RecipeTabs.tsx
View file

@ -1,4 +1,4 @@
import type { RecipeTab } from "@batch-cooking/shared";
import type { RecipeTab, SourceView } from "@batch-cooking/shared";
import type { LucideIcon } from "lucide-react";
import { useTranslation } from "react-i18next";
import {
@ -10,52 +10,79 @@ import {
} from "../../layouts/nav-icons";
import "./recipes.scss";
/** Prefix marking a tab value as "browse this one enabled source's live catalog" rather than a real `RecipeTab` — see {@link sourceTabValue}/{@link parseSourceTabValue}, the one place this shape is assembled/read apart. */
const SOURCE_TAB_PREFIX = "source:";
/**
* A tab of the recipe catalog — either a real {@link RecipeTab} (`GET
* /recipes?tab=`, `recipe.service.ts`'s `listRecipes`) or `"sources"`, a
* web-only mode that doesn't query the recipe table at all: it browses a
* household-enabled external source's own catalog live
* /recipes?tab=`, `recipe.service.ts`'s `listRecipes`) or a `"source:<key>"`
* value identifying one household-enabled external source, browsed live
* (`GET /sources/:sourceKey/browse`, `RecipeSourcesPanel`) instead of
* listing saved `Recipe` rows. Kept out of the shared `RecipeTab` type on
* purpose — the API has no `tab=sources` to validate.
* listing saved `Recipe` rows — one tab per enabled source (see
* `RecipeTabs` below), so switching between sources is as direct as
* switching between Perso/Foyer/Publique, not a single generic "Sources"
* tab hiding a second selector inside it. Kept out of the shared
* `RecipeTab` type on purpose — the API has no such `tab=` value to
* validate, this is a web-only browsing mode.
*/
export type RecipesPageTab = RecipeTab | "sources";
export type RecipesPageTab = RecipeTab | `${typeof SOURCE_TAB_PREFIX}${string}`;
/** Every possible tab, in display order, with its icon — reuses `AccountIcon`/`HouseholdIcon` from the sidebar's own icon set (see nav-icons.tsx) rather than a second "person"/"house" glyph. */
const ALL_TABS: Array<{ value: RecipesPageTab; Icon: LucideIcon }> = [
/** Builds the tab value identifying `sourceKey`'s own tab. */
export function sourceTabValue(sourceKey: string): RecipesPageTab {
return `${SOURCE_TAB_PREFIX}${sourceKey}`;
}
/** The reverse of {@link sourceTabValue} — `null` for any tab that isn't a source tab (a real `RecipeTab`). */
export function parseSourceTabValue(tab: RecipesPageTab): string | null {
return isSourceTab(tab) ? tab.slice(SOURCE_TAB_PREFIX.length) : null;
}
/** Type guard version of the same check — narrows `tab` to a real `RecipeTab` in the `false` branch, which a plain `parseSourceTabValue(tab) === null` check can't (TS can't see through the function call). Needed wherever the narrowed value gets passed on to something typed as `RecipeTab`, e.g. `apiClient.listRecipes`. */
export function isSourceTab(tab: RecipesPageTab): tab is `${typeof SOURCE_TAB_PREFIX}${string}` {
return tab.startsWith(SOURCE_TAB_PREFIX);
}
/** The four real, DB-backed tabs, in display order, with their icon — reuses `AccountIcon`/`HouseholdIcon` from the sidebar's own icon set (see nav-icons.tsx) rather than a second "person"/"house" glyph. No "toutes" tab among them: every recipe a viewer can see falls under exactly one of perso/foyer/publique (its own visibility) — see `recipe.service.ts`'s `listRecipes`. */
const REAL_TABS: Array<{ value: RecipeTab; Icon: LucideIcon }> = [
{ value: "favoris", Icon: FavoriteIcon },
{ value: "perso", Icon: AccountIcon },
{ value: "foyer", Icon: HouseholdIcon },
{ value: "publique", Icon: PublicIcon },
{ value: "sources", Icon: SourcesIcon },
];
/**
* Catalog tab bar — Favoris / Perso / Foyer / Publique / Sources by
* default (`/recettes`, `RecipesPage`). `tabs` narrows which of those
* show — `RecipePickerDialog` (picking a recipe for a planning slot)
* passes just the four real ones: browsing external sources mid-dialog,
* without the review/import flow, doesn't make sense there yet (its
* `onChange` narrows the result back to `RecipeTab` itself, safe exactly
* because `tabs` guarantees `"sources"` is never clickable there). No
* "toutes" tab among the real ones: every recipe a viewer can see falls
* under exactly one of perso/foyer/publique (its own visibility) — see
* `recipe.service.ts`'s `listRecipes`.
* Catalog tab bar — Favoris / Perso / Foyer / Publique, plus one tab per
* household-enabled source (e.g. "TheMealDB"), in that order. A source's
* own icon (`SourceView.iconUrl`) is used when it has one, `SourcesIcon`
* otherwise — unlike the four real tabs, whose label comes from an i18n
* key, a source tab's label is its own name as-is (there's no translation
* for an arbitrary household-picked source's name).
*
* `tabs` narrows which of the four *real* tabs show — every enabled
* source still gets its own tab regardless (narrowing individual sources
* doesn't make sense the way narrowing the four real ones does).
* `RecipePickerDialog` used to pass just the four real ones, before its
* own review/import flow existed to hand a picked source item off to; now
* every caller shows the full set, but the narrowing stays available for
* a future caller that still wants it.
*/
export function RecipeTabs({
active,
onChange,
tabs = ALL_TABS.map((tab) => tab.value),
sources,
tabs = REAL_TABS.map((tab) => tab.value),
}: {
active: RecipesPageTab;
onChange: (tab: RecipesPageTab) => void;
tabs?: readonly RecipesPageTab[];
/** Household-enabled sources, one tab each. Pass `[]` while still loading (see `useEnabledSources`) — that's indistinguishable from "none enabled" for this bar, which simply renders no source tabs either way. */
sources: readonly SourceView[];
tabs?: readonly RecipeTab[];
}) {
const { t } = useTranslation();
return (
<div className="recipe-tabs">
{ALL_TABS.filter(({ value }) => tabs.includes(value)).map(({ value, Icon }) => (
{REAL_TABS.filter(({ value }) => tabs.includes(value)).map(({ value, Icon }) => (
<button
key={value}
type="button"
@ -66,6 +93,24 @@ export function RecipeTabs({
{t(`recipes.tabs.${value}`)}
</button>
))}
{sources.map((source) => {
const value = sourceTabValue(source.key);
return (
<button
key={source.key}
type="button"
className={`recipe-tabs__tab${value === active ? " active" : ""}`}
onClick={() => onChange(value)}
>
{source.iconUrl ? (
<img src={source.iconUrl} alt="" className="recipe-tabs__source-icon" />
) : (
<SourcesIcon aria-hidden="true" />
)}
{source.name}
</button>
);
})}
</div>
);
}

29
apps/web/src/features/recipes/recipes.scss
View file

@ -190,8 +190,9 @@
gap: var(--space-xs);
// Never lets a tab overflow the page (which would force the whole body
// to scroll horizontally, see global.scss's rule against that) — scrolls
// within itself instead once the tabs (including the disabled "Sources"
// placeholder) don't all fit, same pattern as the sidebar's own nav.
// within itself instead once the tabs (favoris/perso/foyer/publique,
// plus one per household-enabled source) don't all fit, same pattern as
// the sidebar's own nav.
overflow-x: auto;
border-bottom: 1px solid var(--color-border);
margin-bottom: var(--space-md);
@ -222,6 +223,16 @@
flex: none;
}
// A source tab's own icon (`SourceView.iconUrl`) — sized to match the
// Lucide `svg` icons above so a source tab doesn't stand out from the
// four real ones.
.recipe-tabs__source-icon {
width: 1.05rem;
height: 1.05rem;
flex: none;
object-fit: contain;
}
&:hover {
color: var(--color-text);
}
@ -340,23 +351,9 @@
// actually new to this tab gets its own rules here.
.recipes-page__header--sources {
// The source <select> only renders when the household has more than one
// enabled source (see RecipeSourcesPanel) — this just keeps it visually
// grouped with the search field when it does.
gap: var(--space-sm);
}
.source-sources-select {
flex: none;
padding: 0.5rem var(--space-md);
font-family: var(--font-body);
font-size: var(--font-size-sm);
border: 1px solid var(--color-border);
border-radius: var(--radius-base);
background: var(--color-surface);
color: var(--color-text);
}
.source-item-table__imported-badge {
padding: 0.1rem 0.5rem;
font-size: var(--font-size-xs);

40
apps/web/src/features/recipes/useEnabledSources.ts Normal file
View file

@ -0,0 +1,40 @@
import type { SourceView } from "@batch-cooking/shared";
import { useEffect, useState } from "react";
import { apiClient } from "../../api/client";
export type EnabledSourcesState =
| { status: "loading" }
| { status: "loaded"; sources: SourceView[] }
| { status: "error" };
/**
* Which sources exist, crossed with which the household has enabled
* (`/parametres/foyer`) — shared by `RecipesPage` and `RecipePickerDialog`,
* both of which need this to render one `RecipeTabs` tab per enabled
* source (see `RecipeTabs`' own doc comment). Loaded once per mount, not
* re-fetched on every render — a household's enabled sources only change
* from the settings page, never from here.
*/
export function useEnabledSources(): EnabledSourcesState {
const [state, setState] = useState<EnabledSourcesState>({ status: "loading" });
useEffect(() => {
let cancelled = false;
Promise.all([apiClient.getSources(), apiClient.getHouseSourceIds()])
.then(([sources, enabledIds]) => {
if (cancelled) return;
setState({
status: "loaded",
sources: sources.filter((source) => enabledIds.includes(source.id)),
});
})
.catch(() => {
if (!cancelled) setState({ status: "error" });
});
return () => {
cancelled = true;
};
}, []);
return state;
}

6
apps/web/src/locales/fr/translation.json
View file

@ -162,8 +162,7 @@
"favoris": "Favoris",
"perso": "Perso",
"foyer": "Foyer",
"publique": "Publique",
"sources": "Sources"
"publique": "Publique"
},
"table": {
"name": "Nom",
@ -171,9 +170,6 @@
"diets": "Régime associé"
},
"sources": {
"sourceLabel": "Source",
"noneEnabled": "Aucune source n'est activée pour votre foyer.",
"noneEnabledLink": "Activez-en une dans les paramètres du foyer",
"searchPlaceholder": "Rechercher…",
"empty": "Aucune recette trouvée.",
"loadMore": "Voir plus",

54
apps/web/src/pages/RecipesPage.tsx
View file

@ -9,7 +9,14 @@ import {
type SourceItemSelection,
} from "../features/recipes/RecipeSourcesPanel";
import { RecipeTable } from "../features/recipes/RecipeTable";
import { RecipeTabs, type RecipesPageTab } from "../features/recipes/RecipeTabs";
import {
RecipeTabs,
type RecipesPageTab,
isSourceTab,
parseSourceTabValue,
sourceTabValue,
} from "../features/recipes/RecipeTabs";
import { useEnabledSources } from "../features/recipes/useEnabledSources";
import "../features/recipes/recipes.scss";
/** Debounce for the search field — avoids firing a request on every keystroke, same idea as the household name's autosave (`HouseholdSettingsPage`). */
@ -32,8 +39,8 @@ type RecipeListState =
*
* The `sources` route exists so a not-yet-imported item is just as
* addressable/deep-linkable as a real recipe's `/recettes/:id` — without
* it, selecting one inside the "Sources" tab only changed local component
* state, with no URL of its own (see `RecipeSourcesPanel`'s
* it, selecting one inside its source's own tab only changed local
* component state, with no URL of its own (see `RecipeSourcesPanel`'s
* `initialSelection`/`onItemSelected`, which this page drives).
*/
export function RecipesPage() {
@ -47,6 +54,7 @@ export function RecipesPage() {
const selectedId = id !== undefined ? Number(id) : null;
const selectedSourceItem: SourceItemSelection | undefined =
sourceKey !== undefined && externalId !== undefined ? { sourceKey, externalId } : undefined;
const enabledSources = useEnabledSources();
// `?search=` lets another page (the recipe form's "faisable maison"
// badge, see `ReproducibleBadge`) deep-link straight into a pre-filled
// search — read once on mount, not kept in sync on every keystroke
@ -55,13 +63,14 @@ export function RecipesPage() {
const [searchParams] = useSearchParams();
// Deep-linking straight into `/recettes/sources/:sourceKey/:externalId`
// must land on the "Sources" tab — otherwise `RecipeSourcesPanel` (which
// reads this URL via `selectedSourceItem` below) wouldn't even be
// must land on that source's own tab — otherwise `RecipeSourcesPanel`
// (which reads this URL via `selectedSourceItem` below) wouldn't even be
// mounted to show it. Lazy initializer: only matters for this page's
// very first render, same reasoning as `search`'s below.
const [activeTab, setActiveTab] = useState<RecipesPageTab>(() =>
selectedSourceItem ? "sources" : "favoris",
selectedSourceItem ? sourceTabValue(selectedSourceItem.sourceKey) : "favoris",
);
const activeSourceKey = parseSourceTabValue(activeTab);
const [search, setSearch] = useState(() => searchParams.get("search") ?? "");
// Seeded from the same initial value as `search` — otherwise the first
// fetch below would fire with an empty term (the debounce effect hasn't
@ -77,10 +86,12 @@ export function RecipesPage() {
}, [search]);
useEffect(() => {
// The "sources" tab doesn't query the recipe table at all — it browses
// a source's own live catalog instead (see `RecipeSourcesPanel`, which
// owns its own fetching entirely).
if (activeTab === "sources") return;
// A source's own tab doesn't query the recipe table at all — it
// browses that source's live catalog instead (see `RecipeSourcesPanel`,
// which owns its own fetching entirely). The type-guard (not just
// `activeSourceKey !== null`) is what lets `activeTab` narrow to
// `RecipeTab` below, for `apiClient.listRecipes`.
if (isSourceTab(activeTab)) return;
let cancelled = false;
setListState({ status: "loading" });
@ -165,7 +176,7 @@ export function RecipesPage() {
<div className="recipes-page">
<div className="recipes-page__header">
<h1>{t("recipes.title")}</h1>
{activeTab !== "sources" && (
{activeSourceKey === null && (
<input
type="search"
className="recipes-page__search"
@ -179,11 +190,26 @@ export function RecipesPage() {
</Link>
</div>
<RecipeTabs active={activeTab} onChange={setActiveTab} />
<RecipeTabs
active={activeTab}
onChange={setActiveTab}
sources={enabledSources.status === "loaded" ? enabledSources.sources : []}
/>
{activeTab === "sources" ? (
{activeSourceKey !== null ? (
<RecipeSourcesPanel
initialSelection={selectedSourceItem}
key={activeSourceKey}
sourceKey={activeSourceKey}
// Only meaningful when it actually belongs to this source — e.g.
// clicking straight from TheMealDB's item "9999" to Marmiton's tab
// changes `activeSourceKey` before `selectedSourceItem` (URL-driven)
// catches up, since only picking a *row* navigates, not switching
// tabs. Passing it through unguarded would have the freshly
// (`key`-forced) remounted panel try to preview "9999" against the
// wrong source.
initialSelection={
selectedSourceItem?.sourceKey === activeSourceKey ? selectedSourceItem : undefined
}
onItemSelected={(item) =>
navigate(
item