muffin-admin 3.16.0 → 3.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muffin-admin",
-  "version": "3.16.0",
+  "version": "3.17.1",
   "description": "NPM package for https://github.com/klen/muffin-admin",
   "files": [
     "src",

package/src/MuffinResourceList.tsx

@@ -78,14 +78,15 @@ function MuffinListToolbar() {
     list: { create },
   } = useMuffinResourceOpts()
   const actions = baseActions.filter((a) => a.view?.includes("list"))
+  const hasExport = actions.some((a) => a.id === "export")
   return (
     <TopToolbar>
       {help && <HelpLink href={help} />}
       <SelectColumnsButton />
       <FilterButton />
-      {actions.length ? actions.map((props) => <ActionButton key={props.id} {...props} />) : null}
       {create && <CreateButton />}
-      <ExportButton />
+      {actions.length ? actions.map((props) => <ActionButton key={props.id} {...props} />) : null}
+      {!hasExport && <ExportButton />}
     </TopToolbar>
   )
 }

package/src/authprovider.ts

@@ -71,6 +71,8 @@ export function MuffinAuthProvider(props: AdminOpts["auth"]) {
         return user
       },
 
+      getAuthorization: () => authGet(storageName),
+
       logout: async () => {
         // Clean storage
         authSet(storageName, "")

package/src/buttons/ActionButton.tsx

@@ -2,7 +2,6 @@ import {
   Button,
   FormGroupsProvider,
   useAugmentedForm,
-  useDataProvider,
   useListContext,
   useRecordContext,
   useResourceContext,
@@ -15,9 +14,10 @@ import { useState } from "react"
 import { buildRA } from "../buildRA"
 import { AdminModal, PayloadButtons, useConfirmation } from "../common"
 import { HelpLink } from "../common/HelpLink"
+import { useMuffinAdminOpts } from "../hooks"
 import { useAction } from "../hooks/useAction"
 import { AdminAction, AdminPayloadProps } from "../types"
-import { buildIcon, findBuilder } from "../utils"
+import { buildIcon, findBuilder, requestHeaders } from "../utils"
 
 export type ActionPayloadProps = {
   active: boolean
@@ -31,18 +31,17 @@ export function ActionButton({ paths, confirm, file, ...props }: AdminAction) {
   const confirmation = useConfirmation()
   const path = paths.find((p) => p.includes("{id}")) || paths[paths.length - 1]
   const { mutate, isPending } = useAction(path)
-  const dataprovider = useDataProvider()
+  const { apiUrl } = useMuffinAdminOpts()
 
   if (file) {
+    let url = `${apiUrl}${path}`
+    if (record) url.replace("{id}", record.id as string)
+
+    const authorization = requestHeaders["Authorization"]
+    if (authorization) url += `?t=${authorization}`
+
     return (
-      <Button
-        component={Link}
-        label={props.label}
-        onClick={(e) => {
-          e.stopPropagation()
-          dataprovider.downloadFile(path)
-        }}
-      >
+      <Button href={url} label={props.label} component={Link} target="_blank">
         {buildIcon(props.icon)}
       </Button>
     )

package/src/dataprovider.ts

@@ -1,4 +1,4 @@
-import { APIParams, makeRequest, requestHeaders, setupAdmin } from "./utils"
+import { APIParams, makeRequest, setupAdmin } from "./utils"
 
 export function MuffinDataprovider(apiUrl: string) {
   async function request(url: string, options?: APIParams) {
@@ -87,23 +87,6 @@ export function MuffinDataprovider(apiUrl: string) {
       })
       return { data: json }
     },
-
-    downloadFile: async (path: string) => {
-      path = path.replace(/^\/+/, "")
-      const response = await fetch(`${apiUrl}/${path}`, {
-        headers: requestHeaders,
-      })
-      const url = window.URL.createObjectURL(await response.blob())
-      const link = document.createElement("a")
-      link.href = url
-      const filename =
-        response.headers.get("content-disposition")?.split("filename=")[1] || path.split("/").pop()
-      link.setAttribute("download", filename)
-      if (filename) link.setAttribute("download", filename)
-      link.click()
-      // no need to append link as child to body.
-      setTimeout(() => window.URL.revokeObjectURL(url), 0) // this is important too, otherwise we will be unnecessarily spiking memory!
-    },
   }
   return methods
 }