Skip to content

Commit 8e84cc7

Browse files
committed
JS-7500: fix
1 parent a820ffd commit 8e84cc7

File tree

5 files changed

+15
-13
lines changed

5 files changed

+15
-13
lines changed

src/json/text.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2714,9 +2714,8 @@
27142714
"notificationMode3": "Custom",
27152715

27162716
"filterTemplate0": "Value template",
2717-
"filterTemplate1": "Current User",
2718-
"filterTemplate2": "Current Object",
2719-
"filterTemplate3": "Space Member",
2717+
"filterTemplate1": "This Object",
2718+
"filterTemplate2": "Current User",
27202719

27212720
"spaceUxType0": "None",
27222721
"spaceUxType1": "Space",

src/scss/menu/icon.scss

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,8 @@
172172
.icon.chat-link { background-image: url('~img/icon/chat/buttons/link0.svg'); }
173173
.icon.chat-pencil { background-image: url('~img/icon/chat/buttons/pencil0.svg'); }
174174

175-
.icon.filterTemplate-user { background-image: url('~img/icon/widget/button/member.svg'); }
176175
.icon.filterTemplate-object { background-image: url('~img/icon/settings/spaces.svg'); }
177-
.icon.filterTemplate-participant { background-image: url('~img/icon/settings/members.svg'); }
176+
.icon.filterTemplate-participant { background-image: url('~img/icon/widget/button/member.svg'); }
178177
.icon.advancedFilter { background-image: url('~img/icon/dataview/filters/advanced0.svg'); }
179178

180179
.icon.clipboard-copy { background-image: url('~img/icon/menu/action/clipboard/copy.svg'); }

src/ts/component/menu/dataview/filter/values.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,6 @@ const MenuDataviewFilterValues = observer(forwardRef<I.MenuRef, I.Menu>((props,
475475
details: types.length == 1 ? { type: types[0] } : {},
476476
}}
477477
dataChange={(items: any) => {
478-
if (!config.experimental) {
479-
return items;
480-
};
481-
482478
const templates = Relation.filterTemplateOptions().map(it => ({ ...it, isSystem: true }));
483479

484480
if (items.length) {

src/ts/interface/block/dataview.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,8 @@ export enum FilterQuickOption {
9292

9393
export enum FilterValueTemplate {
9494
None = 0,
95-
User = 1,
96-
Object = 2,
97-
Participant = 3,
95+
Object = 1,
96+
Participant = 2,
9897
};
9998

10099
export enum FormulaType {

src/ts/lib/util/space.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,22 @@ class UtilSpace {
6262

6363
let spaces = U.Menu.getVaultItems();
6464

65+
console.log('openFirstSpaceOrVoid', spaces);
66+
6567
if (filter) {
66-
spaces = spaces.filter(filter);
68+
spaces = spaces.filter(it => {
69+
console.log('FILTER', it, filter, filter(it));
70+
71+
return filter(it);
72+
});
6773
};
6874

75+
console.log('openFirstSpaceOrVoid', spaces);
76+
6977
if (spaces.length) {
7078
U.Router.switchSpace(spaces[0].targetSpaceId, '', false, param, true);
7179
} else {
80+
console.log('openFirstSpaceOrVoid go void');
7281
U.Router.go('/main/void/error', param);
7382
sidebar.leftPanelSubPageClose(false, false);
7483
};

0 commit comments

Comments
 (0)