diff --git a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
index b0a9dbc2e8..fa39cbc20b 100644
--- a/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
+++ b/packages/nc-gui/components/project/spreadsheet/public/xcTable.vue
@@ -175,7 +175,7 @@
/>
-
+
Unlock
@@ -284,20 +284,6 @@ export default {
modelName: null
}),
computed: {
- // availableColumns() {
- // let columns
- // const hideCols = ['created_at', 'updated_at']
- //
- // if (this.showSystemFields) {
- // columns = this.meta.columns || []
- // } else if (this.data && this.data.length) {
- // // c._cn in this.data[0].row &&
- // columns = (this.meta.columns.filter(c => !(c.pk && c.ai) && !hideCols.includes(c._cn))) || []
- // } else {
- // columns = (this.meta && this.meta.columns && this.meta.columns.filter(c => !(c.pk && c.ai) && !hideCols.includes(c._cn))) || []
- // }
- // return columns
- // },
concatenatedXWhere() {
let where = ''
if (this.searchField && this.searchQuery.trim()) {
@@ -386,13 +372,6 @@ export default {
if (!this.showPasswordModal && !this.notFound) {
await this.loadTableData()
}
- // const {list, count} = await this.api.paginatedList(this.queryParams);
- // this.count = count;
- // this.data = list.map(row => ({
- // row,
- // oldRow: {...row},
- // rowMeta: {}
- // }));
} catch (e) {
console.log(e)
}
@@ -658,6 +637,11 @@ export default {
this.showExpandModal = true
this.selectedExpandRowIndex = row
this.selectedExpandRowMeta = rowMeta
+ },
+ async unlock() {
+ this.showPasswordModal = false
+ await this.loadMetaData()
+ await this.loadTableData()
}
}
}
diff --git a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
index 33a57d3670..2789f5aec1 100644
--- a/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
+++ b/packages/nocodb/src/lib/noco/meta/NcMetaMgrEE.ts
@@ -171,6 +171,7 @@ export default class NcMetaMgrEE extends NcMetaMgr {
}
// todo: move this logic to a common library
+ // todo: replace with condition prop
const privateViewWhere = queryParams.filters?.reduce?.(
(condition, filt, i) => {
if (!i && !filt.logicOp) {