diff --git a/packages/datalib/src/CollectionGridDisplay.ts b/packages/datalib/src/CollectionGridDisplay.ts index 032674e05..823d9508c 100644 --- a/packages/datalib/src/CollectionGridDisplay.ts +++ b/packages/datalib/src/CollectionGridDisplay.ts @@ -101,9 +101,10 @@ export class CollectionGridDisplay extends GridDisplay { setCache: ChangeCacheFunc, loadedRows, changeSet, - readOnly = false + readOnly = false, + currentSettings = null ) { - super(config, setConfig, cache, setCache, driver); + super(config, setConfig, cache, setCache, driver, undefined, undefined, currentSettings); const changedDocs = _.compact(changeSet.updates.map(chs => chs.document)); const insertedDocs = _.compact(changeSet.inserts.map(chs => chs.fields)); this.columns = analyseCollectionDisplayColumns([...(loadedRows || []), ...changedDocs, ...insertedDocs], this); diff --git a/packages/datalib/src/JslGridDisplay.ts b/packages/datalib/src/JslGridDisplay.ts index b77724e19..09f8a917f 100644 --- a/packages/datalib/src/JslGridDisplay.ts +++ b/packages/datalib/src/JslGridDisplay.ts @@ -17,9 +17,10 @@ export class JslGridDisplay extends GridDisplay { isDynamicStructure: boolean, supportsReload: boolean, editable: boolean = false, - driver: EngineDriver = null + driver: EngineDriver = null, + currentSettings = null ) { - super(config, setConfig, cache, setCache, driver); + super(config, setConfig, cache, setCache, driver, undefined, undefined, currentSettings); this.filterable = true; this.sortable = true; diff --git a/packages/datalib/src/ViewGridDisplay.ts b/packages/datalib/src/ViewGridDisplay.ts index 8767bd5a8..419808b1a 100644 --- a/packages/datalib/src/ViewGridDisplay.ts +++ b/packages/datalib/src/ViewGridDisplay.ts @@ -12,9 +12,10 @@ export class ViewGridDisplay extends GridDisplay { cache: GridCache, setCache: ChangeCacheFunc, dbinfo: DatabaseInfo, - serverVersion + serverVersion, + currentSettings ) { - super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion); + super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion, currentSettings); this.columns = this.getDisplayColumns(view); this.formColumns = this.columns; this.filterable = true; diff --git a/packages/web/src/datagrid/JslDataGrid.svelte b/packages/web/src/datagrid/JslDataGrid.svelte index 002751fcd..0a5573028 100644 --- a/packages/web/src/datagrid/JslDataGrid.svelte +++ b/packages/web/src/datagrid/JslDataGrid.svelte @@ -8,6 +8,7 @@ import DataGrid from './DataGrid.svelte'; import JslDataGridCore from './JslDataGridCore.svelte'; + import { useSettings } from '../utility/metadataLoaders'; export let jslid; export let supportsReload = false; @@ -30,6 +31,7 @@ // $: columns = ($info && $info.columns) || []; const config = writable(createGridConfig()); const cache = writable(createGridCache()); + const settingsValue = useSettings(); function handleInitializeFile() { infoCounter += 1; @@ -71,7 +73,8 @@ infoUsed?.__isDynamicStructure, supportsReload, !!changeSetState, - driver + driver, + $settingsValue ); function handleSetLoadedRows(rows) { diff --git a/packages/web/src/tabs/CollectionDataTab.svelte b/packages/web/src/tabs/CollectionDataTab.svelte index 088ea1dec..434149abe 100644 --- a/packages/web/src/tabs/CollectionDataTab.svelte +++ b/packages/web/src/tabs/CollectionDataTab.svelte @@ -36,7 +36,7 @@ import createUndoReducer from '../utility/createUndoReducer'; import invalidateCommands from '../commands/invalidateCommands'; import CollectionDataGridCore from '../datagrid/CollectionDataGridCore.svelte'; - import { useCollectionInfo, useConnectionInfo } from '../utility/metadataLoaders'; + import { useCollectionInfo, useConnectionInfo, useSettings } from '../utility/metadataLoaders'; import { extensions } from '../stores'; import CollectionJsonView from '../formview/CollectionJsonView.svelte'; import createActivator, { getActiveComponent } from '../utility/createActivator'; @@ -69,6 +69,7 @@ const config = useGridConfig(tabid); const cache = writable(createGridCache()); + const settingsValue = useSettings(); const { editorState, editorValue, setEditorData } = useEditorData({ tabid, @@ -112,7 +113,8 @@ cache.update, loadedRows, $changeSetStore?.value, - $connection?.isReadOnly + $connection?.isReadOnly, + $settingsValue ) : null; // $: console.log('LOADED ROWS MONGO', loadedRows); diff --git a/packages/web/src/tabs/ViewDataTab.svelte b/packages/web/src/tabs/ViewDataTab.svelte index 283ce398d..426504fb9 100644 --- a/packages/web/src/tabs/ViewDataTab.svelte +++ b/packages/web/src/tabs/ViewDataTab.svelte @@ -22,6 +22,7 @@ useConnectionInfo, useDatabaseInfo, useDatabaseServerVersion, + useSettings, useViewInfo, } from '../utility/metadataLoaders'; import { getLocalStorage, setLocalStorage } from '../utility/storageCache'; @@ -44,6 +45,7 @@ const config = useGridConfig(tabid); const cache = writable(createGridCache()); + const settingsValue = useSettings(); $: display = $viewInfo && $connection && $serverVersion @@ -56,7 +58,8 @@ $cache, cache.update, $dbinfo, - $serverVersion + $serverVersion, + $settingsValue ) : null;