From 6eb2977568987b9440b62ae7dbd7183338bfcc9b Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Mon, 19 Apr 2021 11:07:29 +0200
Subject: [PATCH] fix(UI): data type not listed in selection if not present in
 global types

---
 .../WorkspacePropsFunctionOptionsModal.vue    | 18 +++++++++++++++++
 .../components/WorkspacePropsTableRow.vue     | 20 ++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue b/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue
index 484e0b85..97316b97 100644
--- a/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue
+++ b/src/renderer/components/WorkspacePropsFunctionOptionsModal.vue
@@ -80,6 +80,9 @@
                         <option v-if="localOptions.returns === 'VOID'">
                            VOID
                         </option>
+                        <option v-if="!isInDataTypes">
+                           {{ localOptions.returns }}
+                        </option>
                         <optgroup
                            v-for="group in workspace.dataTypes"
                            :key="group.group"
@@ -178,6 +181,21 @@ export default {
       },
       customizations () {
          return this.workspace.customizations;
+      },
+      isInDataTypes () {
+         let typeNames = [];
+         for (const group of this.workspace.dataTypes) {
+            const groupTypeNames = group.types.reduce((acc, curr) => {
+               acc.push(curr.name);
+               return acc;
+            }, []);
+
+            typeNames = [
+               ...groupTypeNames,
+               ...typeNames
+            ];
+         }
+         return typeNames.includes(this.localOptions.returns);
       }
    },
    created () {
diff --git a/src/renderer/components/WorkspacePropsTableRow.vue b/src/renderer/components/WorkspacePropsTableRow.vue
index 6fe5de69..13be3e2c 100644
--- a/src/renderer/components/WorkspacePropsTableRow.vue
+++ b/src/renderer/components/WorkspacePropsTableRow.vue
@@ -60,6 +60,9 @@
             class="form-select editable-field small-select text-uppercase"
             @blur="editOFF"
          >
+            <option v-if="!isInDataTypes">
+               {{ row.type }}
+            </option>
             <optgroup
                v-for="group in dataTypes"
                :key="group.group"
@@ -68,7 +71,7 @@
                <option
                   v-for="type in group.types"
                   :key="type.name"
-                  :selected="localRow.type.toUpperCase() === type.name"
+                  :selected="localRow.type === type.name"
                   :value="type.name"
                >
                   {{ type.name }}
@@ -374,6 +377,21 @@ export default {
       },
       isNullable () {
          return !this.indexes.some(index => ['PRIMARY'].includes(index.type));
+      },
+      isInDataTypes () {
+         let typeNames = [];
+         for (const group of this.dataTypes) {
+            const groupTypeNames = group.types.reduce((acc, curr) => {
+               acc.push(curr.name);
+               return acc;
+            }, []);
+
+            typeNames = [
+               ...groupTypeNames,
+               ...typeNames
+            ];
+         }
+         return typeNames.includes(this.row.type);
       }
    },
    watch: {