Skip to content

Commit 215ae50

Browse files
authored
feat(layers panel): 22412 make axis group mutually exclusive. Fix "openByDefault" flag for groups and categories (#1244)
* feat(layers panel): add axis (Indicators) group * Fix "openByDefault" for groups and categories
1 parent 891053e commit 215ae50

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

src/core/localization/translations/en/common.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
"other": "Other",
8484
"elevation": "Elevation",
8585
"photo": "Imagery",
86-
"map": "Map"
86+
"map": "Map",
87+
"indicators": "Indicators"
8788
},
8889
"advanced_analytics_data_list": {
8990
"load_world_data": "Load World Data",

src/core/logical_layers/constants.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,23 @@ export const groupSettings: Record<string, GroupSettings> = {
3838
mutuallyExclusive: true,
3939
order: 2,
4040
},
41+
axis: {
42+
name: i18n.t('groups.indicators'),
43+
openByDefault: false,
44+
mutuallyExclusive: true,
45+
order: 3,
46+
},
4147
qa: {
4248
name: i18n.t('groups.qa'),
4349
openByDefault: true,
4450
mutuallyExclusive: false,
45-
order: 3,
51+
order: 4,
4652
},
4753
osmbasedmap: {
4854
name: i18n.t('groups.osmbasedmap'),
4955
openByDefault: false,
5056
mutuallyExclusive: false,
51-
order: 4,
57+
order: 5,
5258
},
5359
other: {
5460
name: i18n.t('groups.other'),

src/features/layers_panel/components/Category/Category.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function Category({ category }: { category: CategoryWithSettings }) {
1515
const [openMap] = useAtomV2(layersTreeOpenStateAtom);
1616
const [counters] = useAtom(mountedLayersByCategoryAtom);
1717
const mountedLayersCounter = counters[category.id] ?? 0;
18-
const isOpen = openMap.get(category.id) ?? true;
18+
const isOpen = openMap.get(category.id) ?? category.openByDefault;
1919
const setOpen = useAction(layersTreeOpenStateAtom.set);
2020
const onCategoryDeselect = useAction(
2121
() => categoryDeselection.deselect(category.id),

src/features/layers_panel/components/Group/Group.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function Group({
2020
const [openMap] = useAtomV2(layersTreeOpenStateAtom);
2121
const [counters] = useAtom(mountedLayersByGroupAtom);
2222
const mountedLayersCounter = counters[group.id] ?? 0;
23-
const isOpen = openMap.get(group.id) ?? true;
23+
const isOpen = openMap.get(group.id) ?? group.openByDefault;
2424
const setOpen = useAction(layersTreeOpenStateAtom.set);
2525
const groupDeselectAction = useAction(
2626
() => groupDeselection.deselect(group.id),

0 commit comments

Comments
 (0)