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

Added a helper function to generate URL's for the Flask backend server.

Browse Source
master
Pacman Ghost 5 years ago
parent 0864ddadb0
commit c96508f467
4 changed files with 41 additions and 28 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. 45
      web/src/App.js
  2. 6
      web/src/ArticleSearchResult.js
  3. 10
      web/src/PublicationSearchResult.js
  4. 8
      web/src/PublisherSearchResult.js

45
web/src/App.js
Unescape View File

@ -19,14 +19,6 @@ const queryString = require( "query-string" ) ;
export default class App extends React.Component
{
constructor( props ) {
// figure out the base URL of the Flask backend server
// NOTE: We allow the caller to do this since the test suite will usually spin up
// it's own Flask server, but talks to an existing React server, so we need some way
// for pytest to change which Flask server the React frontend code should tak to.
const args = queryString.parse( window.location.search ) ;
let flaskBaseUrl = process.env.REACT_APP_TEST_MODE ? args._flask : null ;
if ( ! flaskBaseUrl )
flaskBaseUrl = process.env.REACT_APP_FLASK_URL ;
// initialize the App
super( props ) ;
@ -35,10 +27,19 @@ export default class App extends React.Component
searchSeqNo: 0,
modalForm: null,
askDialog: null,
// test settings follow
flaskBaseUrl: flaskBaseUrl,
storeMsgs: process.env.REACT_APP_TEST_MODE && args.store_msgs,
} ;
// initialize
const args = queryString.parse( window.location.search ) ;
this._storeMsgs = process.env.REACT_APP_TEST_MODE && args.store_msgs ;
// figure out the base URL of the Flask backend server
// NOTE: We allow the caller to do this since the test suite will usually spin up
// it's own Flask server, but talks to an existing React server, so we need some way
// for pytest to change which Flask server the React frontend code should tak to.
this._flaskBaseUrl = process.env.REACT_APP_TEST_MODE ? args._flask : null ;
if ( ! this._flaskBaseUrl )
this._flaskBaseUrl = process.env.REACT_APP_FLASK_URL ;
}
render() {
@ -63,7 +64,7 @@ export default class App extends React.Component
<AskDialog show={true} content={this.state.askDialog.content} buttons={this.state.askDialog.buttons} />
}
<ToastContainer position="bottom-right" hideProgressBar={true} />
{ this.state.storeMsgs && <div>
{ this._storeMsgs && <div>
<textarea id="_stored_msg-info_toast_" ref="_stored_msg-info_toast_" defaultValue="" hidden={true} />
<textarea id="_stored_msg-warning_toast_" ref="_stored_msg-warning_toast_" defaultValue="" hidden={true} />
<textarea id="_stored_msg-error_toast_" ref="_stored_msg-error_toast_" defaultValue="" hidden={true} />
@ -78,14 +79,14 @@ export default class App extends React.Component
// which is simpler and less error-prone than trying to manually keep our caches in sync. It's less efficient,
// but it won't happen too often, there won't be too many entries, and the database server is local.
this.caches = {} ;
axios.get( this.state.flaskBaseUrl + "/publishers" )
axios.get( this.makeFlaskUrl( "/publishers" ) )
.then( resp => {
this.caches.publishers = resp.data ;
} )
.catch( err => {
this.showErrorToast( <div> Couldn't load the publishers: <div className="monospace"> {err.toString()} </div> </div> ) ;
} ) ;
axios.get( this.state.flaskBaseUrl + "/publications" )
axios.get( this.makeFlaskUrl( "/publications" ) )
.then( resp => {
this.caches.publications = resp.data ;
} )
@ -96,7 +97,7 @@ export default class App extends React.Component
onSearch( query ) {
// run the search
axios.post( this.state.flaskBaseUrl + "/search", {
axios.post( this.makeFlaskUrl( "/search" ), {
query: query
} )
.then( resp => {
@ -149,7 +150,7 @@ export default class App extends React.Component
showWarningToast( msg ) { this._doShowToast( "warning", msg, 15*1000 ) ; }
showErrorToast( msg ) { this._doShowToast( "error", msg, false ) ; }
_doShowToast( type, msg, autoClose ) {
if ( this.state.storeMsgs ) {
if ( this._storeMsgs ) {
// save the message for the test suite to retrieve (nb: we also don't show the toast itself
// since these build up when tests are running at high speed, and obscure elements that
// we want to click on :-/
@ -195,4 +196,16 @@ export default class App extends React.Component
console.log( detail ) ;
}
makeFlaskUrl( url, args ) {
// generate a URL for the Flask backend server
url = this._flaskBaseUrl + url ;
if ( args ) {
let args2 = [] ;
for ( let a in args )
args2.push( a + "=" + encodeURIComponent( args[a] ) ) ;
url = url + "?" + args2.join("&") ;
}
return url ;
}
}

6
web/src/ArticleSearchResult.js
Unescape View File

@ -26,7 +26,7 @@ export class ArticleSearchResult extends React.Component
static onNewArticle( notify ) {
ArticleSearchResult._doEditArticle( {}, (newVals,refs) => {
axios.post( gAppRef.state.flaskBaseUrl + "/article/create", newVals )
axios.post( gAppRef.makeFlaskUrl( "/article/create" ), newVals )
.then( resp => {
// unload any cleaned values
for ( let r in refs ) {
@ -51,7 +51,7 @@ export class ArticleSearchResult extends React.Component
ArticleSearchResult._doEditArticle( this.props.data, (newVals,refs) => {
// send the updated details to the server
newVals.article_id = this.props.data.article_id ;
axios.post( gAppRef.state.flaskBaseUrl + "/article/update", newVals )
axios.post( gAppRef.makeFlaskUrl( "/article/update" ), newVals )
.then( resp => {
// update the UI with the new details
for ( let r in refs )
@ -132,7 +132,7 @@ export class ArticleSearchResult extends React.Component
gAppRef.ask( content, {
"OK": () => {
// delete the article on the server
axios.get( gAppRef.state.flaskBaseUrl + "/article/delete/" + this.props.data.article_id )
axios.get( gAppRef.makeFlaskUrl( "/article/delete/" + this.props.data.article_id ) )
.then( resp => {
// update the UI
this.props.onDelete( "article_id", this.props.data.article_id ) ;

10
web/src/PublicationSearchResult.js
Unescape View File

@ -23,7 +23,7 @@ export class PublicationSearchResult extends React.Component
static onNewPublication( notify ) {
PublicationSearchResult._doEditPublication( {}, (newVals,refs) => {
axios.post( gAppRef.state.flaskBaseUrl + "/publication/create?list=1", newVals )
axios.post( gAppRef.makeFlaskUrl( "/publication/create", {list:1} ), newVals )
.then( resp => {
// update the cached publications
gAppRef.caches.publications = resp.data.publications ;
@ -50,7 +50,7 @@ export class PublicationSearchResult extends React.Component
PublicationSearchResult._doEditPublication( this.props.data, (newVals,refs) => {
// send the updated details to the server
newVals.pub_id = this.props.data.pub_id ;
axios.post( gAppRef.state.flaskBaseUrl + "/publication/update?list=1", newVals )
axios.post( gAppRef.makeFlaskUrl( "/publication/update", {list:1} ), newVals )
.then( resp => {
// update the cached publications
gAppRef.caches.publications = resp.data.publications ;
@ -147,7 +147,7 @@ export class PublicationSearchResult extends React.Component
gAppRef.ask( content, {
"OK": () => {
// delete the publication on the server
axios.get( gAppRef.state.flaskBaseUrl + "/publication/delete/" + this.props.data.pub_id + "?list=1" )
axios.get( gAppRef.makeFlaskUrl( "/publication/delete/" + this.props.data.pub_id, {list:1} ) )
.then( resp => {
// update the cached publications
gAppRef.caches.publications = resp.data.publications ;
@ -169,7 +169,7 @@ export class PublicationSearchResult extends React.Component
} ) ;
}
// get the publication details
axios.get( gAppRef.state.flaskBaseUrl + "/publication/" + this.props.data.pub_id )
axios.get( gAppRef.makeFlaskUrl( "/publication/" + this.props.data.pub_id ) )
.then( resp => {
doDelete( resp.data.nArticles ) ;
} )
@ -185,7 +185,7 @@ export class PublicationSearchResult extends React.Component
gAppRef.ask( content, {
"OK": () => {
// delete the publication on the server
axios.get( gAppRef.state.flaskBaseUrl + "/publication/delete/" + this.props.data.pub_id + "?list=1" )
axios.get( gAppRef.makeFlaskUrl( "/publication/delete/" + this.props.data.pub_id, {list:1} ) )
.then( resp => {
// update the cached publications
gAppRef.caches.publications = resp.data.publications ;

8
web/src/PublisherSearchResult.js
Unescape View File

@ -21,7 +21,7 @@ export class PublisherSearchResult extends React.Component
static onNewPublisher( notify ) {
PublisherSearchResult._doEditPublisher( {}, (newVals,refs) => {
axios.post( gAppRef.state.flaskBaseUrl + "/publisher/create?list=1", newVals )
axios.post( gAppRef.makeFlaskUrl( "/publisher/create", {list:1} ), newVals )
.then( resp => {
// update the cached publishers
gAppRef.caches.publishers = resp.data.publishers ;
@ -48,7 +48,7 @@ export class PublisherSearchResult extends React.Component
PublisherSearchResult._doEditPublisher( this.props.data, (newVals,refs) => {
// send the updated details to the server
newVals.publ_id = this.props.data.publ_id ;
axios.post( gAppRef.state.flaskBaseUrl + "/publisher/update?list=1", newVals )
axios.post( gAppRef.makeFlaskUrl( "/publisher/update", {list:1} ), newVals )
.then( resp => {
// update the cached publishers
gAppRef.caches.publishers = resp.data.publishers ;
@ -129,7 +129,7 @@ export class PublisherSearchResult extends React.Component
gAppRef.ask( content, {
"OK": () => {
// delete the publisher on the server
axios.get( gAppRef.state.flaskBaseUrl + "/publisher/delete/" + this.props.data.publ_id + "?list=1" )
axios.get( gAppRef.makeFlaskUrl( "/publisher/delete/" + this.props.data.publ_id, {list:1} ) )
.then( resp => {
// update the cached publishers
gAppRef.caches.publishers = resp.data.publishers ;
@ -155,7 +155,7 @@ export class PublisherSearchResult extends React.Component
} ) ;
} ;
// get the publisher details
axios.get( gAppRef.state.flaskBaseUrl + "/publisher/" + this.props.data.publ_id )
axios.get( gAppRef.makeFlaskUrl( "/publisher/" + this.props.data.publ_id ) )
.then( resp => {
doDelete( resp.data.nPublications, resp.data.nArticles ) ;
} )

Write Preview
Loading…
Cancel
Save