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

WIP resolve conflicts Precision new #378

Closed
wants to merge 24 commits into from

Commits on Jun 3, 2021

  1. Configuration menu
    Copy the full SHA
    6549f02 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2021

  1. [PFDA-2527] precisionFDA toolbar

    - 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
    Zai Chang committed Aug 2, 2021
    Configuration menu
    Copy the full SHA
    620871a View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2021

  1. [PFDA-2600] Disable Google Analytics via config.pfda.json

     - Also added contactEmail
    Zai Chang committed Aug 3, 2021
    Configuration menu
    Copy the full SHA
    1f9d862 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2021

  1. [PFDA-2560] Session expiration warning dialog to warn users of pendin…

    …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)
    Zai Chang committed Aug 11, 2021
    Configuration menu
    Copy the full SHA
    8aa0210 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2021

  1. [PFDA-2564] Substance submission UI improvements

     - 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
    Zai Chang committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    bb77d39 View commit details
    Browse the repository at this point in the history
  2. [PFDA-2615] Disable the Upload Document button for a reference when "…

    …disableReferenceDocumentUpload" is true in config.json
    Zai Chang committed Aug 17, 2021
    Configuration menu
    Copy the full SHA
    b8b9d61 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2021

  1. Configuration menu
    Copy the full SHA
    2b39d7f View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2021

  1. [PFDA-2528] Added warning modal dialogs when users click links that n…

    …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?"
      },
    Zai Chang committed Aug 31, 2021
    Configuration menu
    Copy the full SHA
    a1bd5cf View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2021

  1. [PFDA-2687] Refined submissions success dialog

     - 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
    Zai Chang committed Oct 13, 2021
    Configuration menu
    Copy the full SHA
    19fe620 View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2021

  1. Configuration menu
    Copy the full SHA
    eb42788 View commit details
    Browse the repository at this point in the history
  2. [PFDA-2671] Fixed substance name not appearing in various places. Thi…

    …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.
    Zai Chang committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    1e3db16 View commit details
    Browse the repository at this point in the history
  3. [PFDA-2728] Update JSDraw license

    Zai Chang committed Oct 19, 2021
    Configuration menu
    Copy the full SHA
    64822cd View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2021

  1. [PFDA-2687] Tweak to substance submission success dialog message

    - Also increased spacing between dialog message and action buttons
    Zai Chang committed Oct 20, 2021
    Configuration menu
    Copy the full SHA
    4fd1b9d View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2021

  1. [PFDA-2781] Add User Downloads menu item

    Zai Chang committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    d3f5514 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Configuration menu
    Copy the full SHA
    40bf31b View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. Configuration menu
    Copy the full SHA
    d6533c3 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. JSDraw new license code

    bartapes committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    a41c5ef View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2023

  1. Merge branch 'development_3.0' into precision_new

    # 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
    bartapes committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    9612edb View commit details
    Browse the repository at this point in the history
  2. After merge cleanup

    bartapes committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    4710325 View commit details
    Browse the repository at this point in the history
  3. After merge cleanup #2

    bartapes committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    079eb64 View commit details
    Browse the repository at this point in the history
  4. Error fix

    bartapes committed Dec 6, 2023
    Configuration menu
    Copy the full SHA
    bef80ff View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. CBG removed

    bartapes committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    9f358fc View commit details
    Browse the repository at this point in the history
  2. CBG removed

    bartapes committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    6ae2c03 View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2024

  1. Merge branch 'development_3.0' into precision_new

    # Conflicts:
    #	src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.html
    bartapes committed Feb 14, 2024
    Configuration menu
    Copy the full SHA
    b732815 View commit details
    Browse the repository at this point in the history