File tree Expand file tree Collapse file tree 2 files changed +13
-8
lines changed
services/static-webserver/client/source/class/osparc/support Expand file tree Collapse file tree 2 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -129,21 +129,21 @@ qx.Class.define("osparc.support.ConversationPage", {
129129
130130 __applyConversation : function ( conversation ) {
131131 const title = this . getChildControl ( "conversation-title" ) ;
132+ const extraContextLabel = this . getChildControl ( "conversation-extra-content" ) ;
132133 const options = this . getChildControl ( "conversation-options" ) ;
133134 if ( conversation ) {
134135 conversation . bind ( "nameAlias" , title , "value" ) ;
135136 const amISupporter = osparc . store . Products . getInstance ( ) . amIASupportUser ( ) ;
136- const extraContextLabel = this . getChildControl ( "conversation-extra-content" ) ;
137- extraContextLabel . setVisibility ( amISupporter ? "visible" : "excluded" ) ;
138137 const extraContext = conversation . getExtraContext ( ) ;
139138 if ( amISupporter && extraContext && Object . keys ( extraContext ) . length ) {
140- let extraContextText = `Support ID: ${ conversation } ` ;
139+ let extraContextText = `Support ID: ${ conversation . getConversationId ( ) } ` ;
141140 const contextProjectId = conversation . getContextProjectId ( ) ;
142141 if ( contextProjectId ) {
143142 extraContextText += `<br>Project ID: ${ contextProjectId } ` ;
144143 }
145144 extraContextLabel . setValue ( extraContextText ) ;
146145 }
146+ extraContextLabel . setVisibility ( amISupporter ? "visible" : "excluded" ) ;
147147 options . show ( ) ;
148148 } else {
149149 title . setValue ( "" ) ;
Original file line number Diff line number Diff line change @@ -144,11 +144,16 @@ qx.Class.define("osparc.support.SupportCenter", {
144144
145145 openConversation : function ( conversationId ) {
146146 const conversationPage = this . getChildControl ( "conversation-page" ) ;
147- osparc . store . ConversationsSupport . getInstance ( ) . getConversation ( conversationId )
148- . then ( conversation => {
149- conversationPage . setConversation ( conversation ) ;
150- this . __showConversation ( ) ;
151- } ) ;
147+ if ( conversationId ) {
148+ osparc . store . ConversationsSupport . getInstance ( ) . getConversation ( conversationId )
149+ . then ( conversation => {
150+ conversationPage . setConversation ( conversation ) ;
151+ this . __showConversation ( ) ;
152+ } ) ;
153+ } else {
154+ conversationPage . setConversation ( null ) ;
155+ this . __showConversation ( ) ;
156+ }
152157 } ,
153158
154159 __createConversation : function ( ) {
You can’t perform that action at this time.
0 commit comments