Merge branch 'develop' of https://github.com/mathesar-foundation/mathesar into simplify-install

Author: pavish

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

@@ -412,6 +412,11 @@ export class RecordsData {
 
     forEachRow((blueprint) => {
       if (blueprint.row.record[pkColumn.id] === undefined) {
+        if (isDraftRecordRow(blueprint.row)) {
+          throw new Error(
+            'Pasting data into a selection that contains unsaved rows is not yet supported. Please open an issue if you need this feature.',
+          );
+        }
         throw new Error(
           'Unable to update record for a row with a missing primary key value',
         );
@@ -448,39 +453,39 @@ export class RecordsData {
       ),
     );
 
-    // TODO: Fix bug - Update this for new record rows as well
-    this.fetchedRecordRows.update((rows) =>
-      rows.map((row) => {
-        const responseMapValue = responseMap.get(row.identifier);
-        if (!responseMapValue) return row;
-        const { blueprint, response } = responseMapValue;
-        if (response.status === 'error') {
-          // NOTE: this is a bit weird and could potentially be improved. If we
-          // were unable to save the record we need to indicate to the user that
-          // all target cells in the record have failed to update. The code
-          // below is a rather crude way of doing this. If one cells caused the
-          // whole record to fail, then the error message will be repeated for
-          // each cell in the record. We could potentially improve on this by
-          // using our `extractDetailedFieldBasedErrors` utility. But we'd still
-          // need to figure how to show some kind of errors in other cells.
-          blueprint.cells.forEach((cell) => {
-            const cellKey = getCellKey(row.identifier, cell.columnId);
-            return cellStatus.set(cellKey, {
-              state: 'failure',
-              errors: [response],
-            });
-          });
-          return row;
-        }
-        const result = first(response.value.results);
-        if (!result) return row;
+    function mutateRow<R extends RecordRow>(row: R): R {
+      const responseMapValue = responseMap.get(row.identifier);
+      if (!responseMapValue) return row;
+      const { blueprint, response } = responseMapValue;
+      if (response.status === 'error') {
+        // NOTE: this is a bit weird and could potentially be improved. If we
+        // were unable to save the record we need to indicate to the user that
+        // all target cells in the record have failed to update. The code
+        // below is a rather crude way of doing this. If one cells caused the
+        // whole record to fail, then the error message will be repeated for
+        // each cell in the record. We could potentially improve on this by
+        // using our `extractDetailedFieldBasedErrors` utility. But we'd still
+        // need to figure how to show some kind of errors in other cells.
         blueprint.cells.forEach((cell) => {
           const cellKey = getCellKey(row.identifier, cell.columnId);
-          return cellStatus.set(cellKey, { state: 'success' });
+          return cellStatus.set(cellKey, {
+            state: 'failure',
+            errors: [response],
+          });
         });
-        return row.withRecord(result);
-      }),
-    );
+        return row;
+      }
+      const result = first(response.value.results);
+      if (!result) return row;
+      blueprint.cells.forEach((cell) => {
+        const cellKey = getCellKey(row.identifier, cell.columnId);
+        return cellStatus.set(cellKey, { state: 'success' });
+      });
+      return row.withRecord(result) as R;
+    }
+
+    this.fetchedRecordRows.update((rows) => rows.map(mutateRow));
+    this.newRecords.update((rows) => rows.map(mutateRow));
 
     let newRecordSummaries: RecordSummariesForSheet = new ImmutableMap();
     for (const response of responses) {

mathesar_ui/src/systems/table-view/TableView.svelte

@@ -52,8 +52,10 @@
       getRecordSummaries: () => get(recordsData.linkedRecordSummaries),
     },
     pastingContext: {
-      // TODO: pasting context should also take new records into account
-      getRecordRows: () => get(recordsData.fetchedRecordRows),
+      getRecordRows: () => [
+        ...get(recordsData.fetchedRecordRows),
+        ...get(recordsData.newRecords),
+      ],
       getSheetColumns: () => [
         ...map(({ column }) => column, get(processedColumns).values()),
       ],