Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
aa096bc
wip: add more field types and deal with Enum in facets
yohanboniface Aug 15, 2025
e4be9c8
wip: add FieldManager and refactor facets
yohanboniface Aug 19, 2025
bc8b9ce
wip: add fields management on the Umap object
yohanboniface Aug 22, 2025
f3bff11
wip: allow to switch from filter dialog to field dialog and vice-versa
yohanboniface Sep 9, 2025
70bbc0d
wip: customize field input according to type and add icon
yohanboniface Sep 11, 2025
337d95f
fix: fix reordering fields
yohanboniface Sep 11, 2025
c86852a
wip: keep order on field rename
yohanboniface Sep 11, 2025
5282467
wip: allow to reorder fields
yohanboniface Sep 11, 2025
02c8688
wip: make sure fields are saved after changing their type
yohanboniface Sep 15, 2025
ce2b86c
wip: introduce DateTimeInput
yohanboniface Sep 15, 2025
9f34f9d
wip: merge fieldsets for fields, filters and keys management
yohanboniface Sep 17, 2025
f763376
wip: fix filters update
yohanboniface Sep 17, 2025
896bd37
wip: poor man way of dealing with French formatted dates
yohanboniface Sep 17, 2025
e75aa62
wip: make sure we can undo a field rename
yohanboniface Sep 17, 2025
e1f1d2c
wip: fix tests
yohanboniface Sep 17, 2025
9196c06
wip: allow to edit filter from the browser
yohanboniface Sep 17, 2025
6e1f0aa
wip: add "+" icon to "add filter" button
yohanboniface Sep 17, 2025
abdef77
wip: move Facet fields to facets module
yohanboniface Sep 17, 2025
c332b9b
wip: add button to create new filter from browser
yohanboniface Sep 17, 2025
a521a3a
wip: do not fail when filtering a feature with a field from another l…
yohanboniface Sep 18, 2025
63fb1af
wip: rename Facet to Filter
yohanboniface Sep 19, 2025
0ff5760
wip: add alert of type warning
yohanboniface Sep 19, 2025
fd1e16d
wip: allow to set filters on a datalayer
yohanboniface Sep 22, 2025
aa84d99
wip: edit field and filter on the right parent from tableeditor
yohanboniface Sep 22, 2025
8554f3a
wip: create both filters and fields from legacy facetKey
yohanboniface Sep 23, 2025
0e6e6ac
wip: delete filter if any when deleting related field
yohanboniface Sep 23, 2025
420bdc2
fix: revert private elements (class fields)
davidbgk Sep 23, 2025
15c81d1
fix: fallback to field name when filter has no label
davidbgk Sep 23, 2025
cd5d6f0
fix: set type button for edit filter icons
davidbgk Sep 23, 2025
0d1636c
fix: dynamic panel header to edit/add filters
davidbgk Sep 23, 2025
e95869a
fix: disable add filter button when there is no field
davidbgk Sep 23, 2025
8e7fe75
feat: add butons to open layer edit and table panels from feature panel
yohanboniface Sep 24, 2025
5076817
feat: add buttons to open layer edit and table panels from feature pa…
davidbgk Sep 24, 2025
7315cc4
feat: add a message when user is logged and anonymous owner to attach…
yohanboniface Sep 24, 2025
66e9fe2
fix: do not try to open a dialog when one is closing
yohanboniface Sep 25, 2025
cdd9b10
wip: allow to change target of new filter
yohanboniface Sep 25, 2025
fea7081
wip: display filter edit button aligned right
yohanboniface Sep 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion umap/static/umap/css/bar.css
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
width: var(--control-size);
height: var(--control-size);
}
.umap-edit-bar button {
.umap-edit-bar button[type="button"] {
padding: 0;
border-radius: 0;
}
Expand Down
33 changes: 26 additions & 7 deletions umap/static/umap/css/form.css
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,19 @@ select {
border-width: 1px;
}

.dark select[disabled],
select[disabled] {
background-color: var(--color-mediumGray);
color: var(--color-lightGray);
cursor: not-allowed;
}

select[multiple="multiple"] {
height: auto;
}

.button,
[type="button"],
[type="button"]:not(.icon),
input[type="submit"] {
display: flex;
align-items: center;
Expand Down Expand Up @@ -155,16 +162,19 @@ input[type="submit"] {
}

button.flat,
[type="button"].flat,
.dark [type="button"].flat {
border: none;
background-color: inherit;
[type="button"].flat {
padding: 0;
text-align: start;
min-height: inherit;
width: initial;
display: initial;
line-height: inherit;
}

button.flat,
[type="button"].flat,
.dark [type="button"].flat {
border: none;
background-color: inherit;
color: var(--text-color);
}

Expand Down Expand Up @@ -306,10 +316,14 @@ details summary {
color: var(--color-light);
}

.dark details fieldset {
.dark details fieldset:not(.formbox) {
border: 1px solid var(--color-darkGray);
}

summary h4 {
display: inline;
}

fieldset legend {
font-size: .9rem;
padding: 0 5px;
Expand Down Expand Up @@ -755,3 +769,8 @@ input.highlightable:not(:placeholder-shown) {
.umap-import [type=url] {
margin-bottom: 0;
}

.select-with-actions {
display: flex;
align-items: center;
}
36 changes: 34 additions & 2 deletions umap/static/umap/css/icon.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
background-color: initial;
}

[type=button].icon-16,
button.icon-16,
.icon-16 {
height: 24px;
line-height: 24px;
width: 24px;
--tile: -24px;
}

[type=button].icon-24,
button.icon-24,
.icon-24 {
background-image: url('../img/24.svg');
--tile: -36px;
Expand Down Expand Up @@ -120,7 +123,7 @@ html[dir="rtl"] .icon {

.icon-drag {
background-position: calc(var(--tile) * 3) calc(var(--tile) * 3);
cursor: move;
cursor: grab;
float: inline-end;
visibility: hidden;
}
Expand Down Expand Up @@ -157,6 +160,35 @@ html[dir="rtl"] .icon {
background-position: calc(var(--tile) * 5) 0;
}

.icon-field-Boolean {
background-position: calc(var(--tile) * 2) calc(var(--tile) * 8);
}

.icon-field-Date {
background-position: calc(var(--tile) * 5) calc(var(--tile) * 8);
}

.icon-field-Datetime {
background-position: calc(var(--tile) * 6) calc(var(--tile) * 8);
}

.icon-field-Enum {
background-position: calc(var(--tile) * 7) calc(var(--tile) * 8);
}

.icon-field-Number {
background-position: calc(var(--tile) * 3) calc(var(--tile) * 8);
}

.icon-field-String {
background-position: var(--tile) calc(var(--tile) * 8);
}

.icon-field-Text {
background-position: 0 calc(var(--tile) * 8);
}


.icon-filters {
background-position: 0px var(--tile);
}
Expand Down
11 changes: 11 additions & 0 deletions umap/static/umap/css/panel.css
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@
background-color: var(--color-veryDarkGray);
}

.panel .umap-filter legend {
display: flex;
justify-content: space-between;
}

.panel .filter-toolbox {
position: absolute;
right: 25px;
background-color: var(--background-color);
}

@media all and (orientation:landscape) {
.panel {
top: var(--current-header-height);
Expand Down
14 changes: 11 additions & 3 deletions umap/static/umap/img/16-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion umap/static/umap/img/16.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading