{spaces.find((space) => space.route === selectedSpace)?.icon}
{spaces.find((space) => space.route === selectedSpace)?.label}
diff --git a/src/components/Subscribes/index.tsx b/src/components/Subscribes/index.tsx
index e4a2b5de7..ab2ba10aa 100644
--- a/src/components/Subscribes/index.tsx
+++ b/src/components/Subscribes/index.tsx
@@ -20,7 +20,7 @@ import {
import classNames from "classnames";
import { listen } from "@tauri-apps/api/event";
import { RouteConfig } from "@/config";
-import { FeedResItem, Folder } from "@/db";
+import { FeedResItem, FolderResItem } from "@/db";
import * as dataAgent from "@/helpers/dataAgent";
import { busChannel } from "@/helpers/busChannel";
import { useBearStore } from "@/stores";
@@ -382,14 +382,14 @@ const ChannelList = (): JSX.Element => {
store.setFeedContextMenuTarget(null)}
/>
{
/>
> => {
+export const getFolders = async (): Promise> => {
return request.get("folders", {});
};
diff --git a/src/index.tsx b/src/index.tsx
index 1a19c565e..cb391c6bc 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,4 +1,3 @@
-import { Theme } from "@radix-ui/themes";
import { createRoot } from "react-dom/client";
import { createBrowserRouter, Navigate, RouterProvider } from "react-router-dom";
diff --git a/src/layout/Setting/Content/DataTableToolbar.tsx b/src/layout/Setting/Content/DataTableToolbar.tsx
index 6efc3bf51..10d6a88bf 100644
--- a/src/layout/Setting/Content/DataTableToolbar.tsx
+++ b/src/layout/Setting/Content/DataTableToolbar.tsx
@@ -5,7 +5,7 @@ import { Table } from "@tanstack/react-table";
import * as dataAgent from "@/helpers/dataAgent";
import { DataTableFacetedFilter } from "./DataTableFacetedFilter";
import { useEffect, useState } from "react";
-import { Folder } from "@/db";
+import { FolderResItem } from "@/db";
import { TextField, Button } from "@radix-ui/themes";
interface DataTableToolbarProps {
@@ -29,7 +29,7 @@ export function DataTableToolbar({
table,
}: DataTableToolbarProps) {
const isFiltered = table.getState().columnFilters.length > 0;
- const [folderList, setFolderList] = useState([]);
+ const [folderList, setFolderList] = useState([]);
const getFolderList = () => {
dataAgent.getFolders().then(({ data }) => {
@@ -52,7 +52,7 @@ export function DataTableToolbar({
}
className="w-[150px] lg:w-[250px]"
/>
- {table.getColumn("folder") && folderList.length > 0 && (
+ {/* {table.getColumn("folder") && folderList.length > 0 && (
({
};
})}
/>
- )}
+ )} */}
{table.getColumn("health_status") && (
void;
@@ -46,14 +46,15 @@ export const DialogDeleteFolder = React.memo((props: DialogProps) => {
Are you absolutely sure?
This action cannot be undone. This will permanently delete the data relates with
- {folder && {folder?.title || folder?.name}}
+ {folder && {folder?.name}}
- handleCancel()}>Cancel
-
diff --git a/src/layout/Setting/Content/DialogUnsubscribeFeed.tsx b/src/layout/Setting/Content/DialogUnsubscribeFeed.tsx
index d3293d3a9..8de342cb0 100644
--- a/src/layout/Setting/Content/DialogUnsubscribeFeed.tsx
+++ b/src/layout/Setting/Content/DialogUnsubscribeFeed.tsx
@@ -16,9 +16,11 @@ export interface DialogProps {
export const DialogUnsubscribeFeed = React.memo((props: DialogProps) => {
const { feed, dialogStatus, setDialogStatus, afterConfirm, afterCancel, trigger } = props;
+ const [loading, setLoading] = useState(false);
const confirmUnsubscribe = () => {
if (feed?.uuid) {
+ setLoading(true);
dataAgent
.deleteChannel(feed.uuid)
.then(() => {
@@ -31,6 +33,9 @@ export const DialogUnsubscribeFeed = React.memo((props: DialogProps) => {
description: err.message,
duration: 2000,
});
+ })
+ .finally(() => {
+ setLoading(false);
});
}
};
@@ -49,11 +54,12 @@ export const DialogUnsubscribeFeed = React.memo((props: DialogProps) => {
{feed && {feed?.title}}
- handleCancel()}>Cancel
-
diff --git a/src/layout/Setting/Content/Feed.tsx b/src/layout/Setting/Content/Feed.tsx
index 8828a4ffc..ae5dd96fc 100644
--- a/src/layout/Setting/Content/Feed.tsx
+++ b/src/layout/Setting/Content/Feed.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react";
import { Folder as FolderIcon, Rss, Trash2 } from "lucide-react";
import { open } from "@tauri-apps/api/shell";
-import { Channel, Folder } from "@/db";
+import { Channel } from "@/db";
import * as dataAgent from "@/helpers/dataAgent";
import { busChannel } from "@/helpers/busChannel";
import { DataTable } from "./DataTable";
@@ -10,8 +10,7 @@ import { CellContext, createColumnHelper } from "@tanstack/react-table";
import { getChannelFavicon } from "@/helpers/parseXML";
import { DialogUnsubscribeFeed } from "./DialogUnsubscribeFeed";
import { useModal } from "@/components/Modal/useModal";
-import { Icon } from "@/components/Icon";
-import { HoverCard } from "@radix-ui/themes";
+import { Avatar, Badge, HoverCard, IconButton } from "@radix-ui/themes";
export const Feed = () => {
const [list, setList] = useState<(Channel & { parent_uuid: String })[]>([]);
@@ -39,33 +38,16 @@ export const Feed = () => {
const { title, link } = props.row.original;
return (
-
- ): JSX.Element {
- return (
- <>
- {props.row.original.folder_name && (
- ): JSX.Element {
return (
([]);
+ const [folderList, setFolderList] = useState([]);
const [showStatus, setModalStatus] = useModal();
- const [currentFolder, setCurrentFolder] = useState(null);
+ const [editStatus, setEditStatus] = useModal();
+ const [currentFolder, setCurrentFolder] = useState(null);
- const handleEditFolder = (folder: Folder) => {
+ const handleEditFolder = (folder: FolderResItem) => {
if (folder?.uuid) {
+ setCurrentFolder(folder);
+ setEditStatus(true);
}
};
- const handleDeleteFolder = (folder: Folder) => {
+ const handleDeleteFolder = (folder: FolderResItem) => {
if (folder?.uuid) {
setCurrentFolder(folder);
setModalStatus(true);
}
};
- const columnHelper = createColumnHelper();
+ const columnHelper = createColumnHelper();
const columns = [
{
accessorKey: "name",
header: "Name",
size: "auto",
- cell(props: CellContext): JSX.Element {
+ cell(props: CellContext): JSX.Element {
return (
): JSX.Element {
+ cell(props: CellContext): JSX.Element {
const record = props.row.original;
return (
{}}
+ />
+ {}}
/>
- })
-
- {title}
-
-
+
);
},
},
- {
- accessorKey: "folder",
- header: "Folder",
- size: "fix-content",
- cell(props: CellContext
-
- )}
-
- );
- },
- },
{
accessorKey: "health_status",
header: "Health Status",
@@ -104,17 +86,17 @@ export const Feed = () => {
}),
columnHelper.accessor((row) => `${row.uuid}-opt`, {
id: "opt",
- header: "Action",
+ header: "",
size: 110,
cell(props: CellContext
- open(props.row.original.feed_url)}>
+ open(props.row.original.feed_url)}>
- handleUnSubscribe(props.row.original)}>
+
+ handleUnSubscribe(props.row.original)}>
+
);
},
diff --git a/src/layout/Setting/Content/FolderList.tsx b/src/layout/Setting/Content/FolderList.tsx
index 094e38dcc..f7188f5b3 100644
--- a/src/layout/Setting/Content/FolderList.tsx
+++ b/src/layout/Setting/Content/FolderList.tsx
@@ -1,37 +1,41 @@
import React, { useEffect, useState } from "react";
import { DataTable } from "./DataTable";
import { Edit, Folder as FolderIcon, Trash2 } from "lucide-react";
-import {FeedResItem, Folder} from "@/db";
+import { FeedResItem, FolderResItem } from "@/db";
import * as dataAgent from "@/helpers/dataAgent";
import { useModal } from "@/components/Modal/useModal";
import { CellContext, createColumnHelper } from "@tanstack/react-table";
-import { Icon } from "@/components/Icon";
import { DialogDeleteFolder } from "./DialogDeleteFolder";
+import { IconButton } from "@radix-ui/themes";
+import { AddFolder } from "@/components/AddFolder";
export const FolderList = () => {
- const [folderList, setFolderList] = useState
- handleEditFolder(record)}>
+ handleEditFolder(record)}>
- handleDeleteFolder(record)}
- >
+
+ handleDeleteFolder(record)}>
+
);
},
@@ -71,7 +72,7 @@ export const FolderList = () => {
};
useEffect(() => {
- console.log('folder effect')
+ console.log("folder effect");
getFolderList();
}, []);
@@ -85,7 +86,15 @@ export const FolderList = () => {