From c3546c5d3ca6b05d6fcdedb768c256f6d44d146d Mon Sep 17 00:00:00 2001
From: Matt Carroll <matt.carroll139@gmail.com>
Date: Mon, 31 Mar 2025 12:03:13 +1100
Subject: [PATCH] OB-2457 # Removed checkIsFormElementSupported property from
 ResourceDefinition type

---
 CHANGELOG.md                      |  4 ++--
 src/freshdeskService.ts           |  9 ---------
 src/sharepointService.ts          | 21 ---------------------
 src/types/resource-definitions.ts | 27 ++++++++++++---------------
 tests/freshdesk.test.ts           |  2 --
 tests/sharepointService.test.ts   |  1 -
 6 files changed, 14 insertions(+), 50 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eff6cdaa..8f8eca0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
-### Changed
+### Removed
 
-- **[BREAKING]** input parameters to `ResourceDefinition['checkIsFormElementSupported']` function.
+- **[BREAKING]** `ResourceDefinition['checkIsFormElementSupported']` property
 
 ## [7.4.0] - 2025-03-11
 
diff --git a/src/freshdeskService.ts b/src/freshdeskService.ts
index 81b4aa39..89fef518 100644
--- a/src/freshdeskService.ts
+++ b/src/freshdeskService.ts
@@ -106,15 +106,6 @@ export function generateFreshdeskTicketFieldDefinitions(
           type: 'CHOICE_SINGLE',
           ...baseField,
           choices: freshdeskField.options,
-          checkIsFormElementSupported(formElementWithOptions) {
-            if (freshdeskField.type === 'nested_field') {
-              return false
-            }
-
-            return (
-              formElementWithOptions.freshdeskFieldName === freshdeskField.name
-            )
-          },
         })
       } else if (
         freshdeskField.type === 'nested_field' &&
diff --git a/src/sharepointService.ts b/src/sharepointService.ts
index 4863f103..6ef85843 100644
--- a/src/sharepointService.ts
+++ b/src/sharepointService.ts
@@ -44,27 +44,6 @@ export function generateSharepointColumnResourceDefinitions(
               label: choice,
               value: choice,
             })),
-            checkIsFormElementSupported(
-              formElementWithOptions,
-              { formsAppEnvironmentId, formElementOptionsSets },
-            ) {
-              const formElementOptionsSetId =
-                formElementWithOptions.dynamicOptionSetId
-              return (
-                !!formElementOptionsSetId &&
-                formElementWithOptions.optionsType === 'DYNAMIC' &&
-                formElementOptionsSets.some((formElementOptionsSet) => {
-                  return (
-                    formElementOptionsSet.type === 'SHAREPOINT_LIST_COLUMN' &&
-                    formElementOptionsSet.environments.some(
-                      (env) =>
-                        env.formsAppEnvironmentId === formsAppEnvironmentId &&
-                        env.sharepointColumn.id === columnDefinition.id,
-                    )
-                  )
-                })
-              )
-            },
           })
         } else if (columnDefinition.dateTime?.format === 'dateOnly') {
           memo.push({
diff --git a/src/types/resource-definitions.ts b/src/types/resource-definitions.ts
index 55bf5cba..b68650bd 100644
--- a/src/types/resource-definitions.ts
+++ b/src/types/resource-definitions.ts
@@ -1,15 +1,22 @@
-import { FormTypes } from '@oneblink/types'
-
 export type ResourceDefinitionChoice = {
   value: string | number
   label: string
 }
 
-export type ResourceDefinition<T> = T & {
+type ResourceDefinitionBase = {
   id: string
   isRequired: boolean
   displayName: string
-} & (
+}
+
+export interface ResourceDefinitionWithChoices {
+  type: 'CHOICE_SINGLE' | 'CHOICE_MULTIPLE'
+  choices: ResourceDefinitionChoice[]
+}
+
+export type ResourceDefinition<T> = T &
+  ResourceDefinitionBase &
+  (
     | {
         type:
           | 'TEXT_SINGLE_LINE'
@@ -20,15 +27,5 @@ export type ResourceDefinition<T> = T & {
           | 'NUMBER'
           | 'BOOLEAN'
       }
-    | {
-        type: 'CHOICE_SINGLE' | 'CHOICE_MULTIPLE'
-        choices: ResourceDefinitionChoice[]
-        checkIsFormElementSupported: (
-          formElementWithOptions: FormTypes.FormElementWithOptions,
-          options: {
-            formElementOptionsSets: FormTypes.FormElementOptionSet[]
-            formsAppEnvironmentId: number
-          },
-        ) => boolean
-      }
+    | ResourceDefinitionWithChoices
   )
diff --git a/tests/freshdesk.test.ts b/tests/freshdesk.test.ts
index edf3542a..4934a02c 100644
--- a/tests/freshdesk.test.ts
+++ b/tests/freshdesk.test.ts
@@ -71,7 +71,6 @@ describe('generateFreshdeskTicketFieldDefinitions', () => {
     ]
     expect(generateFreshdeskTicketFieldDefinitions(fields)).toEqual([
       {
-        checkIsFormElementSupported: expect.any(Function),
         choices: [
           {
             label: 'option 1',
@@ -259,7 +258,6 @@ describe('generateFreshdeskTicketFieldDefinitions', () => {
     ]
     expect(generateFreshdeskTicketFieldDefinitions(fields)).toEqual([
       {
-        checkIsFormElementSupported: expect.any(Function),
         choices: [
           {
             label: 'value 1',
diff --git a/tests/sharepointService.test.ts b/tests/sharepointService.test.ts
index 6fc02a3b..57936f8f 100644
--- a/tests/sharepointService.test.ts
+++ b/tests/sharepointService.test.ts
@@ -80,7 +80,6 @@ describe('generateSharepointColumnResourceDefinitions', () => {
           { label: 'A', value: 'A' },
           { label: 'B', value: 'B' },
         ],
-        checkIsFormElementSupported: expect.any(Function),
       },
     ])
   })