From ab8c092887f951a860145592d7c1c0d2807c8b8e Mon Sep 17 00:00:00 2001
From: Sipke Schoorstra <sipkeschoorstra@outlook.com>
Date: Sat, 8 May 2021 11:58:43 +0200
Subject: [PATCH] Fix multi-text editor

---
 .../elsa-multi-text-property/elsa-multi-text-property.tsx     | 4 ++--
 .../elsa-workflows-studio/src/utils/select-list-items.ts      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/designer/elsa-workflows-studio/src/components/editors/properties/elsa-multi-text-property/elsa-multi-text-property.tsx b/src/designer/elsa-workflows-studio/src/components/editors/properties/elsa-multi-text-property/elsa-multi-text-property.tsx
index 564f11c54..123b59b57 100644
--- a/src/designer/elsa-workflows-studio/src/components/editors/properties/elsa-multi-text-property/elsa-multi-text-property.tsx
+++ b/src/designer/elsa-workflows-studio/src/components/editors/properties/elsa-multi-text-property/elsa-multi-text-property.tsx
@@ -62,8 +62,8 @@ export class ElsaMultiTextProperty {
     const propertyOptions = this.createKeyValueOptions(items);
 
     const elsaInputTags = valueType === 'multi-text' ?
-      <elsa-input-tags values={values} fieldId={fieldId} fieldName={fieldName} onValueChanged={e => this.onValueChanged(e.detail)} /> :
-      <elsa-input-tags-dropdown dropdownValues={propertyOptions} values={values} fieldId={fieldId} fieldName={fieldName} onValueChanged={e => this.onValueChanged(e.detail)} />;
+      <elsa-input-tags-dropdown dropdownValues={propertyOptions} values={values} fieldId={fieldId} fieldName={fieldName} onValueChanged={e => this.onValueChanged(e.detail)} /> :
+      <elsa-input-tags values={values} fieldId={fieldId} fieldName={fieldName} onValueChanged={e => this.onValueChanged(e.detail)} />;
 
     return (
       <elsa-property-editor propertyDescriptor={propertyDescriptor}
diff --git a/src/designer/elsa-workflows-studio/src/utils/select-list-items.ts b/src/designer/elsa-workflows-studio/src/utils/select-list-items.ts
index 3d87cd470..7b5800301 100644
--- a/src/designer/elsa-workflows-studio/src/utils/select-list-items.ts
+++ b/src/designer/elsa-workflows-studio/src/utils/select-list-items.ts
@@ -10,7 +10,7 @@ export async function getSelectListItems(serverUrl: string, propertyDescriptor:
   const options = propertyDescriptor.options;
   let items = [];
 
-  if (!!options.runtimeSelectListItemsProviderType) {
+  if (!!options && options.runtimeSelectListItemsProviderType) {
     items = await fetchRuntimeItems(serverUrl, options);
   } else {
     items = options as Array<any> || [];