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
71fc90d1
Unverified
Commit
71fc90d1
authored
5 years ago
by
Maz Ameli
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Make variables sidebar look nicer (#11553)
* max variables sidebar look nicer * tweak variable name styling
parent
76cf5cbb
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.jsx
+18
-17
18 additions, 17 deletions
...query_builder/components/template_tags/TagEditorParam.jsx
with
18 additions
and
17 deletions
frontend/src/metabase/query_builder/components/template_tags/TagEditorParam.jsx
+
18
−
17
View file @
71fc90d1
...
...
@@ -5,6 +5,7 @@ import { connect } from "react-redux";
import
{
Link
}
from
"
react-router
"
;
import
Toggle
from
"
metabase/components/Toggle
"
;
import
Card
from
"
metabase/components/Card
"
;
import
InputBlurChange
from
"
metabase/components/InputBlurChange
"
;
import
Select
,
{
Option
}
from
"
metabase/components/Select
"
;
import
ParameterValueWidget
from
"
metabase/parameters/components/ParameterValueWidget
"
;
...
...
@@ -126,23 +127,23 @@ export default class TagEditorParam extends Component {
isDimension
&&
Array
.
isArray
(
tag
.
dimension
);
const
hasWidgetOptions
=
widgetOptions
&&
widgetOptions
.
length
>
0
;
return
(
<
div
className
=
"p
b
2 mb2
border-bottom border-dark
"
>
<
h3
className
=
"pb2"
>
{
tag
.
name
}
</
h3
>
<
Card
className
=
"p2 mb2"
>
<
h3
className
=
"pb2
text-brand
"
>
{
tag
.
name
}
</
h3
>
<
div
className
=
"pb
1
"
>
<
h
5
className
=
"pb1
text-normal
"
>
{
t
`Filter label`
}
</
h
5
>
<
div
className
=
"pb
3
"
>
<
h
4
className
=
"pb1"
>
{
t
`Filter label`
}
</
h
4
>
<
InputBlurChange
type
=
"text"
value
=
{
tag
[
"
display-name
"
]
}
className
=
"AdminSelect p1 text-bold text-
medium
bordered border-medium rounded full"
className
=
"AdminSelect p1 text-bold text-
dark
bordered border-medium rounded full"
onBlurChange
=
{
e
=>
this
.
setParameterAttribute
(
"
display-name
"
,
e
.
target
.
value
)
}
/>
</
div
>
<
div
className
=
"pb
1
"
>
<
h
5
className
=
"pb1
text-normal
"
>
{
t
`Variable type`
}
</
h
5
>
<
div
className
=
"pb
3
"
>
<
h
4
className
=
"pb1"
>
{
t
`Variable type`
}
</
h
4
>
<
Select
className
=
"border-medium bg-white block"
value
=
{
tag
.
type
}
...
...
@@ -159,13 +160,13 @@ export default class TagEditorParam extends Component {
</
div
>
{
tag
.
type
===
"
dimension
"
&&
(
<
div
className
=
"pb
1
"
>
<
h
5
className
=
"pb1
text-normal
"
>
<
div
className
=
"pb
3
"
>
<
h
4
className
=
"pb1"
>
{
t
`Field to map to`
}
{
tag
.
dimension
==
null
&&
(
<
span
className
=
"text-error mx1"
>
(required)
</
span
>
)
}
</
h
5
>
</
h
4
>
{
(
!
hasSelectedDimensionField
||
(
hasSelectedDimensionField
&&
fieldMetadataLoaded
))
&&
(
...
...
@@ -185,8 +186,8 @@ export default class TagEditorParam extends Component {
)
}
{
hasSelectedDimensionField
&&
(
<
div
className
=
"pb
1
"
>
<
h
5
className
=
"pb1
text-normal
"
>
{
t
`Filter widget type`
}
</
h
5
>
<
div
className
=
"pb
3
"
>
<
h
4
className
=
"pb1"
>
{
t
`Filter widget type`
}
</
h
4
>
<
Select
className
=
"border-med bg-white block"
value
=
{
tag
[
"
widget-type
"
]
}
...
...
@@ -222,8 +223,8 @@ export default class TagEditorParam extends Component {
</
div
>
)
}
<
div
className
=
"
flex align-center
pb
1
"
>
<
h
5
className
=
"
text-normal mr
1"
>
{
t
`Required?`
}
</
h
5
>
<
div
className
=
"pb
2
"
>
<
h
4
className
=
"
pb
1"
>
{
t
`Required?`
}
</
h
4
>
<
Toggle
value
=
{
tag
.
required
}
onChange
=
{
value
=>
this
.
setRequired
(
value
)
}
...
...
@@ -232,8 +233,8 @@ export default class TagEditorParam extends Component {
{
((
tag
.
type
!==
"
dimension
"
&&
tag
.
required
)
||
(
tag
.
type
===
"
dimension
"
||
tag
[
"
widget-type
"
]))
&&
(
<
div
className
=
"pb
1
"
>
<
h
5
className
=
"pb1
text-normal
"
>
{
t
`Default filter widget value`
}
</
h
5
>
<
div
className
=
"pb
2
"
>
<
h
4
className
=
"pb1"
>
{
t
`Default filter widget value`
}
</
h
4
>
<
ParameterValueWidget
parameter
=
{
{
type
:
...
...
@@ -248,7 +249,7 @@ export default class TagEditorParam extends Component {
/>
</
div
>
)
}
</
div
>
</
Card
>
);
}
}
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