File tree Expand file tree Collapse file tree 3 files changed +15
-36
lines changed
geonode_mapstore_client/client Expand file tree Collapse file tree 3 files changed +15
-36
lines changed Original file line number Diff line number Diff line change @@ -80,14 +80,10 @@ const persistence = {
8080 config,
8181 customFilters
8282 } ) . then ( ( { resources, ...response } ) => {
83- const filterEmptyResources = resources . filter ( resource => ! resource . resource_type ) ;
8483 const filteredResources = resources . filter ( resource => resource . resource_type ) ;
85- response = {
86- ...response ,
87- total : response . total - filterEmptyResources . length
88- }
8984 return {
9085 ...response ,
86+ total : response . total - ( resources . length - filteredResources . length ) ,
9187 resources : filteredResources . map ( ( resource ) => parseCatalogResource ( resource , monitoredState . user ) )
9288 } ;
9389 } ) ;
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ import { getCurrentProcesses } from '@js/selectors/resourceservice';
2121import FlexBox from '@mapstore/framework/components/layout/FlexBox' ;
2222import Spinner from '@mapstore/framework/components/layout/Spinner' ;
2323import Message from '@mapstore/framework/components/I18N/Message' ;
24- import ViewerLayout from '@js/components/ViewerLayout/ViewerLayout' ;
2524
2625/**
2726 * Plugin that monitors async executions embedded in resources and
@@ -88,8 +87,11 @@ function ExecutionTracker({
8887 if ( isEmpty ( resourceData ) ) {
8988 return null ;
9089 }
91-
92- const foundProcess = processes . filter ( ( p ) => p ?. resource ?. pk === resourceData ?. pk ) ;
90+ const resourcePk = resourceData ?. pk ?? resourceData ?. id ;
91+ if ( ! resourcePk ) {
92+ return null ;
93+ }
94+ const foundProcess = processes . filter ( ( p ) => p ?. resource ?. pk === resourcePk ) ;
9395 if ( ! foundProcess ?. length ) {
9496 return null ;
9597 }
@@ -106,14 +108,10 @@ function ExecutionTracker({
106108
107109 return msgId ? (
108110 < div className = "gn-execution-tracker" >
109- < ViewerLayout className = "gn-main-execution-container" >
110- < div className = "gn-execution-tracker-content" >
111- < FlexBox centerChildren gap = "sm" className = "ms-text _font-size-lg _strong" >
112- < Spinner />
113- < Message msgId = { msgId } />
114- </ FlexBox >
115- </ div >
116- </ ViewerLayout >
111+ < FlexBox centerChildren gap = "sm" className = "ms-text _font-size-lg _strong" >
112+ < Spinner />
113+ < Message msgId = { msgId } />
114+ </ FlexBox >
117115 </ div >
118116 ) : null ;
119117}
Original file line number Diff line number Diff line change 1414 height : 100% ;
1515 top : 0 ;
1616 left : 0 ;
17- .gn-main-execution-container {
18- background-color : rgba (0 , 0 , 0 , 0.85 );
19- position : relative ;
20- width : 100% ;
21- height : 100% ;
22- margin : 0 ;
23- padding : 0 ;
24- display : flex ;
25- align-items : center ;
26- justify-content : center ;
27- .gn-execution-tracker-content {
28- width : 100% ;
29- height : 100% ;
30- color : #eeeeee ;
31- background-color : transparent ;
32- display : flex ;
33- align-items : center ;
34- justify-content : center ;
35- }
36- }
17+ background-color : rgba (0 , 0 , 0 , 0.85 );
18+ color : #eeeeee ;
19+ display : flex ;
20+ align-items : center ;
21+ justify-content : center ;
3722}
You can’t perform that action at this time.
0 commit comments