From 1cb65039cdf92f56be9c4c5a8f1a9e3fddfaa418 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Thu, 4 Aug 2022 11:08:19 +0530
Subject: [PATCH 1/3] refactor/gui-v2-added-lookup-column

---
 .../smartsheet-column/EditOrAdd.vue           |  2 +
 .../smartsheet-column/LookupOptions.vue       | 80 +++++++++++++++++++
 2 files changed, 82 insertions(+)
 create mode 100644 packages/nc-gui-v2/components/smartsheet-column/LookupOptions.vue

diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
index 6f1362a539..673991b9c9 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
@@ -1,5 +1,6 @@
 <script lang="ts" setup>
 import { UITypes } from 'nocodb-sdk'
+import LookupOptions from './LookupOptions.vue'
 import { computed, inject, useColumnCreateStoreOrThrow, useMetas, watchEffect } from '#imports'
 import { MetaInj } from '~/context'
 import { uiTypes } from '~/utils/columnUtils'
@@ -91,6 +92,7 @@ watchEffect(() => {
       <SmartsheetColumnDurationOptions v-if="formState.uidt === UITypes.Duration" />
       <SmartsheetColumnRatingOptions v-if="formState.uidt === UITypes.Rating" />
       <SmartsheetColumnCheckboxOptions v-if="formState.uidt === UITypes.Checkbox" />
+      <LookupOptions v-if="formState.uidt === UITypes.Lookup" />
 
       <div>
         <div
diff --git a/packages/nc-gui-v2/components/smartsheet-column/LookupOptions.vue b/packages/nc-gui-v2/components/smartsheet-column/LookupOptions.vue
new file mode 100644
index 0000000000..117923c280
--- /dev/null
+++ b/packages/nc-gui-v2/components/smartsheet-column/LookupOptions.vue
@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import { UITypes, isSystemColumn } from 'nocodb-sdk'
+import { useColumnCreateStoreOrThrow } from '#imports'
+import { MetaInj } from '~/context'
+
+const { formState, validateInfos, onDataTypeChange, setAdditionalValidations } = $(useColumnCreateStoreOrThrow())
+const { tables } = $(useProject())
+const meta = $(inject(MetaInj))
+const { metas } = $(useMetas())
+
+setAdditionalValidations({
+  fk_relation_column_id: [{ required: true, message: 'Required' }],
+  fk_lookup_column_id: [{ required: true, message: 'Required' }],
+})
+
+if (!formState.fk_relation_column_id) formState.fk_relation_column_id = null
+if (!formState.fk_lookup_column_id) formState.fk_lookup_column_id = null
+
+const relationNames = {
+  mm: 'Many To Many',
+  hm: 'Has Many',
+  bt: 'Belongs To',
+}
+
+const refTables = $computed(() => {
+  if (!tables || !tables.length) {
+    return []
+  }
+
+  return meta.columns
+    .filter((c) => c.uidt === UITypes.LinkToAnotherRecord && c.colOptions.type !== 'bt' && !c.system)
+    .map((c) => ({
+      col: c.colOptions,
+      column: c,
+      ...tables.find((t) => t.id === c.colOptions.fk_related_model_id),
+    }))
+    .filter((table) => table.col.fk_related_model_id === table.id && !table.mm)
+})
+
+const columns = $computed(() => {
+  const selectedTable = refTables.find((t) => t.column.id === formState.fk_relation_column_id)
+  if (!selectedTable?.id) {
+    return []
+  }
+
+  return metas[selectedTable.id].columns.filter((c) => !isSystemColumn(c))
+})
+
+</script>
+
+<template>
+  <div class="p-4 w-full flex flex-col border-2 mb-2 mt-4">
+    <div class="w-full flex flex-row space-x-2">
+      <a-form-item class="flex w-1/2 pb-2" :label="$t('labels.childTable')" v-bind="validateInfos.fk_relation_column_id">
+        <a-select v-model:value="formState.fk_relation_column_id" size="small" @change="onDataTypeChange">
+          <a-select-option v-for="(table, index) in refTables" :key="index" :value="table.col.fk_column_id">
+            <div class="flex flex-row items-center space-x-0.5 h-full">
+              <div class="font-weight-bold text-[0.7rem]">{{ table.column.title }}</div>
+              <div class="text-[0.5rem]">({{ relationNames[table.col.type] }} {{ table.title || table.table_name }})</div>
+            </div>
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+      <a-form-item class="flex w-1/2" :label="$t('labels.childColumn')" v-bind="validateInfos.fk_lookup_column_id">
+        <a-select
+          v-model:value="formState.fk_lookup_column_id"
+          name="fk_lookup_column_id"
+          size="small"
+          @change="onDataTypeChange"
+        >
+          <a-select-option v-for="(column, index) in columns" :key="index" :value="column.id">
+            {{ column.title }}
+          </a-select-option>
+        </a-select>
+      </a-form-item>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>

From 0bff8ee0c9edfcc1a5ecbc32b89452010a12c66d Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Thu, 4 Aug 2022 11:28:15 +0530
Subject: [PATCH 2/3] chore/removed unnecassary lookup option import

---
 packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
index 673991b9c9..59bbcc33ec 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { UITypes } from 'nocodb-sdk'
-import LookupOptions from './LookupOptions.vue'
 import { computed, inject, useColumnCreateStoreOrThrow, useMetas, watchEffect } from '#imports'
 import { MetaInj } from '~/context'
 import { uiTypes } from '~/utils/columnUtils'
@@ -93,6 +92,7 @@ watchEffect(() => {
       <SmartsheetColumnRatingOptions v-if="formState.uidt === UITypes.Rating" />
       <SmartsheetColumnCheckboxOptions v-if="formState.uidt === UITypes.Checkbox" />
       <LookupOptions v-if="formState.uidt === UITypes.Lookup" />
+      <SmartsheetColumnLookupOptions v-if="formState.uidt === UITypes.Lookup" />
 
       <div>
         <div

From 8d9c857a74549f3e03ef0a4e47def4b3fcda9332 Mon Sep 17 00:00:00 2001
From: Muhammed Mustafa <mustafa010199@gmail.com>
Date: Thu, 4 Aug 2022 17:50:11 +0530
Subject: [PATCH 3/3] chore/pr conflict resolved

---
 packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
index 59bbcc33ec..638d081e5f 100644
--- a/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
+++ b/packages/nc-gui-v2/components/smartsheet-column/EditOrAdd.vue
@@ -91,7 +91,6 @@ watchEffect(() => {
       <SmartsheetColumnDurationOptions v-if="formState.uidt === UITypes.Duration" />
       <SmartsheetColumnRatingOptions v-if="formState.uidt === UITypes.Rating" />
       <SmartsheetColumnCheckboxOptions v-if="formState.uidt === UITypes.Checkbox" />
-      <LookupOptions v-if="formState.uidt === UITypes.Lookup" />
       <SmartsheetColumnLookupOptions v-if="formState.uidt === UITypes.Lookup" />
 
       <div>