Fix for base_url bug, refs #18 (#19)

datasette · Aug 18, 2023 · 252808a · 252808a
1 parent 0c0b72b
commit 252808a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/datasette_write_ui/__init__.py b/datasette_write_ui/__init__.py
@@ -17,10 +17,7 @@ def extra_template_vars(datasette, database, table):
     async def permission_allowed(actor, permission):
         return await datasette.permission_allowed(actor, permission, (database, table))
 
-    return {
-        "permission_allowed": permission_allowed,
-        "base_url": datasette.urls.instance()[:-1],
-    }
+    return {"permission_allowed": permission_allowed}
 
 
 def affinity_from_type(type):

diff --git a/datasette_write_ui/plugin-api.ts b/datasette_write_ui/plugin-api.ts
@@ -16,7 +16,7 @@ export async function editRowDetails(
   primaryKeys: string
 ): Promise<EditRowDetailsResponse> {
   return fetch(
-    `${BASE_URL}/-/datasette-write-ui/edit-row-details?${new URLSearchParams({
+    `${BASE_URL}-/datasette-write-ui/edit-row-details?${new URLSearchParams({
       db,
       table,
       primaryKeys,
@@ -36,7 +36,7 @@ export async function insertRowDetails(
   table: string
 ): Promise<InsertRowDetailsResponse> {
   return fetch(
-    `${BASE_URL}/-/datasette-write-ui/insert-row-details?${new URLSearchParams({
+    `${BASE_URL}-/datasette-write-ui/insert-row-details?${new URLSearchParams({
       db,
       table,
     })}`

diff --git a/datasette_write_ui/static/table.min.js b/datasette_write_ui/static/table.min.js
diff --git a/datasette_write_ui/write-api.ts b/datasette_write_ui/write-api.ts
@@ -15,7 +15,7 @@ export async function deleteRow(
   table: string,
   primaryKeys: string
 ) {
-  return fetch(`${BASE_URL}/${db}/${table}/${primaryKeys}/-/delete`, {
+  return fetch(`${BASE_URL}${db}/${table}/${primaryKeys}/-/delete`, {
     method: "POST",
     credentials: "include",
     headers: { "Content-Type": "application/json" },
@@ -29,7 +29,7 @@ export async function updateRow(
   primaryKeys: string,
   body: {}
 ) {
-  return fetch(`${BASE_URL}/${db}/${table}/${primaryKeys}/-/update`, {
+  return fetch(`${BASE_URL}${db}/${table}/${primaryKeys}/-/update`, {
     method: "POST",
     credentials: "include",
     headers: { "Content-Type": "application/json" },
@@ -43,7 +43,7 @@ export async function insertRow(
   table: string,
   row: { [key: string]: any }
 ) {
-  return fetch(`${BASE_URL}/${db}/${table}/-/insert`, {
+  return fetch(`${BASE_URL}${db}/${table}/-/insert`, {
     method: "POST",
     credentials: "include",
     headers: { "Content-Type": "application/json" },