@@ -70,18 +70,16 @@ qx.Class.define("osparc.dashboard.Dashboard", {
7070 init : "dashboard" ,
7171 refine : true
7272 } ,
73-
74- preResourcePromisesLoaded : {
75- check : "Boolean" ,
76- init : false ,
77- event : "changePreResourcePromisesLoaded"
78- } ,
7973 } ,
8074
8175 statics : {
8276 PADDING : 15
8377 } ,
8478
79+ events : {
80+ "preResourcesLoaded" : "qx.event.type.Event" ,
81+ } ,
82+
8583 members : {
8684 __studyBrowser : null ,
8785 __templateBrowser : null ,
@@ -187,13 +185,15 @@ qx.Class.define("osparc.dashboard.Dashboard", {
187185 this . add ( tabPage ) ;
188186 } , this ) ;
189187
188+ let preResourcesLoaded = false ;
190189 const preResourcePromises = [ ] ;
191190 const groupsStore = osparc . store . Groups . getInstance ( ) ;
192191 preResourcePromises . push ( groupsStore . fetchGroupsAndMembers ( ) ) ;
193192 preResourcePromises . push ( osparc . store . Services . getServicesLatest ( false ) ) ;
194193 Promise . all ( preResourcePromises )
195194 . then ( ( ) => {
196- this . setPreResourcePromisesLoaded ( true ) ;
195+ preResourcesLoaded = true ;
196+ this . fireEvent ( "preResourcesLoaded" ) ;
197197 if ( this . __studyBrowser ) {
198198 this . __studyBrowser . initResources ( ) ;
199199 }
@@ -210,18 +210,14 @@ qx.Class.define("osparc.dashboard.Dashboard", {
210210 const selectedTab = e . getData ( ) [ 0 ] ;
211211 if ( selectedTab && selectedTab . resourceBrowser ) {
212212 // avoid changing the selection when the PreResources are not yet loaded
213- if ( this . getPreResourcePromisesLoaded ( ) ) {
213+ if ( preResourcesLoaded ) {
214214 selectedTab . resourceBrowser . initResources ( ) ;
215215 } else {
216- const initTab = event => {
217- if ( event . getData ( ) ) {
218- selectedTab . resourceBrowser . initResources ( ) ;
219- }
216+ const initTab = ( ) => {
217+ selectedTab . resourceBrowser . initResources ( )
218+ this . removeListener ( "preResourcesLoaded" , initTab ) ;
220219 } ;
221- this . addListener ( "changePreResourcePromisesLoaded" , ev => {
222- initTab ( ev ) ;
223- this . removeListener ( "changePreResourcePromisesLoaded" , initTab ) ;
224- } ) ;
220+ this . addListener ( "preResourcesLoaded" , initTab , this ) ;
225221 }
226222 }
227223 } , this ) ;
0 commit comments