Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

Updating other places

Browse Source
This commit is contained in:
Jarosław Sadziński 2024-10-15 13:20:08 +02:00
parent 3718883bc9
commit 9b27e3fd2b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/client/ui/GridViewMenus.ts
View File

@ -2,7 +2,7 @@ import {allCommands} from 'app/client/components/commands';
import {GristDoc} from 'app/client/components/GristDoc'; import {GristDoc} from 'app/client/components/GristDoc';
import GridView from 'app/client/components/GridView'; import GridView from 'app/client/components/GridView';
import {makeT} from 'app/client/lib/localization'; import {makeT} from 'app/client/lib/localization';
import {ColumnRec} from "app/client/models/entities/ColumnRec"; import {ColumnRec, columnsOrder} from "app/client/models/entities/ColumnRec";
import {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec'; import {ViewFieldRec} from 'app/client/models/entities/ViewFieldRec';
import {withInfoTooltip} from 'app/client/ui/tooltips'; import {withInfoTooltip} from 'app/client/ui/tooltips';
import {isNarrowScreen, testId, theme, vars} from 'app/client/ui2018/cssVars'; import {isNarrowScreen, testId, theme, vars} from 'app/client/ui2018/cssVars';
@ -293,7 +293,7 @@ function buildDetectDuplicatesMenuItems(gridView: GridView, index?: number) {
const {viewSection} = gridView; const {viewSection} = gridView;
return menuItemSubmenu( return menuItemSubmenu(
() => searchableMenu( () => searchableMenu(
viewSection.columns().map((col) => { [...viewSection.columns()].sort(columnsOrder).map((col) => {
function buildFormula() { function buildFormula() {
if (isListType(col.type())) { if (isListType(col.type())) {
return `any([len(${col.table().tableId()}.lookupRecords(${col.colId()}` + return `any([len(${col.table().tableId()}.lookupRecords(${col.colId()}` +
@ -568,7 +568,9 @@ function buildLookupSection(gridView: GridView, index?: number){
return references.map((ref) => menuItemSubmenu( return references.map((ref) => menuItemSubmenu(
() => searchableMenu( () => searchableMenu(
ref.refTable()?.visibleColumns().map(buildRefColMenu.bind(null, ref)) ?? [], (ref.refTable()?.visibleColumns() ?? [])
.sort(columnsOrder)
.map(buildRefColMenu.bind(null, ref)),
{ {
searchInputPlaceholder: t('Search columns') searchInputPlaceholder: t('Search columns')
} }