Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ncats/GSRSFrontend
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: GSRSv3.1.1SR3
Choose a base ref
...
head repository: ncats/GSRSFrontend
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: development_3.0
Choose a head ref
Loading
Showing with 5,754 additions and 38,576 deletions.
  1. +1 −1 .github/workflows/codeql.yml
  2. +25 −9 .travis.yml
  3. +5 −0 README.md
  4. +0 −37,337 package-lock.json
  5. +12 −12 package.dev.json
  6. +15 −17 package.json
  7. +20 −19 package.real.json
  8. +3 −14 src/README.md
  9. +4 −6 src/app/core/admin/fragment-wizard/fragment-wizard.component.ts
  10. +11 −1 src/app/core/admin/import-browse/import-summary/import-summary.component.ts
  11. +4 −1 src/app/core/app.module.ts
  12. +0 −1 src/app/core/auth/auth.interceptor.ts
  13. +0 −1 src/app/core/auth/login/login.component.ts
  14. +1 −0 src/app/core/bulk-search/bulk-query.model.ts
  15. +8 −6 .../core/bulk-search/bulk-search-results-summary/substances/bulk-search-results-summary.component.ts
  16. +1 −1 src/app/core/bulk-search/bulk-search.component.ts
  17. +370 −20 src/app/core/bulk-search/service/bulk-search.service.ts
  18. +10 −8 src/app/core/bulk-search/user-query-list-dialog/user-query-list-dialog.component.html
  19. +6 −0 src/app/core/bulk-search/user-query-list-dialog/user-query-list-dialog.component.scss
  20. +37 −4 src/app/core/bulk-search/user-query-list-dialog/user-query-list-dialog.component.ts
  21. +24 −0 src/app/core/config/config.model.ts
  22. +5 −1 src/app/core/facets-manager/facets-manager.component.ts
  23. +7 −4 src/app/core/structure/structure-image-modal/structure-image-modal.component.html
  24. +11 −3 src/app/core/structure/structure-image-modal/structure-image-modal.component.ts
  25. +3 −3 src/app/core/substance-details/structure-details/structure-details.component.html
  26. +7 −0 src/app/core/substance-details/structure-details/structure-details.component.scss
  27. +20 −5 src/app/core/substance-details/structure-details/structure-details.component.ts
  28. +3 −1 src/app/core/substance-details/structure-details/structure-details.module.ts
  29. +2 −2 src/app/core/substance-details/substance-codes/substance-codes.component.html
  30. +17 −5 src/app/core/substance-details/substance-codes/substance-codes.component.ts
  31. +1 −1 src/app/core/substance-details/substance-details.component.html
  32. +98 −3 src/app/core/substance-details/substance-details.component.ts
  33. +47 −2 src/app/core/substance-details/substance-history/substance-history.component.html
  34. +99 −4 src/app/core/substance-details/substance-history/substance-history.component.ts
  35. +3 −6 ...p/core/substance-details/substance-mixture-components/substance-mixture-components.component.html
  36. +1 −2 src/app/core/substance-details/substance-mixture-parent/substance-mixture-parent.component.html
  37. +1 −2 src/app/core/substance-details/substance-mixture-source/substance-mixture-source.component.html
  38. +2 −2 src/app/core/substance-details/substance-names/substance-names.component.html
  39. +16 −2 src/app/core/substance-details/substance-names/substance-names.component.ts
  40. +4 −0 src/app/core/substance-details/substance-overview/substance-overview.component.html
  41. +5 −0 src/app/core/substance-details/substance-overview/substance-overview.component.scss
  42. +12 −3 src/app/core/substance-details/substance-overview/substance-overview.component.ts
  43. +2 −2 src/app/core/substance-details/substance-references/substance-references.component.html
  44. +14 −1 src/app/core/substance-details/substance-references/substance-references.component.ts
  45. +2 −2 src/app/core/substance-details/substance-relationships/substance-relationships.component.html
  46. +13 −0 src/app/core/substance-details/substance-relationships/substance-relationships.component.ts
  47. +4 −4 src/app/core/substance-form/codes/substance-form-codes-card.component.html
  48. +16 −1 src/app/core/substance-form/codes/substance-form-codes-card.component.ts
  49. +2 −0 src/app/core/substance-form/constituents/constituent-form.component.ts
  50. +11 −2 src/app/core/substance-form/constituents/substance-form-constituents-card.component.html
  51. +12 −0 src/app/core/substance-form/constituents/substance-form-constituents-card.component.scss
  52. +32 −3 src/app/core/substance-form/constituents/substance-form-constituents-card.component.ts
  53. +5 −1 src/app/core/substance-form/constituents/substance-form-constituents.module.ts
  54. +10 −2 src/app/core/substance-form/constituents/substance-form-constituents.service.ts
  55. +7 −6 src/app/core/substance-form/definition-switch-dialog/definition-switch-dialog.component.ts
  56. +13 −0 src/app/core/substance-form/names/substance-form-names-card.component.ts
  57. +4 −4 src/app/core/substance-form/references/substance-form-references-card.component.html
  58. +15 −1 src/app/core/substance-form/references/substance-form-references-card.component.ts
  59. +4 −4 src/app/core/substance-form/relationships/substance-form-relationships-card.component.html
  60. +17 −1 src/app/core/substance-form/relationships/substance-form-relationships-card.component.ts
  61. +3 −3 src/app/core/substance-form/substance-form.component.html
  62. +3 −0 src/app/core/substance-form/substance-form.component.ts
  63. +5 −0 src/app/core/substance-form/subunit-form/subunit-form.component.html
  64. +14 −0 src/app/core/substance-form/subunit-form/subunit-form.component.ts
  65. +3 −1 src/app/core/substance-selector/advanced-selector-dialog/advanced-selector-dialog.component.ts
  66. +4 −3 src/app/core/substance-selector/substance-selector.component.ts
  67. +1 −1 src/app/core/substance-text-search/substance-text-search.component.ts
  68. +11 −0 src/app/core/substance/substance.model.ts
  69. +115 −44 src/app/core/substance/substance.service.ts
  70. +2 −2 src/app/core/substances-browse/list-create-dialog/list-create-dialog.component.html
  71. +5 −0 src/app/core/substances-browse/list-create-dialog/list-create-dialog.component.scss
  72. +3 −0 src/app/core/substances-browse/list-create-dialog/list-create-dialog.component.ts
  73. +2 −2 src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.html
  74. +0 −1 src/app/core/substances-browse/substance-summary-card/substance-summary-card.component.ts
  75. +429 −353 src/app/core/substances-browse/substances-browse.component.html
  76. +70 −1 src/app/core/substances-browse/substances-browse.component.scss
  77. +295 −46 src/app/core/substances-browse/substances-browse.component.ts
  78. +3 −0 src/app/core/utils/paging-response.model.ts
  79. +6 −1 src/app/fda/application/application.module.ts
  80. +48 −0 src/app/fda/application/applications-browse/applications-browse.component.html
  81. +239 −116 src/app/fda/application/applications-browse/applications-browse.component.ts
  82. +351 −12 src/app/fda/application/service/application.service.ts
  83. +120 −1 src/app/fda/config/config.json
  84. +134 −0 src/app/fda/cross-entity-search/cross-entity-search.component.html
  85. +255 −0 src/app/fda/cross-entity-search/cross-entity-search.component.scss
  86. +25 −0 src/app/fda/cross-entity-search/cross-entity-search.component.spec.ts
  87. +621 −0 src/app/fda/cross-entity-search/cross-entity-search.component.ts
  88. +93 −0 src/app/fda/cross-entity-search/cross-entity-search.module.ts
  89. +16 −0 src/app/fda/cross-entity-search/cross-entity-search.service.spec.ts
  90. +260 −0 src/app/fda/cross-entity-search/cross-entity-search.service.ts
  91. +4 −0 src/app/fda/fda.module.ts
  92. +35 −35 ...app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.html
  93. +47 −1 src/app/fda/impurities/impurities-form/impurities-details-form/impurities-details-form.component.ts
  94. +41 −63 src/app/fda/impurities/impurities-form/impurities-form.component.html
  95. +80 −2 src/app/fda/impurities/impurities-form/impurities-form.component.ts
  96. +13 −19 ...fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.html
  97. +50 −4 ...p/fda/impurities/impurities-form/impurities-inorganic-form/impurities-inorganic-form.component.ts
  98. +20 −26 ...ties/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.html
  99. +52 −6 ...rities/impurities-form/impurities-inorganic-test-form/impurities-inorganic-form-test.component.ts
  100. +15 −20 ...mpurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.html
  101. +56 −9 .../impurities-form/impurities-residual-solvents-form/impurities-residual-solvents-form.component.ts
  102. +19 −26 ...ties-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.html
  103. +52 −5 ...rities-form/impurities-residual-solvents-test-form/impurities-residual-solvents-test.component.ts
  104. +21 −24 ...fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.html
  105. +47 −1 ...p/fda/impurities/impurities-form/impurities-substance-form/impurities-substance-form.component.ts
  106. +167 −141 src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.html
  107. +51 −6 src/app/fda/impurities/impurities-form/impurities-test-form/impurities-test-form.component.ts
  108. +11 −5 src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.html
  109. +50 −6 src/app/fda/impurities/impurities-form/impurities-total-form/impurities-total-form.component.ts
  110. +35 −16 ...impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.html
  111. +50 −4 ...a/impurities/impurities-form/impurities-unspecified-form/impurities-unspecified-form.component.ts
  112. +3 −1 src/app/fda/impurities/impurities.module.ts
  113. +6 −2 src/app/fda/product/product.module.ts
  114. +54 −0 src/app/fda/product/products-browse/products-browse.component.html
  115. +115 −7 src/app/fda/product/products-browse/products-browse.component.ts
  116. +332 −16 src/app/fda/product/service/product.service.ts
  117. +86 −1 src/app/fda/service/general.service.ts
  118. +1 −0 ...a/substance-browse/substance-application-match-list/substance-application-match-list.component.ts
  119. +1 −0 src/app/fda/substance-browse/substance-counts/substance-counts.component.ts
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ jobs:
analyze:
name: Analyze (${{ matrix.language }})
runs-on:
group: ncats-onprem-internal-runners-test
group: ncats-onprem-internal-runners
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
# required for all workflows
34 changes: 25 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -4,28 +4,44 @@ language: node_js
node_js:
- 17.9.1


