new: add a delete content button to empty feed

ybizeul · Sep 17, 2024 · 7ef5166 · 7ef5166
1 parent 0e4bb28
commit 7ef5166
Show file tree

Hide file tree

Showing 8 changed files with 83 additions and 14 deletions.
diff --git a/cmd/ybfeed/__debug_bin2036534813 b/cmd/ybfeed/__debug_bin2036534813
diff --git a/internal/feed/feed.go b/internal/feed/feed.go
@@ -244,6 +244,20 @@ func (feed *Feed) publicItems() ([]PublicFeedItem, error) {
 	return items, nil
 }
 
+func (feed *Feed) Empty() error {
+	items, err := feed.publicItems()
+	if err != nil {
+		return err
+	}
+	for _, item := range items {
+		err := feed.RemoveItem(item.Name)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
 // GetPublicItem returns a marshable struct for a specific feed item
 func (feed *Feed) GetPublicItem(i string) (*PublicFeedItem, error) {
 	if i == "secret" || i == "pin" || i == "config.json" {

diff --git a/internal/handlers/handlers.go b/internal/handlers/handlers.go
@@ -193,16 +193,15 @@ func (api *ApiHandler) GetServer() *chi.Mux {
 		}
 	})
 
-	r.Route("/api/feed", func(r chi.Router) {
+	r.Route("/api/feeds", func(r chi.Router) {
 		r.Get("/{feedName}", api.feedHandlerFunc)
 		r.Post("/{feedName}", api.feedPostHandlerFunc)
 		r.Patch("/{feedName}", api.feedPatchHandlerFunc)
-
-		r.Get("/{feedName}/{itemName}", api.feedItemHandlerFunc)
-		r.Delete("/{feedName}/{itemName}", api.feedItemDeleteHandlerFunc)
-
 		r.Post("/{feedName}/subscription", api.feedSubscriptionHandlerFunc)
 		r.Delete("/{feedName}/subscription", api.feedUnsubscribeHandlerFunc)
+		r.Delete("/{feedName}/items", api.feedItemEmptyHandlerFunc)
+		r.Get("/{feedName}/items/{itemName}", api.feedItemHandlerFunc)
+		r.Delete("/{feedName}/items/{itemName}", api.feedItemDeleteHandlerFunc)
 	})
 	r.Get("/*", RootHandlerFunc)
 
@@ -291,7 +290,7 @@ func (api *ApiHandler) feedHandlerFunc(w http.ResponseWriter, r *http.Request) {
 	http.SetCookie(w, &http.Cookie{
 		Name:    "Secret",
 		Value:   publicFeed.Secret,
-		Path:    fmt.Sprintf("/api/feed/%s", feedName),
+		Path:    fmt.Sprintf("/api/feeds/%s", feedName),
 		Expires: time.Now().Add(time.Hour * 24 * 365 * 10),
 	})
 
@@ -345,6 +344,35 @@ func (api *ApiHandler) feedPatchHandlerFunc(w http.ResponseWriter, r *http.Reque
 		return
 	}
 }
+func (api *ApiHandler) feedItemEmptyHandlerFunc(w http.ResponseWriter, r *http.Request) {
+	logger.Debug("Item API EMPTY request", slog.Any("request", r))
+
+	secret, _ := utils.GetSecret(r)
+
+	feedName, _ := url.QueryUnescape(chi.URLParam(r, "feedName"))
+	if feedName == "" {
+		utils.CloseWithCodeAndMessage(w, 500, "Unable to obtain feed name")
+	}
+
+	f, err := api.FeedManager.GetFeedWithAuth(feedName, secret)
+	if err != nil {
+		switch {
+		case errors.Is(err, feed.FeedErrorNotFound):
+			utils.CloseWithCodeAndMessage(w, 404, fmt.Sprintf("feed '%s' not found", feedName))
+		case errors.Is(err, feed.FeedErrorInvalidSecret):
+			utils.CloseWithCodeAndMessage(w, 401, "Unauthorized")
+		default:
+			utils.CloseWithCodeAndMessage(w, 500, fmt.Sprintf("Error while getting feed: %s", err.Error()))
+		}
+		return
+	}
+
+	err = f.Empty()
+	if err != nil {
+		utils.CloseWithCodeAndMessage(w, 500, fmt.Sprintf("Error while getting feed: %s", err.Error()))
+		return
+	}
+}
 
 func (api *ApiHandler) feedItemHandlerFunc(w http.ResponseWriter, r *http.Request) {
 	logger.Debug("Item API GET request", slog.Any("request", r))

diff --git a/web/ui/src/YBFeed/Components/YBFeedItemImageComponent.tsx b/web/ui/src/YBFeed/Components/YBFeedItemImageComponent.tsx
@@ -8,7 +8,7 @@ export function YBFeedItemImageComponent() {
 
     return(
         <Card.Section mt="sm">
-            <Image src={"/api/feed/"+encodeURIComponent(item!.feed.name)+"/"+item!.name} />
+            <Image src={"/api/feeds/"+encodeURIComponent(item!.feed.name)+"/items/"+item!.name} />
         </Card.Section>
     )
 }
diff --git a/web/ui/src/YBFeed/Components/YBPasteCardComponent.tsx b/web/ui/src/YBFeed/Components/YBPasteCardComponent.tsx
@@ -54,7 +54,7 @@ export function YBPasteCardComponent(props:YBPasteCardComponentProps) {
 
         const requestHeaders: HeadersInit = new Headers();
         requestHeaders.set("Content-Type", type)
-        fetch("/api/feed/" + encodeURIComponent(feed!),{
+        fetch("/api/feeds/" + encodeURIComponent(feed!),{
             method: "POST",
             body: data,
             headers: requestHeaders,
@@ -71,7 +71,7 @@ export function YBPasteCardComponent(props:YBPasteCardComponentProps) {
     const handleFinish = (text:string) => {
         const requestHeaders: HeadersInit = new Headers();
         requestHeaders.set("Content-Type", "text/plain")
-        fetch("/api/feed/" + encodeURIComponent(feed!),{
+        fetch("/api/feeds/" + encodeURIComponent(feed!),{
             method: "POST",
             body: text,
             headers: requestHeaders,

diff --git a/web/ui/src/YBFeed/Components/clipboard.ts b/web/ui/src/YBFeed/Components/clipboard.ts
@@ -21,7 +21,7 @@ export const copyImageItem = (item:YBFeedItem) => {
             img.onload = imageLoaded
 
         })
-        img.src = "/api/feed/"+encodeURIComponent(item.feed.name)+"/"+item.name
+        img.src = "/api/feeds/"+encodeURIComponent(item.feed.name)+"/items/"+item.name
 
         const mime = 'image/png'
         navigator.clipboard.write([new ClipboardItem({[mime]:imageDataPromise})])

diff --git a/web/ui/src/YBFeed/YBFeedConnector.ts b/web/ui/src/YBFeed/YBFeedConnector.ts
@@ -2,7 +2,7 @@ import { YBFeed, YBFeedItem, YBFeedError } from '.'
 
 export class YBFeedConnector {
     feedUrl(feedName: string): string {
-        return "/api/feed/"+encodeURIComponent(feedName)
+        return "/api/feeds/"+encodeURIComponent(feedName)
     }
     async Ping(): Promise<Headers> {
         return new Promise((resolve, reject) => {
@@ -68,7 +68,7 @@ export class YBFeedConnector {
     }
     async GetItem(item: YBFeedItem): Promise<string> {
         return new Promise((resolve, reject) => {
-            fetch(this.feedUrl(item.feed.name)+"/"+item.name,{
+            fetch(this.feedUrl(item.feed.name)+"/items/"+item.name,{
                 credentials: "include"
             })
             .then(r => {
@@ -87,7 +87,7 @@ export class YBFeedConnector {
     }
     async DeleteItem(item: YBFeedItem) {
         return new Promise((resolve, reject) => {
-            fetch(this.feedUrl(item.feed.name)+"/"+encodeURIComponent(item.name),{
+            fetch(this.feedUrl(item.feed.name)+"/items/"+encodeURIComponent(item.name),{
                 method: "DELETE",
                 credentials: "include"
             })
@@ -106,6 +106,29 @@ export class YBFeedConnector {
             })
         })
     }
+    async EmptyFeed(feedName: string): Promise<boolean> {
+        return new Promise((resolve, reject) => {
+            fetch(this.feedUrl(feedName)+
+                "/items",{
+                method: "DELETE",
+                credentials: "include"
+            })
+            .then((f) => {
+                if (f.status !== 200) {
+                    f.text()
+                    .then(text => {
+                        reject(new YBFeedError(f.status, text))
+                    })
+                    .catch(() => {
+                        reject(new YBFeedError(f.status, "Server Unavailable"))
+                    })
+                } else {
+                    resolve(true)
+                }
+            })
+        })
+    }
+
     async SetPIN(feedName: string, pin: string): Promise<boolean> {
         return new Promise((resolve, reject) => {
             fetch(this.feedUrl(feedName),{

diff --git a/web/ui/src/YBFeed/YBFeedFeed.tsx b/web/ui/src/YBFeed/YBFeedFeed.tsx
@@ -6,7 +6,7 @@ import useWebSocket, {ReadyState} from 'react-use-websocket';
 
 import { notifications } from '@mantine/notifications';
 
-import { Menu, ActionIcon, PinInput, Text, Modal, Center, Group, rem} from '@mantine/core';
+import { Menu, ActionIcon, PinInput, Text, Modal, Center, Group, rem, Button} from '@mantine/core';
 
 import { YBFeed, YBFeedConnector, YBFeedItem } from '.'
 
@@ -136,13 +136,17 @@ export function YBFeedFeed() {
         })
     }
 
+    const deleteAll = () => {
+        connection.EmptyFeed(feedParam)
+    }
     return (
         <>
         {goTo?
         <Navigate to={goTo} />
         :""}
         {authenticated===true?
             <Group gap="xs" justify="flex-end" style={{float: 'right'}}>
+                <Button size="xs" variant="outline" color="red" onClick={deleteAll}>Delete Content</Button>
             {vapid?
             <YBNotificationToggleComponent vapid={vapid} feedName={feedParam}/>
             :""}