Merge pull request #4988 from open-formulieren/issue/4978-empty-varia…

…ble-marked-as-geo Avoid empty variables being marked as geometry fields (objects API registration)
open-formulieren · Jan 6, 2025 · a425cc6 · a425cc6
2 parents 933bc44 + 0c3da88
commit a425cc6
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 2 deletions.
diff --git a/...orms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiSummaryHandler.js b/...orms/js/components/admin/form_design/registrations/objectsapi/ObjectsApiSummaryHandler.js
@@ -17,7 +17,7 @@ import {FormattedMessage} from 'react-intl';
 const ObjectsApiSummaryHandler = ({variable, backendOptions}) => {
   const geometryVariableKey = backendOptions.geometryVariableKey;
 
-  if (geometryVariableKey === variable.key) {
+  if (geometryVariableKey && geometryVariableKey === variable.key) {
     return (
       <FormattedMessage
         description="'Mapped to geometry' registration summary message"

diff --git a/...nents/admin/form_design/registrations/objectsapi/ObjectsApiVariableConfigurationEditor.js b/...nents/admin/form_design/registrations/objectsapi/ObjectsApiVariableConfigurationEditor.js
@@ -51,7 +51,7 @@ const ObjectsApiVariableConfigurationEditor = ({variable}) => {
 
   if (version !== 2) throw new Error('Not supported, must be config version 2.');
 
-  const isGeometry = geometryVariableKey === variable.key;
+  const isGeometry = geometryVariableKey && geometryVariableKey === variable.key;
 
   // get the index of our variable in the mapping, if it exists
   let index = variablesMapping.findIndex(

diff --git a/src/openforms/js/components/admin/form_design/variables/VariablesEditor.stories.js b/src/openforms/js/components/admin/form_design/variables/VariablesEditor.stories.js
@@ -284,6 +284,7 @@ export const WithObjectsAPIRegistrationBackends = {
               targetPath: ['other', 'path'],
             },
           ],
+          geometryVariableKey: '',
         },
       },
       {
@@ -301,6 +302,7 @@ export const WithObjectsAPIRegistrationBackends = {
               targetPath: ['path', 'to.the', 'target'],
             },
           ],
+          geometryVariableKey: '',
         },
       },
       {
@@ -375,6 +377,62 @@ export const WithObjectsAPIRegistrationBackends = {
   },
 };
 
+// gh-4978 regression for geometry field on empty variable
+export const EmptyUserDefinedVariableWithObjectsAPIRegistration = {
+  args: {
+    registrationBackends: [
+      {
+        backend: 'objects_api',
+        key: 'objects_api_1',
+        name: 'Example Objects API reg.',
+        options: {
+          version: 2,
+          objectsApiGroup: 1,
+          objecttype: '2c77babf-a967-4057-9969-0200320d23f1',
+          objecttypeVersion: 2,
+          variablesMapping: [
+            {
+              variableKey: 'formioComponent',
+              targetPath: ['path', 'to.the', 'target'],
+            },
+            {
+              variableKey: 'userDefined',
+              targetPath: ['other', 'path'],
+            },
+          ],
+          geometryVariableKey: '',
+        },
+      },
+    ],
+    variables: [
+      // add a variable as if the user clicked "add new user defined variable"
+      {
+        form: 'http://localhost:8000/api/v2/forms/36612390',
+        formDefinition: undefined,
+        name: '',
+        key: '',
+        source: 'user_defined',
+        prefillPlugin: '',
+        prefillAttribute: '',
+        prefillIdentifierRole: 'main',
+        dataType: 'string',
+        dataFormat: undefined,
+        isSensitiveData: false,
+        serviceFetchConfiguration: undefined,
+        initialValue: '',
+        prefillOptions: {},
+      },
+    ],
+  },
+  play: async ({canvasElement}) => {
+    const canvas = within(canvasElement);
+
+    const userDefinedVarsTab = canvas.getByRole('tab', {name: 'Gebruikersvariabelen'});
+    await userEvent.click(userDefinedVarsTab);
+    expect(canvas.queryAllByText('record.geometry')).toHaveLength(0);
+  },
+};
+
 export const FilesMappingAndObjectAPIRegistration = {
   args: {
     registrationBackends: [