feat(macros): add IndexerName (#1511)

* feat(macros): add IndexerName

* fix: tests

* fix: tests

web/src/api/APIClient.ts

@@ -317,7 +317,7 @@ export const APIClient = {
         if (!filter.value)
           return;
 
-        if (filter.id == "indexer") {
+        if (filter.id == "indexer.identifier") {
           params["indexer"].push(filter.value);
         } else if (filter.id === "action_status") {
           params["push_status"].push(filter.value); // push_status is the correct value here otherwise the releases table won't load when filtered by push status

web/src/components/data-table/Cells.tsx

@@ -60,7 +60,7 @@ export const LinksCell = (props: CellProps<Release>) => {
         >
           <div className="mb-1">
             <CellLine title="Release">{props.row.original.name}</CellLine>
-            <CellLine title="Indexer">{props.row.original.indexer}</CellLine>
+            <CellLine title="Indexer">{props.row.original.indexer.identifier}</CellLine>
             <CellLine title="Protocol">{props.row.original.protocol}</CellLine>
             <CellLine title="Implementation">{props.row.original.implementation}</CellLine>
             <CellLine title="Category">{props.row.original.category}</CellLine>

web/src/forms/settings/FeedForms.tsx

@@ -28,7 +28,7 @@ interface UpdateProps {
 
 interface InitialValues {
   id: number;
-  indexer: string;
+  indexer: IndexerMinimal;
   enabled: boolean;
   type: FeedType;
   name: string;

web/src/screens/dashboard/ActivityTable.tsx

@@ -207,7 +207,7 @@ export const ActivityTable = () => {
     },
     {
       Header: "Indexer",
-      accessor: "indexer",
+      accessor: "indexer.identifier",
       Cell: DataTable.TitleCell,
       Filter: SelectColumnFilter,
       filter: "includes"
@@ -239,7 +239,11 @@ export const ActivityTable = () => {
       const newData: Release[] = data.data.map((item, index) => ({
         ...item,
         name: `${randomNames[index]}.iso`,
-        indexer: index % 2 === 0 ? "distrowatch" : "linuxtracker"
+        indexer: {
+          id: 0,
+          name: index % 2 === 0 ? "distrowatch" : "linuxtracker",
+          identifier: index % 2 === 0 ? "distrowatch" : "linuxtracker",
+        },
       }));
       setModifiedData(newData);
     }
@@ -290,7 +294,7 @@ export const ActivityTableContent = () => {
     },
     {
       Header: "Indexer",
-      accessor: "indexer",
+      accessor: "indexer.identifier",
       Cell: DataTable.TitleCell,
       Filter: SelectColumnFilter,
       filter: "includes"
@@ -315,7 +319,11 @@ export const ActivityTableContent = () => {
       const newData: Release[] = data.data.map((item, index) => ({
         ...item,
         name: `${randomNames[index]}.iso`,
-        indexer: index % 2 === 0 ? "distrowatch" : "linuxtracker"
+        indexer: {
+          id: 0,
+          name: index % 2 === 0 ? "distrowatch" : "linuxtracker",
+          identifier: index % 2 === 0 ? "distrowatch" : "linuxtracker",
+        },
       }));
       setModifiedData(newData);
     }

web/src/screens/releases/ReleaseTable.tsx

@@ -122,7 +122,7 @@ export const ReleaseTable = () => {
     },
     {
       Header: "Indexer",
-      accessor: "indexer",
+      accessor: "indexer.identifier",
       Cell: DataTable.IndexerCell,
       Filter: IndexerSelectColumnFilter,
       filter: "equal"
@@ -148,7 +148,11 @@ export const ReleaseTable = () => {
       const newData: Release[] = data.data.map((item, index) => ({
         ...item,
         name: `${randomNames[index]}.iso`,
-        indexer: index % 2 === 0 ? "distrowatch" : "linuxtracker",
+        indexer: {
+          id: 0,
+          name: index % 2 === 0 ? "distrowatch" : "linuxtracker",
+          identifier: index % 2 === 0 ? "distrowatch" : "linuxtracker",
+        },
         category: "Linux ISOs",
         size: index % 2 === 0 ? 4566784529 : (index % 3 === 0 ? 7427019812 : 2312122455),
         source: "",

web/src/screens/settings/Feed.tsx

@@ -179,7 +179,7 @@ function ListItem({ feed }: ListItemProps) {
         <div className="col-span-9 md:col-span-4 pl-10 sm:pl-12 py-3 flex flex-col">
           <span className="pr-2 dark:text-white truncate">{feed.name}</span>
           <span className="pr-3 text-xs truncate">
-            {feed.indexer}
+            {feed.indexer.identifier}
           </span>
         </div>
         <div className="hidden md:flex col-span-2 py-3 items-center">

web/src/types/Feed.d.ts

@@ -5,7 +5,7 @@
 
 interface Feed {
   id: number;
-  indexer: string;
+  indexer: IndexerMinimal;
   name: string;
   type: FeedType;
   enabled: boolean;

web/src/types/Indexer.d.ts

@@ -13,6 +13,12 @@ interface Indexer {
   settings: Array<IndexerSetting>;
 }
 
+interface IndexerMinimal {
+  id: number;
+  name: string;
+  identifier: string;
+}
+
 interface IndexerDefinition {
   id: number;
   name: string;

web/src/types/Release.d.ts

@@ -7,7 +7,7 @@ interface Release {
   id: number;
   filter_status: string;
   rejections: string[];
-  indexer: string;
+  indexer: IndexerMinimal;
   filter: string;
   protocol: string;
   implementation: string;