phono-server/src/routes/relations_single/mod.rs

@@ -17,7 +17,6 @@ mod set_filter_handler;
 mod settings_handler;
 mod update_field_handler;
 mod update_field_ordinality_handler;
-mod update_field_table_width_px_handler;
 mod update_portal_name_handler;
 mod update_rel_name_handler;
 mod update_values_handler;
@@ -50,10 +49,6 @@ pub(super) fn new_router() -> Router<App> {
             "/p/{portal_id}/update-field-ordinality",
             post(update_field_ordinality_handler::post),
         )
-        .route(
-            "/p/{portal_id}/update-field-table-width-px",
-            post(update_field_table_width_px_handler::post),
-        )
         .route("/p/{portal_id}/insert", post(insert_handler::post))
         .route(
             "/p/{portal_id}/update-values",

phono-server/src/routes/relations_single/update_field_ordinality_handler.rs

@@ -1,12 +1,5 @@
-use axum::{
+use axum::{debug_handler, extract::Path, response::Response};
-    debug_handler,
+use phono_models::field::Field;
-    extract::{Path, State},
-    response::Response,
-};
-use phono_models::{
-    accessors::{Accessor as _, Actor, portal::PortalAccessor},
-    field::Field,
-};
 use serde::Deserialize;
 use sqlx::postgres::types::Oid;
 use uuid::Uuid;
@@ -18,7 +11,6 @@ use crate::{
     extractors::ValidatedForm,
     navigator::{Navigator, NavigatorPage},
     user::CurrentUser,
-    workspace_pooler::{RoleAssignment, WorkspacePooler},
 };
 
 #[derive(Debug, Deserialize)]
@@ -44,9 +36,8 @@ pub(super) struct FormBody {
 /// [`PathParams`].
 #[debug_handler(state = crate::app::App)]
 pub(super) async fn post(
-    State(mut pooler): State<WorkspacePooler>,
     AppDbConn(mut app_db): AppDbConn,
-    CurrentUser(user): CurrentUser,
+    CurrentUser(_user): CurrentUser,
     navigator: Navigator,
     Path(PathParams {
         portal_id,
@@ -60,23 +51,11 @@ pub(super) async fn post(
 ) -> Result<Response, AppError> {
     // FIXME CSRF
 
-    let mut workspace_client = pooler
+    // FIXME ensure workspace corresponds to rel/portal, and that user has
-        .acquire_for(workspace_id, RoleAssignment::User(user.id))
+    // permission to access/alter both as needed.
-        .await?;
-
-    let portal = PortalAccessor::new()
-        .id(portal_id)
-        .as_actor(Actor::User(user.id))
-        .verify_workspace_id(workspace_id)
-        .verify_rel_oid(Oid(rel_oid))
-        .verify_rel_ownership()
-        .using_app_db(&mut app_db)
-        .using_workspace_client(&mut workspace_client)
-        .fetch_one()
-        .await?;
 
     // Ensure field exists and belongs to portal.
-    Field::belonging_to_portal(portal.id)
+    Field::belonging_to_portal(portal_id)
         .with_id(field_id)
         .fetch_one(&mut app_db)
         .await?;
@@ -88,12 +67,11 @@ pub(super) async fn post(
         .execute(&mut app_db)
         .await?;
 
-    // TODO: Redirect with subfilter query intact.
     Ok(navigator
         .portal_page()
         .workspace_id(workspace_id)
         .rel_oid(Oid(rel_oid))
-        .portal_id(portal.id)
+        .portal_id(portal_id)
         .build()?
         .redirect_to())
 }

phono-server/src/routes/relations_single/update_field_table_width_px_handler.rs

@@ -1,95 +0,0 @@
-use axum::{
-    Json, debug_handler,
-    extract::{Path, State},
-    response::{IntoResponse as _, Response},
-};
-use phono_models::{
-    accessors::{Accessor as _, Actor, portal::PortalAccessor},
-    field::Field,
-};
-use serde::Deserialize;
-use serde_json::json;
-use sqlx::postgres::types::Oid;
-use uuid::Uuid;
-use validator::Validate;
-
-use crate::{
-    app::AppDbConn,
-    errors::AppError,
-    extractors::ValidatedForm,
-    user::CurrentUser,
-    workspace_pooler::{RoleAssignment, WorkspacePooler},
-};
-
-#[derive(Debug, Deserialize)]
-pub(super) struct PathParams {
-    portal_id: Uuid,
-    rel_oid: u32,
-    workspace_id: Uuid,
-}
-
-#[derive(Debug, Deserialize, Validate)]
-pub(super) struct FormBody {
-    field_id: Uuid,
-    #[validate(range(min = 160, max = 800))]
-    table_width_px: u16,
-}
-
-/// HTTP POST handler for updating the display width of a [`Field`] in the table
-/// view. This is distinct from `./update-field`, because it is initiated in the
-/// UI by a "drag" interaction. It may make sense to fold this into the
-/// aforementioned endpoint later, if it is modified to handle partial updates.
-///
-/// This handler expects 3 path parameters with the structure described by
-/// [`PathParams`].
-///
-/// Note that unlike [`super::update_field_ordinality_handler::post`], this
-/// endpoint expects to be called asynchronously and thus returns an HTTP 200
-/// response instead of a redirect.
-#[debug_handler(state = crate::app::App)]
-pub(super) async fn post(
-    State(mut pooler): State<WorkspacePooler>,
-    AppDbConn(mut app_db): AppDbConn,
-    CurrentUser(user): CurrentUser,
-    Path(PathParams {
-        portal_id,
-        rel_oid,
-        workspace_id,
-    }): Path<PathParams>,
-    ValidatedForm(FormBody {
-        field_id,
-        table_width_px,
-    }): ValidatedForm<FormBody>,
-) -> Result<Response, AppError> {
-    // FIXME CSRF
-
-    let mut workspace_client = pooler
-        .acquire_for(workspace_id, RoleAssignment::User(user.id))
-        .await?;
-
-    let portal = PortalAccessor::new()
-        .id(portal_id)
-        .as_actor(Actor::User(user.id))
-        .verify_workspace_id(workspace_id)
-        .verify_rel_oid(Oid(rel_oid))
-        .verify_rel_ownership()
-        .using_app_db(&mut app_db)
-        .using_workspace_client(&mut workspace_client)
-        .fetch_one()
-        .await?;
-
-    // Ensure field exists and belongs to portal.
-    Field::belonging_to_portal(portal.id)
-        .with_id(field_id)
-        .fetch_one(&mut app_db)
-        .await?;
-
-    Field::update()
-        .id(field_id)
-        .table_width_px(table_width_px.into())
-        .build()?
-        .execute(&mut app_db)
-        .await?;
-
-    Ok(Json(json!({ "ok": true })).into_response())
-}

static/portal-table.css

@@ -57,27 +57,16 @@
 .field-adder__header-lookalike {
   align-items: center;
   background: #0001;
-  border-bottom: solid 1px var(--table-header-border-color);
+  border: solid 1px var(--table-header-border-color);
-  cursor: grab;
+  border-top: none;
+  border-left: none;
   display: flex;
   flex: none;
   font-family: var(--default-font-family--data);
   height: 100%;
   justify-content: space-between;
-  padding: 4px;
+  padding: 0.25rem;
-  padding-left: 8px;
-  padding-right: 0;
   text-align: left;
-  width: calc(var(--column-width) - 8px);
-
-  &:first-child {
-    padding-left: 12px;
-    width: calc(var(--column-width) - 4px);
-  }
-}
-
-.field-adder__header-lookalike {
-  border-right: solid 1px var(--table-header-border-color);
 }
 
 .field-header .basic-dropdown__button {
@@ -89,7 +78,7 @@
 
 .field-header__label {
   overflow: hidden;
-  padding: 4px 0;
+  padding: 4px;
   text-overflow: ellipsis;
   white-space: nowrap;
 }
@@ -115,25 +104,6 @@
   position: absolute;
 }
 
-.field-resize-handle {
-  background: #0001;
-  border-bottom: solid 1px var(--table-header-border-color);
-  cursor: col-resize;
-  height: 100%;
-  width: 8px;
-
-  .field-resize-handle__v-border {
-    border-left: solid 1px var(--table-header-border-color);
-    height: 100%;
-    margin-left: 3px;
-    width: 1px;
-  }
-
-  &:nth-last-child(1 of .field-resize-handle) {
-    width: 4px;
-  }
-}
-
 /* ======== Component: Field Adder ======== */
 
 .field-adder {

svelte/src/field-header.svelte

@@ -3,9 +3,6 @@
   import { type FieldInfo } from "./field.svelte";
   import FieldDetails from "./field-details.svelte";
 
-  const MAX_COL_WIDTH_PX = 800;
-  const MIN_COL_WIDTH_PX = 160;
-
   type Props = {
     field: FieldInfo;
     index: number;
@@ -14,7 +11,6 @@
     ondragover?(ev: DragEvent): unknown;
     ondragstart?(ev: DragEvent): unknown;
     ondrop?(ev: DragEvent): unknown;
-    onresize?(width_px: number): unknown;
   };
 
   let {
@@ -25,7 +21,6 @@
     ondragover,
     ondragstart,
     ondrop,
-    onresize,
   }: Props = $props();
 
   const original_label_value = field.field.table_label;
@@ -35,7 +30,6 @@
   let field_config_dialog_element = $state<HTMLDialogElement | undefined>();
   let name_value = $state(field.field.name);
   let label_value = $state(field.field.table_label ?? "");
-  let resize_drag_x_start = $state<number | undefined>();
 
   $effect(() => {
     field.field.table_label = label_value === "" ? undefined : label_value;
@@ -52,7 +46,7 @@
   {ondragstart}
   {ondrop}
   role="columnheader"
-  style:--column-width={`${field.field.table_width_px}px`}
+  style:width={`${field.field.table_width_px}px`}
   tabindex={0}
 >
   <div class="field-header__label">
@@ -106,33 +100,6 @@
     </menu>
   </BasicDropdown>
 </div>
-<div
-  class="field-resize-handle"
-  draggable={true}
-  ondragstart={(ev) => {
-    resize_drag_x_start = ev.layerX;
-  }}
-  ondragend={(ev) => {
-    if (resize_drag_x_start !== undefined) {
-      onresize?.(
-        Math.min(
-          MAX_COL_WIDTH_PX,
-          Math.max(
-            MIN_COL_WIDTH_PX,
-            field.field.table_width_px + ev.layerX - resize_drag_x_start,
-          ),
-        ),
-      );
-      resize_drag_x_start = undefined;
-    }
-  }}
-  role="separator"
-  aria-valuenow={field.field.table_width_px}
-  aria-valuemin={MIN_COL_WIDTH_PX}
-  aria-valuemax={MAX_COL_WIDTH_PX}
->
-  <div class="field-resize-handle__v-border"></div>
-</div>
 
 <dialog bind:this={remove_field_dialog_element} class="dialog">
   <form method="post" action="remove-field">

svelte/src/table-viewer.webc.svelte

@@ -171,22 +171,6 @@
     form.submit();
   }
 
-  function update_field_table_width_px(
-    field_index: number,
-    new_width_px: number,
-  ) {
-    if (lazy_data?.fields[field_index]) {
-      lazy_data.fields[field_index].field.table_width_px = new_width_px;
-      fetch("update-field-table-width-px", {
-        method: "post",
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded",
-        },
-        body: `field_id=${encodeURIComponent(lazy_data.fields[field_index].field.id)}&table_width_px=${new_width_px}`,
-      }).catch(console.error);
-    }
-  }
-
   // -------- Updates and Effects -------- //
 
   function set_selections(arr: Coords[]) {
@@ -651,9 +635,6 @@
                 });
               }
             }}
-            onresize={(new_width_px) => {
-              update_field_table_width_px(field_index, new_width_px);
-            }}
           />
         {/each}
         <div class="table-viewer__header-actions">