WIP resolve conflicts Precision new #378
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- New config.json options: - customToolbarComponent: Only recognises ‘precisionFDA’ for now - pfdaBaseUrl: base URL for the pfda site - Added config.pfda.json as the base config for a precisionFDA deployment - Added PfdaToolbarComponent which is used instead of the <mat-toolbar> element in BaseComponent if the config setting customToolbarComponent is ‘precisionFDA’ - Added pFDA icons and images
- Also added contactEmail
…g expiration, allowing users to extend a session or upon expiration a button redirecting the user to the login page.
- To enable this feature, add the following to config.json:
"sessionExpirationWarning": {
"extendSessionApiUrl": "/api/update_active",
"maxSessionDurationMinutes": 30
},
- The endpoint at extendSessionApiUrl should respond to a GET request and return 200 if session is updated successfully
- Note that the /login path may be outside of the Angular app (e.g. in the case of precisionFDA)
- For pFDA a button takes the user to the file uploaded to his/her user space. This required a fileUrl attribute inserted into the SubstanceDetail payload - For GSRS in general the dialog message is now a little more descriptive
…disableReferenceDocumentUpload" is true in config.json
…avigate away from GSRS or uses an external API
- To enable, add the following to config.json (values below are customised for precisionFDA)
"externalSiteWarning": {
"enabled": true,
"dialogTitle": "Accessing External Site",
"dialogMessage" : "You will be making an API call outside of the precisionFDA boundary. Do you want to continue?"
},
- Better messaging for the PFDA case - Disallow closing by clicking outside the dialog - Added “Go to Browse” button as an option to stay within the GSRS app
…s is a temporary measure and should be reverted once we upgrade to 3.0, short explanation is that the two 2.7.1 branches used for frontend and backend we used don’t actually match with respect to the name property for substances.
- Also increased spacing between dialog message and action buttons
# Conflicts: # src/app/core/assets/jsdraw/Scilligence.JSDraw2.Pro.js # src/app/core/substance-form/submit-success-dialog/submit-success-dialog.component.html # src/app/core/substance-form/submit-success-dialog/submit-success-dialog.component.ts # src/app/core/substance-form/substance-form.component.ts
# Conflicts: # src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.html
bartapes
force-pushed
the
precision_new
branch
from
b250acc
to
b732815
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.