fix(nc-gui): some merge conflicts

packages/nc-gui/components/dashboard/settings/data-sources/CreateBase.vue

@@ -139,16 +139,10 @@ const validators = computed(() => {
   }
 })
 
-const { validate, validateInfos } = useForm(formState.value, validators)
-
-const populateName = (v: string) => {
-  if (selectedIntegration.value) return
-  formState.value.dataSource.connection.database = `${v.trim()}_noco`
-}
+const { validate, validateInfos, clearValidate } = useForm(formState.value, validators)
 
 const onClientChange = () => {
   formState.value.dataSource = { ...getDefaultConnectionConfig(formState.value.dataSource.client) }
-  populateName(formState.value.title)
 }
 
 const inflectionTypes = ['camelize', 'none']
@@ -322,7 +316,6 @@ watch(
 onMounted(async () => {
   await loadIntegrations(true, base.value?.id)
   formState.value.title = await generateUniqueName()
-  populateName(formState.value.title)
 
   nextTick(() => {
     // todo: replace setTimeout and follow better approach
@@ -497,7 +490,7 @@ const filterIntegrationCategory = (c: IntegrationCategoryItemType) => [Integrati
                   <a-row :gutter="24">
                     <a-col :span="12">
                       <a-form-item label="Data Source Name" v-bind="validateInfos.title">
-                        <a-input v-model:value="formState.title" @input="populateName(formState.title)" />
+                        <a-input v-model:value="formState.title" />
                       </a-form-item>
                     </a-col>
                   </a-row>

packages/nc-gui/components/project/AllTables.vue

@@ -125,7 +125,7 @@ const onCreateBaseClick = () => {
         data-testid="proj-view-btn__add-new-table"
         @click="openTableCreateDialog()"
       >
-        <GeneralIcon icon="addOutlineBox" class="!text-brand-500" />
+        <GeneralIcon icon="addOutlineBox" class="!w-8 !h-8 !text-brand-500" />
 
         <div class="flex flex-col gap-1">
           <div class="label">{{ $t('general.create') }} {{ $t('general.new') }} {{ $t('objects.table') }}</div>
@@ -141,7 +141,7 @@ const onCreateBaseClick = () => {
         data-testid="proj-view-btn__import-data"
         @click="isImportModalOpen = true"
       >
-        <GeneralIcon icon="download" class="!text-orange-700" />
+        <GeneralIcon icon="download" class="!w-7.5 !h-7.5 !text-orange-700" />
         <div class="flex flex-col gap-1">
           <div class="label">{{ $t('activity.import') }} {{ $t('general.data') }}</div>
 
@@ -167,7 +167,7 @@ const onCreateBaseClick = () => {
           }"
           @click="onCreateBaseClick"
         >
-          <GeneralIcon icon="server1" class="!text-green-700" />
+          <GeneralIcon icon="server1" class="!w-7 !h-7 !text-green-700" />
           <div class="flex flex-col gap-1">
             <div class="label">{{ $t('labels.connectDataSource') }}</div>
             <div class="subtext">In realtime to external databases.</div>