install:

- cp package.dev.json package.json
- rm -rf node_modules
- rm -rf package-lock.json
- rm -rf package.json
# Set up the development package JSON for the initial install
- cp package.dev.json package.json
- npm install

# Clean up previous node_modules and package-lock files
- rm -rf node_modules package-lock.json

# Install dependencies (first time, using legacy-peer-deps if necessary)
- npm install --legacy-peer-deps

# Run build scripts
- npm run build-file-select
- npm run build-jsdraw-wrapper
- npm run build-ketcher-wrapper

# Switch to the real package JSON and reinstall
- cp package.real.json package.json
- npm install --legacy-peer-deps

# Install specific webpack version and sources package
- npm install webpack
- npm i --save webpack-sources --legacy-peer-deps
- npm install --save webpack-sources --legacy-peer-deps

# Install @types/ws and undici@5.5.1 (specific versions)
- npm install -f @types/ws@8.5.4
- npm install -g yarn
- npm uninstall undici
- npm install undici@5.5.1

# Install Yarn globally
- npm install -g yarn

# Set memory limit for Node.js to avoid crashes during builds
- export NODE_OPTIONS="--max-old-space-size=8192"

script:
# Run the production build
- npm run build:fda:prod

after_success:
# Run this script only for the 'development_3.0' branch
- if [ $TRAVIS_BRANCH = 'development_3.0' ]; then bash travisScript.sh; else echo "Not a branch set to push"; fi
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -108,6 +108,11 @@ npm audit fix // this step not needed after angular upgrade
- After a few seconds of compiling the application, you're ready to view your application
- Open your browser and navigate to http://localhost:4200

You'll also need to to make adjustments to the API base urls and Gateway. See [here](https://github.com/ncats/gsrs3-main-deployment#optionally-use-development-mode-for-the-frontend-in-the-local-embedded-deployment) details.

If you have a need for a different environment, you can create a new one based on the existing pattern.


## Troubleshooting

GSRSFrontend uses node-sass, which has varying compatibilities based on the version of node.js being used. See https://www.npmjs.com/package/node-sass to check which version is compatable with your node version. The value of node-sass being used can be changed in the root 'package.json' file, where the default value is set as `"node-sass": "4.13.1",`
Loading