fix: remove categories from catalog interface

Signed-off-by: axel7083 <[email protected]>
containers · Mar 7, 2024 · ee82809 · ee82809
1 parent b0ff03e
commit ee82809
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 36 deletions.
diff --git a/packages/backend/src/managers/catalogManager.ts b/packages/backend/src/managers/catalogManager.ts
@@ -37,7 +37,6 @@ export class CatalogManager extends Publisher<Catalog> implements Disposable {
     super(webview, MSG_NEW_CATALOG_STATE, () => this.getCatalog());
     // We start with an empty catalog, for the methods to work before the catalog is loaded
     this.catalog = {
-      categories: [],
       models: [],
       recipes: [],
     };

diff --git a/packages/frontend/src/lib/RecipeDetails.spec.ts b/packages/frontend/src/lib/RecipeDetails.spec.ts
@@ -77,7 +77,6 @@ vi.mock('../stores/localRepositories', () => ({
 }));
 
 const initialCatalog: Catalog = {
-  categories: [],
   models: [
     {
       id: 'model1',

diff --git a/packages/frontend/src/lib/RecipesCard.svelte b/packages/frontend/src/lib/RecipesCard.svelte
@@ -1,13 +1,9 @@
 <script lang="ts">
 import Card from '/@/lib/Card.svelte';
 import { getIcon } from '/@/utils/categoriesUtils';
-import type { Category } from '@shared/src/models/ICategory';
 import { catalog } from '/@/stores/catalog';
 
-export let category: Category;
-
-$: categories = $catalog.categories;
-$: recipes = $catalog.recipes.filter(r => r.categories.includes(category.id)).map(r => ({ ...r, icon: category.id }));
+$: recipes = $catalog.recipes;
 
 export let primaryBackground: string = 'bg-charcoal-800';
 export let secondaryBackground: string = 'bg-charcoal-700';
@@ -16,7 +12,7 @@ export let displayCategory: boolean = true;
 export let displayDescription: boolean = true;
 </script>
 
-<Card title="{category.name}" classes="{primaryBackground} {$$props.class} text-xl font-medium mt-4">
+<Card classes="{primaryBackground} {$$props.class} text-xl font-medium mt-4">
   <div slot="content" class="w-full">
     <div class="grid grid-cols-3 gap-4 mt-4">
       {#if recipes.length === 0}
@@ -31,10 +27,7 @@ export let displayDescription: boolean = true;
           <div slot="content" class="text-base font-normal mt-2">
             {#if displayCategory}
               {#each recipe.categories as categoryId}
-                <Card
-                  title="{categories.find(category => category.id === categoryId)?.name || '?'}"
-                  classes="{primaryBackground} p-1"
-                  primaryBackground="{primaryBackground}" />
+                <Card title="{categoryId}" classes="{primaryBackground} p-1" primaryBackground="{primaryBackground}" />
               {/each}
             {/if}
             {#if displayDescription}

diff --git a/packages/frontend/src/lib/table/application/ColumnModel.spec.ts b/packages/frontend/src/lib/table/application/ColumnModel.spec.ts
@@ -32,7 +32,6 @@ vi.mock('/@/stores/catalog', async () => {
 });
 
 const initialCatalog: Catalog = {
-  categories: [],
   models: [
     {
       id: 'model1',

diff --git a/packages/frontend/src/lib/table/application/ColumnRecipe.spec.ts b/packages/frontend/src/lib/table/application/ColumnRecipe.spec.ts
@@ -47,7 +47,6 @@ vi.mock('/@/utils/client', async () => {
 });
 
 const initialCatalog: Catalog = {
-  categories: [],
   models: [],
   recipes: [
     {

diff --git a/packages/frontend/src/pages/Recipe.spec.ts b/packages/frontend/src/pages/Recipe.spec.ts
@@ -80,7 +80,6 @@ vi.mock('/@/stores/catalog', async () => {
 });
 
 const initialCatalog: Catalog = {
-  categories: [],
   models: [
     {
       id: 'model1',
@@ -123,7 +122,6 @@ const initialCatalog: Catalog = {
 };
 
 const updatedCatalog: Catalog = {
-  categories: [],
   models: [
     {
       id: 'model1',

diff --git a/packages/frontend/src/pages/Recipe.svelte b/packages/frontend/src/pages/Recipe.svelte
@@ -63,9 +63,7 @@ function setSelectedModel(modelId: string) {
   <svelte:fragment slot="subtitle">
     <div class="mt-2">
       {#each recipe?.categories || [] as categoryId}
-        <Card
-          title="{categories.find(category => category.id === categoryId)?.name || '?'}"
-          classes="bg-charcoal-800 p-1 text-xs w-fit" />
+        <Card title="{categoryId}" classes="bg-charcoal-800 p-1 text-xs w-fit" />
       {/each}
     </div>
   </svelte:fragment>

diff --git a/packages/frontend/src/pages/Recipes.svelte b/packages/frontend/src/pages/Recipes.svelte
@@ -3,28 +3,13 @@ import NavPage from '/@/lib/NavPage.svelte';
 import RecipesCard from '/@/lib/RecipesCard.svelte';
 import { RECENT_CATEGORY_ID } from '/@/utils/client';
 import { catalog } from '/@/stores/catalog';
-
-$: categories = $catalog.categories;
 </script>
 
 <NavPage title="Recipe Catalog" searchEnabled="{false}">
   <div slot="content" class="flex flex-col min-w-full min-h-full">
     <div class="min-w-full min-h-full flex-1">
       <div class="px-5 space-y-5 h-full">
-        <!-- Recent recipes -->
-        <RecipesCard
-          category="{{ id: RECENT_CATEGORY_ID, name: 'Recently-viewed recipes' }}"
-          class="p-6"
-          displayDescription="{false}" />
-
-        {#each categories as category}
-          <!-- Natural Language processing -->
-          <RecipesCard
-            category="{category}"
-            primaryBackground=""
-            secondaryBackground="bg-charcoal-800"
-            displayCategory="{false}" />
-        {/each}
+        <RecipesCard primaryBackground="" secondaryBackground="bg-charcoal-800" displayCategory="{false}" />
       </div>
     </div>
   </div>

diff --git a/packages/shared/src/models/ICatalog.ts b/packages/shared/src/models/ICatalog.ts
@@ -23,5 +23,4 @@ import type { Recipe } from './IRecipe';
 export interface Catalog {
   recipes: Recipe[];
   models: ModelInfo[];
-  categories: Category[];
 }