public
/
asl-articles
1
0
Fork 0
Code Issues Pull Requests Projects Releases 5 Wiki Activity

Tightened up the startup process.

Browse Source
master
Pacman Ghost 5 years ago
parent 39253c4743
commit 867ad06bfd
5 changed files with 45 additions and 19 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. BIN
      web/public/images/loading.gif
  2. 2
      web/public/index.html
  3. 2
      web/src/App.css
  4. 56
      web/src/App.js
  5. 4
      web/src/SearchResults.js

BIN
web/public/images/loading.gif
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

2
web/public/index.html
Unescape View File

@ -9,7 +9,7 @@
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
<noscript> Javascript is disabled. Please enable it, then reload this page. </noscript>
<div id="app"> </div>
</body>

2
web/src/App.css
Unescape View File

@ -1,3 +1,5 @@
img#loading { position: fixed ; top: 50% ; left: 50% ; margin-top: -16px ; margin-left: -16px ; }
#ask img.icon { width: 2em ; float: left ; margin: 0 1em 1em 0 ; }
.MuiButton-label { text-transform: none ; }

56
web/src/App.js
Unescape View File

@ -27,6 +27,7 @@ export default class App extends React.Component
searchSeqNo: 0,
modalForm: null,
askDialog: null,
startupTasks: [ "caches.publishers", "caches.publications", "caches.tags" ],
} ;
// initialize
@ -43,20 +44,29 @@ export default class App extends React.Component
}
render() {
return ( <div>
<div id="menu">
[<a href="/" className="new-publisher"
onClick={ (e) => { e.preventDefault() ; PublisherSearchResult.onNewPublisher( this._onNewPublisher.bind(this) ) ; } }
>New publisher</a>]
[<a href="/" className="new-publication"
onClick={ (e) => { e.preventDefault() ; PublicationSearchResult.onNewPublication( this._onNewPublication.bind(this) ) ; } }
>New publication</a>]
[<a href="/" className="new-article"
onClick={ (e) => { e.preventDefault() ; ArticleSearchResult.onNewArticle( this._onNewArticle.bind(this) ) ; } }
>New article</a>]
</div>
<SearchForm onSearch={this.onSearch.bind(this)} />
<SearchResults seqNo={this.state.searchSeqNo} searchResults={this.state.searchResults} />
let content ;
if ( this.state.startupTasks.length > 0 ) {
// we are still starting up
content = <div id="loading"> <img id="loading" src="/images/loading.gif" alt="Loading..." /></div> ;
} else {
// generate the main page
content = ( <div>
<div id="menu">
[<a href="/" className="new-publisher"
onClick={ (e) => { e.preventDefault() ; PublisherSearchResult.onNewPublisher( this._onNewPublisher.bind(this) ) ; } }
>New publisher</a>]
[<a href="/" className="new-publication"
onClick={ (e) => { e.preventDefault() ; PublicationSearchResult.onNewPublication( this._onNewPublication.bind(this) ) ; } }
>New publication</a>]
[<a href="/" className="new-article"
onClick={ (e) => { e.preventDefault() ; ArticleSearchResult.onNewArticle( this._onNewArticle.bind(this) ) ; } }
>New article</a>]
</div>
<SearchForm onSearch={this.onSearch.bind(this)} />
<SearchResults seqNo={this.state.searchSeqNo} searchResults={this.state.searchResults} />
</div> ) ;
}
return ( <div> {content}
{ this.state.modalForm !== null &&
<ModalForm show={true} title={this.state.modalForm.title} content={this.state.modalForm.content} buttons={this.state.modalForm.buttons} />
}
@ -82,6 +92,7 @@ export default class App extends React.Component
axios.get( this.makeFlaskUrl( "/publishers" ) )
.then( resp => {
this.caches.publishers = resp.data ;
this._onStartupTask( "caches.publishers" ) ;
} )
.catch( err => {
this.showErrorToast( <div> Couldn't load the publishers: <div className="monospace"> {err.toString()} </div> </div> ) ;
@ -89,6 +100,7 @@ export default class App extends React.Component
axios.get( this.makeFlaskUrl( "/publications" ) )
.then( resp => {
this.caches.publications = resp.data ;
this._onStartupTask( "caches.publications" ) ;
} )
.catch( err => {
this.showErrorToast( <div> Couldn't load the publications: <div className="monospace"> {err.toString()} </div> </div> ) ;
@ -96,6 +108,7 @@ export default class App extends React.Component
axios.get( this.makeFlaskUrl( "/tags" ) )
.then( resp => {
this.caches.tags = resp.data ;
this._onStartupTask( "caches.tags" ) ;
} )
.catch( err => {
this.showErrorToast( <div> Couldn't load the tags: <div className="monospace"> {err.toString()} </div> </div> ) ;
@ -197,12 +210,12 @@ export default class App extends React.Component
logInternalError( msg, detail ) {
// log an internal error
this.showErrorToast( <div>
INTERNAL ERROR <div>{msg}</div>
INTERNAL ERROR! <div>{msg}</div>
{detail && <div className="monospace">{detail}</div>}
</div> ) ;
console.log( "INTERNAL ERROR: " + msg ) ;
if ( detail )
console.log( detail ) ;
console.log( " " + detail ) ;
}
makeTagLists( tags ) {
@ -229,6 +242,17 @@ export default class App extends React.Component
return url ;
}
_onStartupTask( taskId ) {
// flag that the specified startup task has completed
let pos = this.state.startupTasks.indexOf( taskId ) ;
if ( pos === -1 ) {
this.logInternalError( "Unknown startup task.", "taskId = "+taskId ) ;
return ;
}
this.state.startupTasks.splice( pos, 1 ) ;
this.setState( { startupTasks: this.state.startupTasks } ) ;
}
isTestMode() { return process.env.REACT_APP_TEST_MODE ; }
setTestAttribute( obj, attrName, attrVal ) {
// set an attribute on an element (for testing porpoises)

4
web/src/SearchResults.js
Unescape View File

@ -30,7 +30,7 @@ export class SearchResults extends React.Component
onDelete = { this.onDeleteSearchResult.bind( this ) }
/> ) ;
} else {
gAppRef.logInternalError( "Unknown search result type.", sr.type ) ;
gAppRef.logInternalError( "Unknown search result type.", "srType = "+sr.type ) ;
}
} ) ;
}
@ -46,7 +46,7 @@ export class SearchResults extends React.Component
return ;
}
}
gAppRef.logInternalError( "Tried to delete an unknown search result", idName+"="+idVal ) ;
gAppRef.logInternalError( "Tried to delete an unknown search result.", idName+" = "+idVal ) ;
}
}

Write Preview
Loading…
Cancel
Save