Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
f90692d3
Unverified
Commit
f90692d3
authored
3 years ago
by
Ariya Hidayat
Committed by
GitHub
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Enable subdimensions on time column (type/Time) (#20902)
parent
23517953
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
frontend/src/metabase-lib/lib/metadata/Field.ts
+4
-0
4 additions, 0 deletions
frontend/src/metabase-lib/lib/metadata/Field.ts
src/metabase/api/table.clj
+21
-9
21 additions, 9 deletions
src/metabase/api/table.clj
test/metabase/api/table_test.clj
+1
-1
1 addition, 1 deletion
test/metabase/api/table_test.clj
with
26 additions
and
10 deletions
frontend/src/metabase-lib/lib/metadata/Field.ts
+
4
−
0
View file @
f90692d3
...
...
@@ -309,6 +309,10 @@ export default class Field extends Base {
"
day
"
,
);
if
(
Number
.
isNaN
(
days
)
||
this
.
isTime
())
{
return
"
hour
"
;
}
if
(
days
<
1
)
{
return
"
minute
"
;
}
else
if
(
days
<
31
)
{
...
...
This diff is collapsed.
Click to expand it.
src/metabase/api/table.clj
+
21
−
9
View file @
f90692d3
...
...
@@ -120,6 +120,8 @@
(
def
^
:private
auto-bin-str
(
deferred-tru
"Auto bin"
))
(
def
^
:private
dont-bin-str
(
deferred-tru
"Don''t bin"
))
(
def
^
:private
minute-str
(
deferred-tru
"Minute"
))
(
def
^
:private
hour-str
(
deferred-tru
"Hour"
))
(
def
^
:private
day-str
(
deferred-tru
"Day"
))
(
def
^
:private
dimension-options
...
...
@@ -131,8 +133,8 @@
:mbql
[
:field
nil
{
:temporal-unit
param
}]
:type
"type/DateTime"
})
;; note the order of these options corresponds to the order they will be shown to the user in the UI
[[
(
deferred-tru
"M
inute
"
)
"minute"
]
[
(
deferred-tru
"Hour"
)
"hour"
]
[[
m
inute
-str
"minute"
]
[
hour-str
"hour"
]
[
day-str
"day"
]
[(
deferred-tru
"Week"
)
"week"
]
[(
deferred-tru
"Month"
)
"month"
]
...
...
@@ -146,6 +148,13 @@
[(
deferred-tru
"Week of Year"
)
"week-of-year"
]
[(
deferred-tru
"Month of Year"
)
"month-of-year"
]
[(
deferred-tru
"Quarter of Year"
)
"quarter-of-year"
]])
(
map
(
fn
[[
name
param
]]
{
:name
name
:mbql
[
:field
nil
{
:temporal-unit
param
}]
:type
"type/Time"
})
[[
minute-str
"minute"
]
[
hour-str
"hour"
]
[(
deferred-tru
"Minute of Hour"
)
"minute-of-hour"
]])
(
conj
(
mapv
(
fn
[[
name
[
strategy
param
]]]
{
:name
name
...
...
@@ -189,6 +198,9 @@
(
def
^
:private
datetime-dimension-indexes
(
create-dim-index-seq
"type/DateTime"
))
(
def
^
:private
time-dimension-indexes
(
create-dim-index-seq
"type/Time"
))
(
def
^
:private
numeric-dimension-indexes
(
create-dim-index-seq
"type/Number"
))
...
...
@@ -203,6 +215,9 @@
(
def
^
:private
date-default-index
(
dimension-index-for-type
"type/DateTime"
#
(
=
(
str
day-str
)
(
str
(
:name
%
)))))
(
def
^
:private
time-default-index
(
dimension-index-for-type
"type/Time"
#
(
=
(
str
hour-str
)
(
str
(
:name
%
)))))
(
def
^
:private
numeric-default-index
(
dimension-index-for-type
"type/Number"
#
(
.contains
^
String
(
str
(
:name
%
))
(
str
auto-bin-str
))))
...
...
@@ -212,16 +227,13 @@
(
defn-
supports-numeric-binning?
[
driver
]
(
and
driver
(
driver/supports?
driver
:binning
)))
(
defn-
supports-date-binning?
"Time fields don't support binning, returns true if it's a DateTime field and not a time field"
[{
:keys
[
base_type
]
,
:as
field
}]
(
and
(
types/temporal-field?
field
)
(
not
(
isa?
base_type
:type/Time
))))
(
defn-
assoc-field-dimension-options
[
driver
{
:keys
[
base_type
semantic_type
fingerprint
]
:as
field
}]
(
let
[{
min_value
:min,
max_value
:max
}
(
get-in
fingerprint
[
:type
:type/Number
])
[
default-option
all-options
]
(
cond
(
supports-date-binning?
field
)
(
types/field-is-type?
:type/Time
field
)
[
time-default-index
time-dimension-indexes
]
(
types/temporal-field?
field
)
[
date-default-index
datetime-dimension-indexes
]
(
and
min_value
max_value
...
...
This diff is collapsed.
Click to expand it.
test/metabase/api/table_test.clj
+
1
−
1
View file @
f90692d3
...
...
@@ -713,7 +713,7 @@
(
mt/test-drivers
(
mt/normal-drivers-except
#
{
:sparksql
:mongo
:oracle
:redshift
})
(
mt/dataset
test-data-with-time
(
let
[
response
(
mt/user-http-request
:rasta
:get
200
(
format
"table/%d/query_metadata"
(
mt/id
:users
)))]
(
is
(
=
[]
(
is
(
=
@#
'table-api/time-dimension-indexes
(
dimension-options-for-field
response
"last_login_time"
))))))))))
(
deftest
nested-queries-binning-options-test
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment