Merge pull request #9827 from nocodb/nc-fix/misc

Nc fix/miscellaneous bug fixes

packages/nc-gui/components/general/Gift.vue

@@ -59,7 +59,7 @@ const closeAndShowAgain = () => {
         <GeneralIcon class="icon" icon="gift" size="xlarge" />
         <h4>Gifts Unlocked!</h4>
       </div>
-      <div class="body">We are giving away $100 worth of amazon coupons to our pro open source users!</div>
+      <div class="body">We are giving away $50 worth of amazon coupons to our pro open source users!</div>
     </div>
     <div v-if="!hideImage && !giftBannerDismissedCount" class="img-wrapper">
       <img src="~assets/img/giftCard.svg" />

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

@@ -339,13 +339,15 @@ async function submitForm() {
     }
   }
 
-  await insertRow({
+  const res = await insertRow({
     row: { ...formState.value, ...state.value },
     oldRow: {},
     rowMeta: { new: true },
   })
 
-  submitted.value = true
+  if (res) {
+    submitted.value = true
+  }
 }
 
 async function clearForm() {

packages/nc-gui/components/smartsheet/column/FormulaOptions.vue

@@ -127,6 +127,9 @@ watch(
   () => {
     debouncedValidate()
   },
+  {
+    immediate: true,
+  },
 )
 
 // set additional validations

packages/nc-gui/components/smartsheet/grid/InfiniteTable.vue

@@ -2136,7 +2136,8 @@ watch(
                           'active-cell !after:h-[calc(100%-2px)]':
                             (activeCell.row === row.rowMeta.rowIndex && activeCell.col === 0) ||
                             (selectedRange._start?.row === row.rowMeta.rowIndex && selectedRange._start?.col === 0),
-                          'nc-required-cell': cellMeta[index]?.[0]?.isColumnRequiredAndNull && !isPublicView,
+                          'nc-required-cell':
+                            !row.rowMeta?.isLoading && cellMeta[index]?.[0]?.isColumnRequiredAndNull && !isPublicView,
                           'align-middle': !rowHeightEnum || rowHeightEnum === 1,
                           'align-top': rowHeightEnum && rowHeightEnum !== 1,
                           'filling': fillRangeMap[`${row.rowMeta.rowIndex}-0`],
@@ -2207,7 +2208,8 @@ watch(
                           'active-cell':
                             (activeCell.row === row.rowMeta.rowIndex && activeCell.col === colIndex) ||
                             (selectedRange._start?.row === row.rowMeta.rowIndex && selectedRange._start?.col === colIndex),
-                          'nc-required-cell': cellMeta[index][colIndex].isColumnRequiredAndNull && !isPublicView,
+                          'nc-required-cell':
+                            !row.rowMeta?.isLoading && cellMeta[index][colIndex].isColumnRequiredAndNull && !isPublicView,
                           'align-middle': !rowHeightEnum || rowHeightEnum === 1,
                           'align-top': rowHeightEnum && rowHeightEnum !== 1,
                           'filling': fillRangeMap[`${row.rowMeta.rowIndex}-${colIndex}`],

packages/nc-gui/components/virtual-cell/components/UnLinkedItems.vue

@@ -66,7 +66,7 @@ const relation = computed(() => {
 
 const linkRow = async (row: Record<string, any>, id: number) => {
   if (isNew.value) {
-    addLTARRef(row, injectedColumn?.value as ColumnType)
+    await addLTARRef(row, injectedColumn?.value as ColumnType)
     if (relation.value === 'oo' || relation.value === 'bt') {
       isChildrenExcludedListLinked.value.forEach((isLinked, idx) => {
         if (isLinked) {

packages/nc-gui/composables/useApi/interceptors.ts

@@ -67,6 +67,14 @@ export function addAxiosInterceptors(api: Api<any>) {
           skipLogout: true,
         })
 
+        if (!token) {
+          await state.signOut({
+            redirectToSignin: !isSharedPage,
+            skipApiCall: true,
+          })
+          return Promise.reject(error)
+        }
+
         const config = error.config
         config.headers['xc-auth'] = token
 

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

@@ -92,7 +92,11 @@ export interface SignOutParams {
 export interface Actions {
   signOut: (signOutParams?: SignOutParams) => Promise<void>
   signIn: (token: string, keepProps?: boolean) => void
-  refreshToken: (params: { axiosInstance?: AxiosInstance; skipLogout?: boolean; cognitoOnly?: boolean }) => Promise<void>
+  refreshToken: (params: {
+    axiosInstance?: AxiosInstance
+    skipLogout?: boolean
+    cognitoOnly?: boolean
+  }) => Promise<string | null | void>
   loadAppInfo: () => void
   setIsMobileMode: (isMobileMode: boolean) => void
   navigateToProject: (params: { workspaceId?: string; baseId?: string; type?: NcProjectType; query?: any }) => void

packages/nc-gui/utils/dataUtils.ts

@@ -91,14 +91,14 @@ export async function populateInsertObject({
       col.uidt === UITypes.LinkToAnotherRecord &&
       (<LinkToAnotherRecordType>col.colOptions).type === RelationTypes.BELONGS_TO
     ) {
-      if (ltarState[col.title!]) {
+      if (ltarState[col.title!] || row[col.title!]) {
+        const ltarVal = ltarState[col.title!] || row[col.title!]
         const colOpt = <LinkToAnotherRecordType>col.colOptions
         const childCol = meta.columns!.find((c) => colOpt.fk_child_column_id === c.id)
         const relatedTableMeta = (await getMeta(colOpt.fk_related_model_id!)) as TableType
         if (relatedTableMeta && childCol) {
-          o[childCol.title!] =
-            ltarState[col.title!][relatedTableMeta!.columns!.find((c) => c.id === colOpt.fk_parent_column_id)!.title!]
-          missingRequiredColumns.delete(childCol.title)
+          o[childCol.title!] = ltarVal[relatedTableMeta!.columns!.find((c) => c.id === colOpt.fk_parent_column_id)!.title!]
+          if (o[childCol.title!] !== null && o[childCol.title!] !== undefined) missingRequiredColumns.delete(childCol.title)
         }
       }
     }

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

@@ -2846,6 +2846,8 @@ export interface ViewType {
     | MapType
     | CalendarType
     | (FormType & GalleryType & GridType & KanbanType & MapType & CalendarType);
+  /** ID of view owner user */
+  owned_by?: IdType;
 }
 
 /**
@@ -2918,6 +2920,8 @@ export interface ViewUpdateReqType {
   order?: number;
   /** Should this view show system fields? */
   show_system_fields?: BoolType;
+  /** ID of view owner user */
+  owned_by?: IdType;
 }
 
 /**

packages/nocodb/src/db/BaseModelSqlv2.ts

@@ -4973,7 +4973,7 @@ class BaseModelSqlv2 {
       let response;
       const query = this.dbDriver(this.tnPath).insert(insertObj);
 
-      if (this.isPg || this.isMssql) {
+      if ((this.isPg || this.isMssql) && this.model.primaryKey) {
         query.returning(
           `${this.model.primaryKey.column_name} as ${this.model.primaryKey.id}`,
         );
@@ -5053,7 +5053,7 @@ class BaseModelSqlv2 {
 
       await this.runOps(postInsertOps.map((f) => f(rowId)));
 
-      if (rowId !== null && rowId !== undefined) {
+      if (this.model.primaryKey && rowId !== null && rowId !== undefined) {
         response = await this.readRecord({
           idOrRecord: rowId,
           validateFormula: false,

packages/nocodb/src/helpers/populateSamplePayload.ts

@@ -77,8 +77,6 @@ export async function populateSamplePayloadV2(
     data: {
       table_id: model.id,
       table_name: model.title,
-      view_id: model.views[0].id,
-      view_name: model.views[0].title,
     },
   };
 

packages/nocodb/src/models/Column.ts

@@ -57,6 +57,27 @@ const selectColors = [
 
 const logger = new Logger('Column');
 
+const requiredColumnsToRecreate = {
+  [UITypes.LinkToAnotherRecord]: [
+    'type',
+    'fk_child_column_id',
+    'fk_parent_column_id',
+    'fk_related_model_id',
+  ],
+  [UITypes.Links]: [
+    'type',
+    'fk_child_column_id',
+    'fk_parent_column_id',
+    'fk_related_model_id',
+  ],
+  [UITypes.Rollup]: ['fk_relation_column_id', 'fk_rollup_column_id'],
+  [UITypes.Lookup]: ['fk_relation_column_id', 'fk_lookup_column_id'],
+  [UITypes.QrCode]: ['fk_qr_value_column_id'],
+  [UITypes.Barcode]: ['fk_barcode_value_column_id'],
+  [UITypes.Button]: ['type', 'label'],
+  [UITypes.Formula]: ['formula'],
+};
+
 export default class Column<T = any> implements ColumnType {
   public fk_model_id: string;
   public fk_workspace_id?: string;
@@ -1112,157 +1133,148 @@ export default class Column<T = any> implements ColumnType {
     skipFormulaInvalidate = false,
   ) {
     const oldCol = await Column.get(context, { colId }, ncMeta);
-    let insertColOpt = true;
-    switch (oldCol.uidt) {
-      case UITypes.Lookup: {
-        // LookupColumn.insert()
+    const requiredColAvail =
+      !requiredColumnsToRecreate[oldCol.uidt] ||
+      requiredColumnsToRecreate[oldCol.uidt].every((k) => column[k]);
 
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_LOOKUP,
-          {
-            fk_column_id: colId,
-          },
-        );
-        await NocoCache.deepDel(
-          `${CacheScope.COL_LOOKUP}:${colId}`,
-          CacheDelDirection.CHILD_TO_PARENT,
-        );
-        break;
-      }
-      case UITypes.Rollup: {
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_ROLLUP,
-          {
-            fk_column_id: colId,
-          },
-        );
-        await NocoCache.deepDel(
-          `${CacheScope.COL_ROLLUP}:${colId}`,
-          CacheDelDirection.CHILD_TO_PARENT,
-        );
-        break;
-      }
+    if (requiredColAvail) {
+      switch (oldCol.uidt) {
+        case UITypes.Lookup: {
+          // LookupColumn.insert()
 
-      case UITypes.Links:
-      case UITypes.LinkToAnotherRecord: {
-        // delete only if all required fields are present
-        if (
-          [
-            'type',
-            'fk_child_column_id',
-            'fk_parent_column_id',
-            'fk_related_model_id',
-          ].some((k) => !column[k])
-        ) {
-          insertColOpt = false;
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_LOOKUP,
+            {
+              fk_column_id: colId,
+            },
+          );
+          await NocoCache.deepDel(
+            `${CacheScope.COL_LOOKUP}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
+          break;
+        }
+        case UITypes.Rollup: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_ROLLUP,
+            {
+              fk_column_id: colId,
+            },
+          );
+          await NocoCache.deepDel(
+            `${CacheScope.COL_ROLLUP}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
           break;
         }
 
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_RELATIONS,
-          {
-            fk_column_id: colId,
-          },
-        );
-        await NocoCache.deepDel(
-          `${CacheScope.COL_RELATION}:${colId}`,
-          CacheDelDirection.CHILD_TO_PARENT,
-        );
-        break;
-      }
-      case UITypes.Formula: {
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_FORMULA,
-          {
-            fk_column_id: colId,
-          },
-        );
+        case UITypes.Links:
+        case UITypes.LinkToAnotherRecord: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_RELATIONS,
+            {
+              fk_column_id: colId,
+            },
+          );
+          await NocoCache.deepDel(
+            `${CacheScope.COL_RELATION}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
+          break;
+        }
+        case UITypes.Formula: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_FORMULA,
+            {
+              fk_column_id: colId,
+            },
+          );
 
-        await NocoCache.deepDel(
-          `${CacheScope.COL_FORMULA}:${colId}`,
-          CacheDelDirection.CHILD_TO_PARENT,
-        );
-        break;
-      }
+          await NocoCache.deepDel(
+            `${CacheScope.COL_FORMULA}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
+          break;
+        }
 
-      case UITypes.Button: {
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_BUTTON,
-          {
-            fk_column_id: colId,
-          },
-        );
+        case UITypes.Button: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_BUTTON,
+            {
+              fk_column_id: colId,
+            },
+          );
 
-        await NocoCache.deepDel(
-          `${CacheScope.COL_BUTTON}:${colId}`,
-          CacheDelDirection.CHILD_TO_PARENT,
-        );
-        break;
-      }
+          await NocoCache.deepDel(
+            `${CacheScope.COL_BUTTON}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
+          break;
+        }
 
-      case UITypes.QrCode: {
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_QRCODE,
-          {
-            fk_column_id: colId,
-          },
-        );
+        case UITypes.QrCode: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_QRCODE,
+            {
+              fk_column_id: colId,
+            },
+          );
 
-        await NocoCache.deepDel(
-          `${CacheScope.COL_QRCODE}:${colId}`,
-          CacheDelDirection.CHILD_TO_PARENT,
-        );
-        break;
-      }
+          await NocoCache.deepDel(
+            `${CacheScope.COL_QRCODE}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
+          break;
+        }
 
-      case UITypes.Barcode: {
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_BARCODE,
-          {
-            fk_column_id: colId,
-          },
-        );
+        case UITypes.Barcode: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_BARCODE,
+            {
+              fk_column_id: colId,
+            },
+          );
 
-        await NocoCache.deepDel(
-          `${CacheScope.COL_BARCODE}:${colId}`,
-          CacheDelDirection.CHILD_TO_PARENT,
-        );
-        break;
-      }
+          await NocoCache.deepDel(
+            `${CacheScope.COL_BARCODE}:${colId}`,
+            CacheDelDirection.CHILD_TO_PARENT,
+          );
+          break;
+        }
 
-      case UITypes.MultiSelect:
-      case UITypes.SingleSelect: {
-        await ncMeta.metaDelete(
-          context.workspace_id,
-          context.base_id,
-          MetaTable.COL_SELECT_OPTIONS,
-          {
-            fk_column_id: colId,
-          },
-        );
+        case UITypes.MultiSelect:
+        case UITypes.SingleSelect: {
+          await ncMeta.metaDelete(
+            context.workspace_id,
+            context.base_id,
+            MetaTable.COL_SELECT_OPTIONS,
+            {
+              fk_column_id: colId,
+            },
+          );
 
-        await NocoCache.deepDel(
-          `${CacheScope.COL_SELECT_OPTION}:${colId}:list`,
-          CacheDelDirection.PARENT_TO_CHILD,
-        );
-        break;
+          await NocoCache.deepDel(
+            `${CacheScope.COL_SELECT_OPTION}:${colId}:list`,
+            CacheDelDirection.PARENT_TO_CHILD,
+          );
+          break;
+        }
       }
     }
-
     const updateObj = extractProps(column, [
       'column_name',
       'title',
@@ -1362,7 +1374,7 @@ export default class Column<T = any> implements ColumnType {
     );
 
     // insert new col options only if existing colOption meta is deleted
-    if (insertColOpt)
+    if (requiredColAvail)
       await this.insertColOption(context, column, colId, ncMeta);
 
     // on column update, delete any optimised single query cache

packages/nocodb/src/services/hooks.service.ts

@@ -225,7 +225,7 @@ export class HooksService {
         model: model,
         view: null,
         prevData: null,
-        newData: data,
+        newData: data.rows,
         user: user,
         testFilters: (hook as any)?.filters,
         throwErrorOnFailure: true,