+
diff --git a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
index 9509144597..2be468ce4a 100644
--- a/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
+++ b/packages/nc-gui/components/dashboard/TreeView/TableNode.vue
@@ -229,7 +229,6 @@ const isTableOpened = computed(() => {
{{ table.title }}
-
) {
// Return a successful response back to the calling service
api.instance.interceptors.response.use(
- (response) => response,
+ (response) => {
+ return response
+ },
// Handle Error
(error) => {
if (error.response && error.response.data && error.response.data.msg === DbNotFoundMsg) return router.replace('/project/0')
diff --git a/packages/nc-gui/composables/useViewFilters.ts b/packages/nc-gui/composables/useViewFilters.ts
index 164a08b7b4..40c718d319 100644
--- a/packages/nc-gui/composables/useViewFilters.ts
+++ b/packages/nc-gui/composables/useViewFilters.ts
@@ -447,10 +447,6 @@ export function useViewFilters(
const lookupRelation = (await getMeta(nextCol.fk_model_id))?.columns?.find(
(c) => c.id === (nextCol.colOptions as LookupType).fk_relation_column_id,
)
- if ((lookupRelation.colOptions as LinkToAnotherRecordType).type !== RelationTypes.BELONGS_TO) {
- btLookup = false
- continue
- }
const relatedTableMeta = await getMeta((lookupRelation.colOptions as LinkToAnotherRecordType).fk_related_model_id)
nextCol = relatedTableMeta?.columns?.find((c) => c.id === (nextCol.colOptions as LookupType).fk_lookup_column_id)
diff --git a/packages/nc-gui/context/index.ts b/packages/nc-gui/context/index.ts
index 7fc4e8ddbd..81ebfeaf0e 100644
--- a/packages/nc-gui/context/index.ts
+++ b/packages/nc-gui/context/index.ts
@@ -50,3 +50,4 @@ export const TreeViewInj: InjectionKey<{
openRenameTableDialog: (table: TableType, rightClick: boolean) => void
contextMenuTarget: { type?: 'project' | 'base' | 'table' | 'main' | 'layout'; value?: any }
}> = Symbol('tree-view-functions-injection')
+export const JsonExpandInj: InjectionKey> = Symbol('json-expand-injection')
diff --git a/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue b/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue
index c39c910cdb..0936c0220f 100644
--- a/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue
+++ b/packages/nc-gui/pages/index/[typeOrId]/view/[viewId].vue
@@ -13,6 +13,8 @@ const route = useRoute()
const { loadSharedView, meta } = useSharedView()
const { isViewDataLoading } = storeToRefs(useViewsStore())
+provide(MetaInj, meta)
+
const showPassword = ref(false)
onMounted(async () => {
diff --git a/packages/nc-gui/store/views.ts b/packages/nc-gui/store/views.ts
index 43a75b3309..320e595208 100644
--- a/packages/nc-gui/store/views.ts
+++ b/packages/nc-gui/store/views.ts
@@ -156,6 +156,12 @@ export const useViewsStore = defineStore('viewsStore', () => {
}) => {
const routeName = 'index-typeOrId-projectId-index-index-viewId-viewTitle'
+ let projectIdOrBaseId = projectId
+
+ if (['base'].includes(route.value.params.typeOrId as string)) {
+ projectIdOrBaseId = route.value.params.projectId as string
+ }
+
if (
router.currentRoute.value.query &&
router.currentRoute.value.query.page &&
@@ -163,11 +169,11 @@ export const useViewsStore = defineStore('viewsStore', () => {
) {
await router.push({
name: routeName,
- params: { viewTitle: view.id || '', viewId: tableId, projectId },
+ params: { viewTitle: view.id || '', viewId: tableId, projectId: projectIdOrBaseId },
query: router.currentRoute.value.query,
})
} else {
- await router.push({ name: routeName, params: { viewTitle: view.id || '', viewId: tableId, projectId } })
+ await router.push({ name: routeName, params: { viewTitle: view.id || '', viewId: tableId, projectId: projectIdOrBaseId } })
}
if (hardReload) {
@@ -175,10 +181,14 @@ export const useViewsStore = defineStore('viewsStore', () => {
.replace({
name: routeName,
query: { reload: 'true' },
- params: { viewId: tableId, projectId, viewTitle: view.id || '' },
+ params: { viewId: tableId, projectId: projectIdOrBaseId, viewTitle: view.id || '' },
})
.then(() => {
- router.replace({ name: routeName, query: {}, params: { viewId: tableId, viewTitle: view.id || '', projectId } })
+ router.replace({
+ name: routeName,
+ query: {},
+ params: { viewId: tableId, viewTitle: view.id || '', projectId: projectIdOrBaseId },
+ })
})
}
}
diff --git a/packages/nocodb/src/db/conditionV2.ts b/packages/nocodb/src/db/conditionV2.ts
index 6b598a7bc4..a3202b284d 100644
--- a/packages/nocodb/src/db/conditionV2.ts
+++ b/packages/nocodb/src/db/conditionV2.ts
@@ -100,7 +100,11 @@ const parseConditionV2 = async (
const parentModel = await parentColumn.getModel();
await parentModel.getColumns();
if (colOptions.type === RelationTypes.HAS_MANY) {
- if (['blank', 'notblank'].includes(filter.comparison_op)) {
+ if (
+ ['blank', 'notblank', 'checked', 'notchecked'].includes(
+ filter.comparison_op,
+ )
+ ) {
// handle self reference
if (parentModel.id === childModel.id) {
if (filter.comparison_op === 'blank') {
@@ -158,7 +162,11 @@ const parseConditionV2 = async (
else qbP.whereIn(parentColumn.column_name, selectQb);
};
} else if (colOptions.type === RelationTypes.BELONGS_TO) {
- if (['blank', 'notblank'].includes(filter.comparison_op)) {
+ if (
+ ['blank', 'notblank', 'checked', 'notchecked'].includes(
+ filter.comparison_op,
+ )
+ ) {
// handle self reference
if (parentModel.id === childModel.id) {
if (filter.comparison_op === 'blank') {
@@ -221,7 +229,11 @@ const parseConditionV2 = async (
const mmParentColumn = await colOptions.getMMParentColumn();
const mmChildColumn = await colOptions.getMMChildColumn();
- if (['blank', 'notblank'].includes(filter.comparison_op)) {
+ if (
+ ['blank', 'notblank', 'checked', 'notchecked'].includes(
+ filter.comparison_op,
+ )
+ ) {
// handle self reference
if (mmModel.id === childModel.id) {
if (filter.comparison_op === 'blank') {
@@ -815,6 +827,7 @@ const negatedMapping = {
nlike: { comparison_op: 'like' },
neq: { comparison_op: 'eq' },
blank: { comparison_op: 'notblank' },
+ notchecked: { comparison_op: 'checked' },
};
function getAlias(aliasCount: { count: number }) {
diff --git a/packages/nocodb/src/services/datas.service.ts b/packages/nocodb/src/services/datas.service.ts
index e4328abdab..8d1f639218 100644
--- a/packages/nocodb/src/services/datas.service.ts
+++ b/packages/nocodb/src/services/datas.service.ts
@@ -1,16 +1,11 @@
import { Injectable } from '@nestjs/common';
-import { isSystemColumn, UITypes } from 'nocodb-sdk';
+import { isSystemColumn } from 'nocodb-sdk';
import * as XLSX from 'xlsx';
import papaparse from 'papaparse';
import { nocoExecute } from 'nc-help';
import type { BaseModelSqlv2 } from '~/db/BaseModelSqlv2';
import type { PathParams } from '~/modules/datas/helpers';
-import type { LinkToAnotherRecordColumn, LookupColumn } from '~/models';
-import {
- getDbRows,
- getViewAndModelByAliasOrId,
- serializeCellValue,
-} from '~/modules/datas/helpers';
+import { getDbRows, getViewAndModelByAliasOrId } from '~/modules/datas/helpers';
import { Base, Column, Model, Project, View } from '~/models';
import { NcError } from '~/helpers/catchError';
import getAst from '~/helpers/getAst';
@@ -946,77 +941,6 @@ export class DatasService {
return { offset, dbRows, elapsed, data };
}
- async serializeCellValue({
- value,
- column,
- siteUrl,
- }: {
- column?: Column;
- value: any;
- siteUrl: string;
- }) {
- if (!column) {
- return value;
- }
-
- if (!value) return value;
-
- switch (column?.uidt) {
- case UITypes.Attachment: {
- let data = value;
- try {
- if (typeof value === 'string') {
- data = JSON.parse(value);
- }
- } catch {}
-
- return (data || []).map(
- (attachment) =>
- `${encodeURI(attachment.title)}(${encodeURI(
- attachment.path
- ? `${siteUrl}/${attachment.path}`
- : attachment.url,
- )})`,
- );
- }
- case UITypes.Lookup:
- {
- const colOptions = await column.getColOptions();
- const lookupColumn = await colOptions.getLookupColumn();
- return (
- await Promise.all(
- [...(Array.isArray(value) ? value : [value])].map(async (v) =>
- serializeCellValue({
- value: v,
- column: lookupColumn,
- siteUrl,
- }),
- ),
- )
- ).join(', ');
- }
- break;
- case UITypes.LinkToAnotherRecord:
- {
- const colOptions =
- await column.getColOptions();
- const relatedModel = await colOptions.getRelatedTable();
- await relatedModel.getColumns();
- return [...(Array.isArray(value) ? value : [value])]
- .map((v) => {
- return v[relatedModel.displayValue?.title];
- })
- .join(', ');
- }
- break;
- default:
- if (value && typeof value === 'object') {
- return JSON.stringify(value);
- }
- return value;
- }
- }
-
async getColumnByIdOrName(columnNameOrId: string, model: Model) {
const column = (await model.getColumns()).find(
(c) =>
diff --git a/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts b/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts
index d830effafc..40a974fad1 100644
--- a/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts
+++ b/packages/nocodb/tests/unit/rest/tests/newDataApis.test.ts
@@ -1224,99 +1224,6 @@ function numberBased() {
},
];
- const recordsPg = [
- {
- Id: 1,
- Number: 33,
- Decimal: 33.3,
- Currency: 33.3,
- Percent: 33,
- Duration: 10,
- Rating: 0,
- },
- {
- Id: 2,
- Number: null,
- Decimal: 456.34,
- Currency: 456.34,
- Percent: null,
- Duration: 20,
- Rating: 1,
- },
- {
- Id: 3,
- Number: 456,
- Decimal: 333.3,
- Currency: 333.3,
- Percent: 456,
- Duration: 30,
- Rating: 2,
- },
- {
- Id: 4,
- Number: 333,
- Decimal: null,
- Currency: null,
- Percent: 333,
- Duration: 40,
- Rating: 3,
- },
- {
- Id: 5,
- Number: 267,
- Decimal: 267.5674,
- Currency: 267.5674,
- Percent: 267,
- Duration: 50,
- Rating: null,
- },
- {
- Id: 6,
- Number: 34,
- Decimal: 34,
- Currency: 34,
- Percent: 34,
- Duration: 60,
- Rating: 0,
- },
- {
- Id: 7,
- Number: 8754,
- Decimal: 8754,
- Currency: 8754,
- Percent: 8754,
- Duration: null,
- Rating: 4,
- },
- {
- Id: 8,
- Number: 3234,
- Decimal: 3234.547,
- Currency: 3234.547,
- Percent: 3234,
- Duration: 70,
- Rating: 5,
- },
- {
- Id: 9,
- Number: 44,
- Decimal: 44.2647,
- Currency: 44.2647,
- Percent: 44,
- Duration: 80,
- Rating: 0,
- },
- {
- Id: 10,
- Number: 33,
- Decimal: 33.98,
- Currency: 33.98,
- Percent: 33,
- Duration: 90,
- Rating: 1,
- },
- ];
-
it.only('Number based- List & CRUD', async function () {
// list 10 records
let rsp = await ncAxiosGet({
@@ -1332,11 +1239,7 @@ function numberBased() {
isLastPage: false,
};
expect(rsp.body.pageInfo).to.deep.equal(pageInfo);
- if (isPg(context)) {
- expect(rsp.body.list).to.deep.equal(recordsPg);
- } else {
- expect(rsp.body.list).to.deep.equal(records);
- }
+ expect(rsp.body.list).to.deep.equal(records);
///////////////////////////////////////////////////////////////////////////
@@ -1360,11 +1263,7 @@ function numberBased() {
rsp = await ncAxiosGet({
url: `/api/v1/tables/${table.id}/rows/401`,
});
- if (isPg(context)) {
- expect(rsp.body).to.deep.equal({ ...recordsPg[0], Id: 401 });
- } else {
- expect(rsp.body).to.deep.equal({ ...records[0], Id: 401 });
- }
+ expect(rsp.body).to.deep.equal({ ...records[0], Id: 401 });
///////////////////////////////////////////////////////////////////////////
@@ -1377,14 +1276,6 @@ function numberBased() {
Duration: 55,
Rating: 5,
};
- const updatedRecordPg = {
- Number: 55,
- Decimal: 55.5,
- Currency: 55.5,
- Percent: 55,
- Duration: 55,
- Rating: 5,
- };
const updatedRecords = [
{
@@ -1404,25 +1295,6 @@ function numberBased() {
...updatedRecord,
},
];
- const updatedRecordsPg = [
- {
- Id: 401,
- ...updatedRecordPg,
- },
- {
- Id: 402,
- ...updatedRecordPg,
- },
- {
- Id: 403,
- ...updatedRecordPg,
- },
- {
- Id: 404,
- ...updatedRecordPg,
- },
- ];
-
rsp = await ncAxiosPatch({
body: updatedRecords,
});
@@ -1437,11 +1309,8 @@ function numberBased() {
offset: 400,
},
});
- if (isPg(context)) {
- expect(rsp.body.list).to.deep.equal(updatedRecordsPg);
- } else {
- expect(rsp.body.list).to.deep.equal(updatedRecords);
- }
+
+ expect(rsp.body.list).to.deep.equal(updatedRecords);
///////////////////////////////////////////////////////////////////////////
diff --git a/tests/playwright/pages/Dashboard/Grid/index.ts b/tests/playwright/pages/Dashboard/Grid/index.ts
index 919cf28d0a..40e4b56f3d 100644
--- a/tests/playwright/pages/Dashboard/Grid/index.ts
+++ b/tests/playwright/pages/Dashboard/Grid/index.ts
@@ -272,7 +272,7 @@ export class GridPage extends BasePage {
await this.get().locator('[data-testid="nc-check-all"]').nth(0).click({
button: 'right',
});
- await this.rootPage.locator('text=Update Selected Rows').click();
+ await this.rootPage.locator('.nc-menu-item:has-text("Update Selected Rows")').click();
await this.dashboard.waitForLoaderToDisappear();
}
diff --git a/tests/playwright/pages/Dashboard/common/Topbar/Share.ts b/tests/playwright/pages/Dashboard/common/Topbar/Share.ts
index 143d7c7a9f..af07785484 100644
--- a/tests/playwright/pages/Dashboard/common/Topbar/Share.ts
+++ b/tests/playwright/pages/Dashboard/common/Topbar/Share.ts
@@ -56,10 +56,7 @@ export class TopbarSharePage extends BasePage {
.locator('.ant-switch')
.nth(0)
.click({
- position: {
- x: 4,
- y: 4,
- },
+ position: { x: 4, y: 4 },
});
}
Cancel
+
+
+
+
diff --git a/packages/nc-gui/components/smartsheet/grid/Table.vue b/packages/nc-gui/components/smartsheet/grid/Table.vue
index 43cf0ed365..d8e1f45c32 100644
--- a/packages/nc-gui/components/smartsheet/grid/Table.vue
+++ b/packages/nc-gui/components/smartsheet/grid/Table.vue
@@ -8,6 +8,7 @@ import {
FieldsInj,
IsGroupByInj,
IsLockedInj,
+ JsonExpandInj,
MetaInj,
NavigateDir,
ReadonlyInj,
@@ -225,6 +226,9 @@ const showContextMenu = (e: MouseEvent, target?: { row: number; col: number }) =
}
}
+const isJsonExpand = ref(false)
+provide(JsonExpandInj, isJsonExpand)
+
// #Cell - 1
async function clearCell(ctx: { row: number; col: number } | null, skipUpdate = false) {
@@ -1316,6 +1320,7 @@ const handleCellClick = (event: MouseEvent, row: number, col: number) => {
v-if="addColumnDropdown"
:preload="preloadColumn"
:column-position="columnOrder"
+ :class="{ hidden: isJsonExpand }"
@submit="closeAddColumnDropdown(true)"
@cancel="closeAddColumnDropdown()"
@click.stop
diff --git a/packages/nc-gui/components/smartsheet/grid/newFile.ts b/packages/nc-gui/components/smartsheet/grid/newFile.ts
new file mode 100644
index 0000000000..ceda4f5dc6
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/grid/newFile.ts
@@ -0,0 +1,4 @@
+import { JsonExpandInj, provide } from '#imports';
+import { isJsonExpand } from './Table.vue';
+
+provide(JsonExpandInj, isJsonExpand);
diff --git a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
index d6a6e0abc0..d69efe3ffb 100644
--- a/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
+++ b/packages/nc-gui/components/smartsheet/topbar/SelectMode.vue
@@ -24,7 +24,7 @@ const { onViewsTabChange } = useViewsStore()
:class="{
active: openedViewsTab !== 'view',
}"
- @click="onViewsTabChange(isEeUI ? 'field' : 'relation')"
+ @click="onViewsTabChange('field')"
>
+
+
+
+
+
+
+
+
+ Fields
+
+
+
+
+
+
+ {{ selectedView?.title }}
+
+
+
+
+ Reset
+
+
+ Save changes
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+ Select a field
+
+ Make changes to field properties by selecting a field from the list
+
+