From 0f522a25bb11bcd2e8871e8779ccc1ff8d2b3cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Pardou?= <571533+jrmi@users.noreply.github.com> Date: Thu, 20 Nov 2025 09:33:01 +0100 Subject: [PATCH 1/3] Fix bad merge allowed by github!!!! (#4304) --- .../contrib/integrations/local_baserow/service_types.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/baserow/contrib/integrations/local_baserow/service_types.py b/backend/src/baserow/contrib/integrations/local_baserow/service_types.py index a0d0fe8522..ee6b1bb43c 100644 --- a/backend/src/baserow/contrib/integrations/local_baserow/service_types.py +++ b/backend/src/baserow/contrib/integrations/local_baserow/service_types.py @@ -2327,12 +2327,12 @@ def get_data(): local_model, RowSerializer, is_response=True, user_field_names=True ) - return { + data_to_process = { "results": serializer(rows, many=True).data, "has_next_page": False, } - data_to_process = self._prepare_result(table.get_model(), data_to_process) + return self._prepare_result(local_model, data_to_process) self._process_event( self.model_class.objects.filter(table=table), From d01cd849f64337efef558124a1f3990541601977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Pardou?= <571533+jrmi@users.noreply.github.com> Date: Thu, 20 Nov 2025 14:06:40 +0100 Subject: [PATCH 2/3] Workflow action perf issues for create/update action with many fields (#4302) * improve performances for workflow automations * Improve performances of local baserow upsert form * Revert to the old placeholder string. --------- Co-authored-by: peter_baserow --- backend/src/baserow/core/populate.py | 5 + ...en_editing_a_createupdate_workflow_ac.json | 9 ++ .../local_baserow/local_baserow_form.scss | 8 + .../modules/core/components/InViewport.vue | 32 ++++ .../components/services/FieldMapping.vue | 32 ---- .../services/FieldMappingContext.vue | 14 +- .../components/services/FieldMappingForm.vue | 149 ++++++++---------- .../components/services/FieldMappingsForm.vue | 91 +++++++++++ .../LocalBaserowUpsertRowServiceForm.vue | 12 +- 9 files changed, 227 insertions(+), 125 deletions(-) create mode 100644 changelog/entries/unreleased/bug/improve_performances_when_editing_a_createupdate_workflow_ac.json create mode 100644 web-frontend/modules/core/components/InViewport.vue delete mode 100644 web-frontend/modules/integrations/localBaserow/components/services/FieldMapping.vue create mode 100644 web-frontend/modules/integrations/localBaserow/components/services/FieldMappingsForm.vue diff --git a/backend/src/baserow/core/populate.py b/backend/src/baserow/core/populate.py index 00e878cf4f..c26eb2f339 100644 --- a/backend/src/baserow/core/populate.py +++ b/backend/src/baserow/core/populate.py @@ -14,6 +14,11 @@ def load_test_data(): print("Add basic users...") user_handler = UserHandler() + # Allow to import any external archive + core_settings = CoreHandler().get_settings() + core_settings.verify_import_signature = False + core_settings.save() + for i in range(3): # Create main admin email = f"admin{i + 1}@baserow.io" if i > 0 else "admin@baserow.io" diff --git a/changelog/entries/unreleased/bug/improve_performances_when_editing_a_createupdate_workflow_ac.json b/changelog/entries/unreleased/bug/improve_performances_when_editing_a_createupdate_workflow_ac.json new file mode 100644 index 0000000000..d56a87ca50 --- /dev/null +++ b/changelog/entries/unreleased/bug/improve_performances_when_editing_a_createupdate_workflow_ac.json @@ -0,0 +1,9 @@ +{ + "type": "bug", + "message": "Improve performances when editing a create/update workflow action with a lot of table fields", + "issue_origin": "github", + "issue_number": null, + "domain": "builder", + "bullet_points": [], + "created_at": "2025-11-20" +} \ No newline at end of file diff --git a/web-frontend/modules/core/assets/scss/components/integrations/local_baserow/local_baserow_form.scss b/web-frontend/modules/core/assets/scss/components/integrations/local_baserow/local_baserow_form.scss index 8b1dd3d510..3f2aa63b50 100644 --- a/web-frontend/modules/core/assets/scss/components/integrations/local_baserow/local_baserow_form.scss +++ b/web-frontend/modules/core/assets/scss/components/integrations/local_baserow/local_baserow_form.scss @@ -8,3 +8,11 @@ flex: 1 0 auto; } } + +.field-mapping-form__placeholder { + width: 100%; + height: 36px; + background-color: $white; + + @include rounded($rounded-md); +} diff --git a/web-frontend/modules/core/components/InViewport.vue b/web-frontend/modules/core/components/InViewport.vue new file mode 100644 index 0000000000..e9a88c60d9 --- /dev/null +++ b/web-frontend/modules/core/components/InViewport.vue @@ -0,0 +1,32 @@ + + + diff --git a/web-frontend/modules/integrations/localBaserow/components/services/FieldMapping.vue b/web-frontend/modules/integrations/localBaserow/components/services/FieldMapping.vue deleted file mode 100644 index 442a793528..0000000000 --- a/web-frontend/modules/integrations/localBaserow/components/services/FieldMapping.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/web-frontend/modules/integrations/localBaserow/components/services/FieldMappingContext.vue b/web-frontend/modules/integrations/localBaserow/components/services/FieldMappingContext.vue index d503dfb620..09e3da9e2b 100644 --- a/web-frontend/modules/integrations/localBaserow/components/services/FieldMappingContext.vue +++ b/web-frontend/modules/integrations/localBaserow/components/services/FieldMappingContext.vue @@ -2,12 +2,7 @@