From da148bb2a21330fb3c9d352e375542f564d5c7ce Mon Sep 17 00:00:00 2001
From: mertmit <mertmit99@gmail.com>
Date: Tue, 23 Aug 2022 19:23:17 +0300
Subject: [PATCH] feat: extra parameters for external db

Signed-off-by: mertmit <mertmit99@gmail.com>
---
 .../pages/index/index/create-external.vue     | 65 +++++++++++++++----
 .../nc-gui-v2/utils/projectCreateUtils.ts     |  1 +
 packages/nc-gui-v2/utils/validation.ts        | 14 ++++
 3 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/packages/nc-gui-v2/pages/index/index/create-external.vue b/packages/nc-gui-v2/pages/index/index/create-external.vue
index b4894ebb74..14e5e0d0d0 100644
--- a/packages/nc-gui-v2/pages/index/index/create-external.vue
+++ b/packages/nc-gui-v2/pages/index/index/create-external.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import { Form, Modal, message } from 'ant-design-vue'
-import type { RawValueType } from 'ant-design-vue'
 import {
   clientTypes,
   computed,
@@ -45,6 +44,7 @@ const formState = $ref<ProjectCreateForm>({
     inflectionTable: 'camelize',
   },
   sslUse: 'No',
+  extraParameters: [],
 })
 
 const customFormState = ref<ProjectCreateForm>({
@@ -55,6 +55,7 @@ const customFormState = ref<ProjectCreateForm>({
     inflectionTable: 'camelize',
   },
   sslUse: 'No',
+  extraParameters: [],
 })
 
 const validators = computed(() => {
@@ -66,6 +67,7 @@ const validators = computed(() => {
       },
       projectTitleValidator,
     ],
+    'extraParameters': [extraParameterValidator],
     'dataSource.client': [fieldRequiredValidator],
     ...(formState.dataSource.client === ClientType.SQLITE
       ? {
@@ -97,13 +99,13 @@ const onClientChange = () => {
   populateName(formState.title)
 }
 
-const onSSLModeChange = (v: RawValueType) => {
+const onSSLModeChange = (v: any) => {
   switch (v) {
     case 'No':
       delete formState.dataSource.connection.ssl
       break
     case 'Allowed':
-      formState.dataSource.connection.ssl = true
+      formState.dataSource.connection.ssl = 'true'
       break
     default:
       formState.dataSource.connection.ssl = {
@@ -115,17 +117,16 @@ const onSSLModeChange = (v: RawValueType) => {
   }
 }
 
-const inflectionTypes = ['camelize', 'none']
-const configEditDlg = ref(false)
+const addNewParam = () => {
+  formState.extraParameters.push({ key: '', value: '' })
+}
 
-// populate database name based on title
-watch(
-  () => formState.title,
-  (v) => populateName(v),
-)
+const removeParam = (index: number) => {
+  formState.extraParameters.splice(index, 1)
+}
 
-// generate a random project title
-formState.title = generateUniqueName()
+const inflectionTypes = ['camelize', 'none']
+const configEditDlg = ref(false)
 
 const caFileInput = ref<HTMLInputElement>()
 const keyFileInput = ref<HTMLInputElement>()
@@ -143,12 +144,23 @@ const sslFilesRequired = computed<boolean>(() => {
 })
 
 function getConnectionConfig() {
+  const extraParameters = Object.fromEntries(
+    new Map(
+      formState.extraParameters.map((object) => {
+        return [object.key, object.value]
+      }),
+    ),
+  )
+
   const connection = {
     ...formState.dataSource.connection,
+    ...extraParameters,
   }
 
-  if ('ssl' in connection && connection.ssl && (!sslFilesRequired || Object.values(connection.ssl).every((v) => !v))) {
-    delete connection.ssl
+  if ('ssl' in connection && connection.ssl) {
+    if (formState.sslUse === 'No' || (typeof connection.ssl === 'object' && Object.values(connection.ssl).every((v) => !v))) {
+      delete connection.ssl
+    }
   }
   return connection
 }
@@ -260,8 +272,15 @@ watch(
   { deep: true },
 )
 
+// populate database name based on title
+watch(
+  () => formState.title,
+  (v) => populateName(v),
+)
+
 // select and focus title field on load
 onMounted(() => {
+  formState.title = generateUniqueName()
   nextTick(() => {
     // todo: replace setTimeout and follow better approach
     setTimeout(() => {
@@ -403,6 +422,24 @@ onMounted(() => {
 
             <a-divider />
 
+            <a-form-item class="mb-2" label="Extra connection parameters" v-bind="validateInfos.extraParameters">
+              <a-card>
+                <div v-for="(item, index) of formState.extraParameters" :key="index">
+                  <div class="flex py-1 items-center gap-1">
+                    <a-input v-model:value="item.key" />
+                    <span>:</span>
+                    <a-input v-model:value="item.value" />
+                    <MdiClose :style="{ 'font-size': '1.5em', 'color': 'red' }" @click="removeParam(index)" />
+                  </div>
+                </div>
+                <a-button type="dashed" class="w-full caption mt-2" @click="addNewParam">
+                  <div class="flex items-center justify-center"><MdiPlus /></div>
+                </a-button>
+              </a-card>
+            </a-form-item>
+
+            <a-divider />
+
             <a-form-item :label="$t('labels.inflection.tableName')">
               <a-select v-model:value="formState.inflection.inflectionTable">
                 <a-select-option v-for="type in inflectionTypes" :key="type" :value="type">{{ type }}</a-select-option>
diff --git a/packages/nc-gui-v2/utils/projectCreateUtils.ts b/packages/nc-gui-v2/utils/projectCreateUtils.ts
index 44ae3df141..de792ebdb6 100644
--- a/packages/nc-gui-v2/utils/projectCreateUtils.ts
+++ b/packages/nc-gui-v2/utils/projectCreateUtils.ts
@@ -28,6 +28,7 @@ export interface ProjectCreateForm {
     inflectionTable?: string
   }
   sslUse?: any
+  extraParameters: Record<string, string>[]
 }
 
 const defaultHost = 'localhost'
diff --git a/packages/nc-gui-v2/utils/validation.ts b/packages/nc-gui-v2/utils/validation.ts
index 99cc6b7e41..1972873b99 100644
--- a/packages/nc-gui-v2/utils/validation.ts
+++ b/packages/nc-gui-v2/utils/validation.ts
@@ -127,3 +127,17 @@ export const importExcelUrlValidator = {
     })
   },
 }
+
+export const extraParameterValidator = {
+  validator: (rule: any, value: any, callback: (errMsg?: string) => void) => {
+    for (const param of value) {
+      if (param.key === '') {
+        callback('Parameter key cannot be empty')
+      }
+      if (value.filter((el: any) => el.key === param.key).length !== 1) {
+        callback('Duplicate parameter keys are not allowed')
+      }
+    }
+    callback()
+  },
+}