feat: user field record type

Signed-off-by: mertmit <mertmit99@gmail.com>

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

@@ -2,6 +2,7 @@
 import { onUnmounted } from '@vue/runtime-core'
 import tinycolor from 'tinycolor2'
 import type { Select as AntSelect } from 'ant-design-vue'
+import type { UserFieldRecordType } from 'nocodb-sdk'
 import {
   ActiveCellInj,
   CellClickHookInj,
@@ -25,7 +26,7 @@ import {
 import MdiCloseCircle from '~icons/mdi/close-circle'
 
 interface Props {
-  modelValue?: { id: string; email: string; display_name: string }[] | string | null
+  modelValue?: UserFieldRecordType[] | string | null
   rowIndex?: number
   location?: 'cell' | 'filter'
   forceMulti?: boolean
@@ -75,14 +76,15 @@ const searchVal = ref<string | null>()
 
 const { isUIAllowed } = useRoles()
 
-const options = computed<{ id: string; email: string; display_name: string }[]>(() => {
+const options = computed<UserFieldRecordType[]>(() => {
-  const collaborators: { id: string; email: string; display_name: string }[] = []
+  const collaborators: UserFieldRecordType[] = []
 
   collaborators.push(
     ...(baseUsers.value?.map((user: any) => ({
       id: user.id,
       email: user.email,
       display_name: user.display_name,
+      deleted: user.deleted,
     })) || []),
   )
   return collaborators
@@ -309,9 +311,9 @@ const filterOption = (input: string, option: any) => {
       <template #suffixIcon>
         <GeneralIcon icon="arrowDown" class="text-gray-700 nc-select-expand-btn" />
       </template>
+      <template v-for="op of options" :key="op.id || op.email">
         <a-select-option
-        v-for="op of options"
+          v-if="!op.deleted"
-        :key="op.id || op.email"
           :value="op.id"
           :data-testid="`select-option-${column.title}-${location === 'filter' ? 'filter' : rowIndex}`"
           :class="`nc-select-option-${column.title}-${op.email}`"
@@ -331,6 +333,7 @@ const filterOption = (input: string, option: any) => {
             </span>
           </a-tag>
         </a-select-option>
+      </template>
 
       <template #tagRender="{ label, value: val, onClose }">
         <a-tag

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

@@ -44,7 +44,9 @@ const loadCollaborators = async () => {
 
     totalCollaborators.value = totalRows
     collaborators.value = [
-      ...users.map((user: any) => ({
+      ...users
+        .filter((u: any) => !u?.deleted)
+        .map((user: any) => ({
           ...user,
           base_roles: user.roles,
           roles: extractRolesObj(user.main_roles)?.[OrgUserRoles.SUPER_ADMIN]

packages/nc-gui/composables/useMultiSelect/index.ts

@@ -2,7 +2,7 @@ import { computed } from 'vue'
 import dayjs from 'dayjs'
 import type { Ref } from 'vue'
 import type { MaybeRef } from '@vueuse/core'
-import type { ColumnType, LinkToAnotherRecordType, TableType } from 'nocodb-sdk'
+import type { ColumnType, LinkToAnotherRecordType, TableType, UserFieldRecordType } from 'nocodb-sdk'
 import { RelationTypes, UITypes, dateFormats, isDateMonthFormat, isSystemColumn, isVirtualCol, timeFormats } from 'nocodb-sdk'
 import { parse } from 'papaparse'
 import type { Cell } from './cellRange'
@@ -115,7 +115,7 @@ export function useMultiSelect(
     if (columnObj.uidt === UITypes.User) {
       if (textToCopy && Array.isArray(textToCopy)) {
         textToCopy = textToCopy
-          .map((user: { id: string; email: string; display_name: string }) => {
+          .map((user: UserFieldRecordType) => {
             return user.email
           })
           .join(', ')

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

@@ -2763,6 +2763,13 @@ export interface NotificationUpdateType {
   is_read?: boolean;
 }
 
+export interface UserFieldRecordType {
+  id: string;
+  display_name?: string;
+  email: string;
+  deleted?: boolean;
+}
+
 import type {
   AxiosInstance,
   AxiosRequestConfig,
@@ -3343,7 +3350,7 @@ export class Api<
       }),
 
     /**
- * @description Regenerate user refresh token
+ * @description Creates a new refresh token and JWT auth token for the user. The refresh token is sent as a cookie, while the JWT auth token is included in the response body.
  * 
  * @tags Auth
  * @name TokenRefresh
@@ -3351,7 +3358,7 @@ export class Api<
  * @request POST:/api/v1/auth/token/refresh
  * @response `200` `{
   \**
-   * New access token for user
+   * New JWT auth token for user
    * @example 96751db2d53fb834382b682268874a2ea9ee610e4d904e688d1513f11d3c30d62d36d9e05dec0d63
    *\
   token?: string,
@@ -3367,7 +3374,7 @@ export class Api<
       this.request<
         {
           /**
-           * New access token for user
+           * New JWT auth token for user
            * @example 96751db2d53fb834382b682268874a2ea9ee610e4d904e688d1513f11d3c30d62d36d9e05dec0d63
            */
           token?: string;

packages/nocodb/src/meta/meta.service.ts

@@ -912,7 +912,7 @@ export class MetaService {
     );
   }
 
-  private now(): any {
+  public now(): any {
     return dayjs()
       .utc()
       .format(this.isMySQL() ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD HH:mm:ssZ');

packages/nocodb/src/schema/swagger.json

@@ -23864,6 +23864,27 @@
             "type": "boolean"
           }
         }
+      },
+      "UserFieldRecord": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string",
+            "required": true
+          },
+          "display_name": {
+            "type": "string",
+            "required": false
+          },
+          "email": {
+            "type": "string",
+            "required": true
+          },
+          "deleted": {
+            "type": "boolean",
+            "required": false
+          }
+        }
       }
     },
     "responses": {