Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Mapfor
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
simcaq
Mapfor
Commits
c016aa73
Commit
c016aa73
authored
4 years ago
by
Pietro Cavassin
Browse files
Options
Downloads
Plain Diff
Merge branch 'refactor_front' of gitlab.c3sl.ufpr.br:simcaq/mapfor into refactor_front
parents
bedf6e57
1d2aa704
No related branches found
No related tags found
1 merge request
!25
Refactor tmp into master merge
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/components/Consult.js
+4
-3
4 additions, 3 deletions
src/components/Consult.js
src/components/ExpandableGroupComponent.js
+6
-7
6 additions, 7 deletions
src/components/ExpandableGroupComponent.js
with
10 additions
and
10 deletions
src/components/Consult.js
+
4
−
3
View file @
c016aa73
...
...
@@ -96,9 +96,10 @@ class Consult {
this
.
lastRouteFilters
[
routeKey
]
=
filters
if
(
this
.
lastRouteAbortController
[
routeKey
])
{
// Abort last request of the route
this
.
lastRouteAbortController
[
routeKey
].
abort
()
}
// Commented in order to re-render chart and tables on consult page, might be necessar
// if (this.lastRouteAbortController[routeKey]) { // Abort last request of the route
// this.lastRouteAbortController[routeKey].abort()
// }
let
queryRoute
=
'
/
'
+
route
+
'
?dims=
'
+
dims
.
join
(
'
,
'
)
+
'
&filter=
'
+
filters
.
join
(
'
,
'
)
...
...
This diff is collapsed.
Click to expand it.
src/components/ExpandableGroupComponent.js
+
6
−
7
View file @
c016aa73
...
...
@@ -53,11 +53,10 @@ function ExpandableGroupComponent(props) {
location
=
{
location
}
>
<
/ChartSelectorComponent
>
:
groupInfo
.
charts
.
map
((
chart
,
idx
)
=>
(
<
Box
borderRadius
=
"
10px
"
color
=
"
text.primary
"
boxShadow
=
{
3
}
className
=
"
charts-box table-container box-square second-box
"
>
<
Box
borderRadius
=
"
10px
"
color
=
"
text.primary
"
boxShadow
=
{
3
}
className
=
"
charts-box table-container box-square second-box
"
key
=
{
idx
}
>
<
Grid
container
direction
=
"
row
"
>
<
Grid
item
md
=
{
3
}
className
=
"
title-box
"
>
<
h3
className
=
"
col-md-3 box-text text-center
"
>
{
groupInfo
.
title
}
<
/h3
>
...
...
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