Merge branch 'develop' into enhancement/cache-with-empty-list

packages/nc-gui/components/cell/Checkbox.vue

@@ -8,6 +8,7 @@ import {
   inject,
   parseProp,
   useSelectedCellKeyupListener,
+  useProject,
 } from '#imports'
 
 interface Props {
@@ -26,10 +27,7 @@ const emits = defineEmits<Emits>()
 
 const active = inject(ActiveCellInj, ref(false))
 
-let vModel = $computed<boolean>({
+const { isMssql } = useProject()
-  get: () => !!props.modelValue && props.modelValue !== '0' && props.modelValue !== 0,
-  set: (val: boolean) => emits('update:modelValue', val),
-})
 
 const column = inject(ColumnInj)
 
@@ -48,6 +46,11 @@ const checkboxMeta = $computed(() => {
   }
 })
 
+let vModel = $computed<boolean | number>({
+  get: () => !!props.modelValue && props.modelValue !== '0' && props.modelValue !== 0,
+  set: (val: any) => emits('update:modelValue', isMssql(column?.value?.base_id) ? +val : val),
+})
+
 function onClick(force?: boolean, event?: MouseEvent) {
   if (
     (event?.target as HTMLElement)?.classList?.contains('nc-checkbox') ||

packages/nc-gui/components/cell/attachment/Image.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { iconMap } from '#imports'
+
 interface Props {
   srcs: string[]
   alt?: string

packages/nc-gui/components/dlg/TableCreate.vue

@@ -53,7 +53,7 @@ const validators = computed(() => {
         validator: (_: any, value: any) => {
           // validate duplicate alias
           return new Promise((resolve, reject) => {
-            if ((tables.value || []).some((t) => t.title === (value || ''))) {
+            if ((tables.value || []).some((t) => t.title === (value || '') && t.base_id === props.baseId)) {
               return reject(new Error('Duplicate table alias'))
             }
             return resolve(true)

packages/nc-gui/components/smartsheet/Cell.vue

@@ -193,7 +193,7 @@ onUnmounted(() => {
       `nc-cell-${(column?.uidt || 'default').toLowerCase()}`,
       { 'text-blue-600': isPrimary(column) && !props.virtual && !isForm },
       { 'nc-grid-numeric-cell': isGrid && !isForm && isNumericField },
-      { 'h-[40px]': !props.editEnabled && isForm && !isSurveyForm },
+      { 'h-[40px]': !props.editEnabled && isForm && !isSurveyForm && !isAttachment(column) },
     ]"
     @keydown.enter.exact="navigate(NavigateDir.NEXT, $event)"
     @keydown.shift.enter.exact="navigate(NavigateDir.PREV, $event)"

packages/nc-gui/components/smartsheet/DivDataCell.vue

@@ -0,0 +1,17 @@
+<script lang="ts" setup>
+import { CellClickHookInj, CurrentCellInj, createEventHook, ref } from '#imports'
+
+const el = ref()
+
+const cellClickHook = createEventHook()
+
+provide(CellClickHookInj, cellClickHook)
+
+provide(CurrentCellInj, el)
+</script>
+
+<template>
+  <div ref="el" class="select-none" @click="cellClickHook.trigger($event)">
+    <slot />
+  </div>
+</template>

packages/nc-gui/components/smartsheet/Form.vue

@@ -727,18 +727,20 @@ watch(view, (nextView) => {
                       },
                     ]"
                   >
-                    <LazySmartsheetCell
+                    <LazySmartsheetDivDataCell class="relative">
-                      v-model="formState[element.title]"
+                      <LazySmartsheetCell
-                      class="nc-input"
+                        v-model="formState[element.title]"
-                      :class="`nc-form-input-${element.title.replaceAll(' ', '')}`"
+                        class="nc-input"
-                      :data-testid="`nc-form-input-${element.title.replaceAll(' ', '')}`"
+                        :class="`nc-form-input-${element.title.replaceAll(' ', '')}`"
-                      :column="element"
+                        :data-testid="`nc-form-input-${element.title.replaceAll(' ', '')}`"
-                      :edit-enabled="editEnabled[index]"
+                        :column="element"
-                      @click="editEnabled[index] = true"
+                        :edit-enabled="editEnabled[index]"
-                      @cancel="editEnabled[index] = false"
+                        @click="editEnabled[index] = true"
-                      @update:edit-enabled="editEnabled[index] = $event"
+                        @cancel="editEnabled[index] = false"
-                      @click.stop.prevent
+                        @update:edit-enabled="editEnabled[index] = $event"
-                    />
+                        @click.stop.prevent
+                      />
+                    </LazySmartsheetDivDataCell>
                   </a-form-item>
 
                   <div class="text-gray-500 text-xs" data-testid="nc-form-input-help-text-label">{{ element.description }}</div>

packages/nc-gui/components/smartsheet/TableDataCell.vue

@@ -11,7 +11,7 @@ provide(CurrentCellInj, el)
 </script>
 
 <template>
-  <td ref="el" @click="cellClickHook.trigger($event)">
+  <td ref="el" class="select-none" @click="cellClickHook.trigger($event)">
     <slot />
   </td>
 </template>

packages/nc-gui/components/smartsheet/expanded-form/index.vue

@@ -329,7 +329,7 @@ export default {
 
               <LazySmartsheetHeaderCell v-else :column="col" />
 
-              <div
+              <LazySmartsheetDivDataCell
                 :ref="i ? null : (el) => (cellWrapperEl = el)"
                 class="!bg-white rounded px-1 min-h-[35px] flex items-center mt-2 relative"
               >
@@ -343,7 +343,7 @@ export default {
                   :active="true"
                   @update:model-value="changedColumns.add(col.title)"
                 />
-              </div>
+              </LazySmartsheetDivDataCell>
             </div>
           </div>
         </div>

packages/nc-gui/components/template/Editor.vue

@@ -3,6 +3,7 @@ import dayjs from 'dayjs'
 import utc from 'dayjs/plugin/utc'
 import type { ColumnType, TableType } from 'nocodb-sdk'
 import { UITypes, isSystemColumn, isVirtualCol } from 'nocodb-sdk'
+import type { CheckboxChangeEvent } from 'ant-design-vue/es/checkbox/interface'
 import { srcDestMappingColumns, tableColumns } from './utils'
 import {
   Empty,
@@ -87,6 +88,8 @@ const isImporting = ref(false)
 
 const importingTips = ref<Record<string, string>>({})
 
+const checkAllRecord = ref<boolean[]>([])
+
 const uiTypeOptions = ref<Option[]>(
   (Object.keys(UITypes) as (keyof typeof UITypes)[])
     .filter(
@@ -615,6 +618,13 @@ function handleEditableTnChange(idx: number) {
 function isSelectDisabled(uidt: string, disableSelect = false) {
   return (uidt === UITypes.SingleSelect || uidt === UITypes.MultiSelect) && disableSelect
 }
+
+function handleCheckAllRecord(event: CheckboxChangeEvent, tableName: string) {
+  const isChecked = event.target.checked
+  for (const record of srcDestMapping.value[tableName]) {
+    record.enabled = isChecked
+  }
+}
 </script>
 
 <template>
@@ -671,6 +681,12 @@ function isSelectDisabled(uidt: string, disableSelect = false) {
               <span v-if="column.key === 'source_column' || column.key === 'destination_column'">
                 {{ column.name }}
               </span>
+              <span v-if="column.key === 'action'">
+                <a-checkbox
+                  v-model:checked="checkAllRecord[table.table_name]"
+                  @change="handleCheckAllRecord($event, table.table_name)"
+                />
+              </span>
             </template>
 
             <template #bodyCell="{ column, record }">

packages/nc-gui/components/template/utils.ts

@@ -40,6 +40,7 @@ export const srcDestMappingColumns: (Omit<ColumnGroupType<any>, 'children'> & {
   {
     name: 'Action',
     key: 'action',
-    align: 'right',
+    align: 'center',
+    width: 50,
   },
 ]

packages/nc-gui/composables/useAttachment.ts

@@ -5,6 +5,7 @@ const useAttachment = () => {
 
   const getPossibleAttachmentSrc = (item: Record<string, any>) => {
     const res: string[] = []
+    if (item?.data) res.push(item.data)
     if (item?.path) res.push(`${appInfo.value.ncSiteUrl}/${item.path}`)
     if (item?.url) res.push(item.url)
     return res

packages/nc-gui/composables/useGlobal/actions.ts

@@ -46,11 +46,13 @@ export function useGlobalActions(state: State): Actions {
             signIn(response.data.token)
           }
         })
-        .catch(async (err) => {
+        .catch(async () => {
-          message.error(err.message || t('msg.error.youHaveBeenSignedOut'))
+          if (state.token.value && state.user.value) {
-          await signOut()
+            await signOut()
+            message.error(t('msg.error.youHaveBeenSignedOut'))
+          }
         })
-        .finally(() => resolve())
+        .finally(() => resolve(true))
     })
   }
 

packages/nc-gui/lang/pt_BR.json

@@ -698,7 +698,7 @@
         "allowedSpecialCharList": "Lista de caracteres especiais permitidos"
       },
       "invalidURL": "URL inválido",
-      "invalidEmail": "Invalid Email",
+      "invalidEmail": "E-mail inválido",
       "internalError": "Ocorreu algum erro interno",
       "templateGeneratorNotFound": "O Gerador de Modelos não pode ser encontrado!",
       "fileUploadFailed": "Falha no carregamento do ficheiro",

packages/nc-gui/lang/zh-Hans.json

@@ -221,7 +221,7 @@
     "viewName": "查看名称",
     "viewLink": "查看链接",
     "columnName": "列名",
-    "columnToScanFor": "Column to scan",
+    "columnToScanFor": "要扫描的列",
     "columnType": "列类型",
     "roleName": "权限组",
     "roleDescription": "权限描述",
@@ -412,8 +412,8 @@
     "changePwd": "更改密码",
     "createView": "创建视图",
     "shareView": "分享视图",
-    "findRowByCodeScan": "Find row by scan",
+    "findRowByCodeScan": "通过扫描查找行",
-    "fillByCodeScan": "Fill by scan",
+    "fillByCodeScan": "通过扫描填充",
     "listSharedView": "共享视图列表",
     "ListView": "视图列表",
     "copyView": "复制视图",
@@ -430,7 +430,7 @@
     "iFrame": "复制可嵌入的 HTML 代码",
     "addWebhook": "添加新的 Webhook",
     "enableWebhook": "启用 Webhook",
-    "testWebhook": "Test Webhook",
+    "testWebhook": "测试Webhook",
     "copyWebhook": "复制 Webhook",
     "deleteWebhook": "删除 Webhook",
     "newToken": "添加新 Token",
@@ -470,7 +470,7 @@
       "addOrEditStack": "添加/编辑分类标签"
     },
     "map": {
-      "mappedBy": "Mapped By",
+      "mappedBy": "映射字段",
       "chooseMappingField": "选择映射字段",
       "openInGoogleMaps": "谷歌地图",
       "openInOpenStreetMap": "OSM"
@@ -542,15 +542,15 @@
         "orgViewer": "游客不能创建新项目，仅允许访问受邀项目。"
       },
       "codeScanner": {
-        "loadingScanner": "Loading the scanner...",
+        "loadingScanner": "正在加载扫描仪...",
-        "selectColumn": "Select a column (QR code or Barcode) that you want to use for finding a row by scanning.",
+        "selectColumn": "选择要用于扫描查找行的列(二维码或条形码)。",
-        "moreThanOneRowFoundForCode": "More than one row found for this code. Currently only unique codes are supported.",
+        "moreThanOneRowFoundForCode": "找到了多行此代码。目前只支持唯一的代码。",
         "noRowFoundForCode": "所选列没有找到此代码行"
       },
       "map": {
         "overLimit": "你已经超出了限制。",
         "closeLimit": "您已接近上限。",
-        "limitNumber": "The limit of markers shown in a Map View is 1000 records."
+        "limitNumber": "在地图视图中显示的标记的限制是1000条记录。"
       },
       "footerInfo": "每页行驶",
       "upload": "选择文件以上传",

packages/nc-gui/pages/[projectType]/form/[viewId]/index/index.vue

@@ -146,7 +146,7 @@ const onDecode = async (scannedCodeValue: string) => {
                   </div>
 
                   <div>
-                    <div class="flex">
+                    <LazySmartsheetDivDataCell class="flex relative">
                       <LazySmartsheetVirtualCell
                         v-if="isVirtualCol(field)"
                         :model-value="null"
@@ -178,7 +178,7 @@ const onDecode = async (scannedCodeValue: string) => {
                           <component :is="iconMap.qrCodeScan" class="h-5 w-5" />
                         </div>
                       </a-button>
-                    </div>
+                    </LazySmartsheetDivDataCell>
 
                     <div class="flex flex-col gap-2 text-slate-500 dark:text-slate-300 text-[0.75rem] my-2 px-1">
                       <div v-for="error of v$.localState[field.title]?.$errors" :key="error" class="text-red-500">

packages/nc-gui/pages/[projectType]/form/[viewId]/index/survey.vue

@@ -283,7 +283,7 @@ onMounted(() => {
               />
             </div>
 
-            <div v-if="field.title">
+            <LazySmartsheetDivDataCell v-if="field.title" class="relative">
               <LazySmartsheetVirtualCell
                 v-if="isVirtualCol(field)"
                 v-model="formState[field.title]"
@@ -323,7 +323,7 @@ onMounted(() => {
                   <MaterialSymbolsKeyboardReturn class="mx-1 text-primary" /> to make a line break
                 </div>
               </div>
-            </div>
+            </LazySmartsheetDivDataCell>
           </div>
 
           <div class="ml-1 mt-4 flex w-full text-lg">

packages/noco-docs/content/en/developer-resources/rest-apis.md

@@ -12,7 +12,7 @@ Once you've created the schemas, you can manipulate the data or invoke actions u
 
 Here's the overview of all APIs. For the details, please check out <a href="https://all-apis.nocodb.com/" target="_blank">NocoDB API Documentation</a>. 
 
-You may also interact with the API's resources via <a href="./accessing-apis#swagger-ui" target="_blank">Swagger UI</a>.
+You may also interact with the API's resources via <NuxtLink to="/developer-resources/accessing-apis#swagger-ui" target="_blank">Swagger UI</NuxtLink>.
 
 <alert type="success">
 Currently, the default value for {orgs} is <b>noco</b>. Users will be able to change it in the future release.

packages/noco-docs/content/en/developer-resources/sdk.md

@@ -9,7 +9,7 @@ menuTitle: 'NocoDB SDK'
 We provide SDK for users to integrate with their applications. Currently only SDK for Javascript is supported.
 
 <alert>
-Note: The NocoDB SDK requires authorization token. If you haven't created one, please check out <a href="./accessing-apis" target="_blank">Accessing APIs</a> for details.
+Note: The NocoDB SDK requires authorization token. If you haven't created one, please check out <NuxtLink to="/developer-resources/accessing-apis" target="_blank">Accessing APIs</NuxtLink> for details.
 </alert>
 
 ## SDK For Javascript
@@ -57,7 +57,7 @@ const api = new Api({
 Once you have configured `api`, you can call different types of APIs by `api.<Tag>.<FunctionName>`. 
 
 <alert>
-For Tag and FunctionName, please check out the API table <a href="./rest-apis" target="_blank">here</a>.
+For Tag and FunctionName, please check out the API table <NuxtLink to="/developer-resources/rest-apis" target="_blank">here</NuxtLink>.
 </alert>
 
 #### Example: Calling API - /api/v1/db/meta/projects/{projectId}/tables

packages/noco-docs/content/en/getting-started/upgrading.md

@@ -8,7 +8,7 @@ link: https://codesandbox.io/embed/vigorous-firefly-80kq5?hidenavigation=1&theme
 ---
 
 By default, if `NC_DB` is not specified upon 
-<a href="./installation" target="_blank">installation</a>, then SQLite will be used to store metadata. We suggest users to separate the metadata and user data in different databases as pictured in our <a href="../engineering/architecture" target="_blank">architecture</a>. 
+<NuxtLink to="/getting-started/installation" target="_blank">installation</NuxtLink>, then SQLite will be used to store metadata. We suggest users to separate the metadata and user data in different databases as pictured in our <NuxtLink to="/engineering/architecture" target="_blank">architecture</NuxtLink>. 
 
 ## Docker
 

packages/noco-docs/content/en/index.md

@@ -31,7 +31,7 @@ Also NocoDB's app store allows you to build business workflows on views with com
 
 ### App Store for Workflow Automations
 
-We provide different integrations in three main categories. See <a href="./setup-and-usages/app-store" target="_blank">App Store</a> for details.
+We provide different integrations in three main categories. See <NuxtLink to="/setup-and-usages/account-settings#app-store" target="_blank">App Store</NuxtLink> for details.
 
 - ⚡ &nbsp;Chat : Slack, Discord, Mattermost, and etc
 - ⚡ &nbsp;Email : AWS SES, SMTP, MailerSend, and etc
@@ -46,11 +46,11 @@ We provide the following ways to let users to invoke actions in a programmatic w
 
 ### Sync Schema
 
-We allow you to sync schema changes if you have made changes outside NocoDB GUI. However, it has to be noted then you will have to bring your own schema migrations for moving from environment to others. See <a href="./setup-and-usages/sync-schema" target="_blank">Sync Schema</a> for details.
+We allow you to sync schema changes if you have made changes outside NocoDB GUI. However, it has to be noted then you will have to bring your own schema migrations for moving from environment to others. See <NuxtLink to="/setup-and-usages/sync-schema" target="_blank">Sync Schema</NuxtLink> for details.
 
 ### Audit 
 
-We are keeping all the user operation logs under one place. See <a href="./setup-and-usages/audit" target="_blank">Audit</a> for details.
+We are keeping all the user operation logs under one place. See <NuxtLink to="/setup-and-usages/audit" target="_blank">Audit</NuxtLink> for details.
 
 ##  Why are we building this?
 Most internet businesses equip themselves with either spreadsheet or a database to solve their business needs. Spreadsheets are used by a Billion+ humans collaboratively every single day. However, we are way off working at similar speeds on databases which are way more powerful tools when it comes to computing. Attempts to solve this with SaaS offerings has meant horrible access controls, vendor lockin, data lockin, abrupt price changes & most importantly a glass ceiling on what's possible in future.

packages/noco-docs/content/en/setup-and-usages/meta-management.md

@@ -28,7 +28,7 @@ To access it, click the down arrow button next to Project Name on the top left s
 
 ## Sync Metadata
 
-Go to `Data Sources`, click ``Sync Metadata``, you can see your metadata sync status. If it is out of sync, you can sync the schema. See <a href="./sync-schema">Sync Schema</a> for more.0
+Go to `Data Sources`, click ``Sync Metadata``, you can see your metadata sync status. If it is out of sync, you can sync the schema. See <NuxtLink to="/setup-and-usages/sync-schema">Sync Schema</NuxtLink> for more.
 
 ![image](https://user-images.githubusercontent.com/35857179/219833485-3bcaa6ec-88bc-47cc-b938-5abb4835dc31.png)
 

packages/noco-docs/content/en/setup-and-usages/table-operations.md

@@ -155,7 +155,7 @@ You can use Quick Import when you have data from external sources such as Airtab
 
 ### Import Airtable into an Existing Project
 
-- See <a href="./import-airtable-to-sql-database-within-a-minute-for-free">here</a>
+- See <NuxtLink to="/setup-and-usages/import-airtable-to-sql-database-within-a-minute-for-free">here</NuxtLink>
 
 ### Import CSV data into an Existing Project
 
@@ -165,7 +165,7 @@ You can use Quick Import when you have data from external sources such as Airtab
   - **Use First Row as Headers**: If it is checked, the first row will be treated as header row.
   - **Import Data**: If it is checked, all data will be imported. Otherwise, only table will be created.
   ![image](https://user-images.githubusercontent.com/35857179/197454479-1ed18dce-1d0b-4ee3-88b3-9b6a132dea2a.png)
-- You can revise the table name by double clicking it, column name and column type. By default, the first column will be chosen as <a href="./display-value" target="_blank">Display Value</a> and cannot be deleted.
+- You can revise the table name by double clicking it, column name and column type. By default, the first column will be chosen as <NuxtLink to="/setup-and-usages/display-value" target="_blank">Display Value</NuxtLink> and cannot be deleted.
   ![image](https://user-images.githubusercontent.com/35857179/197454633-5b30323e-2b13-4c55-843a-948c093d373e.png)
 - Click `Import` to start importing process. The table will be created and the data will be imported.
   ![image](https://user-images.githubusercontent.com/35857179/197455547-2d93df5e-a7f0-4c88-af53-990067625967.png)
@@ -178,7 +178,7 @@ You can use Quick Import when you have data from external sources such as Airtab
   - **Use First Row as Headers**: If it is checked, the first row will be treated as header row.
   - **Import Data**: If it is checked, all data will be imported. Otherwise, only table will be created.
   ![image](https://user-images.githubusercontent.com/35857179/197455788-8dd8a7d1-38f3-48c3-a05e-6ab0cf25045c.png)
-- You can revise the table name, column name and column type. By default, the first column will be chosen as <a href="./display-value" target="_blank">Display Value</a> and cannot be deleted.
+- You can revise the table name, column name and column type. By default, the first column will be chosen as <NuxtLink to="/setup-and-usages/display-value" target="_blank">Display Value</NuxtLink> and cannot be deleted.
   <alert>
   Note: If your Excel file contains multiple sheets, each sheet will be stored in a separate table.
   </alert>

packages/nocodb-sdk/src/lib/Api.ts

@@ -7905,7 +7905,7 @@ export class Api<
  */
     dataCreate: (
       sharedViewUuid: string,
-      data: object,
+      data: any,
       params: RequestParams = {}
     ) =>
       this.request<
@@ -7918,7 +7918,7 @@ export class Api<
         path: `/api/v1/db/public/shared-view/${sharedViewUuid}/rows`,
         method: 'POST',
         body: data,
-        type: ContentType.Json,
+        type: ContentType.FormData,
         format: 'json',
         ...params,
       }),

packages/nocodb/docker-compose.yml

@@ -1,4 +1,4 @@
-version: "2.1"
+version: "2.2"
 
 services:
     # db55:
@@ -96,8 +96,8 @@ services:
     #     - 5495:5432
     #   volumes:
     #     - ./pg-sakila-db:/docker-entrypoint-initdb.d
-    pg96:
+    pg147:
-     image: postgres:9.6
+     image: postgres:14.7
      restart: always
      environment:
        POSTGRES_PASSWORD: password
@@ -337,13 +337,13 @@ services:
     xc-test-pg:
       image: node:12.22.1-slim
       depends_on:
-        pg96:
+        pg147:
           condition: service_healthy
       volumes:
         - ./:/home/app
       environment:
         NODE_ENV: test
-        DATABASE_URL: postgres://postgres:password@pg96:5432/postgres
+        DATABASE_URL: postgres://postgres:password@pg147:5432/postgres
       command:
         - /bin/bash
         - -c
@@ -405,13 +405,13 @@ services:
     xc-test-gql-pg:
       image: node:12.22.1-slim
       depends_on:
-        pg96:
+        pg147:
           condition: service_healthy
       volumes:
         - ./:/home/app
       environment:
         NODE_ENV: test
-        DATABASE_URL: postgres://postgres:password@pg96:5432/postgres
+        DATABASE_URL: postgres://postgres:password@pg147:5432/postgres
       command:
         - /bin/bash
         - -c

packages/nocodb/package-lock.json

@@ -17364,9 +17364,9 @@
       "dev": true
     },
     "node_modules/vm2": {
-      "version": "3.9.15",
+      "version": "3.9.16",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.15.tgz",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.16.tgz",
-      "integrity": "sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag==",
+      "integrity": "sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w==",
       "dependencies": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"
@@ -32786,9 +32786,9 @@
       "dev": true
     },
     "vm2": {
-      "version": "3.9.15",
+      "version": "3.9.16",
-      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.15.tgz",
+      "resolved": "https://registry.npmjs.org/vm2/-/vm2-3.9.16.tgz",
-      "integrity": "sha512-XqNqknHGw2avJo13gbIwLNZUumvrSHc9mLqoadFZTpo3KaNEJoe1I0lqTFhRXmXD7WkLyG01aaraXdXT0pa4ag==",
+      "integrity": "sha512-3T9LscojNTxdOyG+e8gFeyBXkMlOBYDoF6dqZbj+MPVHi9x10UfiTAJIobuchRCp3QvC+inybTbMJIUrLsig0w==",
       "requires": {
         "acorn": "^8.7.0",
         "acorn-walk": "^8.2.0"

packages/nocodb/src/lib/controllers/publicControllers/publicData.ctl.ts

@@ -31,6 +31,7 @@ async function dataInsert(req: Request & { files: any[] }, res: Response) {
     password: req.headers?.['xc-password'] as string,
     body: req.body?.data,
     siteUrl: (req as any).ncSiteUrl,
+    // req.files is enriched by multer
     files: req.files,
   });
 
@@ -95,11 +96,11 @@ router.post(
 );
 
 router.get(
-  '/api/v1/db/public/shared-view/:sharedViewUuid/rows/:rowId/mm/:colId',
+  '/api/v1/db/public/shared-view/:sharedViewUuid/rows/:rowId/mm/:columnId',
   catchError(publicMmList)
 );
 router.get(
-  '/api/v1/db/public/shared-view/:sharedViewUuid/rows/:rowId/hm/:colId',
+  '/api/v1/db/public/shared-view/:sharedViewUuid/rows/:rowId/hm/:columnId',
   catchError(publicHmList)
 );
 

packages/nocodb/src/lib/controllers/user/user.ctl.ts

@@ -98,6 +98,15 @@ async function signin(req, res, next) {
   )(req, res, next);
 }
 
+async function signout(req: Request<any, any>, res): Promise<any> {
+  res.json(
+    await userService.signout({
+      req,
+      res,
+    })
+  );
+}
+
 async function googleSignin(req, res, next) {
   passport.authenticate(
     'google',
@@ -246,6 +255,7 @@ const mapRoutes = (router) => {
   // new API
   router.post('/api/v1/auth/user/signup', catchError(signup));
   router.post('/api/v1/auth/user/signin', catchError(signin));
+  router.post('/api/v1/auth/user/signout', catchError(signout));
   router.get(
     '/api/v1/auth/user/me',
     extractProjectIdAndAuthenticate,

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts

@@ -2117,12 +2117,10 @@ class BaseModelSqlv2 {
         datas.map((d) => this.model.mapAliasToColumn(d))
       );
 
-      transaction = await this.dbDriver.transaction();
-
-      // await this.beforeUpdateb(updateDatas, transaction);
       const prevData = [];
       const newData = [];
       const updatePkValues = [];
+      const toBeUpdated = [];
       const res = [];
       for (const d of updateDatas) {
         await this.validate(d);
@@ -2133,11 +2131,17 @@ class BaseModelSqlv2 {
         }
         prevData.push(await this.readByPk(pkValues));
         const wherePk = await this._wherePk(pkValues);
-        await transaction(this.tnPath).update(d).where(wherePk);
         res.push(wherePk);
+        toBeUpdated.push({ d, wherePk });
         updatePkValues.push(pkValues);
       }
 
+      transaction = await this.dbDriver.transaction();
+
+      for (const o of toBeUpdated) {
+        await transaction(this.tnPath).update(o.d).where(o.wherePk);
+      }
+
       await transaction.commit();
 
       for (const pkValues of updatePkValues) {
@@ -3242,17 +3246,24 @@ function extractCondition(nestedArrayConditions, aliasColObjMap) {
     // eslint-disable-next-line prefer-const
     let [logicOp, alias, op, value] =
       str.match(/(?:~(and|or|not))?\((.*?),(\w+),(.*)\)/)?.slice(1) || [];
+
+    if (!alias && !op && !value) {
+      // try match with blank filter format
+      [logicOp, alias, op, value] =
+        str.match(/(?:~(and|or|not))?\((.*?),(\w+)\)/)?.slice(1) || [];
+    }
     let sub_op = null;
 
     if (aliasColObjMap[alias]) {
       if (
         [UITypes.Date, UITypes.DateTime].includes(aliasColObjMap[alias].uidt)
       ) {
-        value = value.split(',');
+        value = value?.split(',');
         // the first element would be sub_op
-        sub_op = value[0];
+        sub_op = value?.[0];
         // remove the first element which is sub_op
-        value.shift();
+        value?.shift();
+        value = value?.[0];
       } else if (op === 'in') {
         value = value.split(',');
       }

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts

@@ -3,11 +3,14 @@ import { jsepCurlyHook, UITypes } from 'nocodb-sdk';
 import mapFunctionName from '../mapFunctionName';
 import genRollupSelectv2 from '../genRollupSelectv2';
 import FormulaColumn from '../../../../../models/FormulaColumn';
-import { validateDateWithUnknownFormat } from '../helpers/formulaFnHelper';
+import {
+  convertDateFormatForConcat,
+  validateDateWithUnknownFormat,
+} from '../helpers/formulaFnHelper';
 import { CacheGetType, CacheScope } from '../../../../../utils/globals';
 import NocoCache from '../../../../../cache/NocoCache';
-import type Model from '../../../../../models/Model';
 import type Column from '../../../../../models/Column';
+import type Model from '../../../../../models/Model';
 import type RollupColumn from '../../../../../models/RollupColumn';
 import type { XKnex } from '../../../index';
 import type LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn';
@@ -633,8 +636,19 @@ async function _formulaQueryBuilder(
           `${pt.callee.name}(${(
             await Promise.all(
               pt.arguments.map(async (arg) => {
-                const query = (await fn(arg)).builder.toQuery();
+                let query = (await fn(arg)).builder.toQuery();
                 if (pt.callee.name === 'CONCAT') {
+                  if (knex.clientType() !== 'sqlite3') {
+                    query = await convertDateFormatForConcat(
+                      arg,
+                      columnIdToUidt,
+                      query,
+                      knex.clientType()
+                    );
+                  } else {
+                    // sqlite3: special handling - See BinaryExpression
+                  }
+
                   if (knex.clientType() === 'mysql2') {
                     // mysql2: CONCAT() returns NULL if any argument is NULL.
                     // adding IFNULL to convert NULL values to empty strings
@@ -679,8 +693,8 @@ async function _formulaQueryBuilder(
       pt.left.fnName = pt.left.fnName || 'ARITH';
       pt.right.fnName = pt.right.fnName || 'ARITH';
 
-      const left = (await fn(pt.left, null, pt.operator)).builder.toQuery();
+      let left = (await fn(pt.left, null, pt.operator)).builder.toQuery();
-      const right = (await fn(pt.right, null, pt.operator)).builder.toQuery();
+      let right = (await fn(pt.right, null, pt.operator)).builder.toQuery();
       let sql = `${left} ${pt.operator} ${right}${colAlias}`;
 
       // comparing a date with empty string would throw
@@ -724,8 +738,22 @@ async function _formulaQueryBuilder(
         }
       }
 
-      // handle NULL values when calling CONCAT for sqlite3
       if (pt.left.fnName === 'CONCAT' && knex.clientType() === 'sqlite3') {
+        // handle date format
+        left = await convertDateFormatForConcat(
+          pt.left?.arguments?.[0],
+          columnIdToUidt,
+          left,
+          knex.clientType()
+        );
+        right = await convertDateFormatForConcat(
+          pt.right?.arguments?.[0],
+          columnIdToUidt,
+          right,
+          knex.clientType()
+        );
+
+        // handle NULL values when calling CONCAT for sqlite3
         sql = `COALESCE(${left}, '') ${pt.operator} COALESCE(${right},'')${colAlias}`;
       }
 

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/functionMappings/pg.ts

@@ -17,9 +17,9 @@ const pg = {
       builder: args.knex.raw(
         `POSITION(${args.knex.raw(
           (await args.fn(args.pt.arguments[1])).builder.toQuery()
-        )} in ${args.knex
+        )} in ${args.knex.raw(
-          .raw((await args.fn(args.pt.arguments[0])).builder)
+          (await args.fn(args.pt.arguments[0])).builder.toQuery()
-          .toQuery()})${args.colAlias}`
+        )})${args.colAlias}`
       ),
     };
   },
@@ -157,11 +157,13 @@ const pg = {
       builder: args.knex.raw(
         `CASE WHEN ${args.knex
           .raw(
-            `${args.pt.arguments
+            `${(
-              .map(async (ar) =>
+              await Promise.all(
-                (await args.fn(ar, '', 'OR')).builder.toQuery()
+                args.pt.arguments.map(async (ar) =>
+                  (await args.fn(ar, '', 'OR')).builder.toQuery()
+                )
               )
-              .join(' OR ')}`
+            ).join(' OR ')}`
           )
           .wrap('(', ')')
           .toQuery()} THEN TRUE ELSE FALSE END ${args.colAlias}`

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/convertDateFormat.ts

@@ -0,0 +1,23 @@
+export function convertDateFormat(date_format: string, type: string) {
+  if (date_format === 'YYYY-MM-DD') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%Y-%m-%d';
+  } else if (date_format === 'YYYY/MM/DD') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%Y/%m/%d';
+  } else if (date_format === 'DD-MM-YYYY') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%d/%m/%Y';
+  } else if (date_format === 'MM-DD-YYYY') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%d-%m-%Y';
+  } else if (date_format === 'DD/MM/YYYY') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%d/%m/%Y';
+  } else if (date_format === 'MM/DD/YYYY') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%m-%d-%Y';
+  } else if (date_format === 'DD MM YYYY') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%d %m %Y';
+  } else if (date_format === 'MM DD YYYY') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%m %d %Y';
+  } else if (date_format === 'YYYY MM DD') {
+    if (type === 'mysql2' || type === 'sqlite3') return '%Y %m %d';
+  }
+  // pg / mssql
+  return date_format;
+}

packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/formulaFnHelper.ts

@@ -1,5 +1,8 @@
 import dayjs, { extend } from 'dayjs';
 import customParseFormat from 'dayjs/plugin/customParseFormat.js';
+import { UITypes } from 'nocodb-sdk';
+import Column from '../../../../../models/Column';
+import { convertDateFormat } from './convertDateFormat';
 extend(customParseFormat);
 
 export function getWeekdayByText(v: string) {
@@ -50,3 +53,45 @@ export function validateDateWithUnknownFormat(v: string) {
   }
   return false;
 }
+
+export async function convertDateFormatForConcat(
+  o,
+  columnIdToUidt,
+  query,
+  clientType
+) {
+  if (
+    o?.type === 'Identifier' &&
+    o?.name in columnIdToUidt &&
+    columnIdToUidt[o.name] === UITypes.Date
+  ) {
+    const meta = (
+      await Column.get({
+        colId: o.name,
+      })
+    ).meta;
+
+    if (clientType === 'mysql2') {
+      query = `DATE_FORMAT(${query}, '${convertDateFormat(
+        meta.date_format,
+        clientType
+      )}')`;
+    } else if (clientType === 'pg') {
+      query = `TO_CHAR(${query}, '${convertDateFormat(
+        meta.date_format,
+        clientType
+      )}')`;
+    } else if (clientType === 'sqlite3') {
+      query = `strftime('${convertDateFormat(
+        meta.date_format,
+        clientType
+      )}', ${query})`;
+    } else if (clientType === 'mssql') {
+      query = `FORMAT(${query}, '${convertDateFormat(
+        meta.date_format,
+        clientType
+      )}')`;
+    }
+  }
+  return query;
+}

packages/nocodb/src/lib/plugins/vultr/Vultr.ts

@@ -105,9 +105,7 @@ export default class Vultr implements IStorageAdapterV2 {
     s3Options.accessKeyId = this.input.access_key;
     s3Options.secretAccessKey = this.input.access_secret;
 
-    s3Options.endpoint = new AWS.Endpoint(
+    s3Options.endpoint = new AWS.Endpoint(this.input.hostname);
-      `s3.${this.input.region}.cloud.ovh.net`
-    );
 
     this.s3Client = new AWS.S3(s3Options);
   }

packages/nocodb/src/lib/plugins/vultr/index.ts

@@ -5,7 +5,7 @@ import type { XcPluginConfig } from 'nc-plugin';
 const config: XcPluginConfig = {
   builder: VultrPlugin,
   title: 'Vultr Object Storage',
-  version: '0.0.1',
+  version: '0.0.2',
   logo: 'plugins/vultr.png',
   description:
     'Using Vultr Object Storage can give flexibility and cloud storage that allows applications greater flexibility and access worldwide.',
@@ -20,13 +20,13 @@ const config: XcPluginConfig = {
         type: XcType.SingleLineText,
         required: true,
       },
-      //   {
+      {
-      //   key: 'region',
+        key: 'hostname',
-      //   label: 'Region',
+        label: 'Host Name',
-      //   placeholder: 'Region',
+        placeholder: 'e.g.: ewr1.vultrobjects.com',
-      //   type: XcType.SingleLineText,
+        type: XcType.SingleLineText,
-      //   required: true
+        required: true,
-      // },
+      },
       {
         key: 'access_key',
         label: 'Access Key',

packages/nocodb/src/lib/services/attachment.svc.ts

@@ -30,8 +30,8 @@ export async function upload(param: {
 
       // if `url` is null, then it is local attachment
       if (!url) {
-        // then store the attachement path only
+        // then store the attachment path only
-        // url will be constructued in `useAttachmentCell`
+        // url will be constructed in `useAttachmentCell`
         attachmentPath = `download/${filePath.join('/')}/${fileName}`;
       }
 

packages/nocodb/src/lib/services/dbData/index.ts

@@ -131,9 +131,7 @@ export async function getDataList(param: {
     count = await baseModel.count(listArgs);
   } catch (e) {
     console.log(e);
-    NcError.internalServerError(
+    NcError.internalServerError('Please check server log for more details');
-      'Internal Server Error, check server log for more details'
-    );
   }
 
   return new PagedResponseImpl(data, {
@@ -642,9 +640,7 @@ export async function dataReadByViewId(param: {
     );
   } catch (e) {
     console.log(e);
-    NcError.internalServerError(
+    NcError.internalServerError('Please check server log for more details');
-      'Internal Server Error, check server log for more details'
-    );
   }
 }
 

packages/nocodb/src/lib/services/public/publicData.svc.ts

@@ -69,10 +69,7 @@ export async function dataList(param: {
     count = await baseModel.count(listArgs);
   } catch (e) {
     console.log(e);
-    // show empty result instead of throwing error here
+    NcError.internalServerError('Please check server log for more details');
-    // e.g. search some text in a numeric field
-
-    NcError.internalServerError('Please try after some time');
   }
 
   return new PagedResponseImpl(data, { ...param.query, count });
@@ -235,7 +232,7 @@ export async function dataInsert(param: {
     const fieldName = file?.fieldname?.replace(/^_|\[\d*]$/g, '');
 
     const filePath = sanitizeUrlPath([
-      'v1',
+      'noco',
       project.title,
       model.title,
       fieldName,
@@ -243,18 +240,25 @@ export async function dataInsert(param: {
 
     if (fieldName in fields && fields[fieldName].uidt === UITypes.Attachment) {
       attachments[fieldName] = attachments[fieldName] || [];
-      const fileName = `${nanoid(6)}_${file.originalname}`;
+      const fileName = `${nanoid(18)}${path.extname(file.originalname)}`;
-      let url = await storageAdapter.fileCreate(
+
+      const url = await storageAdapter.fileCreate(
         slash(path.join('nc', 'uploads', ...filePath, fileName)),
         file
       );
 
+      let attachmentPath;
+
+      // if `url` is null, then it is local attachment
       if (!url) {
-        url = `${param.siteUrl}/download/${filePath.join('/')}/${fileName}`;
+        // then store the attachment path only
+        // url will be constructed in `useAttachmentCell`
+        attachmentPath = `download/${filePath.join('/')}/${fileName}`;
       }
 
       attachments[fieldName].push({
-        url,
+        ...(url ? { url } : {}),
+        ...(attachmentPath ? { path: attachmentPath } : {}),
         title: file.originalname,
         mimetype: file.mimetype,
         size: file.size,
@@ -287,6 +291,7 @@ export async function relDataList(param: {
   }
 
   const column = await Column.get({ colId: param.columnId });
+
   const colOptions = await column.getColOptions<LinkToAnotherRecordColumn>();
 
   const model = await colOptions.getRelatedTable();
@@ -299,25 +304,27 @@ export async function relDataList(param: {
     dbDriver: await NcConnectionMgrv2.get(base),
   });
 
-  const { ast } = await getAst({
+  const { ast, dependencyFields } = await getAst({
     query: param.query,
     model,
     extractOnlyPrimaries: true,
   });
 
   let data = [];
+
   let count = 0;
+
   try {
     data = data = await nocoExecute(
       ast,
-      await baseModel.list(param.query),
+      await baseModel.list(dependencyFields),
       {},
-      param.query
+      dependencyFields
     );
-    count = await baseModel.count(param.query);
+    count = await baseModel.count(dependencyFields);
   } catch (e) {
-    // show empty result instead of throwing error here
+    console.log(e);
-    // e.g. search some text in a numeric field
+    NcError.internalServerError('Please check server log for more details');
   }
 
   return new PagedResponseImpl(data, { ...param.query, count });

packages/nocodb/src/lib/services/user/index.ts

@@ -458,5 +458,20 @@ export async function signup(param: {
   } as any;
 }
 
+export async function signout(param: { req: any; res: any }): Promise<any> {
+  try {
+    param.res.clearCookie('refresh_token');
+    const user = (param.req as any).user;
+    if (user) {
+      await User.update(user.id, {
+        refresh_token: null,
+      });
+    }
+    return { msg: 'Signed out successfully' };
+  } catch (e) {
+    NcError.badRequest(e.message);
+  }
+}
+
 export * from './helpers';
 export { default as initAdminFromEnv } from './initAdminFromEnv';

packages/nocodb/src/schema/swagger.json

@@ -10886,20 +10886,7 @@
         },
         "requestBody": {
           "content": {
-            "application/json": {
+            "multipart/form-data": {}
-              "schema": {
-                "type": "object",
-                "description": "Data Object where the key is column and the value is the data value"
-              },
-              "examples": {
-                "Example 1": {
-                  "value": {
-                    "col1": "foo",
-                    "col2": "bar"
-                  }
-                }
-              }
-            }
           },
           "description": ""
         },

tests/playwright/pages/Dashboard/common/Cell/index.ts

@@ -264,9 +264,11 @@ export class CellPageObject extends BasePage {
     columnHeader,
     count,
     value,
+    verifyChildList = false,
   }: CellProps & {
     count?: number;
     value: string[];
+    verifyChildList?: boolean;
   }) {
     // const count = value.length;
     const cell = await this.get({ index, columnHeader });
@@ -281,6 +283,27 @@ export class CellPageObject extends BasePage {
     for (let i = 0; i < value.length; ++i) {
       await expect(await chips.nth(i).locator('.name')).toHaveText(value[i]);
     }
+
+    if (verifyChildList) {
+      // open child list
+      await this.get({ index, columnHeader }).hover();
+      const arrow_expand = await this.get({ index, columnHeader }).locator('.nc-arrow-expand');
+
+      // arrow expand doesn't exist for bt columns
+      if (await arrow_expand.count()) {
+        await arrow_expand.click();
+
+        // wait for child list to open
+        await this.rootPage.waitForSelector('.nc-modal-child-list:visible');
+
+        // verify child list count & contents
+        const childList = await this.rootPage.locator('.ant-card:visible');
+        expect(await childList.count()).toBe(count);
+
+        // close child list
+        await this.rootPage.locator('.nc-modal-child-list').locator('button.ant-modal-close:visible').click();
+      }
+    }
   }
 
   async unlinkVirtualCell({ index, columnHeader }: CellProps) {

tests/playwright/scripts/docker-compose-pg.yml

@@ -1,8 +1,8 @@
-version: "2.1"
+version: "2.2"
 
 services:
-    pg96:
+    pg147:
-        image: postgres:9.6
+        image: postgres:14.7
         restart: always
         environment:
             POSTGRES_PASSWORD: password

tests/playwright/scripts/docker-compose-playwright-pg.yml

@@ -1,8 +1,8 @@
 version: "2.1"
 
 services:
-    pg96:
+    pg147:
-        image: postgres:15
+        image: postgres:14.7
         restart: always
         environment:
             POSTGRES_PASSWORD: password

tests/playwright/tests/columnFormula.spec.ts

@@ -122,6 +122,18 @@ const formulaDataByDbType = (context: NcContext) => [
     formula: `NOW()`,
     result: ['1', '1', '1', '1', '1'],
   },
+  {
+    formula: `OR(true, false)`,
+    result: isPg(context) ? ['true', 'true', 'true', 'true', 'true'] : ['1', '1', '1', '1', '1'],
+  },
+  {
+    formula: `AND(false, false)`,
+    result: isPg(context) ? ['false', 'false', 'false', 'false', 'false'] : ['0', '0', '0', '0', '0'],
+  },
+  {
+    formula: `IF((SEARCH({Address List}, "Parkway") != 0), "2.0","WRONG")`,
+    result: ['WRONG', 'WRONG', 'WRONG', '2.0', '2.0'],
+  },
 ];
 
 test.describe('Virtual Columns', () => {

tests/playwright/tests/megaTable.spec.ts

@@ -157,4 +157,67 @@ test.describe.serial('Test table', () => {
 
     await page.reload();
   });
+
+  test.skip('mega table - LinkToAnotherRecord', async ({ page }) => {
+    let table_1, table_2;
+    const columns = [];
+
+    // a Primary key column & display column
+    columns.push(
+      {
+        column_name: 'Id',
+        title: 'Id',
+        uidt: UITypes.ID,
+      },
+      {
+        column_name: 'SingleLineText',
+        title: 'SingleLineText',
+        uidt: UITypes.SingleLineText,
+        pv: true,
+      }
+    );
+
+    const project = await api.project.read(context.project.id);
+    // eslint-disable-next-line prefer-const
+    table_1 = await api.base.tableCreate(context.project.id, project.bases?.[0].id, {
+      table_name: 'table_1',
+      title: 'table_1',
+      columns: columns,
+    });
+    // eslint-disable-next-line prefer-const
+    table_2 = await api.base.tableCreate(context.project.id, project.bases?.[0].id, {
+      table_name: 'table_2',
+      title: 'table_2',
+      columns: columns,
+    });
+
+    const rows = [];
+    for (let i = 0; i < 1000; i++) {
+      rows.push({
+        Id: i + 1,
+        SingleLineText: `SingleLineText${i + 1}`,
+      });
+    }
+    await api.dbTableRow.bulkCreate('noco', context.project.id, table_1.id, rows);
+    await api.dbTableRow.bulkCreate('noco', context.project.id, table_2.id, rows);
+
+    await api.dbTableColumn.create(table_2.id, {
+      uidt: UITypes.LinkToAnotherRecord,
+      title: 'LinkToAnotherRecord',
+      column_name: 'LinkToAnotherRecord',
+      parentId: table_1.id,
+      childId: table_2.id,
+      type: 'hm',
+    });
+
+    // // nested add : hm
+    // for (let i = 1; i <= 1000; i++) {
+    //   await api.dbTableRow.nestedAdd('noco', project.title, table_1.table_name, i, 'hm', 'LinkToAnotherRecord', `${i}`);
+    // }
+
+    // nested add : bt
+    for (let i = 1; i <= 1000; i++) {
+      await api.dbTableRow.nestedAdd('noco', project.title, table_2.table_name, i, 'bt', 'table_1', `${i}`);
+    }
+  });
 });

tests/playwright/tests/viewGridShare.spec.ts

@@ -90,7 +90,7 @@ test.describe('Shared view', () => {
 
     // verify virtual records
     for (const record of expectedVirtualRecordsByDb) {
-      await sharedPage.grid.cell.verifyVirtualCell(record);
+      await sharedPage.grid.cell.verifyVirtualCell({ ...record, verifyChildList: true });
     }
 
     /**