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
147985f1
Unverified
Commit
147985f1
authored
7 months ago
by
Ngoc Khuat
Committed by
GitHub
7 months ago
Browse files
Options
Downloads
Patches
Plain Diff
no top level trs (#46911)
parent
8272ac47
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/metabase/pulse/render/body.clj
+2
-2
2 additions, 2 deletions
src/metabase/pulse/render/body.clj
test/metabase/pulse/render/body_test.clj
+15
-15
15 additions, 15 deletions
test/metabase/pulse/render/body_test.clj
with
17 additions
and
17 deletions
src/metabase/pulse/render/body.clj
+
2
−
2
View file @
147985f1
...
...
@@ -16,7 +16,7 @@
[
metabase.shared.models.visualization-settings
:as
mb.viz
]
[
metabase.types
:as
types
]
[
metabase.util
:as
u
]
[
metabase.util.i18n
:refer
[
trs
tru
]]
[
metabase.util.i18n
:refer
[
deferred-trs
trs
tru
]]
[
metabase.util.malli
:as
mu
]
[
toucan2.core
:as
t2
])
(
:import
...
...
@@ -38,7 +38,7 @@
:padding
:16px
})}
(
trs
"There was a problem with this question."
)]}))
(
def
^
:private
error-rendered-message
(
trs
"An error occurred while displaying this card."
))
(
def
^
:private
error-rendered-message
(
deferred-
trs
"An error occurred while displaying this card."
))
(
def
^
:private
error-rendered-info
"Default rendered-info map when there is an error displaying a card on the static viz side.
...
...
This diff is collapsed.
Click to expand it.
test/metabase/pulse/render/body_test.clj
+
15
−
15
View file @
147985f1
...
...
@@ -260,7 +260,7 @@
(
deftest
error-test
(
testing
"renders error"
(
is
(
=
"An error occurred while displaying this card."
(
->
(
body/render
:render-error
nil
nil
nil
nil
nil
)
:content
last
))))
(
->
(
body/render
:render-error
nil
nil
nil
nil
nil
)
:content
last
str
))))
(
testing
"renders card error"
(
is
(
=
"There was a problem with this question."
(
->
(
body/render
:card-error
nil
nil
nil
nil
nil
)
:content
last
)))))
...
...
@@ -884,19 +884,19 @@
{
:table.cell_column
"TOTAL"
:column_settings
{(
format
"[\"ref\",[\"field\",%d,null]]"
(
mt/id
:orders
:total
))
{
:column_title
"CASH MONEY"
}}}}]
(
mt/with-current-user
(
mt/user->id
:rasta
)
(
let
[
card-doc
(
render.tu/render-card-as-hickory
card-id
)
card-header-els
(
hik.s/select
(
hik.s/tag
:th
)
card-doc
)
dashcard-doc
(
render.tu/render-dashcard-as-hickory
dashcard-id
)
dash-header-els
(
hik.s/select
(
hik.s/tag
:th
)
dashcard-doc
)
card-header
[
"ID"
"User ID"
"Product ID"
"SUB CASH MONEY"
"Tax"
"Total"
"Discount ($)"
"Created At"
"Quantity"
]
dashcard-header
[
"ID"
"User ID"
"Product ID"
"SUB CASH MONEY"
"Tax"
"CASH MONEY"
"Discount ($)"
"Created At"
"Quantity"
]]
(
is
(
=
{
:card
card-header
:dashcard
dashcard-header
}
{
:card
(
mapcat
:content
card-header-els
)
:dashcard
(
mapcat
:content
dash-header-els
)}))))))))
(
mt/with-current-user
(
mt/user->id
:rasta
)
(
let
[
card-doc
(
render.tu/render-card-as-hickory
card-id
)
card-header-els
(
hik.s/select
(
hik.s/tag
:th
)
card-doc
)
dashcard-doc
(
render.tu/render-dashcard-as-hickory
dashcard-id
)
dash-header-els
(
hik.s/select
(
hik.s/tag
:th
)
dashcard-doc
)
card-header
[
"ID"
"User ID"
"Product ID"
"SUB CASH MONEY"
"Tax"
"Total"
"Discount ($)"
"Created At"
"Quantity"
]
dashcard-header
[
"ID"
"User ID"
"Product ID"
"SUB CASH MONEY"
"Tax"
"CASH MONEY"
"Discount ($)"
"Created At"
"Quantity"
]]
(
is
(
=
{
:card
card-header
:dashcard
dashcard-header
}
{
:card
(
mapcat
:content
card-header-els
)
:dashcard
(
mapcat
:content
dash-header-els
)}))))))))
(
deftest
table-renders-respect-conditional-formatting
(
testing
"Rendered Tables respect the conditional formatting on a card."
...
...
@@ -928,7 +928,7 @@
(
let
[
style-str
(
:style
attrs
)]
(
when
(
str/includes?
style-str
"background-color"
)
(
->
el
:content
first
))))
(
mapcat
:content
(
take
20
card-row-els
))))))))))))
(
mapcat
:content
(
take
20
card-row-els
))))))))))))
(
deftest
table-renders-conditional-formatting-even-with-hidden-column
(
testing
"Rendered Tables respect the conditional formatting on a 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