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
ea716279
Unverified
Commit
ea716279
authored
7 years ago
by
Tom Robinson
Browse files
Options
Downloads
Patches
Plain Diff
Don't update filter when selecting no points
parent
49dc864d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/src/metabase/qb/lib/actions.js
+11
-7
11 additions, 7 deletions
frontend/src/metabase/qb/lib/actions.js
with
11 additions
and
7 deletions
frontend/src/metabase/qb/lib/actions.js
+
11
−
7
View file @
ea716279
...
...
@@ -9,6 +9,7 @@ import * as Field from "metabase/lib/query/field";
import
*
as
Filter
from
"
metabase/lib/query/filter
"
;
import
{
startNewCard
}
from
"
metabase/lib/card
"
;
import
{
isDate
,
isState
,
isCountry
}
from
"
metabase/lib/schema_metadata
"
;
import
Utils
from
"
metabase/lib/utils
"
;
import
type
{
Card
as
CardObject
}
from
"
metabase/meta/types/Card
"
;
import
type
{
TableMetadata
}
from
"
metabase/meta/types/Metadata
"
;
...
...
@@ -49,8 +50,8 @@ const clone = card => {
const
newCard
=
startNewCard
(
"
query
"
);
newCard
.
display
=
card
.
display
;
newCard
.
dataset_query
=
card
.
dataset_query
;
newCard
.
visualization_settings
=
card
.
visualization_settings
;
newCard
.
dataset_query
=
Utils
.
copy
(
card
.
dataset_query
)
;
newCard
.
visualization_settings
=
Utils
.
copy
(
card
.
visualization_settings
)
;
return
newCard
;
};
...
...
@@ -235,7 +236,7 @@ export const breakout = (card, breakout, tableMetadata) => {
const
MIN_INTERVALS
=
4
;
export
const
updateDateTimeFilter
=
(
card
,
column
,
start
,
end
)
=>
{
c
ard
=
clone
(
card
);
let
newC
ard
=
clone
(
card
);
let
fieldRef
=
getFieldRefFromColumn
(
column
);
start
=
moment
(
start
);
...
...
@@ -256,7 +257,7 @@ export const updateDateTimeFilter = (card, column, start, end) => {
}
// update the breakout
c
ard
=
addOrUpdateBreakout
(
c
ard
,
[
newC
ard
=
addOrUpdateBreakout
(
newC
ard
,
[
"
datetime-field
"
,
fieldRef
,
"
as
"
,
...
...
@@ -267,16 +268,19 @@ export const updateDateTimeFilter = (card, column, start, end) => {
start
=
start
.
startOf
(
column
.
unit
);
end
=
end
.
startOf
(
column
.
unit
);
if
(
start
.
isAfter
(
end
))
{
return
card
;
}
if
(
start
.
isSame
(
end
,
column
.
unit
))
{
// is the start and end are the same (in whatever the original unit was) then just do an "="
return
addOrUpdateFilter
(
c
ard
,
[
return
addOrUpdateFilter
(
newC
ard
,
[
"
=
"
,
[
"
datetime-field
"
,
fieldRef
,
"
as
"
,
column
.
unit
],
start
.
format
()
]);
}
else
{
// otherwise do a BETWEEN
return
addOrUpdateFilter
(
c
ard
,
[
return
addOrUpdateFilter
(
newC
ard
,
[
"
BETWEEN
"
,
[
"
datetime-field
"
,
fieldRef
,
"
as
"
,
column
.
unit
],
start
.
format
(),
...
...
@@ -284,7 +288,7 @@ export const updateDateTimeFilter = (card, column, start, end) => {
]);
}
}
else
{
return
addOrUpdateFilter
(
c
ard
,
[
return
addOrUpdateFilter
(
newC
ard
,
[
"
BETWEEN
"
,
fieldRef
,
start
.
format
(),
...
...
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