3 files changed, 20 insertions, 106 deletions
diff --git a/lib/admin/src/content/computedContent.ts b/lib/admin/src/content/computedContent.ts
deleted file mode 100644
index 75a25f8..0000000
--- a/lib/admin/src/content/computedContent.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright (C) 2023 Vaughn Nugent
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as
-// published by the Free Software Foundation, either version 3 of the
-// License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-import { Ref, computed, ref } from "vue";
-import { find, filter, includes, isEqual, isNil, toLower } from 'lodash-es';
-import { apiCall } from "@vnuge/vnlib.browser"
-import { ContentMeta, BlogEntity, ContentApi, ComputedBlogApi, BlogAdminContext } from "../types.js";
-import { watchAndCompute } from "../helpers.js";
-import { useContent } from "./useContent.js";
-
-export interface ComputedContent extends ContentApi, ComputedBlogApi<ContentMeta> {
-    /**
-     * Gets the raw content for a the currently selected post
-     */
-    getSelectedPostContent(): Promise<string | undefined>;
-    /**
-     * Filter post items by the given reactive filter
-     * @param filter The reactive filter used to filter the content
-     */
-    createReactiveSearch(filter: Ref<string>): Ref<ContentMeta[] | undefined>;
-    /**
-     * triggers a refresh of the content
-     */
-    refresh(): void
-}
-
-/**
- * Gets a computed object with the content and selected content
- * @param context The blog admin context
- * @returns A computed object with the content and selected content
- */
-export const useComputedContent = (context: BlogAdminContext): ComputedContent => {
-
-    //Get the content api from the context
-    const contentApi = useContent(context);
-    const trigger = ref(0);
-
-    const { content, post, channel } = context.getQuery();
-
-    //Watch for channel and selected id changes and get the content
-    const items = watchAndCompute([channel, content, post, trigger], async () => {
-        //Get all content if the channel is set, otherwise return empty array
-        return channel.value ? await apiCall(contentApi.getAllContent) ?? [] : [];
-    }, []);
-
-    const selectedItem = computed<ContentMeta | undefined>(() => {
-        if (!isNil(channel.value) && content.value && content.value !== 'new') {
-            return find(items.value, c => isEqual(c.id, content.value));
-        }
-        return {} as ContentMeta;
-    })
-
-    const getSelectedPostContent = async (): Promise<string | undefined> => {
-        if (!isNil(channel.value) && post.value && post.value !== 'new') {
-            return await apiCall(() => contentApi.getPostContent({ id: post.value } as BlogEntity));
-        }
-        return '';
-    }
-
-    const createReactiveSearch = (sec: Ref<string>): Ref<ContentMeta[] | undefined> => {
-        return computed(() => {
-            return filter(items.value, c => includes(toLower(c.name), toLower(sec.value)) || includes(toLower(c.id), toLower(sec.value)));
-        })
-    }
-
-    const refresh = () => {
-        trigger.value++;
-    }
-
-    return {
-        ...contentApi,
-        items,
-        selectedItem,
-        getSelectedPostContent,
-        createReactiveSearch,
-        selectedId: content,
-        getQuery: context.getQuery,
-        refresh
-    };
-}
diff --git a/lib/admin/src/content/index.ts b/lib/admin/src/content/index.ts
index 802c002..d014136 100644
--- a/lib/admin/src/content/index.ts
+++ b/lib/admin/src/content/index.ts
@@ -13,5 +13,4 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-export * from './useContent'
-export * from './computedContent'
-\ No newline at end of file
+export * from './useContent'
+\ No newline at end of file
diff --git a/lib/admin/src/content/useContent.ts b/lib/admin/src/content/useContent.ts
index 47d27b8..f125b54 100644
--- a/lib/admin/src/content/useContent.ts
+++ b/lib/admin/src/content/useContent.ts
@@ -14,9 +14,11 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 import { includes, isArray, isEmpty, join, map } from 'lodash-es';
-import { WebMessage } from "@vnuge/vnlib.browser"
-import { AxiosRequestConfig } from 'axios';
-import { PostMeta, ContentMeta, ContentApi, BlogEntity, BlogAdminContext } from "../types.js";
+import { get } from '@vueuse/core';
+import { type WebMessage } from "@vnuge/vnlib.browser"
+import { type AxiosRequestConfig } from 'axios';
+import { type MaybeRef } from 'vue';
+import type { PostMeta, ContentMeta, ContentApi, BlogEntity, BlogAdminContext } from "../types";
 
 
 /**
@@ -25,15 +27,13 @@ import { PostMeta, ContentMeta, ContentApi, BlogEntity, BlogAdminContext } from
  * @param channel The channel to get the content for
  * @returns A content api object
  */
-export const useContent = (context : BlogAdminContext): ContentApi => {
+export const useContent = (context : BlogAdminContext, channel: MaybeRef<string>): ContentApi => {
     const axios = context.getAxios();
 
-    const { channel } = context.getQuery();
-
     const getUrl = (): string => {
         const url = context.getContentUrl();
         //Return the url with the channel id query
-        return `${url}?channel=${channel.value}`;
+        return `${url}?channel=${get(channel)}`;
     }
 
     const getContentType = (file: File): string => {
@@ -67,7 +67,7 @@ export const useContent = (context : BlogAdminContext): ContentApi => {
         return await _getContent(post.id);
     }
 
-    const getAllContent = async (): Promise<ContentMeta[]> => {
+    const getAllItems = async (): Promise<ContentMeta[]> => {
         const url = getUrl();
         const response = await axios.get<ContentMeta[]>(url);
         return response.data;
@@ -155,19 +155,26 @@ export const useContent = (context : BlogAdminContext): ContentApi => {
     }
 
     const getContent = async (id: string): Promise<ContentMeta | undefined> => {
-        const index = await getAllContent();
+        const index = await getAllItems();
         return index.find(x => x.id === id);
     }
 
+    const downloadContent = async (content: ContentMeta): Promise<Blob> => {
+        const url = getUrl();
+        const { data } = await axios.get(`${url}&id=${content.id}`, { responseType: 'blob' });
+        return data;
+    }
+
     return {
         getPostContent,
-        getAllContent,
-        deleteContent,
+        getAllItems,
+        delete:deleteContent,
         uploadContent,
         updateContentName,
         updatePostContent,
         updateContent,
         getPublicUrl,
-        getContent
+        getContent,
+        downloadContent,
     };
 }