Merge branch 'develop' into alter_col_refactor

Author: mathemancer

DEVELOPER_GUIDE.md

@@ -10,7 +10,7 @@ Mathesar is built using:
 - [Python](https://www.python.org/) for the backend
 - [Django](https://www.djangoproject.com/) for the web application
 - [SQLAlchemy](https://www.sqlalchemy.org/) to talk to the database
-- [Django REST Framework](https://www.django-rest-framework.org/) for the API 
+- [Django REST Framework](https://www.django-rest-framework.org/) for the API
 - [Svelte](https://svelte.dev/) and [TypeScript](https://www.typescriptlang.org/) for the frontend
 
 ## Local development setup
@@ -77,7 +77,7 @@ We use [pytest](https://docs.pytest.org) for our backend tests.
     ```
     docker exec mathesar_service_dev pytest -k "test_name"
     ```
-    
+
 - See the [pytest documentation](https://docs.pytest.org/en/latest/how-to/usage.html), or run pytest with the `--help` flag to learn about more options for running tests.
 
 - Run all SQL tests:
@@ -183,7 +183,7 @@ Django uses gettext, which require the `.po` files to be compiled into a more ef
 ## Translation process
 
 - We use [Transifex](https://app.transifex.com/mathesar/mathesar/dashboard/) for managing our translation process.
-- You'll need to be a member of the Mathesar organization in Transifex, inorder to work with translations. Please reach out to us for information on how to join. 
+- You'll need to be a member of the Mathesar organization in Transifex, inorder to work with translations. Please reach out to us for information on how to join.
 
 ### For Translators
 
@@ -241,12 +241,34 @@ If you'd like to manually push or pull translations, follow the instructions in
     ```
     docker exec -it mathesar_dev_db psql -U mathesar
     ```
- 
+
+## Working with file attachments
+
+Mathesar has a feature which allows users to upload files through the UI and store references to those file in data. Uploaded files are stored in an S3-compatible storage provider.
+
+To work with this feature in your local development environment, you'll need to take some extra steps to enable it:
+
+1. Copy `file_storage.yml.example` to `file_storage.yml`.
+
+1. Restart docker with the following command
+
+    ```
+    docker compose -f docker-compose.dev.yml up dev-service obj-store
+    ```
+
+    Notice that we start the `obj-store` service too, in addition to the normal `dev-service`.
+
+1. Log in to the file storage backend UI at http://localhost:9001 with `mathesar`/`mathesar`. Create a new storage bucket in the UI called "mathesar-storages".
+
+At this point you can run Mathesar and create new "File" columns in tables. Those columns will present a UI that allows you to attach files to table cells.
+
+With the `obj-store` service running, you can return to http://localhost:9001 to view and manage your uploaded files.
+
 ## Troubleshooting
 
 ### Permissions within Windows
 
-- Running Script in powershell is disabled by default in windows , you have to change permission to run scripts  [Official Docs ](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy?view=powershell-7.2) 
+- Running Script in powershell is disabled by default in windows , you have to change permission to run scripts  [Official Docs ](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy?view=powershell-7.2)
 
 ### Fixing line endings on Windows
 

mathesar_ui/src/i18n/languages/en/dict.json

@@ -165,7 +165,7 @@
   "create_table_move_columns": "Create Table and Move Columns",
   "currently_installed": "Currently Installed",
   "custom": "Custom",
-  "custom_database_nickname_label_help": "Selecting this option can help you differentiate between multiple databases with the name name on separate PostgreSQL severs. You can modify this later if needed.",
+  "custom_database_nickname_label_help": "Selecting this option can help you differentiate between multiple databases with the same name on separate PostgreSQL servers. You can modify this later if needed.",
   "custom_default": "Custom Default",
   "custom_fields": "Custom Fields",
   "customization": "Customization",

mathesar_ui/src/stores/table-data/meta.ts

@@ -92,9 +92,15 @@ function serializeMetaProps(p: MetaProps): string {
   return Url64.encode(JSON.stringify(makeTerseMetaProps(p)));
 }
 
-/** @throws Error if string is not properly formatted. */
-function deserializeMetaProps(s: string): MetaProps {
-  return makeMetaProps(JSON.parse(Url64.decode(s)) as TerseMetaProps);
+function deserializeMetaProps(s: string): MetaProps | undefined {
+  // NOTE: it would be good to someday validate the serialized meta props in a
+  // more robust manner.
+  if (!s) return undefined;
+  try {
+    return makeMetaProps(JSON.parse(Url64.decode(s)) as TerseMetaProps);
+  } catch {
+    return undefined;
+  }
 }
 
 const defaultMetaPropsSerialization = serializeMetaProps(getFullMetaProps());
@@ -281,12 +287,8 @@ export class Meta {
     this.cellModificationStatus.clear();
   }
 
-  static fromSerialization(s: string): Meta | undefined {
-    try {
-      return new Meta(deserializeMetaProps(s));
-    } catch (e) {
-      return undefined;
-    }
+  static fromSerialization(s: string): Meta {
+    return new Meta(deserializeMetaProps(s));
   }
 
   destroy(): void {

mathesar_ui/src/stores/table-data/records.ts

@@ -557,7 +557,10 @@ export class RecordsData {
       if (isDraftRecordRow(row)) {
         return api.records.add({
           ...this.apiContext,
-          record_def: recordDef,
+          record_def: {
+            ...Object.fromEntries(this.contextualFilters),
+            ...recordDef,
+          },
         });
       }
       return api.records.patch({