Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added timeout functionality for pathway summary. Related to #2362. #977

Merged
merged 5 commits into from
Jun 25, 2020

Conversation

JacobPorter
Copy link
Contributor

When a pathway summary query timeouts, the circular wait widget is removed, and then an alert and message is produced that says, "The query took too long or could not be loaded."

@@ -173,7 +173,7 @@ define([
return p + '=' + query[p];
}).join('&');

return when(request.post(_self.apiServer + '/pathway/', {
return when(request.post(_self.apiServer + 'pathway/', {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@JacobPorter Can you put these slashes back in for consistency? It doesn't look like there's a trailing slash in the configs on the servers.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The apiServer string ended with a slash, so that is why it was removed. I can put it back in if you like since it won't hurt anything, but then there will be two slashes.

@dmachi
Copy link
Contributor

dmachi commented Jun 25, 2020 via email

@nconrad
Copy link
Contributor

nconrad commented Jun 25, 2020

@dmachi I likely sent @JacobPorter my local config that did have a trailing slash. I'm now looking at the default config https://github.com/PATRIC3/p3_web/blob/master/config.js and the dataServiceURL in window.App on prod/beta/alpha/etc:

...
accountURL: "https://user.patricbrc.org"
alreadyLoggedIn: true
api: {workspace: ƒ, service: ƒ, data: ƒ}
appLabel: ""
appServiceURL: "https://p3.theseed.org/services/app_service"
appVersion: "3.6.5"
applicationContainer: {srcNodeRef: div#ApplicationContainer.dijitBorderContainerNoGutter.dijitContainer.layoutContainer.dijitLayoutCon…, _connects: Array(0), _supportingWidgets: Array(0), id: "ApplicationContainer", params: {…}, …}
compareregionServiceURL: "https://p3.theseed.org/services/compare_regions"
dataAPI: "https://patricbrc.org/api/"
dataServiceURL: "https://patricbrc.org/api"
docsServiceURL: "https://docs.patricbrc.org/"
enableDevTools: false
gaID: "UA-11736060-7"
genomedistanceServiceURL: "https://p3.theseed.org/services/minhash_service"
homologyServiceURL: "https://p3.theseed.org/services/homology_service"
localStorageCheckInterval: "15000"
probModelSeedServiceURL: "https://p3.theseed.org/services/ProbModelSEED"
serviceAPI: "https://p3.theseed.org/services/app_service"
shockServiceURL: "https://p3.theseed.org/services/shock_api"
toaster: {_attachPoints: Array(3), _attachEvents: Array(1), srcNodeRef: null, _connects: Array(0), _supportingWidgets: Array(0), …}
userServiceURL: "https://user.patricbrc.org"
version: "3.0"
workspaceAPI: "https://p3.theseed.org/services/Workspace"
workspaceServiceURL: "https://p3.theseed.org/services/Workspace"
...

[Note the other "dataAPI", "serviceAPI", "workspaceAPI" urls too]

I don't think the extra slash actually hurts anything? Or, there's also the PathJoin utility function somebody created.

@nconrad
Copy link
Contributor

nconrad commented Jun 25, 2020

@JacobPorter thanks, and sorry for the confusion. I'm partly operating on "if it ain't broken, don't fix it" for a couple weeks, and maybe we'll have maintenance time to address some of these issues.

@nconrad nconrad merged commit affb215 into PATRIC3:develop Jun 25, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants